changed: some methods from ModelConnector moved to Model

git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1119 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2018-07-04 11:34:49 +00:00
parent f85f03a889
commit 08cd621d41
5 changed files with 324 additions and 468 deletions

View File

@@ -148,19 +148,35 @@ void Model::to_text(PT::TextStream & stream, bool clear_stream)
stream.clear();
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_FLAT_STRING;
if( model_connector )
{
model_connector->to_text(stream, *this);
FlatConnector * flat_connector = model_connector->get_flat_connector();
if( flat_connector )
{
flat_connector->to_text(stream, *this);
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
void Model::to_text(std::string & str, bool clear_string)
{
PT::TextStream stream;
if( model_connector )
{
// CHECK ME what if the stream is being used by something other?
PT::TextStream * out_stream = model_connector->get_stream();
to_text(stream, false);
stream.to_string(str, clear_string);
if( out_stream )
{
to_text(*out_stream, true);
out_stream->to_string(str, clear_string);
}
}
}
@@ -168,7 +184,7 @@ std::string Model::to_text()
{
std::string str;
to_text(str);
to_text(str, false);
return str;
}
@@ -179,15 +195,26 @@ std::string Model::to_string()
}
void Model::generate_insert_query(PT::TextStream & stream)
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
if( model_connector )
{
model_connector->generate_insert_query(stream, *this);
DbConnector * db_connector = model_connector->get_db_connector();
if( db_connector )
{
db_connector->generate_insert_query(stream, *this);
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
bool Model::insert(ModelData * model_data)
{
bool result = false;
@@ -195,20 +222,38 @@ bool Model::insert(ModelData * model_data)
if( model_connector )
{
this->model_data = model_data;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
if( model_connector->insert(*this) )
// CHECK ME what if the stream is being used by something other?
PT::TextStream * out_stream = model_connector->get_stream();
if( db_connector && out_stream )
{
save_mode = DO_UPDATE_ON_SAVE; // IMPROVE ME check if there is a primary key
result = true;
before_insert();
out_stream->clear();
result = db_connector->insert(*out_stream, *this);
if( result )
{
save_mode = DO_UPDATE_ON_SAVE; // IMPROVE ME check if there is a primary key
after_insert();
}
else
{
after_insert_failure();
}
}
this->model_data = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
return result;
}
bool Model::insert(ModelData & model_data)
{
return insert(&model_data);
@@ -217,10 +262,19 @@ bool Model::insert(ModelData & model_data)
void Model::generate_update_query(PT::TextStream & stream)
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
if( model_connector )
{
model_connector->generate_update_query(stream, *this);
DbConnector * db_connector = model_connector->get_db_connector();
if( db_connector )
{
db_connector->generate_update_query(stream, *this);
}
}
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
@@ -231,8 +285,26 @@ bool Model::update(ModelData * model_data)
if( model_connector )
{
this->model_data = model_data;
result = model_connector->update(*this);
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?
PT::TextStream * out_stream = model_connector->get_stream();
if( db_connector && out_stream )
{
before_update();
out_stream->clear();
result = db_connector->update(*out_stream, *this);
if( result )
after_update();
else
after_update_failure();
}
this->model_data = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
return result;
@@ -249,7 +321,15 @@ void Model::generate_remove_query(PT::TextStream & stream)
{
if( model_connector )
{
model_connector->generate_remove_query(stream, *this);
DbConnector * db_connector = model_connector->get_db_connector();
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;
}
}
@@ -261,14 +341,31 @@ bool Model::remove(ModelData * model_data)
if( model_connector )
{
this->model_data = model_data;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
DbConnector * db_connector = model_connector->get_db_connector();
if( model_connector->remove(*this) )
// CHECK ME what if the stream is being used by something other?
PT::TextStream * out_stream = model_connector->get_stream();
if( db_connector && out_stream )
{
save_mode = DO_INSERT_ON_SAVE;
result = true;
before_remove();
out_stream->clear();
result = db_connector->remove(*out_stream, *this);
if( result )
{
save_mode = DO_INSERT_ON_SAVE;
after_remove();
}
else
{
after_remove_failure();
}
}
this->model_data = nullptr;
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
return result;
@@ -300,7 +397,7 @@ bool Model::save(ModelData * model_data)
break;
case DO_NOTHING_ON_SAVE:
// may return true?
result = true;
break;
}
@@ -314,20 +411,48 @@ bool Model::save(ModelData & model_data)
}
void Model::clear()
void Model::generate_select_columns(PT::TextStream & stream, const std::wstring & column_prefix)
{
if( model_connector )
{
model_connector->clear_values(*this);
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;
}
}
void Model::map_values_from_query()
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_READING_VALUE_FROM_DB_RESULTSET;
map_fields();
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
void Model::clear()
{
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_CLEARING_VALUE;
map_fields();
model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
save_mode = DO_INSERT_ON_SAVE;
model_data = nullptr;
// do not set model_connector_mode here as it can be set to 'clearing'
}
void Model::before_select()
{
}
@@ -381,6 +506,11 @@ int Model::get_connector_mode()
return model_connector_mode;
}
bool Model::is_empty_field(const wchar_t * value)
{
return (!value || *value == '\0');
}
} // namespace