Finish up implementation

sqldelight · Mar 28, 2023 · 2a3afa8 · 2a3afa8
1 parent 514d496
commit 2a3afa8
Show file tree

Hide file tree

Showing 35 changed files with 201 additions and 152 deletions.
diff --git a/.github/workflows/PR.yml b/.github/workflows/PR.yml
@@ -15,7 +15,7 @@ jobs:
         # for a log of why this is needed, see: https://github.com/touchlab/SQLiter/pull/38#issuecomment-867171789
         #
         # Windows checks are temporarily disabled until fixed, see: https://github.com/cashapp/sqldelight/issues/2579
-        os: [ macOS-latest, ubuntu-18.04 ]
+        os: [ macOS-latest, ubuntu-22.04 ]
         job: [ instrumentation, test, gradle-plugin-tests ]
         exclude:
           - os: windows-latest

diff --git a/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt b/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidDriverTest.kt
@@ -1,6 +1,7 @@
 package com.squareup.sqldelight.android
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlPreparedStatement
 import app.cash.sqldelight.db.SqlSchema
@@ -17,7 +18,7 @@ import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
 class AndroidDriverTest : DriverTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     return AndroidSqliteDriver(schema, getApplicationContext())
   }
 

diff --git a/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidQueryTest.kt b/drivers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidQueryTest.kt
@@ -1,6 +1,7 @@
 package com.squareup.sqldelight.android
 
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
@@ -10,7 +11,7 @@ import org.robolectric.RobolectricTestRunner
 
 @RunWith(RobolectricTestRunner::class)
 class AndroidQueryTest : QueryTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     return AndroidSqliteDriver(schema, getApplicationContext())
   }
 }
diff --git a/...ers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidTransacterTest.kt b/...ers/android-driver/src/test/java/com/squareup/sqldelight/android/AndroidTransacterTest.kt
@@ -4,6 +4,7 @@ import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import app.cash.sqldelight.Transacter
 import app.cash.sqldelight.TransactionWithReturn
 import app.cash.sqldelight.TransactionWithoutReturn
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.android.AndroidSqliteDriver
@@ -17,7 +18,7 @@ import kotlin.concurrent.thread
 
 @RunWith(RobolectricTestRunner::class)
 class AndroidTransacterTest : TransacterTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     return AndroidSqliteDriver(schema, getApplicationContext())
   }
 

