mirror of
https://github.com/vlang/v.git
synced 2023-08-10 21:13:21 +03:00
"none" keyword for optionals + more memory fixes
This commit is contained in:
Alexander Medvednikov
258
compiler/query.v
258
compiler/query.v
@@ -2,9 +2,9 @@
|
||||
// Use of this source code is governed by an MIT license
|
||||
// that can be found in the LICENSE file.
|
||||
|
||||
module main
|
||||
module main
|
||||
|
||||
import strings
|
||||
import strings
|
||||
|
||||
fn sql_params2params_gen(sql_params []string, sql_types []string, qprefix string) string {
|
||||
mut params_gen := ''
|
||||
@@ -32,7 +32,7 @@ fn sql_params2params_gen(sql_params []string, sql_types []string, qprefix string
|
||||
return params_gen
|
||||
}
|
||||
|
||||
// `db.select from User where id == 1 && nr_bookings > 0`
|
||||
// `db.select from User where id == 1 && nr_bookings > 0`
|
||||
fn (p mut Parser) select_query(fn_ph int) string {
|
||||
// NB: qprefix and { p.sql_i, p.sql_params, p.sql_types } SHOULD be reset for each query,
|
||||
// because we can have many queries in the _same_ scope.
|
||||
@@ -40,96 +40,96 @@ fn (p mut Parser) select_query(fn_ph int) string {
|
||||
p.sql_i = 0
|
||||
p.sql_params = []string
|
||||
p.sql_types = []string
|
||||
|
||||
mut q := 'select '
|
||||
p.check(.key_select)
|
||||
n := p.check_name()
|
||||
|
||||
mut q := 'select '
|
||||
p.check(.key_select)
|
||||
n := p.check_name()
|
||||
if n == 'count' {
|
||||
q += 'count(*) from '
|
||||
p.check_name()
|
||||
}
|
||||
table_name := p.check_name()
|
||||
// Register this type's fields as variables so they can be used in where expressions
|
||||
typ := p.table.find_type(table_name)
|
||||
q += 'count(*) from '
|
||||
p.check_name()
|
||||
}
|
||||
table_name := p.check_name()
|
||||
// Register this type's fields as variables so they can be used in where expressions
|
||||
typ := p.table.find_type(table_name)
|
||||
if typ.name == '' {
|
||||
p.error('unknown type `$table_name`')
|
||||
}
|
||||
//fields := typ.fields.filter(typ == 'string' || typ == 'int')
|
||||
// get only string and int fields
|
||||
mut fields := []Var
|
||||
p.error('unknown type `$table_name`')
|
||||
}
|
||||
//fields := typ.fields.filter(typ == 'string' || typ == 'int')
|
||||
// get only string and int fields
|
||||
mut fields := []Var
|
||||
for i, field in typ.fields {
|
||||
if field.typ != 'string' && field.typ != 'int' {
|
||||
if field.typ != 'string' && field.typ != 'int' {
|
||||
continue
|
||||
}
|
||||
fields << field
|
||||
}
|
||||
}
|
||||
fields << field
|
||||
}
|
||||
if fields.len == 0 {
|
||||
p.error('V orm: select: empty fields in `$table_name`')
|
||||
}
|
||||
p.error('V orm: select: empty fields in `$table_name`')
|
||||
}
|
||||
if fields[0].name != 'id' {
|
||||
p.error('V orm: `id int` must be the first field in `$table_name`')
|
||||
}
|
||||
// 'select id, name, age from...'
|
||||
p.error('V orm: `id int` must be the first field in `$table_name`')
|
||||
}
|
||||
// 'select id, name, age from...'
|
||||
if n == 'from' {
|
||||
for i, field in fields {
|
||||
q += field.name
|
||||
q += field.name
|
||||
if i < fields.len - 1 {
|
||||
q += ', '
|
||||
}
|
||||
}
|
||||
q += ' from '
|
||||
}
|
||||
q += ', '
|
||||
}
|
||||
}
|
||||
q += ' from '
|
||||
}
|
||||
for field in fields {
|
||||
//println('registering sql field var $field.name')
|
||||
if field.typ != 'string' && field.typ != 'int' {
|
||||
//println('registering sql field var $field.name')
|
||||
if field.typ != 'string' && field.typ != 'int' {
|
||||
continue
|
||||
}
|
||||
p.cur_fn.register_var({ field | is_used:true })
|
||||
}
|
||||
q += table_name
|
||||
// `where` statement
|
||||
if p.tok == .name && p.lit == 'where' {
|
||||
p.next()
|
||||
p.cgen.start_tmp()
|
||||
p.is_sql = true
|
||||
p.bool_expression()
|
||||
p.is_sql = false
|
||||
q += ' where ' + p.cgen.end_tmp()
|
||||
}
|
||||
// limit?
|
||||
mut query_one := false
|
||||
if p.tok == .name && p.lit == 'limit' {
|
||||
p.next()
|
||||
p.cgen.start_tmp()
|
||||
p.is_sql = true
|
||||
p.bool_expression()
|
||||
p.is_sql = false
|
||||
limit := p.cgen.end_tmp()
|
||||
q += ' limit ' + limit
|
||||
// `limit 1` means we are getting `?User`, not `[]User`
|
||||
if limit.trim_space() == '1' {
|
||||
query_one = true
|
||||
}
|
||||
}
|
||||
}
|
||||
p.cur_fn.register_var({ field | is_used:true })
|
||||
}
|
||||
q += table_name
|
||||
// `where` statement
|
||||
if p.tok == .name && p.lit == 'where' {
|
||||
p.next()
|
||||
p.cgen.start_tmp()
|
||||
p.is_sql = true
|
||||
p.bool_expression()
|
||||
p.is_sql = false
|
||||
q += ' where ' + p.cgen.end_tmp()
|
||||
}
|
||||
// limit?
|
||||
mut query_one := false
|
||||
if p.tok == .name && p.lit == 'limit' {
|
||||
p.next()
|
||||
p.cgen.start_tmp()
|
||||
p.is_sql = true
|
||||
p.bool_expression()
|
||||
p.is_sql = false
|
||||
limit := p.cgen.end_tmp()
|
||||
q += ' limit ' + limit
|
||||
// `limit 1` means we are getting `?User`, not `[]User`
|
||||
if limit.trim_space() == '1' {
|
||||
query_one = true
|
||||
}
|
||||
}
|
||||
println('sql query="$q"')
|
||||
p.cgen.insert_before('// DEBUG_SQL prefix: $qprefix | fn_ph: $fn_ph | query: "$q" ')
|
||||
|
||||
if n == 'count' {
|
||||
p.cgen.set_placeholder(fn_ph, 'pg__DB_q_int(')
|
||||
p.gen(', tos2("$q"))')
|
||||
} else {
|
||||
// Build an object, assign each field.
|
||||
tmp := p.get_tmp()
|
||||
mut obj_gen := strings.new_builder(300)
|
||||
p.gen(', tos2("$q"))')
|
||||
} else {
|
||||
// Build an object, assign each field.
|
||||
tmp := p.get_tmp()
|
||||
mut obj_gen := strings.new_builder(300)
|
||||
for i, field in fields {
|
||||
mut cast := ''
|
||||
mut cast := ''
|
||||
if field.typ == 'int' {
|
||||
cast = 'v_string_int'
|
||||
}
|
||||
cast = 'v_string_int'
|
||||
}
|
||||
obj_gen.writeln('${qprefix}$tmp . $field.name = $cast( *(string*)array__get(${qprefix}row.vals, $i) );')
|
||||
}
|
||||
// One object
|
||||
if query_one {
|
||||
}
|
||||
// One object
|
||||
if query_one {
|
||||
mut params_gen := sql_params2params_gen( p.sql_params, p.sql_types, qprefix )
|
||||
p.cgen.insert_before('
|
||||
|
||||
@@ -144,99 +144,99 @@ if (! opt_${qprefix}row . ok ) {
|
||||
opt_${qprefix}$tmp = v_error( opt_${qprefix}row . error );
|
||||
}else{
|
||||
$table_name ${qprefix}$tmp;
|
||||
pg__Row ${qprefix}row = *(pg__Row*) opt_${qprefix}row . data;
|
||||
pg__Row ${qprefix}row = *(pg__Row*) opt_${qprefix}row . data;
|
||||
${obj_gen.str()}
|
||||
opt_${qprefix}$tmp = opt_ok( & ${qprefix}$tmp, sizeof($table_name) );
|
||||
}
|
||||
|
||||
')
|
||||
p.cgen.resetln('opt_${qprefix}$tmp')
|
||||
}
|
||||
// Array
|
||||
}
|
||||
// Array
|
||||
else {
|
||||
q += ' order by id'
|
||||
params_gen := sql_params2params_gen( p.sql_params, p.sql_types, qprefix )
|
||||
p.cgen.insert_before('char* ${qprefix}params[$p.sql_i];
|
||||
$params_gen
|
||||
$params_gen
|
||||
|
||||
void* ${qprefix}res = PQexecParams(db.conn, "$q", $p.sql_i, 0, ${qprefix}params, 0, 0, 0) ;
|
||||
array_pg__Row ${qprefix}rows = pg__res_to_rows(${qprefix}res);
|
||||
|
||||
// TODO preallocate
|
||||
// TODO preallocate
|
||||
array ${qprefix}arr_$tmp = new_array(0, 0, sizeof($table_name));
|
||||
for (int i = 0; i < ${qprefix}rows.len; i++) {
|
||||
pg__Row ${qprefix}row = *(pg__Row*)array__get(${qprefix}rows, i);
|
||||
$table_name ${qprefix}$tmp;
|
||||
${obj_gen.str()}
|
||||
${obj_gen.str()}
|
||||
_PUSH(&${qprefix}arr_$tmp, ${qprefix}$tmp, ${tmp}2, $table_name);
|
||||
}
|
||||
}
|
||||
')
|
||||
p.cgen.resetln('${qprefix}arr_$tmp')
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if n == 'count' {
|
||||
return 'int'
|
||||
return 'int'
|
||||
} else if query_one {
|
||||
opt_type := 'Option_$table_name'
|
||||
p.cgen.typedefs << 'typedef Option $opt_type;'
|
||||
p.table.register_type( opt_type )
|
||||
return opt_type
|
||||
} else {
|
||||
p.register_array('array_$table_name')
|
||||
return 'array_$table_name'
|
||||
}
|
||||
}
|
||||
p.register_array('array_$table_name')
|
||||
return 'array_$table_name'
|
||||
}
|
||||
}
|
||||
|
||||
// `db.insert(user)`
|
||||
fn (p mut Parser) insert_query(fn_ph int) {
|
||||
p.check_name()
|
||||
p.check(.lpar)
|
||||
var_name := p.check_name()
|
||||
p.check(.rpar)
|
||||
var := p.cur_fn.find_var(var_name)
|
||||
typ := p.table.find_type(var.typ)
|
||||
mut fields := []Var
|
||||
// `db.insert(user)`
|
||||
fn (p mut Parser) insert_query(fn_ph int) {
|
||||
p.check_name()
|
||||
p.check(.lpar)
|
||||
var_name := p.check_name()
|
||||
p.check(.rpar)
|
||||
var := p.cur_fn.find_var(var_name) or { return }
|
||||
typ := p.table.find_type(var.typ)
|
||||
mut fields := []Var
|
||||
for i, field in typ.fields {
|
||||
if field.typ != 'string' && field.typ != 'int' {
|
||||
if field.typ != 'string' && field.typ != 'int' {
|
||||
continue
|
||||
}
|
||||
fields << field
|
||||
}
|
||||
}
|
||||
fields << field
|
||||
}
|
||||
if fields.len == 0 {
|
||||
p.error('V orm: insert: empty fields in `$var.typ`')
|
||||
}
|
||||
p.error('V orm: insert: empty fields in `$var.typ`')
|
||||
}
|
||||
if fields[0].name != 'id' {
|
||||
p.error('V orm: `id int` must be the first field in `$var.typ`')
|
||||
}
|
||||
table_name := var.typ
|
||||
mut sfields := '' // 'name, city, country'
|
||||
mut params := '' // params[0] = 'bob'; params[1] = 'Vienna';
|
||||
mut vals := '' // $1, $2, $3...
|
||||
mut nr_vals := 0
|
||||
p.error('V orm: `id int` must be the first field in `$var.typ`')
|
||||
}
|
||||
table_name := var.typ
|
||||
mut sfields := '' // 'name, city, country'
|
||||
mut params := '' // params[0] = 'bob'; params[1] = 'Vienna';
|
||||
mut vals := '' // $1, $2, $3...
|
||||
mut nr_vals := 0
|
||||
for i, field in fields {
|
||||
if field.name == 'id' {
|
||||
continue
|
||||
}
|
||||
sfields += field.name
|
||||
vals += '$' + i.str()
|
||||
nr_vals++
|
||||
continue
|
||||
}
|
||||
sfields += field.name
|
||||
vals += '$' + i.str()
|
||||
nr_vals++
|
||||
params += 'params[${i-1}] = '
|
||||
if field.typ == 'string' {
|
||||
params += '$var_name . $field.name .str;\n'
|
||||
if field.typ == 'string' {
|
||||
params += '$var_name . $field.name .str;\n'
|
||||
} else if field.typ == 'int' {
|
||||
params += 'int_str($var_name . $field.name).str;\n'
|
||||
params += 'int_str($var_name . $field.name).str;\n'
|
||||
} else {
|
||||
p.error('V ORM: unsupported type `$field.typ`')
|
||||
}
|
||||
if i < fields.len - 1 {
|
||||
sfields += ', '
|
||||
vals += ', '
|
||||
}
|
||||
}
|
||||
p.cgen.insert_before('char* params[$nr_vals];' + params)
|
||||
p.error('V ORM: unsupported type `$field.typ`')
|
||||
}
|
||||
if i < fields.len - 1 {
|
||||
sfields += ', '
|
||||
vals += ', '
|
||||
}
|
||||
}
|
||||
p.cgen.insert_before('char* params[$nr_vals];' + params)
|
||||
p.cgen.set_placeholder(fn_ph, 'PQexecParams( ')
|
||||
p.genln('.conn, "insert into $table_name ($sfields) values ($vals)", $nr_vals,
|
||||
0, params, 0, 0, 0)')
|
||||
}
|
||||
0, params, 0, 0, 0)')
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user