chore: rename distinctOn preview feature to nativeDistinct (#4518)

prisma · Dec 4, 2023 · 0d724e3 · 0d724e3
1 parent 845c140
commit 0d724e3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/psl/psl-core/src/common/preview_features.rs b/psl/psl-core/src/common/preview_features.rs
@@ -34,7 +34,7 @@ macro_rules! features {
     };
 }
 
-// (Usually) Append-only list of features.
+// (Usually) Append-only list of features. (alphabetically sorted)
 features!(
     AggregateApi,
     AtomicNumberOperations,
@@ -43,7 +43,6 @@ features!(
     ConnectOrCreate,
     CreateMany,
     DataProxy,
-    DistinctOn,
     Deno,
     Distinct,
     DriverAdapters,
@@ -65,6 +64,7 @@ features!(
     MultiSchema,
     NamedConstraints,
     NApi,
+    NativeDistinct,
     NativeTypes,
     OrderByAggregateGroup,
     OrderByNulls,
@@ -79,16 +79,16 @@ features!(
     Views,
 );
 
-/// Generator preview features
+/// Generator preview features (alphabetically sorted)
 pub const ALL_PREVIEW_FEATURES: FeatureMap = FeatureMap {
     active: enumflags2::make_bitflags!(PreviewFeature::{
         Deno
-         | DistinctOn
          | DriverAdapters
          | FullTextIndex
          | FullTextSearch
          | Metrics
          | MultiSchema
+         | NativeDistinct
          | PostgresqlExtensions
          | Tracing
          | Views

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,7 +86,7 @@ impl QueryArguments {
             .schema
             .configuration
             .preview_features()
-            .contains(PreviewFeature::DistinctOn);
+            .contains(PreviewFeature::NativeDistinct);
 
         let connector_can_distinct_in_db = self
             .model()