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

fixed: add_field_for_select from Model incorrectly escaped a field string (column name)

Browse Source 
fixed: Finder didn't use full table name (schema.table) in "from" clause
This commit is contained in:
Tomasz Sowa
2021-04-12 18:53:55 +02:00
parent 79fd642ef7
commit 9a4fd9b050
6 changed files with 47 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/baseexpression.h
View File

@@ -81,12 +81,12 @@ public:
if( work_mode == MORM_WORK_MODE_MODEL_FIELDS )
{
put_field_name(field_name, model_env);
put_field_name(field_name, field_type, model_env);
}
else
if( work_mode == MORM_WORK_MODE_MODEL_SAVE_FIELDS )
{
save_foreign_key(field_name, model_env);
save_foreign_key(field_name, field_type, model_env);
}
else
if( work_mode == MORM_WORK_MODE_MODEL_VALUES )
@@ -100,7 +100,7 @@ public:
{
if( (size_t)model_env->field_index < model_env->set_field_name_helper->size() )
{
put_field_name((*model_env->set_field_name_helper)[model_env->field_index], model_env);
put_field_name((*model_env->set_field_name_helper)[model_env->field_index], field_type, model_env);
put_name_value_separator();
put_field_value_or_null(field_value, field_type, model_env);
}
@@ -109,7 +109,7 @@ public:
}
else
{
put_field_name(field_name, model_env);
put_field_name(field_name, field_type, model_env);
put_name_value_separator();
put_field_value_or_null(field_value, field_type, model_env);
}
@@ -172,7 +172,7 @@ public:
// else
if( work_mode == MORM_WORK_MODE_MODEL_FIELDS_VALUES )
{
put_field_name(field_name, model_env);
put_field_name(field_name, field_type, model_env);
put_name_value_separator();
put_field_value_list(field_value, model_connector, model_env);
}
@@ -190,7 +190,7 @@ public:
if( work_mode == MORM_WORK_MODE_MODEL_FIELDS )
{
put_field_name(field_name, model_env);
put_field_name(field_name, field_type, model_env);
}
else
if( work_mode == MORM_WORK_MODE_MODEL_VALUES )
@@ -200,7 +200,7 @@ public:
else
if( work_mode == MORM_WORK_MODE_MODEL_FIELDS_VALUES )
{
put_field_name(field_name, model_env);
put_field_name(field_name, field_type, model_env);
put_name_value_separator();
generate_from_model(field_model);
}
@@ -274,10 +274,8 @@ protected:
virtual void field_before();
virtual void field_after();
virtual void put_field_name(const wchar_t * field_name, ModelEnv * model_env);
virtual void save_foreign_key(const wchar_t * field_name, ModelEnv * model_env);
virtual void put_field_name(const wchar_t * field_name, FT field_type, ModelEnv * model_env);
virtual void save_foreign_key(const wchar_t * field_name, FT field_type, ModelEnv * model_env);
virtual void dump_additional_info(Model & model);
template<typename FieldValue>
@@ -573,7 +571,7 @@ protected:
this->out_stream = &stream;
field_before();
put_field_name(field_name, model_env);
put_field_name(field_name, FT::default_type, model_env);
put_name_value_separator();
bool is_first = true;