feat: improve type inference for sqlite (typedsql) (#4976)

prisma · Aug 12, 2024 · 44f753d · 44f753d
1 parent d33dcc5
commit 44f753d
Show file tree

Hide file tree

Showing 10 changed files with 427 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/quaint/Cargo.toml b/quaint/Cargo.toml
@@ -121,7 +121,7 @@ optional = true
 branch = "vendored-openssl"
 
 [dependencies.rusqlite]
-version = "0.29"
+version = "0.31"
 features = ["chrono", "column_decltype"]
 optional = true
 

diff --git a/quaint/src/connector/column_type.rs b/quaint/src/connector/column_type.rs
@@ -38,6 +38,8 @@ pub enum ColumnType {
     DateArray,
     TimeArray,
 
+    Null,
+
     Unknown,
 }
 
@@ -82,6 +84,7 @@ impl std::fmt::Display for ColumnType {
             ColumnType::DateArray => write!(f, "date-array"),
             ColumnType::TimeArray => write!(f, "time-array"),
 
+            ColumnType::Null => write!(f, "null"),
             ColumnType::Unknown => write!(f, "unknown"),
         }
     }

diff --git a/query-engine/query-engine-c-abi/Cargo.toml b/query-engine/query-engine-c-abi/Cargo.toml
@@ -25,7 +25,7 @@ chrono.workspace = true
 quaint = { path = "../../quaint", default-features = false, features = [
   "sqlite",
 ] }
-rusqlite = "0.29"
+rusqlite = "0.31"
 uuid.workspace = true
 thiserror = "1"
 connection-string.workspace = true

diff --git a/schema-engine/connectors/sql-schema-connector/Cargo.toml b/schema-engine/connectors/sql-schema-connector/Cargo.toml
@@ -43,6 +43,7 @@ either = "1.6"
 sqlformat = "0.2.1"
 sqlparser = "0.32.0"
 versions = "6.1.0"
-
+sqlx-sqlite = { version = "0.8.0" }
+sqlx-core = "0.8.0"
 [dev-dependencies]
 expect-test = "1"
diff --git a/schema-engine/connectors/sql-schema-connector/src/flavour/mysql/connection.rs b/schema-engine/connectors/sql-schema-connector/src/flavour/mysql/connection.rs
@@ -133,10 +133,10 @@ impl Connection {
                 .map(|p| p.set_typ(ColumnType::Unknown))
                 .collect();
 
-            Ok(parsed)
-        } else {
-            Ok(parsed)
+            return Ok(parsed);
         }
+
+        Ok(parsed)
     }
 
     pub(super) async fn apply_migration_script(

diff --git a/schema-engine/connectors/sql-schema-connector/src/flavour/sqlite.rs b/schema-engine/connectors/sql-schema-connector/src/flavour/sqlite.rs
@@ -260,7 +260,9 @@ impl SqlFlavour for SqliteFlavour {
         sql: &'a str,
     ) -> BoxFuture<'a, ConnectorResult<quaint::connector::ParsedRawQuery>> {
         tracing::debug!(sql, query_type = "parse_raw_query");
-        ready(with_connection(&mut self.state, |_, conn| conn.parse_raw_query(sql)))
+        ready(with_connection(&mut self.state, |params, conn| {
+            conn.parse_raw_query(sql, params)
+        }))
     }
 
     fn introspect(