reorganizing class hierarchy

git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1075 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2018-03-23 19:26:57 +00:00
parent de7fc912bb
commit d84ca900c3
27 changed files with 2380 additions and 874 deletions

View File

@@ -58,49 +58,46 @@ void Model::set_connector(ModelConnector & connector)
}
void Model::to_json(PT::TextStream & stream)
void Model::to_text(PT::TextStream & stream)
{
if( model_connector )
{
model_connector->to_json(stream, *this);
model_connector->to_text(stream, *this);
}
}
void Model::to_json(std::string & str)
void Model::to_text(std::string & str)
{
PT::TextStream stream;
to_json(stream);
to_text(stream);
stream.to_string(str);
}
std::string Model::to_json()
std::string Model::to_text()
{
std::string str;
to_json(str);
to_text(str);
return str;
}
std::string Model::to_string()
{
return to_text();
}
void Model::insert(PT::TextStream & stream, int orm_db_type)
void Model::generate_insert_query(PT::TextStream & stream)
{
if( model_connector )
{
model_connector->insert(stream, *this, orm_db_type);
model_connector->generate_insert_query(stream, *this);
}
}
void Model::insert(PT::TextStream & stream)
{
if( model_connector )
{
model_connector->insert(stream, *this);
}
}
void Model::insert()
{
@@ -110,21 +107,15 @@ void Model::insert()
}
}
void Model::update(PT::TextStream & stream, int orm_db_type)
void Model::generate_update_query(PT::TextStream & stream)
{
if( model_connector )
{
model_connector->update(stream, *this, orm_db_type);
model_connector->generate_update_query(stream, *this);
}
}
void Model::update(PT::TextStream & stream)
{
if( model_connector )
{
model_connector->update(stream, *this);
}
}
void Model::update()
{