fix enum column names in sql files

oyvindberg · Jun 19, 2023 · b36afc9 · b36afc9
1 parent 734c041
commit b36afc9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/typo/src/scala/typo/internal/TypeMapperDb.scala b/typo/src/scala/typo/internal/TypeMapperDb.scala
@@ -67,7 +67,7 @@ case class TypeMapperDb(enums: Map[String, db.StringEnum], domains: Map[String,
       case str if str.startsWith("_")          => dbTypeFrom(udtName.drop(1), characterMaximumLength).map(tpe => db.Type.Array(tpe))
       case typeName =>
         enums
-          .get(typeName)
+          .get(typeName.replaceAll("\"", ""))
           .map(`enum` => db.Type.EnumRef(`enum`.name))
           .orElse(domains.get(typeName).map(domain => db.Type.DomainRef(domain.name)))
     }

diff --git a/typo/src/scala/typo/internal/metadb/load.scala b/typo/src/scala/typo/internal/metadb/load.scala
@@ -56,7 +56,7 @@ object load {
     val primaryKeys = PrimaryKeys(input.tableConstraints, input.keyColumnUsage)
     val uniqueKeys = UniqueKeys(input.tableConstraints, input.keyColumnUsage)
     val enums = Enums(input.pgEnums)
-    val enumsByName = enums.map(e => (e.name.name, e)).toMap
+    val enumsByName = enums.flatMap(e => List((e.name.name, e), (e.name.value, e))).toMap
     val domains = input.domains.map { d =>
       val tpe = TypeMapperDb(enumsByName, Map.empty)
         .dbTypeFrom(