diff --git a/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt b/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/DriverTest.kt
@@ -20,10 +20,10 @@ import kotlin.test.assertTrue
 
 abstract class DriverTest {
   protected lateinit var driver: SqlDriver
-  protected val schema = object : SqlSchema {
+  protected val schema = object : SqlSchema<QueryResult.Value<Unit>> {
     override val version: Int = 1
 
-    override fun create(driver: SqlDriver): QueryResult<Unit> {
+    override fun create(driver: SqlDriver): QueryResult.Value<Unit> {
       driver.execute(
         0,
         """
@@ -59,7 +59,7 @@ abstract class DriverTest {
   }
   private var transacter = AtomicReference<Transacter?>(null)
 
-  abstract fun setupDatabase(schema: SqlSchema): SqlDriver
+  abstract fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver
 
   private fun changes(): Long? {
     // wrap in a transaction to ensure read happens on transaction thread/connection

diff --git a/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/QueryTest.kt b/drivers/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/QueryTest.kt
@@ -24,14 +24,14 @@ abstract class QueryTest {
 
   private lateinit var driver: SqlDriver
 
-  abstract fun setupDatabase(schema: SqlSchema): SqlDriver
+  abstract fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver
 
   @BeforeTest fun setup() {
     driver = setupDatabase(
-      schema = object : SqlSchema {
+      schema = object : SqlSchema<QueryResult.Value<Unit>> {
         override val version: Int = 1
 
-        override fun create(driver: SqlDriver): QueryResult<Unit> {
+        override fun create(driver: SqlDriver): QueryResult.Value<Unit> {
           driver.execute(
             null,
             """
@@ -50,7 +50,7 @@ abstract class QueryTest {
           oldVersion: Int,
           newVersion: Int,
           vararg callbacks: AfterVersion,
-        ): QueryResult<Unit> {
+        ): QueryResult.Value<Unit> {
           // No-op.
           return QueryResult.Unit
         }

diff --git a/...s/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/TransacterTest.kt b/...s/driver-test/src/commonMain/kotlin/com/squareup/sqldelight/driver/test/TransacterTest.kt
@@ -16,19 +16,19 @@ abstract class TransacterTest {
   protected lateinit var transacter: TransacterImpl
   private lateinit var driver: SqlDriver
 
-  abstract fun setupDatabase(schema: SqlSchema): SqlDriver
+  abstract fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver
 
   @BeforeTest fun setup() {
     val driver = setupDatabase(
-      object : SqlSchema {
+      object : SqlSchema<QueryResult.Value<Unit>> {
         override val version = 1
-        override fun create(driver: SqlDriver): QueryResult<Unit> = QueryResult.Unit
+        override fun create(driver: SqlDriver): QueryResult.Value<Unit> = QueryResult.Unit
         override fun migrate(
           driver: SqlDriver,
           oldVersion: Int,
           newVersion: Int,
           vararg callbacks: AfterVersion,
-        ): QueryResult<Unit> = QueryResult.Unit
+        ): QueryResult.Value<Unit> = QueryResult.Unit
       },
     )
     transacter = object : TransacterImpl(driver) {}

diff --git a/...driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/LazyDriverBaseTest.kt b/...driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/LazyDriverBaseTest.kt
@@ -40,11 +40,11 @@ abstract class LazyDriverBaseTest {
     driver.close()
   }
 
-  protected fun defaultSchema(): SqlSchema {
-    return object : SqlSchema {
+  protected fun defaultSchema(): SqlSchema<QueryResult.Value<Unit>> {
+    return object : SqlSchema<QueryResult.Value<Unit>> {
       override val version: Int = 1
 
-      override fun create(driver: SqlDriver): QueryResult<Unit> {
+      override fun create(driver: SqlDriver): QueryResult.Value<Unit> {
         driver.execute(
           20,
           """
@@ -86,7 +86,7 @@ abstract class LazyDriverBaseTest {
   }
 
   private fun setupDatabase(
-    schema: SqlSchema,
+    schema: SqlSchema<QueryResult.Value<Unit>>,
     config: DatabaseConfiguration = defaultConfiguration(schema),
   ): NativeSqliteDriver {
     deleteDatabase(config.name!!)
@@ -95,7 +95,7 @@ abstract class LazyDriverBaseTest {
     return NativeSqliteDriver(manager!!)
   }
 
-  protected fun defaultConfiguration(schema: SqlSchema): DatabaseConfiguration {
+  protected fun defaultConfiguration(schema: SqlSchema<QueryResult.Value<Unit>>): DatabaseConfiguration {
     return DatabaseConfiguration(
       name = "testdb",
       version = 1,

diff --git a/...e-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeDriverTest.kt b/...e-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeDriverTest.kt
@@ -1,5 +1,6 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
@@ -8,15 +9,15 @@ import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
 import com.squareup.sqldelight.driver.test.DriverTest
 
 class NativeDriverTest : DriverTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     val name = "testdb"
     deleteDatabase(name)
     return NativeSqliteDriver(schema, name)
   }
 }
 
 class NativeDriverMemoryTest : DriverTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     return inMemoryDriver(schema)
   }
 }
diff --git a/...ve-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeQueryTest.kt b/...ve-driver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeQueryTest.kt
@@ -1,5 +1,6 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
@@ -8,15 +9,15 @@ import co.touchlab.sqliter.DatabaseFileContext
 import com.squareup.sqldelight.driver.test.QueryTest
 
 class NativeQueryTest : QueryTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     val name = "testdb"
     DatabaseFileContext.deleteDatabase(name)
     return NativeSqliteDriver(schema, name)
   }
 }
 
 class NativeQueryMemoryTest : QueryTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     return inMemoryDriver(schema)
   }
 }
diff --git a/...iver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeTransacterTest.kt b/...iver/src/nativeTest/kotlin/com/squareup/sqldelight/drivers/native/NativeTransacterTest.kt
@@ -1,5 +1,6 @@
 package com.squareup.sqldelight.drivers.native
 
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.native.NativeSqliteDriver
@@ -8,15 +9,15 @@ import co.touchlab.sqliter.DatabaseFileContext.deleteDatabase
 import com.squareup.sqldelight.driver.test.TransacterTest
 
 class NativeTransacterTest : TransacterTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     val name = "testdb"
     deleteDatabase(name)
     return NativeSqliteDriver(schema, name)
   }
 }
 
 class NativeTransacterMemoryTest : TransacterTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     return inMemoryDriver(schema)
   }
 }
diff --git a/...eTest/kotlin/com/squareup/sqldelight/drivers/native/connectionpool/BaseConcurrencyTest.kt b/...eTest/kotlin/com/squareup/sqldelight/drivers/native/connectionpool/BaseConcurrencyTest.kt
@@ -53,7 +53,7 @@ abstract class BaseConcurrencyTest {
   }
 
   fun setupDatabase(
-    schema: SqlSchema,
+    schema: SqlSchema<QueryResult.Value<Unit>>,
     dbType: DbType,
     configBase: DatabaseConfiguration,
     maxReaderConnections: Int = 4,
@@ -111,10 +111,10 @@ abstract class BaseConcurrencyTest {
     configBase: DatabaseConfiguration = DatabaseConfiguration(name = null, version = 1, create = {}),
   ): SqlDriver {
     return setupDatabase(
-      schema = object : SqlSchema {
+      schema = object : SqlSchema<QueryResult.Value<Unit>> {
         override val version: Int = 1
 
-        override fun create(driver: SqlDriver): QueryResult<Unit> {
+        override fun create(driver: SqlDriver): QueryResult.Value<Unit> {
           driver.execute(
             null,
             """

diff --git a/...s/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteDriverTest.kt b/...s/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteDriverTest.kt
@@ -1,13 +1,14 @@
 package com.squareup.sqldelight.driver.sqlite
 
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver.Companion.IN_MEMORY
 import com.squareup.sqldelight.driver.test.DriverTest
 
 class SqliteDriverTest : DriverTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     val database = JdbcSqliteDriver(IN_MEMORY)
     schema.create(database)
     return database

diff --git a/...rs/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteQueryTest.kt b/...rs/sqlite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteQueryTest.kt
@@ -1,13 +1,14 @@
 package com.squareup.sqldelight.driver.sqlite
 
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver.Companion.IN_MEMORY
 import com.squareup.sqldelight.driver.test.QueryTest
 
 class SqliteQueryTest : QueryTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     val database = JdbcSqliteDriver(IN_MEMORY)
     schema.create(database)
     return database

diff --git a/...lite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteTransacterTest.kt b/...lite-driver/src/test/kotlin/com/squareup/sqldelight/driver/sqlite/SqliteTransacterTest.kt
@@ -1,13 +1,14 @@
 package com.squareup.sqldelight.driver.sqlite
 
+import app.cash.sqldelight.db.QueryResult
 import app.cash.sqldelight.db.SqlDriver
 import app.cash.sqldelight.db.SqlSchema
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
 import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver.Companion.IN_MEMORY
 import com.squareup.sqldelight.driver.test.TransacterTest
 
 class SqliteTransacterTest : TransacterTest() {
-  override fun setupDatabase(schema: SqlSchema): SqlDriver {
+  override fun setupDatabase(schema: SqlSchema<QueryResult.Value<Unit>>): SqlDriver {
     val database = JdbcSqliteDriver(IN_MEMORY)
     schema.create(database)
     return database

diff --git a/drivers/sqljs-driver/src/main/kotlin/app/cash/sqldelight/driver/sqljs/JsSqlDriver.kt b/drivers/sqljs-driver/src/main/kotlin/app/cash/sqldelight/driver/sqljs/JsSqlDriver.kt
@@ -14,14 +14,14 @@ import kotlin.js.Promise
 
 fun Promise<Database>.driver(): Promise<SqlDriver> = then { JsSqlDriver(it) }
 
-fun Promise<SqlDriver>.withSchema(schema: SqlSchema? = null): Promise<SqlDriver> = then {
+fun Promise<SqlDriver>.withSchema(schema: SqlSchema<QueryResult.Value<Unit>>? = null): Promise<SqlDriver> = then {
   schema?.create(it)
   it
 }
 
 fun Promise<SqlDriver>.transacter(): Promise<Transacter> = then { object : TransacterImpl(it) {} }
 
-fun initSqlDriver(schema: SqlSchema? = null): Promise<SqlDriver> = initDb().driver().withSchema(schema)
+fun initSqlDriver(schema: SqlSchema<QueryResult.Value<Unit>>? = null): Promise<SqlDriver> = initDb().driver().withSchema(schema)
 
 class JsSqlDriver(private val db: Database) : SqlDriver {
 

diff --git a/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt b/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsDriverTest.kt
@@ -19,10 +19,10 @@ import kotlin.test.assertTrue
 class JsDriverTest {
 
   private lateinit var driverPromise: Promise<SqlDriver>
-  private val schema = object : SqlSchema {
+  private val schema = object : SqlSchema<QueryResult.Value<Unit>> {
     override val version: Int = 1
 
-    override fun create(driver: SqlDriver): QueryResult<Unit> {
+    override fun create(driver: SqlDriver): QueryResult.Value<Unit> {
       driver.execute(
         0,
         """
@@ -54,7 +54,7 @@ class JsDriverTest {
       oldVersion: Int,
       newVersion: Int,
       vararg callbacks: AfterVersion,
-    ): QueryResult<Unit> {
+    ): QueryResult.Value<Unit> {
       // No-op.
       return QueryResult.Unit
     }

diff --git a/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsQueryTest.kt b/drivers/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsQueryTest.kt
@@ -26,10 +26,10 @@ class JsQueryTest {
     )
   }
 
-  private val schema = object : SqlSchema {
+  private val schema = object : SqlSchema<QueryResult.Value<Unit>> {
     override val version: Int = 1
 
-    override fun create(driver: SqlDriver): QueryResult<Unit> {
+    override fun create(driver: SqlDriver): QueryResult.Value<Unit> {
       driver.execute(
         null,
         """
@@ -48,7 +48,7 @@ class JsQueryTest {
       oldVersion: Int,
       newVersion: Int,
       vararg callbacks: AfterVersion,
-    ): QueryResult<Unit> {
+    ): QueryResult.Value<Unit> {
       // No-op.
       return QueryResult.Unit
     }

diff --git a/...rs/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsTransacterTest.kt b/...rs/sqljs-driver/src/test/kotlin/com/squareup/sqldelight/drivers/sqljs/JsTransacterTest.kt
@@ -18,7 +18,7 @@ import kotlin.test.assertTrue
 
 class JsTransacterTest {
 
-  private val schema = object : SqlSchema {
+  private val schema = object : SqlSchema<QueryResult.Value<Unit>> {
     override val version = 1
     override fun create(driver: SqlDriver) = QueryResult.Unit
     override fun migrate(