fix: attrs setup

teamkeel · Feb 18, 2025 · 96a159a · 96a159a
1 parent 94b3450
commit 96a159a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/schema/attributes/computed.go b/schema/attributes/computed.go
@@ -24,13 +24,11 @@ func defaultComputed(schema []*parser.AST) (*expressions.Parser, error) {
 	}
 
 	opts := []expressions.Option{
-		options.WithCtx(),
 		options.WithSchemaTypes(schema),
 		options.WithComparisonOperators(),
 		options.WithLogicalOperators(),
 		options.WithArithmeticOperators(),
 		options.WithFunctions(),
-		options.WithReturnTypeAssertion(parser.FieldTypeBoolean, false),
 	}
 
 	parser, err := expressions.NewParser(opts...)

diff --git a/schema/attributes/permission.go b/schema/attributes/permission.go
@@ -52,17 +52,15 @@ func ValidatePermissionExpression(schema []*parser.AST, model *parser.ModelNode,
 
 	opts := []expressions.Option{}
 
-	operands, err := resolve.IdentOperands(expression)
-	if err != nil {
-		return nil, err
-	}
+	operands, _ := resolve.IdentOperands(expression)
 
-	if action != nil {
+	if action != nil && operands != nil {
+	out:
 		for _, operand := range operands {
 			for _, input := range action.Inputs {
 				if operand.Fragments[0] == input.Name() {
 					opts = append(opts, options.WithActionInputs(schema, action))
-					break
+					break out
 				}
 			}
 		}