Merge pull request #2232 from satorg/get-put-final

Rid of anonymous `Get`s and `Put`s

Author: jatcwang

modules/core/src/main/scala/doobie/util/get.scala

@@ -24,7 +24,7 @@ import doobie.util.meta.Meta
   *   If non-empty, the column/parameter type reported by the database will be checked to match this list during
   *   typechecking against the database.
   */
-sealed abstract class Get[A](
+final class Get[A] private (
     val typeStack: NonEmptyList[Option[String]],
     val jdbcSources: NonEmptyList[JdbcType],
     val jdbcSourceSecondary: List[JdbcType],
@@ -66,7 +66,7 @@ sealed abstract class Get[A](
       jdbcSourceSecondary = jdbcSourceSecondary,
       vendorTypeNames = vendorTypeNames,
       get = get.map(f)
-    ) {}
+    )
 
   /** Equivalent to `tmap`, but allows the conversion to fail with an error message.
     */
@@ -99,7 +99,7 @@ object Get extends GetInstances with GetPlatform {
       jdbcSourceSecondary = jdbcSourceSecondary,
       vendorTypeNames = checkedVendorType.toList,
       get = get
-    ) {}
+    )
 
     def many[A](
         jdbcSources: NonEmptyList[JdbcType],
@@ -116,7 +116,6 @@ object Get extends GetInstances with GetPlatform {
         checkedVendorType: Option[String]
     ): Get[A] =
       many(NonEmptyList.of(jdbcSources), jdbcSourceSecondary, get, checkedVendorType)
-
   }
 
   /** Get instance for an advanced JDBC type. */
@@ -133,7 +132,7 @@ object Get extends GetInstances with GetPlatform {
       jdbcSourceSecondary = Nil,
       vendorTypeNames = vendorTypeNames.toList,
       get = get
-    ) {}
+    )
 
     def many[A](
         jdbcSources: NonEmptyList[JdbcType],

modules/core/src/main/scala/doobie/util/put.scala

@@ -23,7 +23,7 @@ import scala.reflect.ClassTag
   *   If non-empty, the column/parameter type reported by the database will be checked to match this list during
   *   typechecking against the database.
   */
-sealed abstract class Put[A](
+final class Put[A] private (
     val typeStack: NonEmptyList[Option[String]],
     val jdbcTargets: NonEmptyList[JdbcType],
     val vendorTypeNames: List[String],
@@ -53,7 +53,7 @@ sealed abstract class Put[A](
       vendorTypeNames = vendorTypeNames,
       put = put.contramap(f),
       update = update.contramap(f)
-    ) {}
+    )
 
   def unsafeSetNonNullable(ps: PreparedStatement, n: Int, a: A): Unit =
     if (a == null) sys.error(s"Expected non-nullable param at $n. Use Option to describe nullable values.")
@@ -100,7 +100,7 @@ object Put extends PutInstances {
       vendorTypeNames = checkedVendorType.toList,
       put = put,
       update = update
-    ) {}
+    )
 
     def many[A](
         jdbcTargets: NonEmptyList[JdbcType],
@@ -140,7 +140,7 @@ object Put extends PutInstances {
       vendorTypeNames = vendorTypeNames.toList,
       put = put,
       update = update
-    ) {}
+    )
 
     def many[A](
         jdbcTargets: NonEmptyList[JdbcType],

modules/core/src/main/scala/doobie/util/write.scala

@@ -66,8 +66,10 @@ sealed trait Write[A] {
 
   def toFragment(a: A, sql: String = List.fill(length)("?").mkString(",")): Fragment = {
     val elems: List[Elem] = (puts zip toList(a)).map {
-      case ((p: Put[a], NoNulls), a)  => Elem.Arg(a.asInstanceOf[a], p)
-      case ((p: Put[a], Nullable), a) => Elem.Opt(a.asInstanceOf[Option[a]], p)
+      case ((p, nullab), x) => nullab match {
+          case NoNulls  => p match { case px: Put[x] => Elem.Arg(x.asInstanceOf[x], px) }
+          case Nullable => p match { case px: Put[x] => Elem.Opt(x.asInstanceOf[Option[x]], px) }
+        }
     }
     Fragment(sql, elems, None)
   }