Map Custom Null enum type with database typing function

sbres · sbres · commit 576f3f0099cc · 2022-04-25T17:17:49.000+01:00
diff --git a/internal/codegen/golang/mysql_type.go b/internal/codegen/golang/mysql_type.go
@@ -86,10 +86,17 @@ func mysqlType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 		for _, schema := range req.Catalog.Schemas {
 			for _, enum := range schema.Enums {
 				if enum.Name == columnType {
-					if schema.Name == req.Catalog.DefaultSchema {
-						return StructName(enum.Name, req.Settings)
+					if notNull {
+						if schema.Name == req.Catalog.DefaultSchema {
+							return StructName(enum.Name, req.Settings)
+						}
+						return StructName(schema.Name+"_"+enum.Name, req.Settings)
+					} else {
+						if schema.Name == req.Catalog.DefaultSchema {
+							return "Null" + StructName(enum.Name, req.Settings)
+						}
+						return "Null" + StructName(schema.Name+"_"+enum.Name, req.Settings)
 					}
-					return StructName(schema.Name+"_"+enum.Name, req.Settings)
 				}
 			}
 		}
diff --git a/internal/codegen/golang/postgresql_type.go b/internal/codegen/golang/postgresql_type.go
@@ -280,10 +280,17 @@ func postgresType(req *plugin.CodeGenRequest, col *plugin.Column) string {
 
 			for _, enum := range schema.Enums {
 				if rel.Name == enum.Name && rel.Schema == schema.Name {
-					if schema.Name == req.Catalog.DefaultSchema {
-						return StructName(enum.Name, req.Settings)
+					if notNull {
+						if schema.Name == req.Catalog.DefaultSchema {
+							return StructName(enum.Name, req.Settings)
+						}
+						return StructName(schema.Name+"_"+enum.Name, req.Settings)
+					} else {
+						if schema.Name == req.Catalog.DefaultSchema {
+							return "Null" + StructName(enum.Name, req.Settings)
+						}
+						return "Null" + StructName(schema.Name+"_"+enum.Name, req.Settings)
 					}
-					return StructName(schema.Name+"_"+enum.Name, req.Settings)
 				}
 			}
 

Original file line number	Diff line number	Diff line change
`@@ -86,10 +86,17 @@ func mysqlType(req plugin.CodeGenRequest, col plugin.Column) string {`
`86`	`86`	`for _, schema := range req.Catalog.Schemas {`
`87`	`87`	`for _, enum := range schema.Enums {`
`88`	`88`	`if enum.Name == columnType {`
`89`		`- if schema.Name == req.Catalog.DefaultSchema {`
`90`		`- return StructName(enum.Name, req.Settings)`
	`89`	`+ if notNull {`
	`90`	`+ if schema.Name == req.Catalog.DefaultSchema {`
	`91`	`+ return StructName(enum.Name, req.Settings)`
	`92`	`+ }`
	`93`	`+ return StructName(schema.Name+"_"+enum.Name, req.Settings)`
	`94`	`+ } else {`
	`95`	`+ if schema.Name == req.Catalog.DefaultSchema {`
	`96`	`+ return "Null" + StructName(enum.Name, req.Settings)`
	`97`	`+ }`
	`98`	`+ return "Null" + StructName(schema.Name+"_"+enum.Name, req.Settings)`
`91`	`99`	`}`
`92`		`- return StructName(schema.Name+"_"+enum.Name, req.Settings)`
`93`	`100`	`}`
`94`	`101`	`}`
`95`	`102`	`}`
Original file line number	Diff line number	Diff line change
`@@ -280,10 +280,17 @@ func postgresType(req plugin.CodeGenRequest, col plugin.Column) string {`
`280`	`280`
`281`	`281`	`for _, enum := range schema.Enums {`
`282`	`282`	`if rel.Name == enum.Name && rel.Schema == schema.Name {`
`283`		`- if schema.Name == req.Catalog.DefaultSchema {`
`284`		`- return StructName(enum.Name, req.Settings)`
	`283`	`+ if notNull {`
	`284`	`+ if schema.Name == req.Catalog.DefaultSchema {`
	`285`	`+ return StructName(enum.Name, req.Settings)`
	`286`	`+ }`
	`287`	`+ return StructName(schema.Name+"_"+enum.Name, req.Settings)`
	`288`	`+ } else {`
	`289`	`+ if schema.Name == req.Catalog.DefaultSchema {`
	`290`	`+ return "Null" + StructName(enum.Name, req.Settings)`
	`291`	`+ }`
	`292`	`+ return "Null" + StructName(schema.Name+"_"+enum.Name, req.Settings)`
`285`	`293`	`}`
`286`		`- return StructName(schema.Name+"_"+enum.Name, req.Settings)`
`287`	`294`	`}`
`288`	`295`	`}`
`289`	`296`