Elimenate all references to spin-sqlite

Signed-off-by: Ryan Levick <[email protected]>

Author: rylev

Cargo.lock

@@ -29,9 +29,9 @@ tokio = { version = "1", features = ["macros", "rt"] }
 default = ["spin-cli"]
 # Includes the runtime configuration handling used by the Spin CLI
 spin-cli = [
-  "dep:spin-sqlite",
-  "dep:spin-sqlite-inproc",
-  "dep:spin-sqlite-libsql",
+    "dep:spin-sqlite",
+    "dep:spin-sqlite-inproc",
+    "dep:spin-sqlite-libsql",
 ]
 
 [lints]

crates/factor-sqlite/Cargo.toml

@@ -5,6 +5,7 @@ use std::{
     sync::Arc,
 };
 
+use async_trait::async_trait;
 use serde::Deserialize;
 use spin_factors::{
     anyhow::{self, Context as _},
@@ -119,18 +120,18 @@ impl DefaultLabelResolver for RuntimeConfigResolver {
 
 const DEFAULT_SQLITE_DB_FILENAME: &str = "sqlite_db.db";
 
-#[async_trait::async_trait]
+#[async_trait]
 impl Connection for spin_sqlite_inproc::InProcConnection {
     async fn query(
         &self,
         query: &str,
         parameters: Vec<v2::Value>,
     ) -> Result<v2::QueryResult, v2::Error> {
-        <Self as spin_sqlite::Connection>::query(self, query, parameters).await
+        self.query(query, parameters).await
     }
 
     async fn execute_batch(&self, statements: &str) -> anyhow::Result<()> {
-        <Self as spin_sqlite::Connection>::execute_batch(self, statements).await
+        self.execute_batch(statements).await
     }
 }
 
@@ -165,26 +166,20 @@ impl LibSqlConnection {
     }
 }
 
-#[async_trait::async_trait]
+#[async_trait]
 impl Connection for LibSqlConnection {
     async fn query(
         &self,
         query: &str,
         parameters: Vec<v2::Value>,
     ) -> Result<v2::QueryResult, v2::Error> {
         let client = self.get_client().await?;
-        <spin_sqlite_libsql::LibsqlClient as spin_sqlite::Connection>::query(
-            client, query, parameters,
-        )
-        .await
+        client.query(query, parameters).await
     }
 
     async fn execute_batch(&self, statements: &str) -> anyhow::Result<()> {
         let client = self.get_client().await?;
-        <spin_sqlite_libsql::LibsqlClient as spin_sqlite::Connection>::execute_batch(
-            client, statements,
-        )
-        .await
+        client.execute_batch(statements).await
     }
 }
 

crates/factor-sqlite/src/runtime_config/spin.rs

@@ -4,9 +4,7 @@ use std::{
 };
 
 use anyhow::Context;
-use async_trait::async_trait;
 use once_cell::sync::OnceCell;
-use spin_sqlite::Connection;
 use spin_world::v2::sqlite;
 use tracing::{instrument, Level};
 
@@ -68,10 +66,9 @@ impl InProcConnection {
     }
 }
 
-#[async_trait]
-impl Connection for InProcConnection {
+impl InProcConnection {
     #[instrument(name = "spin_sqlite_inproc.query", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "sqlite", otel.name = query))]
-    async fn query(
+    pub async fn query(
         &self,
         query: &str,
         parameters: Vec<sqlite::Value>,
@@ -86,7 +83,7 @@ impl Connection for InProcConnection {
     }
 
     #[instrument(name = "spin_sqlite_inproc.execute_batch", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "sqlite", db.statements = statements))]
-    async fn execute_batch(&self, statements: &str) -> anyhow::Result<()> {
+    pub async fn execute_batch(&self, statements: &str) -> anyhow::Result<()> {
         let connection = self.db_connection()?;
         let statements = statements.to_owned();
         tokio::task::spawn_blocking(move || {

crates/sqlite-inproc/src/lib.rs

@@ -11,7 +11,6 @@ async-trait = "0.1.68"
 # libsqlite3-sys as used by spin-sqlite-inproc.
 libsql = { version = "0.3.2", features = ["remote"], default-features = false }
 rusqlite = { version = "0.29.0", features = ["bundled"] }
-spin-sqlite = { path = "../sqlite" }
 spin-world = { path = "../world" }
 sqlparser = "0.34"
 tokio = { version = "1", features = ["full"] }

crates/sqlite-libsql/Cargo.toml

@@ -15,10 +15,9 @@ impl LibsqlClient {
     }
 }
 
-#[async_trait::async_trait]
-impl spin_sqlite::Connection for LibsqlClient {
+impl LibsqlClient {
     #[instrument(name = "spin_sqlite_libsql.query", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "sqlite", otel.name = query))]
-    async fn query(
+    pub async fn query(
         &self,
         query: &str,
         parameters: Vec<sqlite::Value>,
@@ -38,7 +37,7 @@ impl spin_sqlite::Connection for LibsqlClient {
     }
 
     #[instrument(name = "spin_sqlite_libsql.execute_batch", skip(self), err(level = Level::INFO), fields(otel.kind = "client", db.system = "sqlite", db.statements = statements))]
-    async fn execute_batch(&self, statements: &str) -> anyhow::Result<()> {
+    pub async fn execute_batch(&self, statements: &str) -> anyhow::Result<()> {
         self.inner.execute_batch(statements).await?;
 
         Ok(())

crates/sqlite-libsql/src/lib.rs

@@ -1,14 +1 @@
-use spin_core::async_trait;
-use spin_world::v2::sqlite;
 
-/// A trait abstracting over operations to a SQLite database
-#[async_trait]
-pub trait Connection: Send + Sync {
-    async fn query(
-        &self,
-        query: &str,
-        parameters: Vec<sqlite::Value>,
-    ) -> Result<sqlite::QueryResult, sqlite::Error>;
-
-    async fn execute_batch(&self, statements: &str) -> anyhow::Result<()>;
-}