fix: named inputs as lhs expression operand (#1287)

* fix: named inputs as lhs expression operand * chore: fixes
teamkeel · Nov 9, 2023 · bad329e · bad329e
1 parent c18f8df
commit bad329e
Show file tree

Hide file tree

Showing 7 changed files with 443 additions and 29 deletions.
diff --git a/integration/testdata/operation_list_where_explicit/main.test.ts b/integration/testdata/operation_list_where_explicit/main.test.ts
@@ -17,6 +17,20 @@ test("List Where filters - using equal operator (string) - filters correctly", a
   expect(results[0].title).toEqual("Fred");
 });
 
+test("List Where filters inverse - using equal operator (string) - filters correctly", async () => {
+  await actions.createPost({ title: "Fred" });
+  await actions.createPost({ title: "NotFred" });
+
+  const { results } = await actions.listPostsEqualStringInverse({
+    where: {
+      whereArg: "Fred",
+    },
+  });
+
+  expect(results.length).toEqual(1);
+  expect(results[0].title).toEqual("Fred");
+});
+
 test("List Where filters - using not equal operator (string) - filters correctly", async () => {
   await actions.createPost({ title: "Fred" });
   await actions.createPost({ title: "NotFred" });

diff --git a/integration/testdata/operation_list_where_explicit/schema.keel b/integration/testdata/operation_list_where_explicit/schema.keel
@@ -11,6 +11,9 @@ model Post {
         list listPostsEqualString(whereArg: Text) {
             @where(post.title == whereArg)
         }
+        list listPostsEqualStringInverse(whereArg: Text) {
+            @where(whereArg == post.title)
+        }
         list listPostsNotEqualString(whereArg: Text) {
             @where(post.title != whereArg)
         }

diff --git a/schema/__debug_bin947378542 b/schema/__debug_bin947378542
diff --git a/schema/expressions/scope.go b/schema/expressions/scope.go
@@ -362,15 +362,8 @@ func applyAdditionalOperandScopes(asts []*parser.AST, scope *ExpressionScope, co
 	switch attribute.Name.Value {
 	case parser.AttributePermission:
 		// no inputs allowed in permissions
-	case parser.AttributeValidate:
-		if position == OperandPositionLhs {
-			scope = applyInputsInScope(asts, context, scope)
-		}
 	default:
-		// todo: is this correct?
-		if position == OperandPositionRhs {
-			scope = applyInputsInScope(asts, context, scope)
-		}
+		scope = applyInputsInScope(asts, context, scope)
 	}
 
 	return scope.Merge(additionalScope)