feat(query-engine-wasm): exclude native-drivers only errors from `was…

…m32` target (#4616) * feat(query-engine-wasm): start excluding native-drivers only errors from wasm32 target * feat(query-engine-wasm): fix compilation on native targets * chore(query-engine-wasm): update comment * chore(query-engine-wasm): remove comment * chore(query-engine-wasm): fix clippy * chore(query-engine-wasm): apply "repr(transparent)" to "ConnectionInfo" on Wasm, to shove off a few bytes * chore(query-engine-wasm): remove comments * feat: address review comments * chore: clippy * chore: fix quaint test * fix(driver-adapters): fix condition that made Vitess fail
prisma · Jan 16, 2024 · 476ee04 · 476ee04
1 parent 0fb4ba0
commit 476ee04
Show file tree

Hide file tree

Showing 21 changed files with 570 additions and 425 deletions.
diff --git a/libs/user-facing-errors/src/quaint.rs b/libs/user-facing-errors/src/quaint.rs
diff --git a/quaint/src/connector.rs b/quaint/src/connector.rs
@@ -13,6 +13,8 @@ mod connection_info;
 
 pub mod external;
 pub mod metrics;
+#[cfg(feature = "native")]
+pub mod native;
 mod queryable;
 mod result_set;
 #[cfg(any(feature = "mssql-native", feature = "postgresql-native", feature = "mysql-native"))]
@@ -22,6 +24,10 @@ mod type_identifier;
 
 pub use self::result_set::*;
 pub use connection_info::*;
+
+#[cfg(feature = "native")]
+pub use native::*;
+
 pub use external::*;
 pub use queryable::*;
 pub use transaction::*;

diff --git a/quaint/src/connector/connection_info.rs b/quaint/src/connector/connection_info.rs
diff --git a/quaint/src/connector/mssql/native/error.rs b/quaint/src/connector/mssql/native/error.rs
@@ -1,4 +1,4 @@
-use crate::error::{DatabaseConstraint, Error, ErrorKind};
+use crate::error::{DatabaseConstraint, Error, ErrorKind, NativeErrorKind};
 use tiberius::error::IoErrorKind;
 
 impl From<tiberius::error::Error> for Error {
@@ -8,17 +8,19 @@ impl From<tiberius::error::Error> for Error {
                 kind: IoErrorKind::UnexpectedEof,
                 message,
             } => {
-                let mut builder = Error::builder(ErrorKind::ConnectionClosed);
+                let mut builder = Error::builder(ErrorKind::Native(NativeErrorKind::ConnectionClosed));
                 builder.set_original_message(message);
                 builder.build()
             }
-            e @ tiberius::error::Error::Io { .. } => Error::builder(ErrorKind::ConnectionError(e.into())).build(),
+            e @ tiberius::error::Error::Io { .. } => {
+                Error::builder(ErrorKind::Native(NativeErrorKind::ConnectionError(e.into()))).build()
+            }
             tiberius::error::Error::Tls(message) => {
                 let message = format!(
                     "The TLS settings didn't allow the connection to be established. Please review your connection string. (error: {message})"
                 );
 
-                Error::builder(ErrorKind::TlsError { message }).build()
+                Error::builder(ErrorKind::Native(NativeErrorKind::TlsError { message })).build()
             }
             tiberius::error::Error::Server(e) if [3902u32, 3903u32, 3971u32].iter().any(|code| e.code() == *code) => {
                 let kind = ErrorKind::TransactionAlreadyClosed(e.message().to_string());

diff --git a/quaint/src/connector/mysql/native/error.rs b/quaint/src/connector/mysql/native/error.rs
@@ -1,6 +1,6 @@
 use crate::{
     connector::mysql::error::MysqlError,
-    error::{Error, ErrorKind},
+    error::{Error, ErrorKind, NativeErrorKind},
 };
 use mysql_async as my;
 
@@ -17,14 +17,16 @@ impl From<&my::ServerError> for MysqlError {
 impl From<my::Error> for Error {
     fn from(e: my::Error) -> Error {
         match e {
-            my::Error::Io(my::IoError::Tls(err)) => Error::builder(ErrorKind::TlsError {
+            my::Error::Io(my::IoError::Tls(err)) => Error::builder(ErrorKind::Native(NativeErrorKind::TlsError {
                 message: err.to_string(),
-            })
+            }))
             .build(),
             my::Error::Io(my::IoError::Io(err)) if err.kind() == std::io::ErrorKind::UnexpectedEof => {
-                Error::builder(ErrorKind::ConnectionClosed).build()
+                Error::builder(ErrorKind::Native(NativeErrorKind::ConnectionClosed)).build()
+            }
+            my::Error::Io(io_error) => {
+                Error::builder(ErrorKind::Native(NativeErrorKind::ConnectionError(io_error.into()))).build()
             }
-            my::Error::Io(io_error) => Error::builder(ErrorKind::ConnectionError(io_error.into())).build(),
             my::Error::Driver(e) => Error::builder(ErrorKind::QueryError(e.into())).build(),
             my::Error::Server(ref server_error) => {
                 let mysql_error: MysqlError = server_error.into();

diff --git a/quaint/src/connector/native.rs b/quaint/src/connector/native.rs
@@ -0,0 +1,31 @@
+#[cfg(feature = "mssql")]
+use crate::connector::MssqlUrl;
+#[cfg(feature = "mysql")]
+use crate::connector::MysqlUrl;
+#[cfg(feature = "postgresql")]
+use crate::connector::PostgresUrl;
+
+/// General information about a SQL connection, provided by native Rust drivers.
+#[cfg(not(target_arch = "wasm32"))]
+#[derive(Debug, Clone)]
+pub enum NativeConnectionInfo {
+    /// A PostgreSQL connection URL.
+    #[cfg(feature = "postgresql")]
+    Postgres(PostgresUrl),
+    /// A MySQL connection URL.
+    #[cfg(feature = "mysql")]
+    Mysql(MysqlUrl),
+    /// A SQL Server connection URL.
+    #[cfg(feature = "mssql")]
+    Mssql(MssqlUrl),
+    /// A SQLite connection URL.
+    #[cfg(feature = "sqlite")]
+    Sqlite {
+        /// The filesystem path of the SQLite database.
+        file_path: String,
+        /// The name the database is bound to - Always "main"
+        db_name: String,
+    },
+    #[cfg(feature = "sqlite")]
+    InMemorySqlite { db_name: String },
+}
diff --git a/quaint/src/connector/postgres/native/error.rs b/quaint/src/connector/postgres/native/error.rs
@@ -2,7 +2,7 @@ use tokio_postgres::error::DbError;
 
 use crate::{
     connector::postgres::error::PostgresError,
-    error::{Error, ErrorKind},
+    error::{Error, ErrorKind, NativeErrorKind},
 };
 
 impl From<&DbError> for PostgresError {
@@ -21,7 +21,7 @@ impl From<&DbError> for PostgresError {
 impl From<tokio_postgres::error::Error> for Error {
     fn from(e: tokio_postgres::error::Error) -> Error {
         if e.is_closed() {
-            return Error::builder(ErrorKind::ConnectionClosed).build();
+            return Error::builder(ErrorKind::Native(NativeErrorKind::ConnectionClosed)).build();
         }
 
         if let Some(db_error) = e.as_db_error() {
@@ -46,7 +46,7 @@ impl From<tokio_postgres::error::Error> for Error {
 
         match reason.as_str() {
             "error connecting to server: timed out" => {
-                let mut builder = Error::builder(ErrorKind::ConnectTimeout);
+                let mut builder = Error::builder(ErrorKind::Native(NativeErrorKind::ConnectTimeout));
 
                 if let Some(code) = code {
                     builder.set_original_code(code);
@@ -57,9 +57,9 @@ impl From<tokio_postgres::error::Error> for Error {
             } // sigh...
             // https://github.com/sfackler/rust-postgres/blob/0c84ed9f8201f4e5b4803199a24afa2c9f3723b2/tokio-postgres/src/connect_tls.rs#L37
             "error performing TLS handshake: server does not support TLS" => {
-                let mut builder = Error::builder(ErrorKind::TlsError {
+                let mut builder = Error::builder(ErrorKind::Native(NativeErrorKind::TlsError {
                     message: reason.clone(),
-                });
+                }));
 
                 if let Some(code) = code {
                     builder.set_original_code(code);
@@ -105,7 +105,12 @@ fn try_extracting_io_error(err: &tokio_postgres::error::Error) -> Option<Error>
 
     err.source()
         .and_then(|err| err.downcast_ref::<std::io::Error>())
-        .map(|err| ErrorKind::ConnectionError(Box::new(std::io::Error::new(err.kind(), format!("{err}")))))
+        .map(|err| {
+            ErrorKind::Native(NativeErrorKind::ConnectionError(Box::new(std::io::Error::new(
+                err.kind(),
+                format!("{err}"),
+            ))))
+        })
         .map(|kind| Error::builder(kind).build())
 }
 
@@ -117,9 +122,9 @@ impl From<native_tls::Error> for Error {
 
 impl From<&native_tls::Error> for Error {
     fn from(e: &native_tls::Error) -> Error {
-        let kind = ErrorKind::TlsError {
+        let kind = ErrorKind::Native(NativeErrorKind::TlsError {
             message: format!("{e}"),
-        };
+        });
 
         Error::builder(kind).build()
     }

diff --git a/quaint/src/connector/postgres/native/mod.rs b/quaint/src/connector/postgres/native/mod.rs
@@ -7,6 +7,7 @@ mod error;
 pub(crate) use crate::connector::postgres::url::PostgresUrl;
 use crate::connector::postgres::url::{Hidden, SslAcceptMode, SslParams};
 use crate::connector::{timeout, IsolationLevel, Transaction};
+use crate::error::NativeErrorKind;
 
 use crate::{
     ast::{Query, Value},
@@ -93,9 +94,9 @@ impl SslParams {
 
         if let Some(ref cert_file) = self.certificate_file {
             let cert = fs::read(cert_file).map_err(|err| {
-                Error::builder(ErrorKind::TlsError {
+                Error::builder(ErrorKind::Native(NativeErrorKind::TlsError {
                     message: format!("cert file not found ({err})"),
-                })
+                }))
                 .build()
             })?;
 
@@ -104,9 +105,9 @@ impl SslParams {
 
         if let Some(ref identity_file) = self.identity_file {
             let db = fs::read(identity_file).map_err(|err| {
-                Error::builder(ErrorKind::TlsError {
+                Error::builder(ErrorKind::Native(NativeErrorKind::TlsError {
                     message: format!("identity file not found ({err})"),
-                })
+                }))
                 .build()
             })?;
             let password = self.identity_password.0.as_deref().unwrap_or("");

diff --git a/quaint/src/connector/postgres/url.rs b/quaint/src/connector/postgres/url.rs
@@ -608,7 +608,7 @@ mod tests {
         match res {
             Ok(_) => unreachable!(),
             Err(e) => match e.kind() {
-                ErrorKind::TlsError { .. } => (),
+                ErrorKind::Native(NativeErrorKind::TlsError { .. }) => (),
                 other => panic!("{:#?}", other),
             },
         }

diff --git a/quaint/src/connector/timeout.rs b/quaint/src/connector/timeout.rs
@@ -2,12 +2,16 @@ use crate::error::{Error, ErrorKind};
 use futures::Future;
 use std::time::Duration;
 
+#[cfg(feature = "native")]
 pub async fn connect<T, F, E>(duration: Option<Duration>, f: F) -> crate::Result<T>
 where
     F: Future<Output = std::result::Result<T, E>>,
     E: Into<Error>,
 {
-    timeout(duration, f, || Error::builder(ErrorKind::ConnectTimeout).build()).await
+    timeout(duration, f, || {
+        Error::builder(ErrorKind::Native(crate::error::NativeErrorKind::ConnectTimeout)).build()
+    })
+    .await
 }
 
 pub async fn socket<T, F, E>(duration: Option<Duration>, f: F) -> crate::Result<T>