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

some work in branches/join_models

Browse Source 
added: ModelEnv class - now Model has a pointer to ModelEnv
       and ModelEnv has a pointer to ModelData, model_connector_mode, table_index and doc_field_pointer
       



git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1191 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2019-05-13 17:59:28 +00:00
parent 34ddf11351
commit b37a577713
9 changed files with 441 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
src/model.cpp
View File

@@ -41,11 +41,8 @@ namespace morm
Model::Model()
{
model_connector = nullptr;
model_data = nullptr;
doc_field_pointer = nullptr;
model_env = nullptr;
save_mode = DO_INSERT_ON_SAVE;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
query_result = nullptr;
}
@@ -53,11 +50,7 @@ Model::Model(const Model & m)
{
model_connector = m.model_connector;
save_mode = m.save_mode;
model_data = nullptr;
doc_field_pointer = nullptr; // does it need to be copied?
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
query_result = nullptr;
model_env = m.model_env; // or just set to null?
}
@@ -65,6 +58,7 @@ Model::~Model()
{
}
void Model::set_save_mode(SaveMode save_mode)
{
this->save_mode = save_mode;
@@ -170,7 +164,10 @@ void Model::to_text(PT::TextStream & stream, ModelData * model_data, bool clear_
stream.clear();
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING;
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING;
if( model_connector )
{
@@ -178,13 +175,14 @@ void Model::to_text(PT::TextStream & stream, ModelData * model_data, bool clear_
if( flat_connector )
{
this->model_data = model_data;
this->model_env->model_data = model_data;
flat_connector->to_text(stream, *this);
this->model_data = nullptr;
this->model_env->model_data = nullptr;
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
// what about if an exception was thrown? this pointer will not be null
model_env = nullptr;
}
@@ -247,7 +245,7 @@ std::string Model::to_string()
void Model::generate_insert_query(PT::TextStream & stream)
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
if( model_connector )
{
@@ -259,7 +257,7 @@ void Model::generate_insert_query(PT::TextStream & stream)
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
@@ -270,8 +268,11 @@ bool Model::insert(ModelData * model_data)
if( model_connector )
{
this->model_data = model_data;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
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;
DbConnector * db_connector = model_connector->get_db_connector();
// CHECK ME what if the stream is being used by something other?
@@ -294,8 +295,8 @@ bool Model::insert(ModelData * model_data)
}
}
this->model_data = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
// what about if an exception was thrown? this pointer will not be null
model_env = nullptr;
}
return result;
@@ -311,7 +312,7 @@ bool Model::insert(ModelData & model_data)
void Model::generate_update_query(PT::TextStream & stream)
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
if( model_connector )
{
@@ -323,7 +324,7 @@ void Model::generate_update_query(PT::TextStream & stream)
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
@@ -333,8 +334,11 @@ bool Model::update(ModelData * model_data)
if( model_connector )
{
this->model_data = model_data;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
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;
DbConnector * db_connector = model_connector->get_db_connector();
// CHECK ME what if the stream is being used by something other?
@@ -352,8 +356,8 @@ bool Model::update(ModelData * model_data)
after_update_failure();
}
this->model_data = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
// what about if an exception was thrown? this pointer will not be null
model_env = nullptr;
}
return result;
@@ -371,14 +375,14 @@ void Model::generate_remove_query(PT::TextStream & stream)
if( model_connector )
{
DbConnector * db_connector = model_connector->get_db_connector();
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
if( db_connector )
{
db_connector->generate_remove_query(stream, *this);
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
}
@@ -389,8 +393,11 @@ bool Model::remove(ModelData * model_data)
if( model_connector )
{
this->model_data = model_data;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
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;
DbConnector * db_connector = model_connector->get_db_connector();
// CHECK ME what if the stream is being used by something other?
@@ -413,8 +420,8 @@ bool Model::remove(ModelData * model_data)
}
}
this->model_data = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
// what about if an exception was thrown? this pointer will not be null
model_env = nullptr;
}
return result;
@@ -460,21 +467,17 @@ bool Model::save(ModelData & model_data)
}
void Model::generate_select_columns(PT::TextStream & stream, const std::string & column_prefix, ModelData * model_data)
void Model::generate_select_columns(PT::TextStream & stream, const std::string & column_prefix)
{
if( model_connector )
if( model_connector && model_env )
{
this->model_data = model_data;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
if( db_connector )
{
db_connector->generate_select_columns(stream, *this, column_prefix);
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
this->model_data = nullptr;
}
}
@@ -487,7 +490,7 @@ void Model::generate_doc_for_flat(PT::TextStream & stream, bool clear_stream)
stream.clear();
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_FLAT;
if( model_connector )
{
@@ -499,7 +502,7 @@ void Model::generate_doc_for_flat(PT::TextStream & stream, bool clear_stream)
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
@@ -510,7 +513,7 @@ void Model::generate_doc_for_db(PT::TextStream & stream, bool clear_stream)
stream.clear();
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_DB;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DOC_FOR_DB;
if( model_connector )
{
@@ -522,37 +525,35 @@ void Model::generate_doc_for_db(PT::TextStream & stream, bool clear_stream)
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
void Model::map_values_from_query(QueryResult * query_result)
void Model::map_values_from_query()
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET;
this->query_result = query_result;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET;
map_fields();
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
this->query_result = nullptr;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
void Model::clear()
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE;
ModelEnv model_env_local;
model_env = &model_env_local;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE;
map_fields();
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
model_env = nullptr;
save_mode = DO_INSERT_ON_SAVE;
model_data = nullptr;
}
void Model::prepare_to_select()
{
table_index = 1;
model_env->table_index = 1;
}
@@ -610,9 +611,30 @@ void Model::after_remove_failure()
int Model::get_connector_mode()
{
return model_connector_mode;
if( model_env )
{
return model_env->model_connector_mode;
}
else
{
return MORM_MODEL_CONNECTOR_MODE_NONE;
}
}
ModelData * Model::get_model_data()
{
if( model_env )
{
return model_env->model_data;
}
else
{
return nullptr;
}
}
bool Model::is_empty_field(const wchar_t * value)
{
return (!value || *value == '\0');