Add local time support (#40)

Co-authored-by: hfhbd <[email protected]>

Author: hfhbd

postgres-native-sqldelight-dialect/src/main/kotlin/app/softwork/sqldelight/postgresdialect/PostgresNativeDialect.kt

@@ -32,7 +32,7 @@ class PostgresNativeDialect : SqlDelightDialect by PostgreSqlDialect() {
                     dateDataType != null -> {
                         when (dateDataType!!.firstChild.text) {
                             "DATE" -> PostgreSqlType.DATE
-                            //"TIME" -> PostgreSqlType.TIME
+                            "TIME" -> PostgreSqlType.TIME
                             "TIMESTAMP" -> if (dateDataType!!.node.getChildren(null)
                                     .any { it.text == "WITH" }
                             ) PostgreSqlType.TIMESTAMP_TIMEZONE else PostgreSqlType.TIMESTAMP
@@ -65,7 +65,7 @@ internal enum class PostgreSqlType(override val javaType: TypeName): DialectType
     },
     BIG_INT(LONG),
     DATE(ClassName("kotlinx.datetime", "LocalDate")),
-    //TIME(kotlinx.datetime.LocalTime::class.asTypeName()),
+    TIME(ClassName("kotlinx.datetime", "LocalTime")),
     TIMESTAMP(ClassName("kotlinx.datetime", "LocalDateTime")),
     TIMESTAMP_TIMEZONE(ClassName("kotlinx.datetime", "Instant")),
     INTERVAL(ClassName("kotlin.time", "Duration")),
@@ -77,7 +77,7 @@ internal enum class PostgreSqlType(override val javaType: TypeName): DialectType
                 when (this) {
                     SMALL_INT, INTEGER, BIG_INT -> "bindLong"
                     DATE -> "bindDate"
-                    //TIME -> "bindTime"
+                    TIME -> "bindTime"
                     TIMESTAMP -> "bindLocalTimestamp"
                     TIMESTAMP_TIMEZONE -> "bindTimestamp"
                     INTERVAL -> "bindInterval"
@@ -93,7 +93,7 @@ internal enum class PostgreSqlType(override val javaType: TypeName): DialectType
             when (this) {
                 SMALL_INT, INTEGER, BIG_INT -> "$cursorName.getLong($columnIndex)"
                 DATE -> "$cursorName.getDate($columnIndex)"
-                //TIME -> "$cursorName.getTime($columnIndex)"
+                TIME -> "$cursorName.getTime($columnIndex)"
                 TIMESTAMP -> "$cursorName.getLocalTimestamp($columnIndex)"
                 TIMESTAMP_TIMEZONE -> "$cursorName.getTimestamp($columnIndex)"
                 INTERVAL -> "$cursorName.getInterval($columnIndex)"

postgres-native-sqldelight-driver/build.gradle.kts

@@ -28,7 +28,7 @@ kotlin {
         commonMain {
             dependencies {
                 api("app.cash.sqldelight:runtime:2.0.0-alpha03")
-                api("org.jetbrains.kotlinx:kotlinx-datetime:0.3.3")
+                api("org.jetbrains.kotlinx:kotlinx-datetime:0.4.0")
                 api("app.softwork:kotlinx-uuid-core:0.0.15")
             }
         }

postgres-native-sqldelight-driver/src/commonMain/kotlin/app/softwork/sqldelight/postgresdriver/PostgresNativeDriver.kt

@@ -300,8 +300,7 @@ class PostgresCursor(
     }
 
     fun getDate(index: Int): LocalDate? = getString(index)?.toLocalDate()
-
-    // fun getTime(index: Int): LocalTime? = getInt(index)?.toLocalTime()
+    fun getTime(index: Int): LocalTime? = getString(index)?.toLocalTime()
     fun getLocalTimestamp(index: Int): LocalDateTime? = getString(index)?.replace(" ", "T")?.toLocalDateTime()
     fun getTimestamp(index: Int): Instant? = getString(index)?.let {
         Instant.parse(it.replace(" ", "T"))
@@ -373,11 +372,10 @@ class PostgresPreparedStatement(private val parameters: Int) : SqlPreparedStatem
         bind(index, value?.toString(), dateOid)
     }
 
-    /*
+
     fun bindTime(index: Int, value: LocalTime?) {
         bind(index, value?.toString(), timeOid)
     }
-    */
 
     fun bindLocalTimestamp(index: Int, value: LocalDateTime?) {
         bind(index, value?.toString(), timestampOid)

testing/src/commonMain/sqldelight/app/softwork/sqldelight/postgresdriver/1.sqm

@@ -4,6 +4,7 @@ CREATE TABLE foo(
 a INT PRIMARY KEY,
 b TEXT NOT NULL,
 date DATE NOT NULL,
+time TIME NOT NULL,
 timestamp TIMESTAMP NOT NULL,
 instant TIMESTAMPTZ NOT NULL,
 interval INTERVAL NOT NULL,

testing/src/commonTest/kotlin/app/softwork/sqldelight/postgresdriver/PostgresNativeDriverTest.kt

@@ -23,6 +23,7 @@ class PostgresNativeDriverTest {
             a = 42,
             b = "answer",
             date = LocalDate(2020, Month.DECEMBER, 12),
+            time = LocalTime(12, 42, 0, 0),
             timestamp = LocalDateTime(2014, Month.AUGUST, 1, 12, 1, 2, 0),
             instant = Instant.fromEpochMilliseconds(10L),
             interval = 42.seconds,
@@ -44,12 +45,13 @@ class PostgresNativeDriverTest {
         val queries = NativePostgres(driver).fooQueries
         NativePostgres.Schema.migrate(driver, 0, NativePostgres.Schema.version)
         queries.copy()
-        val result = driver.copy("42,answer,2020-12-12,2014-08-01T12:01:02.0000,1970-01-01T00:00:00.010Z,PT42S,00000000-0000-0000-0000-000000000000")
+        val result = driver.copy("42,answer,2020-12-12,12:42:00.0000,2014-08-01T12:01:02.0000,1970-01-01T00:00:00.010Z,PT42S,00000000-0000-0000-0000-000000000000")
         assertEquals(1, result)
         val foo = Foo(
             a = 42,
             b = "answer",
             date = LocalDate(2020, Month.DECEMBER, 12),
+            time = LocalTime(12, 42, 0, 0),
             timestamp = LocalDateTime(2014, Month.AUGUST, 1, 12, 1, 2, 0),
             instant = Instant.fromEpochMilliseconds(10L),
             interval = 42.seconds,