First steps to move to SQLDelight

.github/workflows/test.yml

@@ -8,12 +8,7 @@ on:
 
 jobs:
   test:
-    strategy:
-      matrix:
-        java: [ '11' ]
-
-    name: test with java ${{ matrix.java }}
-
+    name: test
     runs-on: ubuntu-latest
 
     steps:
@@ -22,7 +17,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: ${{ matrix.java }}
+          java-version: '17'
           distribution: 'temurin'
 
       - name: Run Gradle

libpretixsync/build-postgres.gradle

@@ -6,9 +6,10 @@ plugins {
     id 'jacoco'
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.kotlin.kapt'
-    id 'com.google.protobuf' version '0.9.4'
+    id 'com.google.protobuf'
     id 'com.github.gmazzo.buildconfig' version "5.3.5"
     id 'org.gradle.idea'
+    id 'app.cash.sqldelight'
 }
 apply from: 'versions.gradle'
 
@@ -107,6 +108,8 @@ dependencies {
     implementation "net.i2p.crypto:eddsa:$eddsa_version"
     implementation "com.google.protobuf:protobuf-javalite:$protobuf_version"
 
+    implementation "app.cash.sqldelight:jdbc-driver:$sqldelight_version"
+
     kapt "io.requery:requery-processor:$requery_version"
     annotationProcessor "javax.annotation:jsr250-api:$jsr250_version"
 
@@ -121,3 +124,13 @@ task copyTestResources(type: Copy) {
     into "${buildDir}/classes/test"
 }
 processTestResources.dependsOn copyTestResources
+
+sqldelight {
+    databases {
+        SyncDatabase {
+            packageName = "eu.pretix.libpretixsync.sqldelight"
+            dialect "app.cash.sqldelight:postgresql-dialect:$sqldelight_version"
+            srcDirs('src/main/sqldelight/postgres', 'src/main/sqldelight/common', 'src/main/sqldelight/migrations')
+        }
+    }
+}

libpretixsync/build.gradle

@@ -4,9 +4,10 @@ plugins {
     id 'jacoco'
     id 'org.jetbrains.kotlin.jvm'
     id 'org.jetbrains.kotlin.kapt'
-    id 'com.google.protobuf' version '0.9.4'
+    id 'com.google.protobuf'
     id 'com.github.gmazzo.buildconfig' version '5.3.5'
     id 'org.gradle.idea'
+    id 'app.cash.sqldelight'
 }
 apply from: 'versions.gradle'
 
@@ -104,6 +105,8 @@ dependencies {
     implementation "net.i2p.crypto:eddsa:$eddsa_version"
     implementation "com.google.protobuf:protobuf-javalite:$protobuf_version"
 
+    implementation "app.cash.sqldelight:sqlite-driver:$sqldelight_version"
+
     kapt "io.requery:requery-processor:$requery_version"
     annotationProcessor "javax.annotation:jsr250-api:$jsr250_version"
 
@@ -118,3 +121,17 @@ task copyTestResources(type: Copy) {
     into "${buildDir}/classes/test"
 }
 processTestResources.dependsOn copyTestResources
+
+sqldelight {
+    databases {
+        SyncDatabase {
+            packageName = "eu.pretix.libpretixsync.sqldelight"
+            srcDirs('src/main/sqldelight/sqlite', 'src/main/sqldelight/common', 'src/main/sqldelight/migrations')
+
+            // Oldest dialect supported by SQLDelight 2.0.2
+            // In Android projects, it will auto-select based on SDK
+            // but not go lower than 3.18 (Android 9 is still on 3.8)
+            dialect "app.cash.sqldelight:sqlite-3-18-dialect:$sqldelight_version"
+        }
+    }
+}

libpretixsync/settings.gradle

@@ -12,7 +12,8 @@ pluginManagement {
 // but building it inside the multi module project doesn't exit with "unknown version already on classpath" error
 plugins {
     id "org.jetbrains.kotlin.jvm" version "1.9.23" apply false
+    id "com.google.protobuf" version "0.9.4" apply false
+    id "app.cash.sqldelight" version "2.0.2" apply false
 }
 
 rootProject.name = 'eu.pretix.libpretixsync'
-

libpretixsync/src/main/java/eu/pretix/libpretixsync/api/PretixApi.kt

@@ -3,9 +3,9 @@ package eu.pretix.libpretixsync.api
 import eu.pretix.libpretixsync.DummySentryImplementation
 import eu.pretix.libpretixsync.SentryInterface
 import eu.pretix.libpretixsync.config.ConfigStore
+import eu.pretix.libpretixsync.db.AbstractQueuedCheckIn
 import eu.pretix.libpretixsync.db.Answer
-import eu.pretix.libpretixsync.db.Question
-import eu.pretix.libpretixsync.db.QueuedCheckIn
+import eu.pretix.libpretixsync.models.Question
 import eu.pretix.libpretixsync.utils.NetUtils
 import eu.pretix.libpretixsync.utils.URLFragmentEncoder
 import okhttp3.MediaType
@@ -46,7 +46,7 @@ open class PretixApi(url: String, key: String, orgaSlug: String, version: Int, h
     fun redeem(eventSlug: String, secret: String, datetime: Date?, force: Boolean, nonce: String?, answers: List<Answer>?, listId: Long, ignore_unpaid: Boolean, pdf_data: Boolean, type: String?, source_type: String?, callTimeout: Long? = null, questions_supported: Boolean = true): ApiResponse {
         var dt: String? = null
         if (datetime != null) {
-            dt = QueuedCheckIn.formatDatetime(datetime)
+            dt = AbstractQueuedCheckIn.formatDatetime(datetime)
         }
         return redeem(eventSlug, secret, dt, force, nonce, answers, listId, ignore_unpaid, pdf_data, type, source_type, callTimeout, questions_supported)
     }
@@ -73,9 +73,9 @@ open class PretixApi(url: String, key: String, orgaSlug: String, version: Int, h
                         "pdf" -> "application/pdf".toMediaTypeOrNull()!!
                         else -> "application/unknown".toMediaTypeOrNull()!!
                     }, a.value.split("/").last())
-                    answerbody.put("" + (a.question as Question).getServer_id(), fileid)
+                    answerbody.put("" + (a.question as Question).serverId, fileid)
                 } else {
-                    answerbody.put("" + (a.question as Question).getServer_id(), a.value)
+                    answerbody.put("" + (a.question as Question).serverId, a.value)
                 }
             }
         }
