feat: Add table config

Author: dongyu

internal/config/config.go

@@ -102,6 +102,15 @@ type SQL struct {
 	Table []Table `json:"table" yaml:"table"`
 }
 
+func (qsql SQL) GetTable(name string) *Table {
+	for _, item := range qsql.Table {
+		if item.Name == name {
+			return &item
+		}
+	}
+	return nil
+}
+
 type SQLGen struct {
 	Go     *SQLGo     `json:"go,omitempty" yaml:"go"`
 	Kotlin *SQLKotlin `json:"kotlin,omitempty" yaml:"kotlin"`

internal/dinosql/gen.go

@@ -589,6 +589,24 @@ func (r Result) Enums(settings config.CombinedSettings) []GoEnum {
 	return enums
 }
 
+// GetStructName 结构名称
+func GetStructName(name string, settings config.CombinedSettings) string {
+	tb := settings.Package.GetTable(name)
+	if tb != nil {
+		name = tb.GetStructName(name)
+	}
+	return StructName(name, settings)
+}
+
+// GetColumnName 获取字段名称
+func GetColumnName(name, tableName string, settings config.CombinedSettings) string {
+	tb := settings.Package.GetTable(tableName)
+	if tb != nil {
+		name = tb.GetColumnName(name)
+	}
+	return StructName(name, settings)
+}
+
 func StructName(name string, settings config.CombinedSettings) string {
 	if rename := settings.Rename[name]; rename != "" {
 		return rename

internal/mysql/gen.go

@@ -79,13 +79,13 @@ func (r *Result) Structs(settings config.CombinedSettings) []dinosql.GoStruct {
 	var structs []dinosql.GoStruct
 	for tableName, cols := range r.Schema.tables {
 		s := dinosql.GoStruct{
-			Name:  inflection.Singular(dinosql.StructName(tableName, settings)),
+			Name:  inflection.Singular(dinosql.GetStructName(tableName, settings)),
 			Table: core.FQN{tableName, "", ""}, // TODO: Complete hack. Only need for equality check to see if struct can be reused between queries
 		}
 
 		for _, col := range cols {
 			s.Fields = append(s.Fields, dinosql.GoField{
-				Name:    dinosql.StructName(col.Name.String(), settings),
+				Name:    dinosql.GetColumnName(col.Name.String(), tableName, settings),
 				Type:    r.goTypeCol(Column{col, tableName}),
 				Tags:    map[string]string{"json:": col.Name.String()},
 				Comment: "",
@@ -164,12 +164,11 @@ func (r *Result) GoQueries(settings config.CombinedSettings) []dinosql.GoQuery {
 				same := true
 				for i, f := range s.Fields {
 					c := query.Columns[i]
-					sameName := f.Name == dinosql.StructName(columnName(c.ColumnDefinition, i), settings)
+					sameName := f.Name == dinosql.GetColumnName(columnName(c.ColumnDefinition, i), s.Table.Catalog, settings)
 					sameType := f.Type == r.goTypeCol(c)
 
 					hackedFQN := core.FQN{c.Table, "", ""} // TODO: only check needed here is equality to see if struct can be reused, this type should be removed or properly used
 					sameTable := s.Table.Catalog == hackedFQN.Catalog && s.Table.Schema == hackedFQN.Schema && s.Table.Rel == hackedFQN.Rel
-
 					if !sameName || !sameType || !sameTable {
 						same = false
 					}