From eeea8c17b7dfb4ca706de3d2fdcdb4b4d168e9e0 Mon Sep 17 00:00:00 2001 From: Mael GRAMAIN Date: Tue, 22 Dec 2020 21:01:18 -0400 Subject: [PATCH] SQL database migration command --- extra/db.sql | 64 ---------------------------------------------------- main.go | 7 ++++-- utils/sql.go | 10 ++++++-- 3 files changed, 13 insertions(+), 68 deletions(-) delete mode 100644 extra/db.sql diff --git a/extra/db.sql b/extra/db.sql deleted file mode 100644 index bfcc657..0000000 --- a/extra/db.sql +++ /dev/null @@ -1,64 +0,0 @@ -CREATE DATABASE IF NOT EXISTS `sacrebleudatabase` /*!40100 DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci */ /*!80016 DEFAULT ENCRYPTION='N' */; -USE `sacrebleudatabase`; --- MySQL dump 10.13 Distrib 8.0.22, for macos10.15 (x86_64) --- --- Host: localhost Database: sacrebleudatabase --- ------------------------------------------------------ --- Server version 8.0.22 - -/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */; -/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */; -/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */; -/*!50503 SET NAMES utf8 */; -/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */; -/*!40103 SET TIME_ZONE='+00:00' */; -/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */; -/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */; -/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */; -/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */; - --- --- Table structure for table `domains` --- - -DROP TABLE IF EXISTS `domains`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `domains` ( - `id` int NOT NULL, - `friendly_name` text NOT NULL, - `fqdn` varchar(255) NOT NULL, - `owner_id` int NOT NULL, - `last_edit` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; - --- --- Table structure for table `records` --- - -DROP TABLE IF EXISTS `records`; -/*!40101 SET @saved_cs_client = @@character_set_client */; -/*!50503 SET character_set_client = utf8mb4 */; -CREATE TABLE `records` ( - `id` int NOT NULL AUTO_INCREMENT, - `domain_id` int NOT NULL, - `name` text NOT NULL, - `content` text NOT NULL, - `ttl` int NOT NULL, - `type` int NOT NULL, - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=8 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; -/*!40101 SET character_set_client = @saved_cs_client */; -/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */; - -/*!40101 SET SQL_MODE=@OLD_SQL_MODE */; -/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */; -/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */; -/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */; -/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */; -/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */; -/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */; - --- Dump completed on 2020-12-13 15:47:09 diff --git a/main.go b/main.go index 27e079c..b06034e 100644 --- a/main.go +++ b/main.go @@ -21,8 +21,8 @@ var DB *sql.DB //Main loop func main() { - //Get the config patch from --config flag - configPatch := flag.String("config", "extra/config.ini.example", "the patch to the config file") + configPatch := flag.String("config", "extra/config.ini.example", "the patch to the config file") //Get the config patch from --config flag + sqlMigration := flag.Bool("sqlmigrate", false, "initialize / migrate the database") //Detect if migration asked flag.Parse() //Load the INI configuration file @@ -41,6 +41,9 @@ func main() { //Initialize the sql database utils.SQLDatabase(conf) + if *sqlMigration { + utils.SQLMigrate() + } //Start the DNS server server := &dns.Server{Addr: conf.App.IP + strconv.Itoa(conf.App.Port), Net: "udp"} //define the server diff --git a/utils/sql.go b/utils/sql.go index 2f53731..245aeb3 100644 --- a/utils/sql.go +++ b/utils/sql.go @@ -34,9 +34,15 @@ func SQLDatabase(conf *Conf) { CheckErr(err) } +//SQLMigrate : Launch the database migration (creation of tables) +func SQLMigrate() { + logrus.Info("SQL : Database migration launched") + db.AutoMigrate(&Record{}) +} + //Check for a record in the SQL database func sqlCheckForRecord(redisKey string, dKey string, entry Record) (Record, bool) { - db.Where("name = ? AND type = ?", dKey, entry.Qtype).First(&entry) + db.Where("fqdn = ? AND type = ?", dKey, entry.Qtype).First(&entry) logrus.Debugf("SQL : %s => %s", entry.Fqdn, entry.Content) //log the result @@ -55,7 +61,7 @@ func sqlCheckForRecord(redisKey string, dKey string, entry Record) (Record, bool func sqlCheckForReverse6Wildcard(redisKey string, dKey string, entry Record) (Record, error) { returnedEntry := entry - rows, err := db.Table("records").Select("id", "content", "name").Where("name LIKE ?", "*%.ip6.arpa.").Rows() + rows, err := db.Table("records").Select("id", "content", "fqdn").Where("fqdn LIKE ?", "*%.ip6.arpa.").Rows() DbgErr(err) //Check for empty row or non important error