chore: rename distinctOn preview feature to nativeDistinct

prisma · Dec 4, 2023 · 252b817 · 252b817
1 parent 845c140
commit 252b817
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/psl/builtin-connectors/src/postgres_datamodel_connector.rs b/psl/builtin-connectors/src/postgres_datamodel_connector.rs
@@ -66,7 +66,7 @@ const CAPABILITIES: ConnectorCapabilities = enumflags2::make_bitflags!(Connector
     InsertReturning |
     UpdateReturning |
     RowIn |
-    DistinctOn
+    NativeDistinct
 });
 
 pub struct PostgresDatamodelConnector;

diff --git a/psl/psl-core/src/common/preview_features.rs b/psl/psl-core/src/common/preview_features.rs
@@ -43,7 +43,7 @@ features!(
     ConnectOrCreate,
     CreateMany,
     DataProxy,
-    DistinctOn,
+    NativeDistinct,
     Deno,
     Distinct,
     DriverAdapters,
@@ -83,7 +83,7 @@ features!(
 pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap {
     active: enumflags2::make_bitflags!(PreviewFeature::{
         Deno
-         | DistinctOn
+         | NativeDistinct
          | DriverAdapters
          | FullTextIndex
          | FullTextSearch

diff --git a/psl/psl-core/src/datamodel_connector/capabilities.rs b/psl/psl-core/src/datamodel_connector/capabilities.rs
@@ -103,8 +103,8 @@ capabilities!(
     NativeUpsert,
     InsertReturning,
     UpdateReturning,
-    RowIn,      // Connector supports (a, b) IN (c, d) expression.
-    DistinctOn  // Connector supports DB-level distinct (e.g. postgres)
+    RowIn,          // Connector supports (a, b) IN (c, d) expression.
+    NativeDistinct  // Connector supports DB-level distinct (e.g. postgres)
 );
 
 /// Contains all capabilities that the connector is able to serve.

diff --git 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#"
-        [1;91merror[0m: [1mThe preview feature "foo" is not known. Expected one of: distinctOn, deno, driverAdapters, fullTextIndex, fullTextSearch, metrics, multiSchema, postgresqlExtensions, tracing, views[0m
+        [1;91merror[0m: [1mThe preview feature "foo" is not known. Expected one of: deno, driverAdapters, fullTextIndex, fullTextSearch, metrics, multiSchema, nativeDistinct, postgresqlExtensions, tracing, views[0m
           [1;94m-->[0m  [4mschema.prisma:3[0m
         [1;94m   | [0m
         [1;94m 2 | [0m  provider = "prisma-client-js"

diff --git a/query-engine/query-structure/src/query_arguments.rs b/query-engine/query-structure/src/query_arguments.rs
@@ -86,14 +86,14 @@ impl QueryArguments {
             .schema
             .configuration
             .preview_features()
-            .contains(PreviewFeature::DistinctOn);
+            .contains(PreviewFeature::NativeDistinct);
 
         let connector_can_distinct_in_db = self
             .model()
             .dm
             .schema
             .connector
-            .has_capability(ConnectorCapability::DistinctOn);
+            .has_capability(ConnectorCapability::NativeDistinct);
 
         has_distinct_feature && connector_can_distinct_in_db && self.order_by.is_empty()
     }