db_models for enums

simo7 · simo7 · commit 9a37c215ab6c · 2024-11-05T00:50:59.000+01:00
diff --git a/internal/gen.go b/internal/gen.go
@@ -446,7 +446,7 @@ func buildModels(conf Config, req *plugin.GenerateRequest) []Struct {
 			}
 			for _, column := range table.Columns {
 				typ := makePyType(conf, req, column) // TODO: This used to call compiler.ConvertColumn?
-				typ.InnerType = strings.TrimPrefix(typ.InnerType, "models.")
+				typ.InnerType = strings.TrimPrefix(typ.InnerType, "db_models.")
 				s.Fields = append(s.Fields, Field{
 					Name:    column.Name,
 					Type:    typ,
@@ -692,9 +692,9 @@ func buildQueries(conf Config, req *plugin.GenerateRequest, structs []Struct) ([
 				same := true
 				for i, f := range s.Fields {
 					c := query.Columns[i]
-					// HACK: models do not have "models." on their types, so trim that so we can find matches
+					// HACK: models do not have "db_models." on their types, so trim that so we can find matches
 					trimmedPyType := makePyType(conf, req, c)
-					trimmedPyType.InnerType = strings.TrimPrefix(trimmedPyType.InnerType, "models.")
+					trimmedPyType.InnerType = strings.TrimPrefix(trimmedPyType.InnerType, "db_models.")
 					sameName := f.Name == columnName(c, i)
 					sameType := f.Type == trimmedPyType
 					sameTable := sdk.SameTableName(c.Table, &s.Table, req.Catalog.DefaultSchema)
diff --git a/internal/postgresql_type.go b/internal/postgresql_type.go
@@ -52,9 +52,9 @@ func postgresType(req *plugin.GenerateRequest, col *plugin.Column) string {
 			for _, enum := range schema.Enums {
 				if columnType == enum.Name {
 					if schema.Name == req.Catalog.DefaultSchema {
-						return "models." + modelName(enum.Name, req.Settings)
+						return "db_models." + modelName(enum.Name, req.Settings)
 					}
-					return "models." + modelName(schema.Name+"_"+enum.Name, req.Settings)
+					return "db_models." + modelName(schema.Name+"_"+enum.Name, req.Settings)
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -52,9 +52,9 @@ func postgresType(req plugin.GenerateRequest, col plugin.Column) string {`
`52`	`52`	`for _, enum := range schema.Enums {`
`53`	`53`	`if columnType == enum.Name {`
`54`	`54`	`if schema.Name == req.Catalog.DefaultSchema {`
`55`		`- return "models." + modelName(enum.Name, req.Settings)`
	`55`	`+ return "db_models." + modelName(enum.Name, req.Settings)`
`56`	`56`	`}`
`57`		`- return "models." + modelName(schema.Name+"_"+enum.Name, req.Settings)`
	`57`	`+ return "db_models." + modelName(schema.Name+"_"+enum.Name, req.Settings)`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`