Merge branch 'master' into develop

This commit is contained in:
go-jet 2025-04-26 14:36:22 +02:00
commit 6813237d4e
12 changed files with 372 additions and 2011 deletions

View file

@ -106,10 +106,10 @@ func getTableModelImports(modelType TableModel, tableMetaData metadata.Table) []
importPaths := map[string]bool{}
for _, columnMetaData := range tableMetaData.Columns {
field := modelType.Field(columnMetaData)
importPath := field.Type.ImportPath
if importPath != "" {
importPaths[importPath] = true
for _, importPath := range append([]string{field.Type.ImportPath}, field.Type.AdditionalImportPaths...) {
if importPath != "" {
importPaths[importPath] = true
}
}
}
@ -207,8 +207,9 @@ func (f TableModelField) TagsString() string {
// Type represents type of the struct field
type Type struct {
ImportPath string
Name string
ImportPath string
AdditionalImportPaths []string
Name string
}
// NewType creates new type for dummy object