codegen: Try to output code that cross-compiles

nafg · Dec 8, 2023 · 741421b · 741421b
1 parent d0a76d3
commit 741421b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/slick-additions-codegen/src/main/scala/slick/additions/codegen/TablesCodeGenerator.scala b/slick-additions-codegen/src/main/scala/slick/additions/codegen/TablesCodeGenerator.scala
@@ -23,19 +23,19 @@ class TablesCodeGenerator extends BaseCodeGenerator {
       .typeApply(rowClassType)
 
   def mkMapping(rowClassName: String, mappingName: String, columns: List[ColumnConfig]) = {
-    val companion                   = Term.Name(rowClassName)
-    val rowClassType                = Type.Name(rowClassName)
-    val terms                       = columns.map(_.tableFieldTerm)
-    val numCols                     = columns.length
-    val (tuple, factory, extractor) =
+    val companion    = Term.Name(rowClassName)
+    val rowClassType = Type.Name(rowClassName)
+    val terms        = columns.map(_.tableFieldTerm)
+    val numCols      = columns.length
+    val rhs          =
       if (numCols == 1)
-        (terms.head, companion.termSelect("apply"), companion.termSelect("unapply"))
+        terms.head
+          .termSelect("mapTo")
+          .termApplyType(rowClassType)
       else if (numCols <= 22)
-        (
-          Term.Tuple(terms),
-          Term.Eta(companion.termSelect("apply")).termSelect("tupled"),
-          companion.termSelect("unapply")
-        )
+        Term.Tuple(terms)
+          .termSelect("mapTo")
+          .termApplyType(rowClassType)
       else {
         @tailrec
         def group22[A](values: List[A])(group: List[A] => A): A =
@@ -64,13 +64,13 @@ class TablesCodeGenerator extends BaseCodeGenerator {
             term"Some".termApply(res)
           )
 
-        (group22[Term](terms)(Term.Tuple(_)), fac, extractor)
+        group22[Term](terms)(Term.Tuple(_))
+          .termSelect("<>")
+          .termApply(fac, extractor)
       }
 
     defDef(mappingName, declaredType = Some(mappingType(rowClassType)))()(
-      tuple
-        .termSelect("<>")
-        .termApply(factory, extractor)
+      rhs
     )
   }
 

diff --git a/slick-additions-codegen/src/test/resources/entity/TableModules.scala b/slick-additions-codegen/src/test/resources/entity/TableModules.scala
@@ -14,7 +14,7 @@ object TableModules {
       override def keyColumnName = "id"
       val name                   = column[String]("name")
       def mapping: slick.lifted.MappedProjection[ColorsRow] =
-        name.<>(ColorsRow.apply, ColorsRow.unapply)
+        name.mapTo[ColorsRow]
     }
   }
   object People extends EntityTableModule[Long, PeopleRow]("people") {

diff --git a/slick-additions-codegen/src/test/resources/plain/Tables.scala b/slick-additions-codegen/src/test/resources/plain/Tables.scala
@@ -3,10 +3,9 @@ import slick.jdbc.H2Profile.api._
 object Tables {
   class Colors(_tableTag: Tag)
       extends Table[ColorsRow](_tableTag, Some("PUBLIC"), "colors") {
-    val id   = column[Long]("id")
-    val name = column[String]("name")
-    def * : slick.lifted.ProvenShape[ColorsRow] =
-      (id, name).<>((ColorsRow.apply _).tupled, ColorsRow.unapply)
+    val id                                      = column[Long]("id")
+    val name                                    = column[String]("name")
+    def * : slick.lifted.ProvenShape[ColorsRow] = (id, name).mapTo[ColorsRow]
   }
   lazy val Colors = TableQuery[Colors]
   class People(_tableTag: Tag)