Skip to content

Commit 40b3711

Browse files
committed
orm: fixes
1 parent 1b3385c commit 40b3711

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

cmd/tools/vtest-self.v

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,10 @@ fn main() {
312312
unbuffer_stdout()
313313
os.chdir(vroot)!
314314
args_idx := os.args.index('test-self')
315+
if args_idx < 0 {
316+
eprintln('vtest-self: could not find `test-self` in os.args: ${os.args}')
317+
exit(1)
318+
}
315319
vargs := os.args[1..args_idx]
316320
targs := os.args#[args_idx + 1..]
317321
cfg := Config.init(vargs, targs) or {

vlib/v/gen/c/orm.v

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1739,6 +1739,9 @@ fn (mut g Gen) write_orm_select(node ast.SqlExpr, connection_var_name string, re
17391739
}
17401740

17411741
ident.name = array_get_call_code
1742+
ident.obj = ast.Var{
1743+
name: array_get_call_code
1744+
}
17421745
where_expr.right = ident
17431746
sub.where_expr = where_expr
17441747

@@ -1771,6 +1774,9 @@ fn (mut g Gen) write_orm_select(node ast.SqlExpr, connection_var_name string, re
17711774
mut right_where_expr := where_expr.right as ast.Ident
17721775
left_where_expr.name = fkey
17731776
right_where_expr.name = tmp
1777+
right_where_expr.obj = ast.Var{
1778+
name: tmp
1779+
}
17741780
where_expr.left = left_where_expr
17751781
where_expr.right = ast.SelectorExpr{
17761782
pos: right_where_expr.pos
@@ -2086,7 +2092,7 @@ fn (mut g Gen) write_orm_upsert_conflict_groups(groups [][]string) {
20862092
}
20872093
g.write('})),')
20882094
}
2089-
g.write('}))')
2095+
g.write('}))') // closing: `}` compound literal init, `)` _MOV, `)` new_array_from_c_array
20902096
}
20912097

20922098
// return indexes of any auto-increment fields or fields with default values

0 commit comments

Comments
 (0)