@@ -93,7 +93,7 @@ open class PretixApi(url: String, key: String, orgaSlug: String, version: Int, h
     fun redeem(lists: List<Long>, secret: String, datetime: Date?, force: Boolean, nonce: String?, answers: List<Answer>?, ignore_unpaid: Boolean, pdf_data: Boolean, type: String?, source_type: String?, callTimeout: Long? = null, questions_supported: Boolean = true): ApiResponse {
         var dt: String? = null
         if (datetime != null) {
-            dt = QueuedCheckIn.formatDatetime(datetime)
+            dt = AbstractQueuedCheckIn.formatDatetime(datetime)
         }
         return redeem(lists, secret, dt, force, nonce, answers, ignore_unpaid, pdf_data, type, source_type, callTimeout, questions_supported)
     }
@@ -120,9 +120,9 @@ open class PretixApi(url: String, key: String, orgaSlug: String, version: Int, h
                         "pdf" -> "application/pdf".toMediaTypeOrNull()!!
                         else -> "application/unknown".toMediaTypeOrNull()!!
                     }, a.value.split("/").last())
-                    answerbody.put("" + (a.question as Question).getServer_id(), fileid)
+                    answerbody.put("" + (a.question as Question).serverId, fileid)
                 } else {
-                    answerbody.put("" + (a.question as Question).getServer_id(), a.value)
+                    answerbody.put("" + (a.question as Question).serverId, a.value)
                 }
             }
         }
@@ -314,7 +314,7 @@ open class PretixApi(url: String, key: String, orgaSlug: String, version: Int, h
     }
 
     @Throws(ApiException::class)
-    open fun downloadFile(full_url: String): ApiResponse? {
+    open fun downloadFile(full_url: String): ApiResponse {
         var request = Request.Builder()
                 .url(full_url)
                 .header("Authorization", "Device $key")