Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(query-engine): deprecate the "driverAdapters" feature flag, in preparation for GA #4910

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion psl/psl-core/src/common/preview_features.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,6 @@ features!(
pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap {
active: enumflags2::make_bitflags!(PreviewFeature::{
Deno
| DriverAdapters
| FullTextIndex
| FullTextSearch
| Metrics
Expand All @@ -108,6 +107,7 @@ pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap {
| ConnectOrCreate
| CreateMany
| DataProxy
| DriverAdapters
| Distinct
| ExtendedIndexes
| ExtendedWhereUnique
Expand Down
2 changes: 1 addition & 1 deletion psl/psl/tests/config/generators.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ datasource db {

generator foo {
provider = "prisma-client-js"
previewFeatures = ["driverAdapters", "relationJoins"]
previewFeatures = ["relationJoins"]
}

model Movie {
Expand Down
26 changes: 9 additions & 17 deletions query-engine/query-engine-node-api/src/engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading