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

refactoring: ModelEnv::model_connector_mode renamed to model_work_mode

Browse Source 
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
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;
}
}