mirror of
https://github.com/msfjarvis/compose-lobsters
synced 2025-08-14 10:37:05 +05:30
Migrate to SQLDelight 2.0.0-alpha02
This commit is contained in:
parent
3ca9dc37d7
commit
f7cf5720a7
12 changed files with 33 additions and 31 deletions
|
@ -17,6 +17,9 @@ kotlin {
|
|||
dependsOn(sourceSets["androidTestFixturesDebug"])
|
||||
dependsOn(sourceSets["androidTestFixturesRelease"])
|
||||
}
|
||||
sourceSets["commonMain"].apply {
|
||||
dependencies { implementation(libs.sqldelight.primitiveAdapters) }
|
||||
}
|
||||
sourceSets["desktopMain"].apply { dependencies { implementation(libs.sqldelight.jvmDriver) } }
|
||||
sourceSets["desktopTest"].apply {
|
||||
dependencies {
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
package dev.msfjarvis.claw.database.local
|
||||
|
||||
import android.content.Context
|
||||
import com.squareup.sqldelight.android.AndroidSqliteDriver
|
||||
import com.squareup.sqldelight.db.SqlDriver
|
||||
import app.cash.sqldelight.db.SqlDriver
|
||||
import app.cash.sqldelight.driver.android.AndroidSqliteDriver
|
||||
import dev.msfjarvis.claw.database.LobstersDatabase
|
||||
|
||||
actual class DriverFactory(private val context: Context) {
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package dev.msfjarvis.claw.database.local
|
||||
|
||||
import com.squareup.sqldelight.db.SqlDriver
|
||||
import app.cash.sqldelight.adapter.primitive.IntColumnAdapter
|
||||
import app.cash.sqldelight.db.SqlDriver
|
||||
import dev.msfjarvis.claw.database.LobstersDatabase
|
||||
import dev.msfjarvis.claw.database.model.TagsAdapter
|
||||
|
||||
|
@ -14,5 +15,5 @@ private fun getTagsAdapter() = TagsAdapter()
|
|||
|
||||
fun createDatabase(driverFactory: DriverFactory): LobstersDatabase {
|
||||
val driver = driverFactory.createDriver()
|
||||
return LobstersDatabase(driver, SavedPost.Adapter(getTagsAdapter()))
|
||||
return LobstersDatabase(driver, SavedPost.Adapter(IntColumnAdapter, getTagsAdapter()))
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package dev.msfjarvis.claw.database.model
|
||||
|
||||
import com.squareup.sqldelight.ColumnAdapter
|
||||
import app.cash.sqldelight.ColumnAdapter
|
||||
|
||||
class TagsAdapter : ColumnAdapter<List<String>, String> {
|
||||
override fun decode(databaseValue: String): List<String> {
|
||||
|
|
|
@ -1 +1,3 @@
|
|||
import kotlin.Int;
|
||||
|
||||
ALTER TABLE SavedPost ADD COLUMN commentCount INTEGER AS Int;
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
import kotlin.Int;
|
||||
import kotlin.String;
|
||||
import kotlin.collections.List;
|
||||
|
||||
ALTER TABLE SavedPost RENAME TO SavedPost_Old;
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
import kotlin.Int;
|
||||
import kotlin.String;
|
||||
import kotlin.collections.List;
|
||||
|
||||
CREATE TABLE IF NOT EXISTS SavedPost(
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
package dev.msfjarvis.claw.database.local
|
||||
|
||||
import com.squareup.sqldelight.db.SqlDriver
|
||||
import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
|
||||
import app.cash.sqldelight.db.SqlDriver
|
||||
import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
|
||||
import dev.msfjarvis.claw.database.LobstersDatabase
|
||||
import java.io.File
|
||||
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package dev.msfjarvis.claw.database.local
|
||||
|
||||
import com.squareup.sqldelight.sqlite.driver.JdbcSqliteDriver
|
||||
import app.cash.sqldelight.adapter.primitive.IntColumnAdapter
|
||||
import app.cash.sqldelight.driver.jdbc.sqlite.JdbcSqliteDriver
|
||||
import dev.msfjarvis.claw.database.LobstersDatabase
|
||||
import dev.msfjarvis.claw.database.model.TagsAdapter
|
||||
import kotlin.test.Test
|
||||
|
@ -20,7 +21,7 @@ class SqlDelightQueriesTest {
|
|||
val database =
|
||||
LobstersDatabase(
|
||||
driver,
|
||||
SavedPost.Adapter(TagsAdapter()),
|
||||
SavedPost.Adapter(IntColumnAdapter, TagsAdapter()),
|
||||
)
|
||||
postQueries = database.savedPostQueries
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue