tpl: sql script removes quote

ezbuy · Apr 23, 2020 · 88d7da1 · 88d7da1
1 parent 13baa8c
commit 88d7da1
Show file tree

Hide file tree

Showing 9 changed files with 33 additions and 31 deletions.
diff --git a/example/model/model_test.go b/example/model/model_test.go
@@ -23,13 +23,20 @@ func runInitSQLScript() error {
 		return err
 	}
 	for _, f := range fs {
-		query, err := ioutil.ReadFile(filepath.Join(dir, f.Name()))
+		plain, err := ioutil.ReadFile(filepath.Join(dir, f.Name()))
 		if err != nil {
 			return err
 		}
-		log.Printf("EXEC SCRIPT: \nFILENAME:%s \nPLAIN QUERY: %s", f.Name(), string(query))
-		if _, err := MySQL().Exec(string(query)); err != nil {
-			return err
+		log.Printf("EXEC SCRIPT: \nFILENAME:%s \nPLAIN QUERY: %s", f.Name(), string(plain))
+		queries := strings.Split(string(plain), ";")
+		for _, q := range queries {
+			if strings.TrimSpace(q) == "" {
+				continue
+			}
+			log.Printf("EXEC QUERY: %s", q)
+			if _, err := MySQL().Exec(q); err != nil {
+				return err
+			}
 		}
 	}
 	return nil

diff --git a/example/script/gen.script.mysql.blog.sql b/example/script/gen.script.mysql.blog.sql
@@ -8,7 +8,6 @@ CREATE TABLE `blogs` (
 	`readed` INT(11) NOT NULL DEFAULT '0',
 	`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	`updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	PRIMARY KEY(`id`,`user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'blogs';
-CREATE INDEX `status_of_blog_idx` ON `blogs`(`status`);
+	PRIMARY KEY(`id`,`user_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'blogs';
+CREATE INDEX status_of_blog_idx ON blogs(status);
 
diff --git a/example/script/gen.script.mysql.indexed.blog.sql b/example/script/gen.script.mysql.indexed.blog.sql
@@ -8,6 +8,5 @@ CREATE TABLE `indexed_blog` (
 	`readed` INT(11) NOT NULL DEFAULT '0',
 	`created_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	`updated_at` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	PRIMARY KEY(`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'indexed_blog';
+	PRIMARY KEY(`id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'indexed_blog';
 
diff --git a/example/script/gen.script.mysql.office.sql b/example/script/gen.script.mysql.office.sql
@@ -9,6 +9,5 @@ CREATE TABLE `testCRUD` (
 	`update_by` VARCHAR(100) NOT NULL DEFAULT '',
 	`create_date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
 	`update_date` DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
-	PRIMARY KEY(`office_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'testCRUD';
+	PRIMARY KEY(`office_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'testCRUD';
 
diff --git a/example/script/gen.script.mysql.user.base.info.sql b/example/script/gen.script.mysql.user.base.info.sql
@@ -1,4 +1,4 @@
 
-DROP VIEW IF EXISTS `user_base_info`;
-CREATE VIEW `user_base_info` AS SELECT `id`,`name`,`mailbox`,`sex` FROM users;
+DROP VIEW IF EXISTS user_base_info;
+CREATE VIEW user_base_info AS SELECT `id`,`name`,`mailbox`,`sex` FROM users;
 
diff --git a/example/script/gen.script.mysql.user.blogs.sql b/example/script/gen.script.mysql.user.blogs.sql
@@ -2,6 +2,5 @@
 CREATE TABLE `user_blogs` (
 	`user_id` INT(11) NOT NULL DEFAULT '0',
 	`blog_id` INT(11) NOT NULL DEFAULT '0',
-	PRIMARY KEY(`user_id`,`blog_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'user_blogs';
+	PRIMARY KEY(`user_id`,`blog_id`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT 'user_blogs';
 
diff --git a/example/script/gen.script.mysql.user.sql b/example/script/gen.script.mysql.user.sql
@@ -1,6 +1,7 @@
 
 CREATE TABLE `users` (
 	`id` INT(11) NOT NULL AUTO_INCREMENT,
+	`sub_id` INT(11) NOT NULL DEFAULT '0',
 	`name` VARCHAR(100) NOT NULL DEFAULT '',
 	`mailbox` VARCHAR(100) NOT NULL DEFAULT '' COMMENT '邮箱',
 	`sex` TINYINT(1) UNSIGNED NOT NULL DEFAULT '1',
@@ -14,9 +15,8 @@ CREATE TABLE `users` (
 	`created_at` BIGINT(20) NOT NULL DEFAULT '0',
 	`updated_at` BIGINT(20) NOT NULL DEFAULT '0',
 	`deleted_at` BIGINT(20) NULL ,
-	PRIMARY KEY(`id`),
-	UNIQUE KEY `uniq_mailbox_password_of_user_uk` (`mailbox`,`password`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '用户表';
-CREATE INDEX `sex_of_user_idx` ON `users`(`sex`);
-CREATE INDEX `age_of_user_rng` ON `users`(`age`);
+	PRIMARY KEY(`id`,`sub_id`,`name`),
+	UNIQUE KEY `uniq_mailbox_password_of_user_uk` (`mailbox`,`password`)) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '用户表';
+CREATE INDEX sex_of_user_idx ON users(sex);
+CREATE INDEX age_of_user_rng ON users(age);
 
diff --git a/tpl/bindata.go b/tpl/bindata.go
diff --git a/tpl/script.mysql.sql b/tpl/script.mysql.sql
@@ -17,17 +17,16 @@ CREATE TABLE `{{$obj.DbTable}}` (
 		{{- end -}}
 	)
 	{{- end}}
-	{{- end}}
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '{{$obj.Comment}}';
+	{{- end}}) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT '{{$obj.Comment}}';
 
 {{- range $i, $index := $obj.Indexes}}
 {{- if not $index.HasPrimaryKey}}
-CREATE INDEX `{{$index.Name | camel2name}}` ON `{{$obj.DbTable}}`(
+CREATE INDEX {{$index.Name | camel2name}} ON {{$obj.DbTable}}(
 	{{- range $i, $f := $index.Fields -}}
 		{{- if eq (add $i 1) (len $index.Fields) -}}
-			`{{- $f.Name | camel2name -}}`
+			{{- $f.Name | camel2name -}}
 		{{- else -}}
-			`{{- $f.Name | camel2name -}}`,
+			{{- $f.Name | camel2name -}},
 		{{- end -}}
 	{{- end -}}
 );
@@ -36,12 +35,12 @@ CREATE INDEX `{{$index.Name | camel2name}}` ON `{{$obj.DbTable}}`(
 
 {{- range $i, $index := $obj.Ranges}}
 {{- if not $index.HasPrimaryKey}}
-CREATE INDEX `{{$index.Name | camel2name}}` ON `{{$obj.DbTable}}`(
+CREATE INDEX {{$index.Name | camel2name}} ON {{$obj.DbTable}}(
 	{{- range $i, $f := $index.Fields -}}
 		{{- if eq (add $i 1) (len $index.Fields) -}}
-			`{{- $f.Name | camel2name -}}`
+			{{- $f.Name | camel2name -}}
 		{{- else -}}
-			`{{- $f.Name | camel2name -}}`,
+			{{- $f.Name | camel2name -}},
 		{{- end -}}
 	{{- end -}}
 );
@@ -50,8 +49,8 @@ CREATE INDEX `{{$index.Name | camel2name}}` ON `{{$obj.DbTable}}`(
 {{- end}}
 
 {{- if ne $obj.DbView ""}}
-DROP VIEW IF EXISTS `{{$obj.DbView}}`;
-CREATE VIEW `{{$obj.DbView}}` AS {{$obj.ImportSQL}};
+DROP VIEW IF EXISTS {{$obj.DbView}};
+CREATE VIEW {{$obj.DbView}} AS {{$obj.ImportSQL}};
 {{- end}}
 
 {{end}}