feat(js-connectors): use standard provider names ("mysql", "postgres"…

…, ...) (#4141)

* feat(js-connectors): use "standard" provider names ("mysql", "postgres", ...) with JS connectors

* chore(js-connectors): remove deprecated unit tests

* chore(js-connectors): remove "@prisma/pg" from smoke tests

* chore(query-engine): move ConnectorMode from psl to request_handlers

* chore(query-engine): remove deprecated tests

psl/builtin-connectors/src/lib.rs

@@ -9,15 +9,11 @@ pub use mongodb::MongoDbType;
 pub use mssql_datamodel_connector::{MsSqlType, MsSqlTypeParameter};
 pub use mysql_datamodel_connector::MySqlType;
 pub use postgres_datamodel_connector::{PostgresDatasourceProperties, PostgresType};
-pub use psl_core::js_connector::JsConnector;
 
 mod mongodb;
 mod mssql_datamodel_connector;
 mod mysql_datamodel_connector;
 mod native_type_definition;
-mod neon;
-mod pg_js;
-mod planetscale;
 mod postgres_datamodel_connector;
 mod sqlite_datamodel_connector;
 
@@ -29,18 +25,5 @@ pub const MYSQL: &'static dyn Connector = &mysql_datamodel_connector::MySqlDatam
 pub const SQLITE: &'static dyn Connector = &sqlite_datamodel_connector::SqliteDatamodelConnector;
 pub const MSSQL: &'static dyn Connector = &mssql_datamodel_connector::MsSqlDatamodelConnector;
 pub const MONGODB: &'static dyn Connector = &mongodb::MongoDbDatamodelConnector;
-pub static PLANETSCALE_SERVERLESS: &'static dyn Connector = &planetscale::PLANETSCALE_SERVERLESS;
-pub static NEON_SERVERLESS: &'static dyn Connector = &neon::NEON_SERVERLESS;
-pub static PG_JS: &'static dyn Connector = &pg_js::PG_JS;
 
-pub static BUILTIN_CONNECTORS: ConnectorRegistry = &[
-    POSTGRES,
-    MYSQL,
-    SQLITE,
-    MSSQL,
-    COCKROACH,
-    PG_JS,
-    MONGODB,
-    PLANETSCALE_SERVERLESS,
-    NEON_SERVERLESS,
-];
+pub static BUILTIN_CONNECTORS: ConnectorRegistry = &[POSTGRES, MYSQL, SQLITE, MSSQL, COCKROACH, MONGODB];

psl/psl-core/src/datamodel_connector.rs

@@ -24,9 +24,7 @@ pub use self::{
     relation_mode::RelationMode,
 };
 
-use crate::{
-    configuration::DatasourceConnectorData, js_connector::JsConnector, Configuration, Datasource, PreviewFeature,
-};
+use crate::{configuration::DatasourceConnectorData, Configuration, Datasource, PreviewFeature};
 use diagnostics::{DatamodelError, Diagnostics, NativeTypeErrorFactory, Span};
 use enumflags2::BitFlags;
 use lsp_types::CompletionList;
@@ -44,11 +42,6 @@ pub const EXTENSIONS_KEY: &str = "extensions";
 
 /// The datamodel connector API.
 pub trait Connector: Send + Sync {
-    // Provides safe downcasting to a JsConnector, in case it is one.
-    fn as_js_connector(&self) -> Option<JsConnector> {
-        None
-    }
-
     /// The name of the provider, for string comparisons determining which connector we are on.
     fn provider_name(&self) -> &'static str;
 
@@ -368,7 +361,7 @@ pub trait Connector: Send + Sync {
     }
 }
 
-#[derive(Copy, Clone, Debug)]
+#[derive(Copy, Clone, Debug, PartialEq)]
 pub enum Flavour {
     Cockroach,
     Mongo,

psl/psl-core/src/lib.rs

@@ -3,7 +3,6 @@
 #![allow(clippy::derive_partial_eq_without_eq)]
 
 pub mod datamodel_connector;
-pub mod js_connector;
 
 /// `mcf`: Turns a collection of `configuration::Datasource` and `configuration::Generator` into a
 /// JSON representation. This is the `get_config()` representation.

query-engine/connector-test-kit-rs/query-tests-setup/src/runner/mod.rs

@@ -11,8 +11,8 @@ use query_core::{
 };
 use query_engine_metrics::MetricRegistry;
 use request_handlers::{
-    load_executor, BatchTransactionOption, GraphqlBody, JsonBatchQuery, JsonBody, JsonSingleQuery, MultiQuery,
-    RequestBody, RequestHandler,
+    load_executor, BatchTransactionOption, ConnectorMode, GraphqlBody, JsonBatchQuery, JsonBody, JsonSingleQuery,
+    MultiQuery, RequestBody, RequestHandler,
 };
 use std::{env, sync::Arc};
 
@@ -52,7 +52,15 @@ impl Runner {
         let schema = psl::parse_schema(datamodel).unwrap();
         let data_source = schema.configuration.datasources.first().unwrap();
         let url = data_source.load_url(|key| env::var(key).ok()).unwrap();
-        let executor = load_executor(data_source, schema.configuration.preview_features(), &url).await?;
+
+        let connector_mode = ConnectorMode::Rust;
+        let executor = load_executor(
+            connector_mode,
+            data_source,
+            schema.configuration.preview_features(),
+            &url,
+        )
+        .await?;
         let query_schema: QuerySchemaRef = Arc::new(schema::build(Arc::new(schema), true));
 
         Ok(Self {

query-engine/connectors/sql-query-connector/src/database/js.rs

@@ -51,7 +51,6 @@ pub struct Js {
     connector: JsConnector,
     connection_info: ConnectionInfo,
     features: psl::PreviewFeatures,
-    psl_connector: psl::builtin_connectors::JsConnector,
 }
 
 fn get_connection_info(url: &str) -> connector::Result<ConnectionInfo> {
@@ -70,23 +69,14 @@ impl FromSource for Js {
         url: &str,
         features: psl::PreviewFeatures,
     ) -> connector_interface::Result<Js> {
-        match source.active_connector.as_js_connector() {
-            Some(psl_connector) => {
-                let connector = registered_js_connector(source.active_provider)?;
-                let connection_info = get_connection_info(url)?;
-
-                Ok(Js {
-                    connector,
-                    connection_info,
-                    features,
-                    psl_connector,
-                })
-            }
-            None => panic!(
-                "Connector for provider {} is not a JsConnector",
-                source.active_connector.provider_name()
-            ),
-        }
+        let connector = registered_js_connector(source.active_provider)?;
+        let connection_info = get_connection_info(url)?;
+
+        Ok(Js {
+            connector,
+            connection_info,
+            features,
+        })
     }
 }
 
@@ -101,7 +91,7 @@ impl Connector for Js {
     }
 
     fn name(&self) -> &'static str {
-        self.psl_connector.name
+        "js"
     }
 
     fn should_retry_on_transient_error(&self) -> bool {

query-engine/js-connectors/js/smoke-test-js/prisma/mysql-planetscale/schema.prisma

@@ -3,7 +3,7 @@ generator client {
 }
 
 datasource db {
-  provider = "@prisma/planetscale"
+  provider = "mysql"
   url      = env("JS_PLANETSCALE_DATABASE_URL")
 }
 

query-engine/js-connectors/js/smoke-test-js/prisma/postgres-neon/schema.prisma

@@ -3,7 +3,7 @@ generator client {
 }
 
 datasource db {
-  provider = "@prisma/neon"
+  provider = "postgres"
   url      = env("JS_NEON_DATABASE_URL")
 }
 

query-engine/js-connectors/js/smoke-test-js/prisma/postgres-pg/schema.prisma

@@ -3,7 +3,7 @@ generator client {
 }
 
 datasource db {
-  provider = "@prisma/pg"
+  provider = "postgres"
   url      = env("JS_PG_DATABASE_URL")
 }
 

query-engine/js-connectors/src/queryable.rs

@@ -29,7 +29,7 @@ use tracing::{info_span, Instrument};
 ///
 pub struct JsBaseQueryable {
     pub(crate) proxy: CommonProxy,
-    pub(crate) flavour: Flavour,
+    pub flavour: Flavour,
 }
 
 impl JsBaseQueryable {