store

data/config/MyIni.go

@@ -81,12 +81,12 @@ func GetOutDir() string {
 	return _map.OutDir
 }
 
-// // SetSingularTable Set Disabled Table Name Plurals.设置禁用表名复数
+// // SetSingularTable Set Disabled Table ChainType Plurals.设置禁用表名复数
 // func SetSingularTable(b bool) {
 // 	_map.SingularTable = b
 // }
 
-// // GetSingularTable Get Disabled Table Name Plurals.获取禁用表名复数
+// // GetSingularTable Get Disabled Table ChainType Plurals.获取禁用表名复数
 // func GetSingularTable() bool {
 // 	return _map.SingularTable
 // }
@@ -275,7 +275,7 @@ func GetWebTagType() int {
 	return _map.WebTagType
 }
 
-//GetTableNames get format tableNames by config. 获取格式化后设置的表名
+// GetTableNames get format tableNames by config. 获取格式化后设置的表名
 func GetTableNames() string {
 	var sb strings.Builder
 	if _map.TableNames != "" {
@@ -302,27 +302,27 @@ func GetTableNames() string {
 	return sb.String()
 }
 
-//GetOriginTableNames get origin tableNames. 获取原始的设置的表名
+// GetOriginTableNames get origin tableNames. 获取原始的设置的表名
 func GetOriginTableNames() string {
 	return _map.TableNames
 }
 
-//SetTableNames set tableNames. 设置生成的表名
+// SetTableNames set tableNames. 设置生成的表名
 func SetTableNames(tableNames string) {
 	_map.TableNames = tableNames
 }
 
-//GetIsColumnName get  gen columnName config . 获取生成列名的config
+// GetIsColumnName get  gen columnName config . 获取生成列名的config
 func GetIsColumnName() bool {
 	return _map.IsColumnName
 }
 
-//SetIsColumnName set gen ColumnName config. 设置生成列名的config
+// SetIsColumnName set gen ColumnName config. 设置生成列名的config
 func SetIsColumnName(isColumnName bool) {
 	_map.IsColumnName = isColumnName
 }
 
-//GetIsOutFileByTableName get  gen columnName config . 设置是否根据表名生成文件
+// GetIsOutFileByTableName get  gen columnName config . 设置是否根据表名生成文件
 func GetIsOutFileByTableName() bool {
 	return _map.IsOutFileByTableName
 }

data/dlg/common.go

@@ -7,7 +7,7 @@ import (
 	"github.com/jroimartin/gocui"
 	"github.com/xxjwxc/gormt/data/view/model"
 	"github.com/xxjwxc/gormt/data/view/model/genmysql"
-	"github.com/xxjwxc/gormt/data/view/model/gensqlite"
+	//"github.com/xxjwxc/gormt/data/view/model/gensqlite"
 
 	"github.com/xxjwxc/gormt/data/config"
 
@@ -79,8 +79,8 @@ func generate(g *gocui.Gui, v *gocui.View) {
 	switch config.GetDbInfo().Type {
 	case 0:
 		modeldb = genmysql.GetModel()
-	case 1:
-		modeldb = gensqlite.GetModel()
+		//case 1:
+		//	modeldb = gensqlite.GetModel()
 	}
 	if modeldb == nil {
 		mylog.Error(fmt.Errorf("modeldb not fund : please check db_info.type (0:mysql , 1:sqlite , 2:mssql) "))

data/view/genfunc/def.go

@@ -8,6 +8,32 @@ func (m *{{.StructName}}) TableName() string {
 }
 `
 	genColumn = `
+type I{{.StructName}} interface {
+{{range $em := .Em}}
+	Get{{$em.StructName}}() {{$em.Type}}{{end}}
+}
+
+{{$module := .StructName}}
+{{range $em := .Em}}
+func (m *{{$module}}) Get{{$em.StructName}}() {{$em.Type}} {
+	return m.{{$em.StructName}}
+}
+{{end}}
+
+// ToMap  struct to map 结构体转成map
+func (m *{{.StructName}}) ToMap() map[string]any {
+	return map[string]any{ {{range $em := .Em}}
+		"{{$em.ColumnName}}":m.{{$em.StructName}}, {{end}}
+	}
+}
+
+// ToMapWithoutModel  struct to map 结构体转成map, 不带gorm.Model
+func (m *{{.StructName}}) ToMapWithoutModel() map[string]any {
+	return map[string]any{ {{range $em := .Em}} {{ if and (ne $em.ColumnName "id") (ne $em.ColumnName "created_at") (ne $em.ColumnName "updated_at") (ne $em.ColumnName "deleted_at") }}
+		"{{$em.ColumnName}}":m.{{$em.StructName}}, {{end}}{{end}}
+	}
+}
+
 // {{.StructName}}Columns get sql column name.获取数据库列名
 var {{.StructName}}Columns = struct { {{range $em := .Em}}
 	{{$em.StructName}} string{{end}}    

data/view/genstruct/common.go

@@ -160,6 +160,7 @@ func (s *GenStruct) GenerateColumnName() []string {
 		Em         []struct {
 			ColumnName string
 			StructName string
+			Type       string
 		}
 	}
 	data.StructName = s.Name
@@ -168,18 +169,21 @@ func (s *GenStruct) GenerateColumnName() []string {
 			data.Em = append(data.Em, []struct {
 				ColumnName string
 				StructName string
+				Type       string
 			}{
-				{ColumnName: "id", StructName: "ID"},
-				{ColumnName: "created_at", StructName: "CreatedAt"},
-				{ColumnName: "updated_at", StructName: "UpdatedAt"},
-				{ColumnName: "deleted_at", StructName: "DeletedAt"},
+				{ColumnName: "id", StructName: "ID", Type: "uint"},
+				{ColumnName: "created_at", StructName: "CreatedAt", Type: "time.Time"},
+				{ColumnName: "updated_at", StructName: "UpdatedAt", Type: "time.Time"},
+				{ColumnName: "deleted_at", StructName: "DeletedAt", Type: "gorm.DeletedAt"},
 			}...)
 		} else if len(v.ColumnName) > 0 {
 			data.Em = append(data.Em, struct {
 				ColumnName string
 				StructName string
+				Type       string
 			}{ColumnName: v.ColumnName,
 				StructName: v.Name,
+				Type:       v.Type,
 			})
 		}
 
@@ -260,7 +264,7 @@ func (p *GenPackage) AddStruct(st GenStruct) {
 // Generate Get the result data.获取结果数据
 func (p *GenPackage) Generate() string {
 	p.genimport() // auto add import .补充 import
-
+	p.AddImport(`"time"`)
 	var pa generate.PrintAtom
 	pa.Add("package", p.Name)
 	// add import

data/view/genstruct/def.go

@@ -2,7 +2,7 @@ package genstruct
 
 // GenElement element of sturct.元素类
 type GenElement struct {
-	Name       string              // Name.元素名
+	Name       string              // ChainType.元素名
 	ColumnName string              // table name.表名
 	Type       string              // Type.类型标记
 	Notes      string              // Notes.注释

data/view/gtools/gtools.go

@@ -11,9 +11,9 @@ import (
 
 	"github.com/xxjwxc/gormt/data/config"
 
-	"github.com/xxjwxc/gormt/data/view/model/genmssql"
+	//"github.com/xxjwxc/gormt/data/view/model/genmssql"
 	"github.com/xxjwxc/gormt/data/view/model/genmysql"
-	"github.com/xxjwxc/gormt/data/view/model/gensqlite"
+	//"github.com/xxjwxc/gormt/data/view/model/gensqlite"
 	"github.com/xxjwxc/public/tools"
 )
 
@@ -35,10 +35,10 @@ func showCmd() {
 	switch config.GetDbInfo().Type {
 	case 0: // mysql
 		modeldb = genmysql.GetModel()
-	case 1: // sqllite
-		modeldb = gensqlite.GetModel()
-	case 2: //
-		modeldb = genmssql.GetModel()
+		//case 1: // sqllite
+		//	modeldb = gensqlite.GetModel()
+		//case 2: //
+		//	modeldb = genmssql.GetModel()
 	}
 	if modeldb == nil {
 		mylog.Error(fmt.Errorf("modeldb not fund : please check db_info.type (0:mysql , 1:sqlite , 2:mssql) "))

data/view/model/genmssql/common.go

@@ -1,100 +0,0 @@
-package genmssql
-
-import (
-	"strings"
-
-	"github.com/xxjwxc/gormt/data/config"
-	"github.com/xxjwxc/public/mylog"
-
-	"github.com/xxjwxc/gormt/data/view/model"
-)
-
-// filterModel filter.过滤 gorm.Model
-func filterModel(list *[]genColumns) bool {
-	if config.GetDBTag() != "gorm" || !config.GetUserGormModel() {
-		return false
-	}
-
-	var _temp []genColumns
-	num := 0
-	for _, v := range *list {
-		if strings.EqualFold(v.Field, "id") ||
-			strings.EqualFold(v.Field, "created_at") ||
-			strings.EqualFold(v.Field, "updated_at") ||
-			strings.EqualFold(v.Field, "deleted_at") {
-			num++
-		} else {
-			_temp = append(_temp, v)
-		}
-	}
-
-	if num >= 4 {
-		*list = _temp
-		return true
-	}
-
-	return false
-}
-
-// fixForeignKey fix foreign key.过滤外键
-func fixForeignKey(list []genForeignKey, columuName string, result *[]model.ForeignKey) {
-	for _, v := range list {
-		if strings.EqualFold(v.ColumnName, columuName) { // find it .找到了
-			*result = append(*result, model.ForeignKey{
-				TableName:  v.ReferencedTableName,
-				ColumnName: v.ReferencedColumnName,
-			})
-		}
-	}
-}
-
-// GetModel get model interface. 获取model接口
-func GetModel() model.IModel {
-	//now just support mysql
-	return &MssqlModel
-}
-
-// FixNotes 分析元素表注释
-func FixNotes(em *model.ColumnsInfo, note string) {
-	b0 := FixElementTag(em, note)        // gorm
-	b1 := FixForeignKeyTag(em, em.Notes) // 外键
-	if !b0 && b1 {                       // 补偿
-		FixElementTag(em, em.Notes) // gorm
-	}
-}
-
-// FixElementTag 分析元素表注释
-func FixElementTag(em *model.ColumnsInfo, note string) bool {
-	matches := noteRegex.FindStringSubmatch(note)
-	if len(matches) < 2 {
-		em.Notes = note
-		return false
-	}
-
-	mylog.Infof("get one gorm tag:(%v) ==> (%v)", em.BaseInfo.Name, matches[1])
-	em.Notes = note[len(matches[0]):]
-	em.Gormt = matches[1]
-	return true
-}
-
-// FixForeignKeyTag 分析元素表注释(外键)
-func FixForeignKeyTag(em *model.ColumnsInfo, note string) bool {
-	matches := foreignKeyRegex.FindStringSubmatch(note) // foreign key 外键
-	if len(matches) < 2 {
-		em.Notes = note
-		return false
-	}
-	em.Notes = note[len(matches[0]):]
-
-	// foreign key 外键
-	tmp := strings.Split(matches[1], ".")
-	if len(tmp) > 0 {
-		mylog.Infof("get one foreign key:(%v) ==> (%v)", em.BaseInfo.Name, matches[1])
-		em.ForeignKeyList = append(em.ForeignKeyList, model.ForeignKey{
-			TableName:  tmp[0],
-			ColumnName: tmp[1],
-		})
-	}
-
-	return true
-}

data/view/model/genmssql/def.go

@@ -1,46 +0,0 @@
-package genmssql
-
-import "regexp"
-
-// genColumns show full columns
-type genColumns struct {
-	Field   string  `gorm:"column:Field"`
-	Type    string  `gorm:"column:Type"`
-	Key     string  `gorm:"column:Key"`
-	Desc    string  `gorm:"column:Comment"`
-	Null    string  `gorm:"column:Null"`
-	Default *string `gorm:"column:Default"`
-}
-
-//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 ='matrix' AND REFERENCED_TABLE_NAME IS NOT NULL AND TABLE_NAME = 'credit_card' ;
-// genForeignKey Foreign key of db info . 表的外键信息
-type genForeignKey struct {
-	TableSchema           string `gorm:"column:table_schema"`            // Database of columns.列所在的数据库
-	TableName             string `gorm:"column:table_name"`              // Data table of column.列所在的数据表
-	ColumnName            string `gorm:"column:column_name"`             // Column names.列名
-	ReferencedTableSchema string `gorm:"column:referenced_table_schema"` // The database where the index is located.该索引所在的数据库
-	ReferencedTableName   string `gorm:"column:referenced_table_name"`   // Affected tables . 该索引受影响的表
-	ReferencedColumnName  string `gorm:"column:referenced_column_name"`  // Which column of the affected table.该索引受影响的表的哪一列
-}
-
-/////////////////////////////////////////////////////////////////////////
-
-// TableDescription 表及表注释
-type TableDescription struct {
-	Name  string `gorm:"column:name"`  // 表名
-	Value string `gorm:"column:value"` // 表注释
-}
-
-type ColumnKeys struct {
-	ID     int    `gorm:"column:id"`
-	Name   string `gorm:"column:name"`   // 列名
-	Pk     int    `gorm:"column:pk"`     // 是否主键
-	Type   string `gorm:"column:tp"`     // 类型
-	Length int    `gorm:"column:len"`    // 长度
-	Isnull int    `gorm:"column:isnull"` // 是否为空
-	Desc   string `gorm:"column:des"`    // 列注释
-}
-
-var noteRegex = regexp.MustCompile(`^\[@gorm\s(\S+)+\]`)
-var foreignKeyRegex = regexp.MustCompile(`^\[@fk\s(\S+)+\]`)

data/view/model/genmssql/genmssql.go

@@ -1,257 +0,0 @@
-package genmssql
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/xxjwxc/gormt/data/config"
-	"github.com/xxjwxc/gormt/data/view/model"
-	"github.com/xxjwxc/public/mylog"
-	"github.com/xxjwxc/public/tools"
-	"gorm.io/driver/sqlserver"
-	"gorm.io/gorm"
-)
-
-// MssqlModel mysql model from IModel
-var MssqlModel mssqlModel
-
-type mssqlModel struct {
-}
-
-// GenModel get model.DBInfo info.获取数据库相关属性
-func (m *mssqlModel) GenModel() model.DBInfo {
-	dsn := fmt.Sprintf("server=%v;database=%v;user id=%v;password=%v;port=%v;encrypt=disable",
-		config.GetDbInfo().Host, config.GetDbInfo().Database, config.GetDbInfo().Username, config.GetDbInfo().Password, config.GetDbInfo().Port)
-	db, err := gorm.Open(sqlserver.Open(dsn), &gorm.Config{})
-	if err != nil {
-		mylog.Error(err)
-		return model.DBInfo{}
-	}
-	defer func() {
-		sqldb, _ := db.DB()
-		sqldb.Close()
-	}()
-
-	var dbInfo model.DBInfo
-	m.getPackageInfo(db, &dbInfo)
-	dbInfo.PackageName = m.GetPkgName()
-	dbInfo.DbName = m.GetDbName()
-	return dbInfo
-}
-
-// GetDbName get database name.获取数据库名字
-func (m *mssqlModel) GetDbName() string {
-	return config.GetDbInfo().Database
-}
-
-// GetTableNames get table name.获取格式化后指定的表名
-func (m *mssqlModel) GetTableNames() string {
-	return config.GetTableNames()
-}
-
-// GetOriginTableNames get table name.获取原始指定的表名
-func (m *mssqlModel) GetOriginTableNames() string {
-	return config.GetOriginTableNames()
-}
-
-// GetPkgName package names through config outdir configuration.通过config outdir 配置获取包名
-func (m *mssqlModel) GetPkgName() string {
-	dir := config.GetOutDir()
-	dir = strings.Replace(dir, "\\", "/", -1)
-	if len(dir) > 0 {
-		if dir[len(dir)-1] == '/' {
-			dir = dir[:(len(dir) - 1)]
-		}
-	}
-	var pkgName string
-	list := strings.Split(dir, "/")
-	if len(list) > 0 {
-		pkgName = list[len(list)-1]
-	}
-
-	if len(pkgName) == 0 || pkgName == "." {
-		list = strings.Split(tools.GetModelPath(), "/")
-		if len(list) > 0 {
-			pkgName = list[len(list)-1]
-		}
-	}
-
-	return pkgName
-}
-
-func (m *mssqlModel) getPackageInfo(orm *gorm.DB, info *model.DBInfo) {
-	tabls := m.getTables(orm) // get table and notes
-	// if m := config.GetTableList(); len(m) > 0 {
-	// 	// 制定了表之后
-	// 	newTabls := make(map[string]string)
-	// 	for t := range m {
-	// 		if notes, ok := tabls[t]; ok {
-	// 			newTabls[t] = notes
-	// 		} else {
-	// 			fmt.Printf("table: %s not found in db\n", t)
-	// 		}
-	// 	}
-	// 	tabls = newTabls
-	// }
-	for tabName, notes := range tabls {
-		var tab model.TabInfo
-		tab.Name = tabName
-		tab.Notes = notes
-
-		if config.GetIsOutSQL() {
-			// TODO:获取创建sql语句
-			// Get create SQL statements.获取创建sql语句
-			// rows, err := orm.Raw("show create table " + assemblyTable(tabName)).Rows()
-			// //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.构造元素
-		tab.Em = m.getTableElement(orm, tabName)
-		// --------end
-
-		info.TabList = append(info.TabList, tab)
-	}
-	// sort tables
-	sort.Slice(info.TabList, func(i, j int) bool {
-		return info.TabList[i].Name < info.TabList[j].Name
-	})
-}
-
-// getTableElement Get table columns and comments.获取表列及注释
-func (m *mssqlModel) getTableElement(orm *gorm.DB, tab string) (el []model.ColumnsInfo) {
-	sql := fmt.Sprintf(`SELECT 
-    id   = a.colorder,
-    name     = a.name,
-    pk       = case when exists(SELECT 1 FROM sysobjects where xtype='PK' and parent_obj=a.id and name in (
-                     SELECT name FROM sysindexes WHERE indid in( SELECT indid FROM sysindexkeys WHERE id = a.id AND colid=a.colid))) then 1 else 0 end,
-    tp       = b.name,
-    len       = COLUMNPROPERTY(a.id,a.name,'PRECISION'),
-    isnull     = a.isnullable,
-    des   = isnull(g.[value],'')
-FROM 
-    syscolumns a
-left join 
-    systypes b 
-on 
-    a.xusertype=b.xusertype
-inner join 
-    sysobjects d 
-on 
-    a.id=d.id  and d.xtype='U' and  d.name<>'dtproperties'
-left join 
-sys.extended_properties   g 
-on 
-    a.id=G.major_id and a.colid=g.minor_id  
-left join
-sys.extended_properties f
-on 
-    d.id=f.major_id and f.minor_id=0
-where 
-    d.name='%v' 
-order by 
-    a.colorder`, tab)
-
-	lenPk := 0
-	// get keys
-	var Keys []ColumnKeys
-	orm.Raw(sql).Scan(&Keys)
-	for i := 0; i < len(Keys); i++ {
-		v := &Keys[i]
-		if v.Pk == 1 {
-			lenPk++
-		}
-		if strings.EqualFold(v.Type, "varchar") { // 字符串
-			v.Type = fmt.Sprintf("varchar(%v)", v.Length)
-		} else if strings.EqualFold(v.Type, "int") { // int
-			v.Type = fmt.Sprintf("int(%v)", v.Length)
-		}
-	}
-	// ----------end
-
-	// TODO:ForeignKey
-
-	for _, v := range Keys {
-		var tmp model.ColumnsInfo
-		tmp.Name = v.Name
-		tmp.Type = v.Type
-		FixNotes(&tmp, v.Desc) // 分析表注释
-
-		if v.Pk > 0 { // 主键，或者联合组件
-			if lenPk <= 1 { // 主键
-				tmp.Index = append(tmp.Index, model.KList{
-					Key:     model.ColumnsKeyPrimary,
-					Multi:   false,
-					KeyType: "primaryKey",
-				})
-			} else {
-				tmp.Index = append(tmp.Index, model.KList{
-					Key:     model.ColumnsKeyPrimary,
-					Multi:   true,
-					KeyType: "FULLTEXT",
-				})
-			}
-		}
-
-		tmp.IsNull = (v.Isnull == 1)
-
-		el = append(el, tmp)
-	}
-	return
-}
-
-// getTables Get columns and comments.获取表列及注释
-func (m *mssqlModel) getTables(orm *gorm.DB) map[string]string {
-	tbDesc := make(map[string]string)
-
-	// Get column names.获取列名
-	if m.GetOriginTableNames() != "" {
-		sarr := strings.Split(m.GetOriginTableNames(), ",")
-		if len(sarr) != 0 {
-			for _, val := range sarr {
-				tbDesc[val] = ""
-			}
-		}
-	} else {
-		var list []TableDescription
-		err := orm.Raw(`SELECT DISTINCT
-		d.name,
-		f.value
-		FROM
-		syscolumns a
-		LEFT JOIN systypes b ON a.xusertype= b.xusertype
-		INNER JOIN sysobjects d ON a.id= d.id
-		AND d.xtype= 'U'
-		AND d.name<> 'dtproperties'
-		LEFT JOIN syscomments e ON a.cdefault= e.id
-		LEFT JOIN sys.extended_properties g ON a.id= G.major_id
-		AND a.colid= g.minor_id
-		LEFT JOIN sys.extended_properties f ON d.id= f.major_id
-		AND f.minor_id= 0 ;`).Scan(&list).Error
-		if err != nil {
-			if !config.GetIsGUI() {
-				fmt.Println(err)
-			}
-			return tbDesc
-		}
-
-		for _, v := range list {
-			tbDesc[v.Name] = v.Value
-		}
-	}
-
-	return tbDesc
-}
-
-func assemblyTable(name string) string {
-	return "`" + name + "`"
-}

data/view/model/gensqlite/common.go

@@ -1,96 +0,0 @@
-package gensqlite
-
-import (
-	"strings"
-
-	"github.com/xxjwxc/gormt/data/config"
-
-	"github.com/xxjwxc/gormt/data/view/model"
-)
-
-// filterModel filter.过滤 gorm.Model
-func filterModel(list *[]genColumns) bool {
-	if config.GetDBTag() != "gorm" || !config.GetUserGormModel() {
-		return false
-	}
-
-	var _temp []genColumns
-	num := 0
-	for _, v := range *list {
-		if strings.EqualFold(v.Name, "id") ||
-			strings.EqualFold(v.Name, "created_at") ||
-			strings.EqualFold(v.Name, "updated_at") ||
-			strings.EqualFold(v.Name, "deleted_at") {
-			num++
-		} else {
-			_temp = append(_temp, v)
-		}
-	}
-
-	if num >= 4 {
-		*list = _temp
-		return true
-	}
-
-	return false
-}
-
-// fixForeignKey fix foreign key.过滤外键
-func fixForeignKey(list []genForeignKey, columuName string, result *[]model.ForeignKey) {
-	for _, v := range list {
-		if strings.EqualFold(v.ColumnName, columuName) { // find it .找到了
-			*result = append(*result, model.ForeignKey{
-				TableName:  v.ReferencedTableName,
-				ColumnName: v.ReferencedColumnName,
-			})
-		}
-	}
-}
-
-// GetModel get model interface. 获取model接口
-func GetModel() model.IModel {
-	//now just support mysql
-	return &SQLiteModel
-}
-
-// FixNotes 分析元素表注释
-func FixNotes(em *model.ColumnsInfo, note string) {
-	b0 := FixElementTag(em, note)        // gorm
-	b1 := FixForeignKeyTag(em, em.Notes) // 外键
-	if !b0 && b1 {                       // 补偿
-		FixElementTag(em, em.Notes) // gorm
-	}
-}
-
-// FixElementTag 分析元素表注释
-func FixElementTag(em *model.ColumnsInfo, note string) bool {
-	matches := noteRegex.FindStringSubmatch(note)
-	if len(matches) < 2 {
-		em.Notes = note
-		return false
-	}
-	em.Notes = note[len(matches[0]):]
-	em.Gormt = matches[1]
-	return true
-}
-
-// FixForeignKeyTag 分析元素表注释(外键)
-func FixForeignKeyTag(em *model.ColumnsInfo, note string) bool {
-	matches := foreignKeyRegex.FindStringSubmatch(note) // foreign key 外键
-	if len(matches) < 2 {
-		em.Notes = note
-		return false
-	}
-	em.Notes = note[len(matches[0]):]
-
-	// foreign key 外键
-	tmp := strings.Split(matches[1], ".")
-	if len(tmp) > 0 {
-		em.ForeignKeyList = append(em.ForeignKeyList, model.ForeignKey{
-			TableName:  tmp[0],
-			ColumnName: tmp[1],
-		})
-	}
-
-	return true
-}

data/view/model/gensqlite/def.go

@@ -1,32 +0,0 @@
-package gensqlite
-
-import "regexp"
-
-type keys struct {
-	NonUnique  int    `gorm:"column:Non_unique"`
-	KeyName    string `gorm:"column:Key_name"`
-	ColumnName string `gorm:"column:Column_name"`
-}
-
-// genColumns show full columns
-type genColumns struct {
-	Name    string `gorm:"column:name"`
-	Type    string `gorm:"column:type"`
-	Pk      int    `gorm:"column:pk"`
-	NotNull int    `gorm:"column:notnull"`
-}
-
-//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 ='matrix' AND REFERENCED_TABLE_NAME IS NOT NULL AND TABLE_NAME = 'credit_card' ;
-// genForeignKey Foreign key of db info . 表的外键信息
-type genForeignKey struct {
-	TableSchema           string `gorm:"column:table_schema"`            // Database of columns.列所在的数据库
-	TableName             string `gorm:"column:table_name"`              // Data table of column.列所在的数据表
-	ColumnName            string `gorm:"column:column_name"`             // Column names.列名
-	ReferencedTableSchema string `gorm:"column:referenced_table_schema"` // The database where the index is located.该索引所在的数据库
-	ReferencedTableName   string `gorm:"column:referenced_table_name"`   // Affected tables . 该索引受影响的表
-	ReferencedColumnName  string `gorm:"column:referenced_column_name"`  // Which column of the affected table.该索引受影响的表的哪一列
-}
-
-var noteRegex = regexp.MustCompile(`^\[@gorm\s(\S+)+\]`)
-var foreignKeyRegex = regexp.MustCompile(`^\[@fk\s(\S+)+\]`)

data/view/model/gensqlite/gensqlite.go

@@ -1,205 +0,0 @@
-package gensqlite
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-
-	"github.com/xxjwxc/public/mylog"
-
-	"github.com/xxjwxc/gormt/data/config"
-	"github.com/xxjwxc/gormt/data/view/model"
-	"github.com/xxjwxc/public/tools"
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-)
-
-// SQLiteModel mysql model from IModel
-var SQLiteModel sqliteModel
-
-type sqliteModel struct {
-}
-
-// GenModel get model.DBInfo info.获取数据库相关属性
-func (m *sqliteModel) GenModel() model.DBInfo {
-	db, err := gorm.Open(sqlite.Open(config.GetDbInfo().Host), &gorm.Config{})
-	if err != nil {
-		mylog.Error(err)
-		return model.DBInfo{}
-	}
-	defer func() {
-		sqldb, _ := db.DB()
-		sqldb.Close()
-	}()
-
-	var dbInfo model.DBInfo
-	m.getPackageInfo(db, &dbInfo)
-	dbInfo.PackageName = m.GetPkgName()
-	dbInfo.DbName = m.GetDbName()
-	return dbInfo
-}
-
-// GetDbName get database name.获取数据库名字
-func (m *sqliteModel) GetDbName() string {
-	dir := config.GetDbInfo().Host
-	dir = strings.Replace(dir, "\\", "/", -1)
-	if len(dir) > 0 {
-		if dir[len(dir)-1] == '/' {
-			dir = dir[:(len(dir) - 1)]
-		}
-	}
-	var dbName string
-	list := strings.Split(dir, "/")
-	if len(list) > 0 {
-		dbName = list[len(list)-1]
-	}
-	list = strings.Split(dbName, ".")
-	if len(list) > 0 {
-		dbName = list[0]
-	}
-
-	if len(dbName) == 0 || dbName == "." {
-		panic(fmt.Sprintf("%v : db host config err.must file dir", dbName))
-	}
-
-	return dbName
-}
-
-// GetTableNames get table name.获取指定的表名
-func (m *sqliteModel) GetTableNames() string {
-	return config.GetTableNames()
-}
-
-// GetPkgName package names through config outdir configuration.通过config outdir 配置获取包名
-func (m *sqliteModel) GetPkgName() string {
-	dir := config.GetOutDir()
-	dir = strings.Replace(dir, "\\", "/", -1)
-	if len(dir) > 0 {
-		if dir[len(dir)-1] == '/' {
-			dir = dir[:(len(dir) - 1)]
-		}
-	}
-	var pkgName string
-	list := strings.Split(dir, "/")
-	if len(list) > 0 {
-		pkgName = list[len(list)-1]
-	}
-
-	if len(pkgName) == 0 || pkgName == "." {
-		list = strings.Split(tools.GetModelPath(), "/")
-		if len(list) > 0 {
-			pkgName = list[len(list)-1]
-		}
-	}
-
-	return pkgName
-}
-
-func (m *sqliteModel) getPackageInfo(orm *gorm.DB, info *model.DBInfo) {
-	tabls := m.getTables(orm) // get table and notes
-	for tabName, notes := range tabls {
-		var tab model.TabInfo
-		tab.Name = tabName
-		tab.Notes = notes
-
-		if config.GetIsOutSQL() {
-			// Get create SQL statements.获取创建sql语句
-			rows, err := orm.Raw("SELECT tbl_name,sql FROM sqlite_master WHERE type='table' AND name = " + assemblyTable(tabName)).Rows()
-			//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.构造元素
-		tab.Em = m.getTableElement(orm, tabName)
-		// --------end
-
-		info.TabList = append(info.TabList, tab)
-	}
-	// sort tables
-	sort.Slice(info.TabList, func(i, j int) bool {
-		return info.TabList[i].Name < info.TabList[j].Name
-	})
-}
-
-// getTableElement Get table columns and comments.获取表列及注释
-func (m *sqliteModel) getTableElement(orm *gorm.DB, tab string) (el []model.ColumnsInfo) {
-	var list []genColumns
-	// Get table annotations.获取表注释
-	orm.Raw(fmt.Sprintf("PRAGMA table_info(%v)", assemblyTable(tab))).Scan(&list)
-	// filter gorm.Model.过滤 gorm.Model
-	if filterModel(&list) {
-		el = append(el, model.ColumnsInfo{
-			Type: "gorm.Model",
-		})
-	}
-	// -----------------end
-
-	// ForeignKey
-	var foreignKeyList []genForeignKey
-	if config.GetIsForeignKey() {
-	}
-	// ------------------end
-
-	for _, v := range list {
-		var tmp model.ColumnsInfo
-		tmp.Name = v.Name
-		tmp.Type = v.Type
-		FixNotes(&tmp, "")
-		if v.Pk == 1 { // 主键
-			tmp.Index = append(tmp.Index, model.KList{
-				Key:   model.ColumnsKeyPrimary,
-				Multi: false,
-			})
-		}
-
-		tmp.IsNull = (v.NotNull != 1)
-
-		// ForeignKey
-		fixForeignKey(foreignKeyList, tmp.Name, &tmp.ForeignKeyList)
-		// -----------------end
-		el = append(el, tmp)
-	}
-	return
-}
-
-// getTables Get columns and comments.获取表列及注释
-func (m *sqliteModel) getTables(orm *gorm.DB) map[string]string {
-	tbDesc := make(map[string]string)
-
-	// Get column names.获取列名
-	var tables []string
-
-	rows, err := orm.Raw("SELECT name FROM sqlite_master WHERE type='table'").Rows()
-	if err != nil {
-		if !config.GetIsGUI() {
-			fmt.Println(err)
-		}
-		return tbDesc
-	}
-
-	for rows.Next() {
-		var table string
-		rows.Scan(&table)
-		if !strings.EqualFold(table, "sqlite_sequence") { // 剔除系统默认
-			tables = append(tables, table)
-			tbDesc[table] = ""
-		}
-	}
-	rows.Close()
-
-	// TODO.获取表注释
-
-	return tbDesc
-}
-
-func assemblyTable(name string) string {
-	return "'" + name + "'"
-}