codegen: Generate valid enum names for symbols (#972)

sqlc-dev · Apr 7, 2021 · eec0fe1 · eec0fe1
1 parent 0d6d915
commit eec0fe1
Show file tree

Hide file tree

Showing 6 changed files with 90 additions and 9 deletions.
diff --git a/internal/codegen/golang/result.go b/internal/codegen/golang/result.go
@@ -34,12 +34,18 @@ func buildEnums(r *compiler.Result, settings config.CombinedSettings) []Enum {
 				Name:    StructName(enumName, settings),
 				Comment: enum.Comment,
 			}
-			for _, v := range enum.Vals {
+			seen := make(map[string]struct{}, len(enum.Vals))
+			for i, v := range enum.Vals {
+				value := EnumReplace(v)
+				if _, found := seen[value]; found || value == "" {
+					value = fmt.Sprintf("value_%d", i)
+				}
 				e.Constants = append(e.Constants, Constant{
-					Name:  StructName(enumName+"_"+EnumReplace(v), settings),
+					Name:  StructName(enumName+"_"+value, settings),
 					Value: v,
 					Type:  e.Name,
 				})
+				seen[value] = struct{}{}
 			}
 			enums = append(enums, e)
 		}

diff --git a/internal/endtoend/testdata/ddl_create_enum/mysql/go/models.go b/internal/endtoend/testdata/ddl_create_enum/mysql/go/models.go
diff --git a/internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go b/internal/endtoend/testdata/ddl_create_enum/mysql/go/query.sql.go
diff --git a/internal/endtoend/testdata/ddl_create_enum/mysql/schema.sql b/internal/endtoend/testdata/ddl_create_enum/mysql/schema.sql
@@ -1,3 +1,4 @@
 CREATE TABLE foo (
-    foobar ENUM ('foo-a', 'foo_b', 'foo:c', 'foo/d', 'foo@e', 'foo+f', 'foo!g') NOT NULL
+    foobar ENUM ('foo-a', 'foo_b', 'foo:c', 'foo/d', 'foo@e', 'foo+f', 'foo!g') NOT NULL,
+    digit  ENUM ('0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '#', '*')    NOT NULL
 );
diff --git a/internal/endtoend/testdata/ddl_create_enum/postgresql/go/models.go b/internal/endtoend/testdata/ddl_create_enum/postgresql/go/models.go
diff --git a/internal/endtoend/testdata/ddl_create_enum/postgresql/schema.sql b/internal/endtoend/testdata/ddl_create_enum/postgresql/schema.sql
@@ -10,4 +10,19 @@ CREATE TYPE foobar AS ENUM (
     'foo!g'
 );
 
+CREATE TYPE "digit" AS ENUM (
+  '0',
+  '1',
+  '2',
+  '3',
+  '4',
+  '5',
+  '6',
+  '7',
+  '8',
+  '9',
+  '#',
+  '*'
+);
+
 CREATE TABLE foo (val foobar NOT NULL);