Improve turso support

Cargo.toml

@@ -63,7 +63,7 @@ thiserror = "2.0"
 tokio = { version = "1" }
 tokio-postgres = "0.7"
 tokio-test = { version = "0.4" }
-turso = "0.3"
+turso_core = { version = "0.3", default-features = false, features = ["fs"] }
 url = "2.5"
 uuid = "1.2"
 

butane/Cargo.toml

@@ -28,6 +28,7 @@ debug = ["butane_core/debug"]
 log = ["butane_core/log"]
 r2d2 = ["dep:r2d2"]
 turso = ["butane_core/turso"]
+turso-async = ["async", "async-adapter", "butane_core/turso-async"]
 tls = ["butane_core/tls"]
 uuid = ["butane_codegen/uuid", "butane_core/uuid"]
 # This feature is for testing only. It will delete the .butane directory inside the butane crate, which only

butane_core/Cargo.toml

@@ -11,19 +11,22 @@ rust-version.workspace = true
 
 [features]
 default = ["fs"]
-async-adapter = ["async", "crossbeam-channel"]
+async-adapter = ["crossbeam-channel"]
 async = ["tokio"]
-datetime = ["chrono", "tokio-postgres?/with-chrono-0_4"]
+datetime = ["chrono", "tokio-postgres?/with-chrono-0_4", "turso_core?/time"]
 debug = ["log"]
 fake = ["dep:fake", "rand"]
 fs = ["dep:fs2"]
-json = ["tokio-postgres?/with-serde_json-1", "rusqlite?/serde_json"]
+json = ["tokio-postgres?/with-serde_json-1", "rusqlite?/serde_json", "turso_core?/json"]
 log = ["dep:log", "rusqlite?/trace"]
 pg = ["async", "bytes", "tokio-postgres"]
+rusqlite = ["dep:rusqlite"]
 sqlite = ["rusqlite"]
 sqlite-bundled = ["rusqlite/bundled"]
 tls = ["native-tls", "postgres-native-tls"]
-turso = ["async", "dep:turso"]
+turso = ["dep:turso_core"]
+turso-async = ["turso", "async", "async-adapter"]
+uuid = ["dep:uuid"]
 
 [dependencies]
 async-trait = { workspace = true}
@@ -58,7 +61,7 @@ serde_json = { workspace = true }
 sqlparser = { workspace = true }
 syn = { workspace = true }
 thiserror = { workspace = true }
-turso = { workspace = true, optional = true }
+turso_core = { workspace = true, optional = true, features = ["serde", "fs", "uuid"] }
 url.workspace = true
 uuid = { workspace = true, optional = true }
 
@@ -75,6 +78,10 @@ tokio = { workspace = true, features = ["macros"] }
 uuid.workspace = true
 whoami = "1.6"
 
+[[test]]
+name = "autopk"
+required-features = ["async"]
+
 [[test]]
 name = "uuid"
 required-features = ["uuid"]

butane_core/src/db/helper.rs

@@ -19,6 +19,22 @@ pub(crate) trait PlaceholderSource {
     fn next_placeholder(&mut self) -> Cow<'_, str>;
 }
 
+/// Placeholder source for databases that use `?` as a placeholder (SQLite, Turso).
+#[derive(Debug)]
+pub(crate) struct QuestionMarkPlaceholderSource;
+
+impl QuestionMarkPlaceholderSource {
+    pub(crate) fn new() -> Self {
+        QuestionMarkPlaceholderSource {}
+    }
+}
+
+impl PlaceholderSource for QuestionMarkPlaceholderSource {
+    fn next_placeholder(&mut self) -> Cow<'_, str> {
+        Cow::Borrowed("?")
+    }
+}
+
 /// Quotes the `word` if it is a reserved word.
 pub fn quote_reserved_word(word: &str) -> Cow<'_, str> {
     if sqlparser::keywords::ALL_KEYWORDS.contains(&word.to_uppercase().as_str()) {

butane_core/src/db/mod.rs

@@ -51,7 +51,7 @@ mod macros;
 #[cfg(feature = "pg")]
 pub mod pg;
 
-#[cfg(feature = "sqlite")]
+#[cfg(any(feature = "sqlite", feature = "turso"))]
 pub mod sqlite;
 
 /// Turso database backend.