Adding support for java.util.Date (#24)

I've added support java.util.Date. I've added the same tests as for
LocalDateTime and all tests pass successfully. Let me know if anything
else is needed.

---------

Co-authored-by: Li Haoyi <[email protected]>

Author: marcvk

docs/reference.md

@@ -7371,6 +7371,29 @@ Expr("2023-11-12 03:22:41").cast[java.time.LocalDateTime]
 
 
 
+### ExprOps.cast.utildate
+
+
+
+```scala
+Expr("2023-11-12 03:22:41").cast[java.util.Date]
+```
+
+
+*
+    ```sql
+    SELECT CAST(? AS TIMESTAMP) AS res
+    ```
+
+
+
+*
+    ```scala
+    new java.text.SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse("2023-11-12 03:22:41")
+    ```
+
+
+
 ### ExprOps.cast.instant
 
 
@@ -9201,6 +9224,7 @@ case class DataTypes[T[_]](
     myLocalDate: T[LocalDate],
     myLocalTime: T[LocalTime],
     myLocalDateTime: T[LocalDateTime],
+    myUtilDate: T[Date],
     myInstant: T[Instant],
     myVarBinary: T[geny.Bytes],
     myUUID: T[java.util.UUID],
@@ -9219,6 +9243,7 @@ val value = DataTypes[Sc](
   myLocalDate = LocalDate.parse("2023-12-20"),
   myLocalTime = LocalTime.parse("10:15:30"),
   myLocalDateTime = LocalDateTime.parse("2011-12-03T10:15:30"),
+  myUtilDate = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS").parse("2011-12-03T10:15:30.000"),
   myInstant = Instant.parse("2011-12-03T10:15:30Z"),
   myVarBinary = new geny.Bytes(Array[Byte](1, 2, 3, 4, 5, 6, 7, 8)),
   myUUID = new java.util.UUID(1234567890L, 9876543210L),
@@ -9236,6 +9261,7 @@ db.run(
     _.myLocalDate := value.myLocalDate,
     _.myLocalTime := value.myLocalTime,
     _.myLocalDateTime := value.myLocalDateTime,
+    _.myUtilDate := value.myUtilDate,
     _.myInstant := value.myInstant,
     _.myVarBinary := value.myVarBinary,
     _.myUUID := value.myUUID,

scalasql/core/src/DialectTypeMappers.scala

@@ -28,6 +28,7 @@ trait DialectTypeMappers extends DialectConfig {
   implicit def BooleanType: TypeMapper[Boolean]
   implicit def UuidType: TypeMapper[UUID]
   implicit def BytesType: TypeMapper[geny.Bytes]
+  implicit def UtilDateType: TypeMapper[java.util.Date]
   implicit def LocalDateType: TypeMapper[LocalDate]
   implicit def LocalTimeType: TypeMapper[LocalTime]
 

scalasql/core/src/TypeMapper.scala

@@ -87,6 +87,9 @@ object TypeMapper {
     d.UuidType
   implicit def bytesFromDialectTypeMappers(implicit d: DialectTypeMappers): TypeMapper[geny.Bytes] =
     d.BytesType
+  implicit def utilDateFromDialectTypeMappers(
+      implicit d: DialectTypeMappers
+  ): TypeMapper[java.util.Date] = d.UtilDateType
   implicit def localDateFromDialectTypeMappers(
       implicit d: DialectTypeMappers
   ): TypeMapper[LocalDate] = d.LocalDateType

scalasql/src/dialects/Dialect.scala

@@ -107,6 +107,14 @@ trait Dialect extends DialectTypeMappers {
     def put(r: PreparedStatement, idx: Int, v: geny.Bytes) = r.setBytes(idx, v.array)
   }
 
+  implicit def UtilDateType: TypeMapper[java.util.Date] = new UtilDateType
+  class UtilDateType extends TypeMapper[java.util.Date] {
+    def jdbcType = JDBCType.TIMESTAMP
+    def get(r: ResultSet, idx: Int) = new java.util.Date(r.getTimestamp(idx).getTime)
+    def put(r: PreparedStatement, idx: Int, v: java.util.Date) =
+      r.setTimestamp(idx, new java.sql.Timestamp(v.getTime))
+  }
+
   implicit def LocalDateType: TypeMapper[LocalDate] = new LocalDateType
   class LocalDateType extends TypeMapper[LocalDate] {
     def jdbcType = JDBCType.DATE

scalasql/src/dialects/MySqlDialect.scala

@@ -67,6 +67,9 @@ trait MySqlDialect extends Dialect {
   override implicit def InstantType: TypeMapper[Instant] = new MySqlInstantType
   class MySqlInstantType extends InstantType { override def castTypeString = "DATETIME" }
 
+  override implicit def UtilDateType: TypeMapper[java.util.Date] = new MySqlUtilDateType
+  class MySqlUtilDateType extends UtilDateType { override def castTypeString = "DATETIME" }
+
   override implicit def UuidType: TypeMapper[UUID] = new MySqlUuidType
 
   class MySqlUuidType extends UuidType {

scalasql/src/dialects/SqliteDialect.scala

@@ -31,6 +31,9 @@ trait SqliteDialect extends Dialect with ReturningDialect with OnConflictOps {
   override implicit def InstantType: TypeMapper[Instant] = new SqliteInstantType
   class SqliteInstantType extends InstantType { override def castTypeString = "VARCHAR" }
 
+  override implicit def UtilDateType: TypeMapper[java.util.Date] = new SqliteUtilDateType
+  class SqliteUtilDateType extends UtilDateType { override def castTypeString = "VARCHAR" }
+
   override implicit def ExprStringOpsConv(v: Expr[String]): SqliteDialect.ExprStringOps[String] =
     new SqliteDialect.ExprStringOps(v)
 

scalasql/test/resources/h2-customer-schema.sql

@@ -50,6 +50,7 @@ CREATE TABLE data_types (
     my_local_date DATE,
     my_local_time TIME,
     my_local_date_time TIMESTAMP,
+    my_util_date TIMESTAMP,
     my_instant TIMESTAMP WITH TIME ZONE,
     my_var_binary VARBINARY(256),
     my_uuid UUID,

scalasql/test/resources/mysql-customer-schema.sql

@@ -50,6 +50,7 @@ CREATE TABLE data_types (
     my_local_date DATE,
     my_local_time TIME,
     my_local_date_time TIMESTAMP,
+    my_util_date TIMESTAMP,
     my_instant DATETIME,
     my_var_binary VARBINARY(256),
     my_uuid CHAR(36),
@@ -76,4 +77,4 @@ CREATE TABLE enclosing(
     my_string VARCHAR(256),
     foo_id INTEGER,
     my_boolean BOOLEAN
-);
+);

scalasql/test/resources/postgres-customer-schema.sql

@@ -52,6 +52,7 @@ CREATE TABLE data_types (
     my_local_date DATE,
     my_local_time TIME,
     my_local_date_time TIMESTAMP,
+    my_util_date TIMESTAMP,
     my_instant TIMESTAMP WITH TIME ZONE,
     my_var_binary BYTEA,
     my_uuid UUID,
@@ -82,10 +83,11 @@ CREATE TABLE enclosing(
     my_boolean BOOLEAN
 );
 
+
 CREATE SCHEMA otherschema;
 
 CREATE TABLE otherschema.invoice(
     id SERIAL PRIMARY KEY,
     total DECIMAL(20, 2),
     vendor_name VARCHAR(256)
-);
+);

scalasql/test/resources/sqlite-customer-schema.sql

@@ -48,6 +48,7 @@ CREATE TABLE data_types (
     my_local_date DATE,
     my_local_time TIME,
     my_local_date_time TIMESTAMP,
+    my_util_date TIMESTAMP,
     my_instant DATETIME,
     my_var_binary VARBINARY,
     my_uuid BINARY(16),
@@ -77,4 +78,4 @@ CREATE TABLE enclosing(
     my_string VARCHAR(256),
     foo_id INTEGER,
     my_boolean BOOLEAN
-);
+);