feat: allow scalar shorthand for in filter (#3890)

fixes prisma/prisma#18549
prisma · Apr 18, 2023 · c965da6 · c965da6
1 parent 0de09f5
commit c965da6
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 4 deletions.
diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/filters/filters.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/filters/filters.rs
@@ -146,6 +146,16 @@ mod filter_spec {
           @r###"{"data":{"findManyUser":[{"unique":1},{"unique":2}]}}"###
         );
 
+        insta::assert_snapshot!(
+          &user_uniques(&runner, r#"(where: { name: { in: "Bernd" }})"#).await?,
+          @r###"{"data":{"findManyUser":[{"unique":2}]}}"###
+        );
+
+        insta::assert_snapshot!(
+          &user_uniques(&runner, r#"(where: { NOT: { name: { in: "Bernd" } }})"#).await?,
+          @r###"{"data":{"findManyUser":[{"unique":1},{"unique":3},{"unique":4}]}}"###
+        );
+
         Ok(())
     }
 
@@ -158,6 +168,17 @@ mod filter_spec {
           @r###"{"data":{"findManyUser":[{"unique":3},{"unique":4}]}}"###
         );
 
+        insta::assert_snapshot!(
+          &user_uniques(&runner, r#"(where: { name: { notIn: "Bernd" }})"#).await?,
+          @r###"{"data":{"findManyUser":[{"unique":1},{"unique":3},{"unique":4}]}}"###
+        );
+
+        // NOT notIn == in
+        insta::assert_snapshot!(
+          &user_uniques(&runner, r#"(where: { NOT: { name: { notIn: "Bernd" }}})"#).await?,
+          @r###"{"data":{"findManyUser":[{"unique":2}]}}"###
+        );
+
         Ok(())
     }
 

diff --git a/query-engine/core/src/query_graph_builder/extractors/filters/scalar.rs b/query-engine/core/src/query_graph_builder/extractors/filters/scalar.rs
@@ -98,7 +98,8 @@ impl<'a> ScalarFilterParser<'a> {
                         PrismaValue::Null => field.equals(value),
                         PrismaValue::List(values) => field.is_in(values),
 
-                        _ => unreachable!(), // Validation guarantees this.
+                        val if self.reverse() => field.not_in(vec![val]),
+                        val => field.is_in(vec![val]),
                     },
                     ConditionValue::FieldRef(field_ref) if self.reverse() => field.not_in(field_ref),
                     ConditionValue::FieldRef(field_ref) => field.is_in(field_ref),
@@ -119,7 +120,8 @@ impl<'a> ScalarFilterParser<'a> {
                         PrismaValue::Null => field.not_equals(value),
                         PrismaValue::List(values) => field.not_in(values),
 
-                        _ => unreachable!(), // Validation guarantees this.
+                        val if self.reverse() => field.is_in(vec![val]),
+                        val => field.not_in(vec![val]),
                     },
                     ConditionValue::FieldRef(field_ref) if self.reverse() => field.is_in(field_ref),
                     ConditionValue::FieldRef(field_ref) => field.not_in(field_ref),

diff --git a/query-engine/dmmf/src/tests/test-schemas/snapshots/odoo.snapshot.json.gz b/query-engine/dmmf/src/tests/test-schemas/snapshots/odoo.snapshot.json.gz
diff --git a/query-engine/schema-builder/src/input_types/fields/field_filter_types.rs b/query-engine/schema-builder/src/input_types/fields/field_filter_types.rs
@@ -411,14 +411,17 @@ fn inclusion_filters(
     mapped_type: InputType,
     nullable: bool,
 ) -> impl Iterator<Item = InputField> {
-    let input_type = InputType::list(mapped_type);
+    let input_type = InputType::list(mapped_type.clone());
 
-    let field_types: Vec<InputType> = if ctx.has_capability(ConnectorCapability::ScalarLists) {
+    let mut field_types: Vec<InputType> = if ctx.has_capability(ConnectorCapability::ScalarLists) {
         input_type.with_field_ref_input(ctx)
     } else {
         vec![input_type]
     };
 
+    // Allow for scalar shorthand too: { in: 2 } <=> { in: [2] }
+    field_types.push(mapped_type);
+
     vec![
         input_field(ctx, filters::IN, field_types.clone(), None)
             .optional()