Merge pull request #1594 from oyvindberg/enable-derives-for-scala-3

Enable support for `derives` in Scala 3 for `Read`, `Write` and `Text`
typelevel · Dec 10, 2021 · aa68012 · aa68012
2 parents afe1f26 + e6ecf82
commit aa68012
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 3 deletions.
diff --git a/modules/core/src/main/scala-3/util/ReadPlatform.scala b/modules/core/src/main/scala-3/util/ReadPlatform.scala
@@ -20,7 +20,7 @@ trait ReadPlatform:
     )
 
   // Generic Read for products.
-  given [P <: Product, A](
+  given derived [P <: Product, A](
     using m: Mirror.ProductOf[P],
           i: A =:= m.MirroredElemTypes,
           w: Read[A]

diff --git a/modules/core/src/main/scala-3/util/WritePlatform.scala b/modules/core/src/main/scala-3/util/WritePlatform.scala
@@ -22,7 +22,7 @@ trait WritePlatform:
     )
 
   // Generic write for products.
-  given [P <: Product, A](
+  given derived[P <: Product, A](
     using m: Mirror.ProductOf[P],
           i: m.MirroredElemTypes =:= A,
           w: Write[A]

diff --git a/modules/core/src/test/scala-3/doobie/util/ReadSuitePlatform.scala b/modules/core/src/test/scala-3/doobie/util/ReadSuitePlatform.scala
@@ -21,4 +21,7 @@ trait ReadSuitePlatform { self: munit.FunSuite =>
     util.Read[Option[(Int, Woozle *: Woozle *: String *: EmptyTuple)]]
   }
 
+  test("derives") {
+    case class Foo(a: String, b: Int) derives util.Read
+  }
 }
diff --git a/modules/core/src/test/scala-3/doobie/util/WriteSuitePlatform.scala b/modules/core/src/test/scala-3/doobie/util/WriteSuitePlatform.scala
@@ -21,4 +21,7 @@ trait WriteSuitePlatform { self: munit.FunSuite =>
     util.Write[Option[(Int, Woozle *: Woozle *: String *: EmptyTuple)]]
   }
 
+  test("derives") {
+    case class Foo(a: String, b: Int) derives util.Write
+  }
 }
diff --git a/modules/postgres/src/main/scala-3/doobie/postgres/TextPlatform.scala b/modules/postgres/src/main/scala-3/doobie/postgres/TextPlatform.scala
@@ -17,7 +17,7 @@ trait TextPlatform { this: Text.type =>
     (h product t).contramap(l => (l.head, l.tail))
 
   // Put is available for single-element products.
-  given [P <: Product, A](
+  given derived[P <: Product, A](
     using m: Mirror.ProductOf[P],
           i: m.MirroredElemTypes =:= A,
           t: Text[A]

diff --git a/modules/postgres/src/test/scala-2/doobie/postgres/TextSuitePlatform.scala b/modules/postgres/src/test/scala-2/doobie/postgres/TextSuitePlatform.scala
@@ -0,0 +1,9 @@
+// Copyright (c) 2013-2020 Rob Norris and Contributors
+// This software is licensed under the MIT License (MIT).
+// For more information see LICENSE or https://opensource.org/licenses/MIT
+
+package doobie.postgres
+
+trait TextSuitePlatform { self: munit.FunSuite =>
+
+}
diff --git a/modules/postgres/src/test/scala-3/postgres/TextSuitePlatform.scala b/modules/postgres/src/test/scala-3/postgres/TextSuitePlatform.scala
@@ -0,0 +1,11 @@
+// Copyright (c) 2013-2020 Rob Norris and Contributors
+// This software is licensed under the MIT License (MIT).
+// For more information see LICENSE or https://opensource.org/licenses/MIT
+
+package doobie.postgres
+
+trait TextSuitePlatform { self: munit.FunSuite =>
+  test("derives") {
+    case class Foo(a: String, b: Int) derives Text
+  }
+}