add more check

vlang · Jan 18, 2025 · 4a2c3ce · 4a2c3ce
1 parent 897257a
commit 4a2c3ce
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/vlib/v/checker/infix.v b/vlib/v/checker/infix.v
@@ -781,7 +781,7 @@ fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type {
 			if typ != ast.no_type {
 				typ_sym := c.table.sym(typ)
 				op := node.op.str()
-				if left_type.has_flag(.option) {
+				if left_type.has_flag(.option) && !c.inside_sql {
 					c.error('${node.left} is an Optional, it needs to be unwrapped first',
 						node.left.pos())
 				}

diff --git a/vlib/v/checker/tests/orm_op_with_option_and_none.out b/vlib/v/checker/tests/orm_op_with_option_and_none.out
@@ -47,17 +47,3 @@ vlib/v/checker/tests/orm_op_with_option_and_none.vv:45:30: warning: comparison w
       |                                    ~~
    46 |     }!
    47 |
-vlib/v/checker/tests/orm_op_with_option_and_none.vv:49:25: error: name is an Optional, it needs to be unwrapped first
-   47 | 
-   48 |     _ := sql db {
-   49 |         select from Foo where name is none
-      |                               ~~~~
-   50 |     }!
-   51 |
-vlib/v/checker/tests/orm_op_with_option_and_none.vv:53:25: error: name is an Optional, it needs to be unwrapped first
-   51 | 
-   52 |     _ := sql db {
-   53 |         select from Foo where name !is none
-      |                               ~~~~
-   54 |     }!
-   55 | }