refactor: update ModelName function to handle schema name (main)

Author: rayakame

internal/core/utils.go

@@ -6,9 +6,12 @@ import (
 	"strings"
 )
 
-func ModelName(name string) string {
+func ModelName(enumName string, schemaName string) string {
+	if schemaName != "" {
+		enumName = schemaName + "_" + enumName
+	}
 	out := ""
-	for _, p := range strings.Split(name, "_") {
+	for _, p := range strings.Split(enumName, "_") {
 		out += cases.Title(language.Und, cases.NoLower).String(p)
 	}
 	return out

internal/types/postgresql.go

@@ -51,9 +51,9 @@ func PostgresTypeToPython(req *plugin.GenerateRequest, col *plugin.Column) strin
 			for _, enum := range schema.Enums {
 				if columnType == enum.Name {
 					if schema.Name == req.Catalog.DefaultSchema {
-						return "models." + core.ModelName(enum.Name)
+						return "models." + core.ModelName(enum.Name, "")
 					}
-					return "models." + core.ModelName(schema.Name+"_"+enum.Name)
+					return "models." + core.ModelName(enum.Name, schema.Name)
 				}
 			}
 		}