Merge branch 'main' into fix/allow-missing-datasource-url

Author: jacek-prisma

.github/workflows/test-query-compiler-template.yml

@@ -76,11 +76,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Cache Docker images.
-        uses: ScribeMD/docker-cache@0.5.0
-        with:
-          key: docker-${{ inputs.setup_task }}-${{hashFiles('docker-compose.yaml')}}
-
       - name: Set Prisma branch
         id: set-prisma-branch
         run: |

.github/workflows/test-schema-engine-linux-template.yml

@@ -44,11 +44,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Cache Docker images.
-        uses: ScribeMD/docker-cache@0.5.0
-        with:
-          key: docker-${{ inputs.database_name }}-${{ hashFiles('docker-compose.yaml') }}
-
       #
       # Multithreaded tests
       #

.github/workflows/test-schema-engine.yml

@@ -46,11 +46,6 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
-      - name: Cache Docker images.
-        uses: ScribeMD/docker-cache@0.5.0
-        with:
-          key: docker-${{ matrix.database.name }}-${{hashFiles('docker-compose.yaml')}}
-
       - name: 'Start ${{ matrix.database.name }}'
         run: make start-${{ matrix.database.name }}-single
 

Cargo.lock

@@ -271,7 +271,7 @@ fn visit_scalar_field_attributes(
 
     // @unique
     if ctx.visit_optional_single_attr("unique") {
-        visit_field_unique(scalar_field_id, model_data, ctx);
+        visit_field_unique(scalar_field_id, model_id, model_data, ctx);
         ctx.validate_visited_arguments();
     }
 
@@ -284,7 +284,12 @@ fn visit_scalar_field_attributes(
     ctx.validate_visited_attributes();
 }
 
-fn visit_field_unique(scalar_field_id: ScalarFieldId, model_data: &mut ModelAttributes, ctx: &mut Context<'_>) {
+fn visit_field_unique(
+    scalar_field_id: ScalarFieldId,
+    model_id: crate::ModelId,
+    model_data: &mut ModelAttributes,
+    ctx: &mut Context<'_>,
+) {
     let mapped_name = match ctx
         .visit_optional_arg("map")
         .and_then(|arg| coerce::string(arg, ctx.diagnostics))
@@ -318,6 +323,7 @@ fn visit_field_unique(scalar_field_id: ScalarFieldId, model_data: &mut ModelAttr
     };
 
     let clustered = validate_clustering_setting(ctx);
+    let where_clause = parse_where_clause(model_id, ctx);
 
     let attribute_id = ctx.current_attribute_id();
     model_data.ast_indexes.push((
@@ -333,6 +339,7 @@ fn visit_field_unique(scalar_field_id: ScalarFieldId, model_data: &mut ModelAttr
             source_field: Some(scalar_field_id),
             mapped_name,
             clustered,
+            where_clause,
             ..Default::default()
         },
     ))

psl/parser-database/src/attributes.rs

@@ -1030,3 +1030,76 @@ fn partial_index_object_syntax_rejects_boolean_for_enum_field() {
     "#]];
     expected.assert_eq(&err);
 }
+
+#[test]
+fn field_level_partial_unique_with_raw_on_postgres() {
+    let dml = indoc! {r#"
+        model User {
+            id     Int    @id
+            email  String @unique(where: raw("status = 'active'"))
+            status String
+        }
+    "#};
+
+    psl::parse_schema_without_extensions(with_header(dml, Provider::Postgres, &["partialIndexes"]))
+        .unwrap()
+        .assert_has_model("User")
+        .assert_unique_on_fields(&["email"])
+        .assert_raw_where_clause("status = 'active'");
+}
+
+#[test]
+fn field_level_partial_unique_with_object_syntax() {
+    let dml = indoc! {r#"
+        model User {
+            id     Int     @id
+            email  String  @unique(where: { active: true })
+            active Boolean
+        }
+    "#};
+
+    psl::parse_schema_without_extensions(with_header(dml, Provider::Postgres, &["partialIndexes"]))
+        .unwrap()
+        .assert_has_model("User")
+        .assert_unique_on_fields(&["email"])
+        .assert_where_object(&[("active", WhereCondition::Equals(WhereValue::Boolean(true)))]);
+}
+
+#[test]
+fn field_level_partial_unique_requires_preview_feature() {
+    let dml = indoc! {r#"
+        model User {
+            id     Int    @id
+            email  String @unique(where: raw("status = 'active'"))
+            status String
+        }
+    "#};
+
+    let err = parse_unwrap_err(&with_header(dml, Provider::Postgres, &[]));
+    let expected = expect![[r#"
+        error: Error parsing attribute "@unique": Partial indexes are a preview feature. Add "partialIndexes" to previewFeatures in your generator block.
+          -->  schema.prisma:12
+           | 
+        11 |     id     Int    @id
+        12 |     email  String @unique(where: raw("status = 'active'"))
+           | 
+    "#]];
+    expected.assert_eq(&err);
+}
+
+#[test]
+fn field_level_partial_unique_with_map() {
+    let dml = indoc! {r#"
+        model User {
+            id     Int    @id
+            email  String @unique(map: "email_active_idx", where: raw("status = 'active'"))
+            status String
+        }
+    "#};
+
+    psl::parse_schema_without_extensions(with_header(dml, Provider::Postgres, &["partialIndexes"]))
+        .unwrap()
+        .assert_has_model("User")
+        .assert_unique_on_fields(&["email"])
+        .assert_raw_where_clause("status = 'active'");
+}

psl/psl/tests/attributes/partial_index.rs

@@ -0,0 +1,9 @@
+model Post {
+  id        Int      @id
+  title     String
+  published Boolean
+
+  @@unique([title], where:{published:{not:false}})
+  @@index([title], where:{published:true})
+  @@index([title], where:{published:{not: false},id:{not: null}})
+}

psl/psl/tests/reformatter/object_expression_and_object_member.prisma

@@ -0,0 +1,9 @@
+model Post {
+  id        Int     @id
+  title     String
+  published Boolean
+
+  @@unique([title], where: { published: { not: false } })
+  @@index([title], where: { published: true })
+  @@index([title], where: { published: { not: false }, id: { not: null } })
+}

psl/psl/tests/reformatter/object_expression_and_object_member.reformatted.prisma

@@ -377,6 +377,40 @@ fn reformat_expression(pair: Pair<'_>, target: &mut dyn LineWriteable) {
             Rule::path => target.write(current.as_str()),
             Rule::function_call => reformat_function_call(current, target),
             Rule::array_expression => reformat_array_expression(current, target),
+            Rule::object_expression => reformat_object_expression(current, target),
+            _ => unreachable(&current),
+        }
+    }
+}
+
+fn reformat_object_expression(pair: Pair<'_>, target: &mut dyn LineWriteable) {
+    target.write("{ ");
+    let mut is_first_member = true;
+
+    for current in pair.into_inner() {
+        match current.as_rule() {
+            Rule::object_member => {
+                if !is_first_member {
+                    target.write(", ");
+                }
+                reformat_object_member(current, target);
+                is_first_member = false;
+            }
+            _ => unreachable(&current),
+        }
+    }
+
+    target.write(" }");
+}
+
+fn reformat_object_member(pair: Pair<'_>, target: &mut dyn LineWriteable) {
+    for current in pair.into_inner() {
+        match current.as_rule() {
+            Rule::identifier => {
+                target.write(current.as_str());
+                target.write(": ");
+            }
+            Rule::expression => reformat_expression(current, target),
             _ => unreachable(&current),
         }
     }