Correct sql scripts and use SQLite 3.38 dialect

pull/1323/head
lihenggui 2 years ago
parent 8fc89e8965
commit bbc9a537dc

@ -56,9 +56,7 @@ kotlin {
}
val jsMain by getting {
dependencies {
implementation(libs.sqldelight.sqljs.driver)
implementation(libs.sqldelight.webworker.driver)
implementation(npm("sql.js", "1.6.2"))
implementation(devNpm("copy-webpack-plugin", "9.1.0"))
}
}
@ -75,6 +73,7 @@ sqldelight {
create("NiaDatabase") {
packageName.set("com.google.samples.apps.nowinandroid.core.database")
generateAsync.set(true)
dialect("app.cash.sqldelight:sqlite-3-38-dialect:2.0.1")
}
}
}

@ -50,14 +50,14 @@ VALUES (?, ?, ?, ?, ?, ?, ?);
upsertNewsResources:
INSERT INTO news_resources (id, title, content, url, header_image_url, publish_date, type)
VALUES (?, ?, ?, ?, ?, ?, ?);
-- ON CONFLICT(id) DO UPDATE SET
-- title = excluded.title,
-- content = excluded.content,
-- url = excluded.url,
-- header_image_url = excluded.header_image_url,
-- publish_date = excluded.publish_date,
-- type = excluded.type;
VALUES (?, ?, ?, ?, ?, ?, ?)
ON CONFLICT(id) DO UPDATE SET
title = excluded.title,
content = excluded.content,
url = excluded.url,
header_image_url = excluded.header_image_url,
publish_date = excluded.publish_date,
type = excluded.type;
insertOrIgnoreTopicCrossRefEntities:
INSERT OR IGNORE INTO news_resources_topics (news_resource_id, topic_id)

@ -1,4 +1,4 @@
CREATE TABLE news_resources_topics (
CREATE TABLE IF NOT EXISTS news_resources_topics (
news_resource_id TEXT NOT NULL,
topic_id TEXT NOT NULL,
PRIMARY KEY (news_resource_id, topic_id),
@ -7,4 +7,5 @@ CREATE TABLE news_resources_topics (
);
CREATE INDEX idx_news_resource_id ON news_resources_topics(news_resource_id);
CREATE INDEX idx_topic_id ON news_resources_topics(topic_id);

@ -161,7 +161,6 @@ compose-ui-tooling-preview = { module = "androidx.compose.ui:ui-tooling-preview"
sqldelight-android-driver = { group = "app.cash.sqldelight", name = "android-driver", version.ref = "sqldelight" }
sqldelight-native-driver = { group = "app.cash.sqldelight", name = "native-driver", version.ref = "sqldelight" }
sqldelight-sqlite-driver = { group = "app.cash.sqldelight", name = "sqlite-driver", version.ref = "sqldelight" }
sqldelight-sqljs-driver = { group = "app.cash.sqldelight", name = "sqljs-driver", version.ref = "sqldelight" }
sqldelight-webworker-driver = { group = "app.cash.sqldelight", name = "web-worker-driver", version.ref = "sqldelight" }
sqldelight-coroutines-extensions = { group = "app.cash.sqldelight", name = "coroutines-extensions", version.ref = "sqldelight" }
sqldelight-primitive-adapters = { group = "app.cash.sqldelight", name = "primitive-adapters", version.ref = "sqldelight" }

Loading…
Cancel
Save