tomasz.sowa
/
morm
1
0
Fork 0
Code Issues 2 Pull Requests Releases Activity

fixed: a null was printed for id when serializing lists/vectors 

in BaseExpression::put_field_value_list(): has_primary_key_set flag was not copied to model_env
This commit is contained in:
Tomasz Sowa 2021-04-14 16:21:10 +02:00
parent 9a4fd9b050
commit 1c5d32551a
2 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/baseexpression.h
View File

@ -337,16 +337,7 @@ protected:
field_value_list_separator();
}
//ModelEnv model_env_local(*model_env);
//m.model_env = &model_env_local;
//before_field_value(field_value);
//m.set_connector(model_connector);
put_field_value(m);
//generate_from_model(m);
//m.model_env = nullptr;
//after_field_value(field_value);
is_first = false;
}
@ -372,11 +363,12 @@ protected:
ModelEnv model_env_local(*model_env);
m.model_env = &model_env_local;
//before_field_value(field_value);
m.model_env->has_primary_key_set = m.get_has_primary_key_set();
m.set_connector(model_connector);
generate_from_model(m);
m.model_env = nullptr;
//after_field_value(field_value);
is_first = false;
}

8
src/modelenv.h
View File

@ -84,12 +84,8 @@ public:
ModelEnv(const ModelEnv & e)
{
model_data = e.model_data;
finder_helper = e.finder_helper;
cursor_helper = e.cursor_helper;
model_work_mode = e.model_work_mode;
model_work_submode = e.model_work_submode;
dump_mode = e.dump_mode;
copy_global_objects(e);
table_index = e.table_index;
set_field_name_helper = e.set_field_name_helper;
field_value_helper_tab = e.field_value_helper_tab;