diff --git a/psl/psl-core/src/common/preview_features.rs b/psl/psl-core/src/common/preview_features.rs index cadaa636395e..0ca8571aaa7f 100644 --- a/psl/psl-core/src/common/preview_features.rs +++ b/psl/psl-core/src/common/preview_features.rs @@ -87,7 +87,6 @@ features!( pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap { active: enumflags2::make_bitflags!(PreviewFeature::{ Deno - | DriverAdapters | FullTextIndex | FullTextSearch | Metrics @@ -108,6 +107,7 @@ pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap { | ConnectOrCreate | CreateMany | DataProxy + | DriverAdapters | Distinct | ExtendedIndexes | ExtendedWhereUnique diff --git a/psl/psl/tests/config/generators.rs b/psl/psl/tests/config/generators.rs index 273de14c7443..d48b0dd535cf 100644 --- a/psl/psl/tests/config/generators.rs +++ b/psl/psl/tests/config/generators.rs @@ -258,7 +258,7 @@ fn nice_error_for_unknown_generator_preview_feature() { .unwrap_err(); let expectation = expect![[r#" - error: The preview feature "foo" is not known. Expected one of: deno, driverAdapters, fullTextIndex, fullTextSearch, metrics, multiSchema, nativeDistinct, postgresqlExtensions, tracing, views, relationJoins, prismaSchemaFolder, omitApi + error: The preview feature "foo" is not known. Expected one of: deno, fullTextIndex, fullTextSearch, metrics, multiSchema, nativeDistinct, postgresqlExtensions, tracing, views, relationJoins, prismaSchemaFolder, omitApi --> schema.prisma:3  |   2 |  provider = "prisma-client-js" diff --git a/query-engine/driver-adapters/executor/bench/schema.prisma b/query-engine/driver-adapters/executor/bench/schema.prisma index 6346afed158d..cfc4bfad6d91 100644 --- a/query-engine/driver-adapters/executor/bench/schema.prisma +++ b/query-engine/driver-adapters/executor/bench/schema.prisma @@ -5,7 +5,7 @@ datasource db { generator foo { provider = "prisma-client-js" - previewFeatures = ["driverAdapters", "relationJoins"] + previewFeatures = ["relationJoins"] } model Movie { diff --git a/query-engine/query-engine-node-api/src/engine.rs b/query-engine/query-engine-node-api/src/engine.rs index 01c78b6e2c17..d408c3e6c92b 100644 --- a/query-engine/query-engine-node-api/src/engine.rs +++ b/query-engine/query-engine-node-api/src/engine.rs @@ -94,27 +94,19 @@ impl QueryEngine { let mut schema = psl::validate(datamodel.into()); let config = &mut schema.configuration; - let preview_features = config.preview_features(); let mut connector_mode = ConnectorMode::Rust; - if !preview_features.contains(PreviewFeature::DriverAdapters) { - tracing::info!( - "Please enable the {} preview feature to use driver adapters.", - PreviewFeature::DriverAdapters - ); - } else { - #[cfg(feature = "driver-adapters")] - if let Some(adapter) = maybe_adapter { - let js_queryable = driver_adapters::from_js(adapter); - - connector_mode = ConnectorMode::Js { - adapter: Arc::new(js_queryable), - }; + #[cfg(feature = "driver-adapters")] + if let Some(adapter) = maybe_adapter { + let js_queryable = driver_adapters::from_js(adapter); - let provider_name = schema.connector.provider_name(); - tracing::info!("Registered driver adapter for {provider_name}."); - } + connector_mode = ConnectorMode::Js { + adapter: Arc::new(js_queryable), + }; + + let provider_name = schema.connector.provider_name(); + tracing::info!("Registered driver adapter for {provider_name}."); } let connector_mode = connector_mode;