re check

xxjwxc · Nov 27, 2019 · 5cd0ac6 · 5cd0ac6
1 parent 7f2972f
commit 5cd0ac6
Show file tree

Hide file tree

Showing 7 changed files with 57 additions and 105 deletions.
diff --git a/config.yml b/config.yml
@@ -1,3 +1,5 @@
+base:
+    is_dev : false
 out_dir : ./model  # 输出目录
 singular_table : false  # 单表模式:true:禁用表名复数,false:采用表明复数 参考:gorm.SingularTable
 simple : false # 简单输出(默认gorm标签不输出)

diff --git a/data/cmd/cmd.go b/data/cmd/cmd.go
@@ -74,7 +74,7 @@ func initConfig() {
 		os.Exit(1)
 	} else {
 		fmt.Println("using config info:")
-		fmt.Println(tools.GetJsonStr(config.GetMysqlDbInfo()))
+		fmt.Println(tools.GetJSONStr(config.GetMysqlDbInfo()))
 	}
 }
 

diff --git a/data/view/cnf/def.go b/data/view/cnf/def.go
@@ -21,6 +21,7 @@ var TypeMysqlDicMp = map[string]string{
 	"json":                "string",
 	"text":                "string",
 	"timestamp":           "time.Time",
+	"double":              "float64",
 }
 
 // TypeMysqlMatchMp Fuzzy Matching Types.模糊匹配类型

diff --git a/data/view/model/genmysql/genmysql.go b/data/view/model/genmysql/genmysql.go
@@ -65,14 +65,15 @@ func getPackageInfo(orm *mysqldb.MySqlDB, info *model.DBInfo) {
 
 		// Get create SQL statements.获取创建sql语句
 		rows, err := orm.Raw("show create table " + tabName).Rows()
-		defer rows.Close()
+		//defer rows.Close()
 		if err == nil {
 			if rows.Next() {
 				var table, CreateTable string
 				rows.Scan(&table, &CreateTable)
 				tab.SQLBuildStr = CreateTable
 			}
 		}
+		// rows.Close()
 		// ----------end
 
 		// build element.构造元素
@@ -88,15 +89,15 @@ func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumusInfo)
 	keyNums := make(map[string]int)
 	// get keys
 	var Keys []keys
-	orm.Raw("show keys from " + tab).Find(&Keys)
+	orm.Raw("show keys from " + tab).Scan(&Keys)
 	for _, v := range Keys {
 		keyNums[v.KeyName]++
 	}
 	// ----------end
 
 	var list []genColumns
 	// Get table annotations.获取表注释
-	orm.Raw("show FULL COLUMNS from " + tab).Find(&list)
+	orm.Raw("show FULL COLUMNS from " + tab).Scan(&list)
 	// filter gorm.Model.过滤 gorm.Model
 	if filterModel(&list) {
 		el = append(el, model.ColumusInfo{
@@ -107,8 +108,8 @@ func getTableElement(orm *mysqldb.MySqlDB, tab string) (el []model.ColumusInfo)
 
 	// ForeignKey
 	var foreignKeyList []genForeignKey
-	orm.Raw(`select table_schema,table_name,column_name,referenced_table_schema,referenced_table_name,referenced_column_name from INFORMATION_SCHEMA.KEY_COLUMN_USAGE
-	where table_schema = ? AND REFERENCED_TABLE_NAME IS NOT NULL AND TABLE_NAME = ? `, config.GetMysqlDbInfo().Database, tab).Find(&foreignKeyList)
+	orm.Raw(fmt.Sprintf(`select table_schema,table_name,column_name,referenced_table_schema,referenced_table_name,referenced_column_name from INFORMATION_SCHEMA.KEY_COLUMN_USAGE
+	where table_schema = '%v' AND REFERENCED_TABLE_NAME IS NOT NULL AND TABLE_NAME = '%v'`, config.GetMysqlDbInfo().Database, tab)).Scan(&foreignKeyList)
 	// ------------------end
 
 	for _, v := range list {
@@ -159,12 +160,13 @@ func getTables(orm *mysqldb.MySqlDB) map[string]string {
 
 	// Get column names.获取列名
 	var tables []string
+
 	rows, err := orm.Raw("show tables").Rows()
 	if err != nil {
 		fmt.Println(err)
 		return tbDesc
 	}
-	defer rows.Close()
+	// defer rows.Close()
 
 	for rows.Next() {
 		var table string
@@ -174,16 +176,16 @@ func getTables(orm *mysqldb.MySqlDB) map[string]string {
 	}
 
 	// Get table annotations.获取表注释
-	rows, err = orm.Raw("SELECT TABLE_NAME,TABLE_COMMENT FROM information_schema.TABLES WHERE table_schema=?;",
-		config.GetMysqlDbInfo().Database).Rows()
+	rows1, err := orm.Raw("SELECT TABLE_NAME,TABLE_COMMENT FROM information_schema.TABLES WHERE table_schema= '" + config.GetMysqlDbInfo().Database + "'").Rows()
+	// defer rows1.Close()
 	if err != nil {
 		fmt.Println(err)
 		return tbDesc
 	}
 
-	for rows.Next() {
+	for rows1.Next() {
 		var table, desc string
-		rows.Scan(&table, &desc)
+		rows1.Scan(&table, &desc)
 		tbDesc[table] = desc
 	}
 

diff --git a/go.mod b/go.mod
@@ -3,15 +3,13 @@ module github.com/xxjwxc/gormt
 go 1.13
 
 require (
-	github.com/BurntSushi/toml v0.3.1
-	github.com/go-playground/locales v0.12.1 // indirect
-	github.com/go-playground/universal-translator v0.16.0 // indirect
-	github.com/jinzhu/gorm v1.9.10
-	github.com/leodido/go-urn v1.1.0 // indirect
+	github.com/go-playground/universal-translator v0.17.0 // indirect
+	github.com/jinzhu/gorm v1.9.11
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/leodido/go-urn v1.2.0 // indirect
 	github.com/spf13/cobra v0.0.5
-	github.com/xxjwxc/public v0.0.0-20190915135914-aefa9155c004
+	github.com/xxjwxc/public v0.0.0-20191107073037-ea6b812d567f
 	gopkg.in/go-playground/assert.v1 v1.2.1 // indirect
-	gopkg.in/go-playground/validator.v9 v9.29.1
-	gopkg.in/yaml.v2 v2.2.2
-	gopkg.in/yaml.v3 v3.0.0-20191026110619-0b21df46bc1d
+	gopkg.in/go-playground/validator.v9 v9.30.2
+	gopkg.in/yaml.v2 v2.2.7
 )