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

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
}