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

refactoring: ModelEnv::model_connector_mode renamed to model_work_mode 

ModelEnv::model_connector_submode renamed to model_work_submode
             and similarly macros MORM_MODEL_CONNECTOR_MODE.* -> MORM_MODEL_WORK_MODE_*
	     MORM_MODEL_CONNECTOR_SUBMODE.* -> MORM_MODEL_WORK_SUBMODE_*



git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1212 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa 2019-09-18 15:28:06 +00:00
parent 3d73a64f23
commit bb3f69fe8d
4 changed files with 100 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/model.cpp
View File

@ -134,7 +134,7 @@ void Model::to_text(PT::TextStream & stream, ModelData * model_data, bool clear_
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING;
model_env->dump_mode = dump_mode;
if( model_connector )
@ -216,7 +216,7 @@ void Model::generate_insert_query(PT::TextStream & stream, ModelData * model_dat
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_data = model_data;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
if( model_connector )
{
@ -262,14 +262,14 @@ bool Model::insert_tree(bool insert_whole_tree)
if( insert_whole_tree )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_INSERT;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_INSERT;
map_fields();
}
if( model_connector )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
// CHECK ME what if the stream is being used by something other?
@ -297,8 +297,8 @@ bool Model::insert_tree(bool insert_whole_tree)
if( insert_whole_tree )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_INSERT;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_INSERT;
map_fields();
}
@ -312,7 +312,7 @@ void Model::generate_update_query(PT::TextStream & stream, ModelData * model_dat
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_data = model_data;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
if( model_connector )
{
@ -357,14 +357,14 @@ bool Model::update_tree(bool update_whole_tree)
if( update_whole_tree )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_UPDATE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_UPDATE;
map_fields();
}
if( model_connector )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
// CHECK ME what if the stream is being used by something other?
@ -385,8 +385,8 @@ bool Model::update_tree(bool update_whole_tree)
if( update_whole_tree )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_UPDATE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_UPDATE;
map_fields();
}
@ -399,7 +399,7 @@ void Model::generate_remove_query(PT::TextStream & stream, ModelData * model_dat
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_data = model_data;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
if( model_connector )
{
@ -445,14 +445,14 @@ bool Model::remove_tree(bool remove_whole_tree)
if( remove_whole_tree )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_REMOVE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_REMOVE;
map_fields();
}
if( model_connector )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
// CHECK ME what if the stream is being used by something other?
@ -478,8 +478,8 @@ bool Model::remove_tree(bool remove_whole_tree)
if( remove_whole_tree )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_REMOVE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_REMOVE;
map_fields();
}
@ -517,11 +517,11 @@ bool Model::save_tree(bool save_whole_tree)
if( save_whole_tree )
{
if( save_mode == DO_DELETE_ON_SAVE )
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
else
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_SAVE;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_SAVE;
map_fields();
}
@ -551,11 +551,11 @@ bool Model::save_tree(bool save_whole_tree)
if( save_whole_tree )
{
if( save_mode == DO_DELETE_ON_SAVE )
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY;
else
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY;
model_env->model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_SAVE;
model_env->model_work_submode = MORM_MODEL_WORK_SUBMODE_SAVE;
map_fields();
}
@ -567,7 +567,7 @@ void Model::generate_select_columns(PT::TextStream & stream)
{
if( model_connector && model_env )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
if( db_connector )
@ -586,7 +586,7 @@ void Model::generate_doc_for_flat(PT::TextStream & stream, bool clear_stream)
stream.clear();
}
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT;
if( model_connector )
{
@ -598,7 +598,7 @@ void Model::generate_doc_for_flat(PT::TextStream & stream, bool clear_stream)
}
}
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_NONE;
}
@ -609,7 +609,7 @@ void Model::generate_doc_for_db(PT::TextStream & stream, bool clear_stream)
stream.clear();
}
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_DB;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_DB;
if( model_connector )
{
@ -621,7 +621,7 @@ void Model::generate_doc_for_db(PT::TextStream & stream, bool clear_stream)
}
}
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_NONE;
}
@ -629,10 +629,10 @@ void Model::map_values_from_query()
{
if( model_env )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_READING_VALUE_FROM_DB_RESULTSET;
model_env->all_fields_are_null = true;
map_fields();
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_NONE;
if( model_env->all_fields_are_null )
{
@ -652,7 +652,7 @@ void Model::clear()
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_CLEARING_VALUE;
map_fields();
model_env = nullptr;
@ -713,15 +713,15 @@ void Model::after_remove_failure()
{
}
int Model::get_connector_mode()
int Model::get_work_mode()
{
if( model_env )
{
return model_env->model_connector_mode;
return model_env->model_work_mode;
}
else
{
return MORM_MODEL_CONNECTOR_MODE_NONE;
return MORM_MODEL_WORK_MODE_NONE;
}
}

76
src/model.h
View File

@ -139,7 +139,7 @@ public:
{
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_SET_FIELD_VALUE;
model_env->field_index = 0;
FieldValueHelper field_value_helper;
@ -186,7 +186,7 @@ protected:
virtual void after_update_failure();
virtual void after_remove_failure();
virtual int get_connector_mode();
virtual int get_work_mode();
virtual ModelData * get_model_data();
@ -825,37 +825,37 @@ protected:
{
if( model_connector && model_env )
{
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_SET_FIELD_VALUE )
{
field_generic_set_field_value(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_ITERATE_PRIMARY_KEY_VALUES )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_ITERATE_PRIMARY_KEY_VALUES )
{
field_generic_iterate_primary_key_values(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING )
{
field_generic_generate_flat_string(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DB_SQL )
{
field_generic_generate_db_sql(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_READING_VALUE_FROM_DB_RESULTSET )
{
field_generic_read_value_from_db_resultset(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_CLEARING_VALUE )
{
field_generic_clear_value(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT )
{
field_generic_generate_doc_for_flat(db_field_name, flat_field_name, field_value, insertable, updatable, is_primary_key);
}
@ -939,8 +939,8 @@ protected:
if( db_expression && !is_empty_field(db_field_name) )
{
int old_connector_mode = model_env->model_connector_mode;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_PRIMARY_KEY_VALUES;
int old_work_mode = model_env->model_work_mode;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_ITERATE_PRIMARY_KEY_VALUES;
FieldValueHelper helper; // in the future we can have a primary key from more than one column
helper.db_field_name = db_field_name;
@ -961,7 +961,7 @@ protected:
{
ModelEnv model_env_local;
model_env_local.copy_global_objects(*model_env);
model_env_local.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE;
model_env_local.model_work_mode = MORM_MODEL_WORK_MODE_SET_FIELD_VALUE;
model_env_local.field_value_helper_tab = &helper_tab;
model_env_local.field_index = 0;
field_model.model_env = &model_env_local;
@ -993,7 +993,7 @@ protected:
}
model_env->field_value_helper_tab = nullptr;
model_env->model_connector_mode = old_connector_mode;
model_env->model_work_mode = old_work_mode;
}
}
}
@ -1003,22 +1003,22 @@ protected:
{
if( !is_empty_field(db_field_name) )
{
if( model_env->model_connector_submode == MORM_MODEL_CONNECTOR_SUBMODE_INSERT )
if( model_env->model_work_submode == MORM_MODEL_WORK_SUBMODE_INSERT )
{
field_model.insert_tree(true);
}
if( model_env->model_connector_submode == MORM_MODEL_CONNECTOR_SUBMODE_UPDATE )
if( model_env->model_work_submode == MORM_MODEL_WORK_SUBMODE_UPDATE )
{
field_model.update_tree(true);
}
if( model_env->model_connector_submode == MORM_MODEL_CONNECTOR_SUBMODE_REMOVE )
if( model_env->model_work_submode == MORM_MODEL_WORK_SUBMODE_REMOVE )
{
field_model.remove_tree(true);
}
if( model_env->model_connector_submode == MORM_MODEL_CONNECTOR_SUBMODE_SAVE )
if( model_env->model_work_submode == MORM_MODEL_WORK_SUBMODE_SAVE )
{
field_model.save_tree(true);
}
@ -1039,7 +1039,7 @@ protected:
{
if( model_env->dump_mode || field_model.save_mode == DO_INSERT_ON_SAVE || field_model.save_mode == DO_UPDATE_ON_SAVE )
{
field_model.model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING;
field_model.model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING;
flat_expression->field_model(flat_field_name, field_model, insertable, updatable, false, model_env);
}
}
@ -1057,7 +1057,7 @@ protected:
if( db_expression && !is_empty_field(db_field_name) )
{
field_model.model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
field_model.model_env->model_work_mode = MORM_MODEL_WORK_MODE_GENERATING_DB_SQL;
field_model.table_name(field_model.model_env->table_name);
db_expression->prepare_short_table_name(field_model.model_env->table_name, field_model.model_env->table_name_short);
@ -1109,7 +1109,7 @@ protected:
field_model.map_fields();
}
field_model.model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
field_model.model_env->model_work_mode = MORM_MODEL_WORK_MODE_NONE;
}
}
}
@ -1185,7 +1185,7 @@ protected:
field_model.model_env = &model_env_local;
field_model.set_connector(model_connector);
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_SET_PARENT_ID )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_SET_PARENT_ID )
{
if( !has_foreign_key )
{
@ -1193,7 +1193,7 @@ protected:
}
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY )
{
if( has_foreign_key )
{
@ -1201,7 +1201,7 @@ protected:
}
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY )
{
if( !has_foreign_key )
{
@ -1209,27 +1209,27 @@ protected:
}
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING )
{
field_model_generate_flat_string(db_field_name, flat_field_name, field_model, insertable, updatable);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DB_SQL )
{
field_model_generate_db_sql(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_CLEARING_VALUE )
{
field_model_clear_values(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT )
{
field_model_generate_doc_flat(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_READING_VALUE_FROM_DB_RESULTSET )
{
field_model_read_values_from_queryresult(db_field_name, flat_field_name, field_model, insertable, updatable, has_foreign_key);
}
@ -1244,7 +1244,7 @@ protected:
{
if( model_connector && model_env )
{
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING )
{
FlatConnector * flat_connector = model_connector->get_flat_connector();
@ -1262,7 +1262,7 @@ protected:
}
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DB_SQL )
{
DbConnector * db_connector = model_connector->get_db_connector();
@ -1286,7 +1286,7 @@ protected:
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_CLEARING_VALUE )
{
Clearer * clearer = model_connector->get_clearer();
@ -1296,7 +1296,7 @@ protected:
}
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT )
{
FlatConnector * doc_connector = model_connector->get_doc_connector(); // different connector will be here (doc, flat)
@ -1457,7 +1457,7 @@ protected:
{
if( model_env )
{
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_SET_PARENT_ID;
model_env->model_work_mode = MORM_MODEL_WORK_MODE_SET_PARENT_ID;
map_fields();
}
}
@ -1484,9 +1484,9 @@ 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)
{
if( model_connector )
if( model_connector && model_env )
{
if( get_connector_mode() == MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_DB_SQL )
{
DbConnector * db_connector = model_connector->get_db_connector();
@ -1501,17 +1501,17 @@ public:
}
}
else
if( get_connector_mode() == MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING )
if( model_env->model_work_mode == MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING )
{
field_generic(L"", flat_field_name, field_value, false, false, false);
}
else
if( get_connector_mode() == MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET )
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);
}
else
if( get_connector_mode() == MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE )
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
}

16
src/modelenv.h
View File

@ -55,8 +55,8 @@ public:
ModelData * model_data;
FinderHelper * finder_helper;
CursorHelper * cursor_helper;
int model_connector_mode;
int model_connector_submode;
int model_work_mode;
int model_work_submode;
bool dump_mode;
// local objects
@ -89,8 +89,8 @@ public:
model_data = e.model_data;
finder_helper = e.finder_helper;
cursor_helper = e.cursor_helper;
model_connector_mode = e.model_connector_mode;
model_connector_submode = e.model_connector_submode;
model_work_mode = e.model_work_mode;
model_work_submode = e.model_work_submode;
dump_mode = e.dump_mode;
table_index = e.table_index;
doc_field_pointer = e.doc_field_pointer;
@ -109,8 +109,8 @@ public:
finder_helper = e.finder_helper;
cursor_helper = e.cursor_helper;
model_connector_mode = e.model_connector_mode;
model_connector_submode = e.model_connector_submode;
model_work_mode = e.model_work_mode;
model_work_submode = e.model_work_submode;
dump_mode = e.dump_mode;
// what about doc_field_pointer?
@ -121,8 +121,8 @@ public:
model_data = nullptr;
finder_helper = nullptr;
cursor_helper = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_connector_submode = MORM_MODEL_CONNECTOR_SUBMODE_NONE;
model_work_mode = MORM_MODEL_WORK_MODE_NONE;
model_work_submode = MORM_MODEL_WORK_SUBMODE_NONE;
dump_mode = false;
doc_field_pointer = nullptr;
table_name.clear();

36
src/morm_types.h
View File

@ -35,32 +35,32 @@
#ifndef headerfile_morm_morm_types
#define headerfile_morm_morm_types
#define MORM_MODEL_CONNECTOR_MODE_NONE 0
#define MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING 1
#define MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT 2
#define MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_DB 3
#define MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL 4
#define MORM_MODEL_WORK_MODE_NONE 0
#define MORM_MODEL_WORK_MODE_GENERATING_FLAT_STRING 1
#define MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_FLAT 2
#define MORM_MODEL_WORK_MODE_GENERATING_DOC_FOR_DB 3
#define MORM_MODEL_WORK_MODE_GENERATING_DB_SQL 4
// not used at the moment, there are not any flat parsers (json parser)
#define MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_FLAT_STRING 5
#define MORM_MODEL_WORK_MODE_READING_VALUE_FROM_FLAT_STRING 5
#define MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET 6
#define MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE 7
#define MORM_MODEL_WORK_MODE_READING_VALUE_FROM_DB_RESULTSET 6
#define MORM_MODEL_WORK_MODE_CLEARING_VALUE 7
#define MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY 8
#define MORM_MODEL_CONNECTOR_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY 9
#define MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITH_FOREIGN_KEY 8
#define MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY 9
#define MORM_MODEL_CONNECTOR_MODE_SET_PARENT_ID 10
#define MORM_MODEL_CONNECTOR_MODE_ITERATE_PRIMARY_KEY_VALUES 11
#define MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE 12
#define MORM_MODEL_WORK_MODE_SET_PARENT_ID 10
#define MORM_MODEL_WORK_MODE_ITERATE_PRIMARY_KEY_VALUES 11
#define MORM_MODEL_WORK_MODE_SET_FIELD_VALUE 12
// submodes used in some cases
#define MORM_MODEL_CONNECTOR_SUBMODE_NONE 0
#define MORM_MODEL_CONNECTOR_SUBMODE_INSERT 1
#define MORM_MODEL_CONNECTOR_SUBMODE_UPDATE 2
#define MORM_MODEL_CONNECTOR_SUBMODE_REMOVE 3
#define MORM_MODEL_CONNECTOR_SUBMODE_SAVE 4
#define MORM_MODEL_WORK_SUBMODE_NONE 0
#define MORM_MODEL_WORK_SUBMODE_INSERT 1
#define MORM_MODEL_WORK_SUBMODE_UPDATE 2
#define MORM_MODEL_WORK_SUBMODE_REMOVE 3
#define MORM_MODEL_WORK_SUBMODE_SAVE 4