Allow customizing name of primary key type based on rows (#121)

oyvindberg · Jul 13, 2024 · 156f927 · 156f927
1 parent b6db739
commit 156f927
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/typo/src/scala/typo/Naming.scala b/typo/src/scala/typo/Naming.scala
@@ -35,7 +35,10 @@ class Naming(val pkg: sc.QIdent) {
   protected def tpe(name: db.RelationName, suffix: String): sc.QIdent =
     pkg / name.schema.map(sc.Ident.apply).toList / sc.Ident(Naming.titleCase(name.name)).appended(suffix)
 
-  def idName(source: Source): sc.QIdent = relation(source, "Id")
+  def idName(source: Source, cols: List[db.Col]): sc.QIdent = {
+    ((), cols)._1 // allow implementors to use this
+    relation(source, "Id")
+  }
   def repoName(source: Source): sc.QIdent = relation(source, "Repo")
   def repoImplName(source: Source): sc.QIdent = relation(source, "RepoImpl")
   def repoMockName(source: Source): sc.QIdent = relation(source, "RepoMock")

diff --git a/typo/src/scala/typo/internal/ComputedTable.scala b/typo/src/scala/typo/internal/ComputedTable.scala
@@ -43,7 +43,6 @@ case class ComputedTable(
 
   val maybeId: Option[IdComputed] =
     dbTable.primaryKey.flatMap { pk =>
-      val tpe = sc.Type.Qualified(naming.idName(source))
       pk.colNames match {
         case NonEmptyList(colName, Nil) =>
           val dbCol = dbColsByName(colName)
@@ -60,8 +59,10 @@ case class ComputedTable(
                 Some(IdComputed.UnaryUserSpecified(col, underlying))
               else if (!options.enablePrimaryKeyType.include(dbTable.name))
                 Some(IdComputed.UnaryNoIdType(col, underlying))
-              else
+              else {
+                val tpe = sc.Type.Qualified(naming.idName(source, List(col.dbCol)))
                 Some(IdComputed.UnaryNormal(col, tpe))
+              }
           }
 
         case colNames =>
@@ -74,6 +75,7 @@ case class ComputedTable(
                 dbCol = dbColsByName(colName)
               )
             }
+          val tpe = sc.Type.Qualified(naming.idName(source, cols.toList.map(_.dbCol)))
           Some(IdComputed.Composite(cols, tpe, paramName = sc.Ident("compositeId")))
       }
     }