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

10
src/model.h
View File

@@ -1324,6 +1324,8 @@ public:
template<typename FieldValue>
void add_field_for_select(const wchar_t * new_column_expression, const wchar_t * new_column_name, const wchar_t * flat_field_name, FieldValue & field_value)
{
FT field_type = FT::no_insertable | FT::no_updatable | FT::raw_field_name;
if( model_connector && model_env )
{
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DB_SQL )
@@ -1336,24 +1338,24 @@ public:
if( db_expression && !is_empty_field(new_column_expression) )
{
db_expression->add_field_for_select(new_column_expression, new_column_name, field_value);
db_expression->add_field_for_select(new_column_expression, new_column_name, field_value, field_type, model_env);
}
}
}
else
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING )
{
field_generic(L"", flat_field_name, field_value, false, false, false);
field_generic(L"", flat_field_name, field_value, field_type);
}
else
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_READING_VALUE_FROM_DB_RESULTSET )
{
field_generic(new_column_name, L"", field_value, false, false, false);
field_generic(new_column_name, L"", field_value, field_type);
}
else
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_CLEARING_VALUE )
{
field_generic(L"", L"", field_value, false, false, false); // the names don't matter here
field_generic(L"", L"", field_value, field_type); // the names don't matter here
}
}
}