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

namespace PT renamed to pt

Browse Source
This commit is contained in:
Tomasz Sowa
2021-05-20 16:25:01 +02:00
parent b12037a7e5
commit 34274ca230
32 changed files with 383 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/model.cpp
View File

@@ -132,11 +132,11 @@ void Model::table()
{
if( model_connector )
{
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( plog )
{
(*plog) << PT::Log::log1 << "Morm: you should provide the table name e.g. provide table() method and call table(...) there" << PT::Log::logend;
(*plog) << pt::Log::log1 << "Morm: you should provide the table name e.g. provide table() method and call table(...) there" << pt::Log::logend;
}
}
}
@@ -178,7 +178,7 @@ bool Model::found()
}
void Model::get_table_name(PT::WTextStream & stream, bool with_schema_name, ModelData * model_data, bool clear_stream)
void Model::get_table_name(pt::WTextStream & stream, bool with_schema_name, ModelData * model_data, bool clear_stream)
{
if( clear_stream )
{
@@ -221,7 +221,7 @@ void Model::get_table_name(PT::WTextStream & stream, bool with_schema_name, Mode
void Model::get_table_name(std::wstring & str, bool with_schema_name, ModelData * model_data, bool clear_string)
{
PT::WTextStream stream;
pt::WTextStream stream;
if( clear_string )
str.clear();
@@ -233,14 +233,14 @@ void Model::get_table_name(std::wstring & str, bool with_schema_name, ModelData
void Model::get_table_name(std::string & str, bool with_schema_name, ModelData * model_data, bool clear_string)
{
PT::WTextStream stream;
pt::WTextStream stream;
get_table_name(stream, with_schema_name, model_data, false);
PT::WideStreamToUTF8(stream, str, clear_string);
pt::WideStreamToUTF8(stream, str, clear_string);
}
void Model::to_text(PT::TextStream & stream, ModelData * model_data, bool clear_stream, bool dump_mode)
void Model::to_text(pt::TextStream & stream, ModelData * model_data, bool clear_stream, bool dump_mode)
{
if( clear_stream )
{
@@ -278,13 +278,13 @@ void Model::to_text(PT::TextStream & stream, ModelData * model_data, bool clear_
}
void Model::to_text(PT::TextStream & stream, ModelData & model_data, bool clear_stream, bool dump_mode)
void Model::to_text(pt::TextStream & stream, ModelData & model_data, bool clear_stream, bool dump_mode)
{
to_text(stream, &model_data, clear_stream, dump_mode);
}
void Model::to_text(PT::TextStream & stream, bool clear_stream, bool dump_mode)
void Model::to_text(pt::TextStream & stream, bool clear_stream, bool dump_mode)
{
to_text(stream, nullptr, clear_stream, dump_mode);
}
@@ -296,7 +296,7 @@ void Model::to_text(std::string & str, ModelData * model_data, bool clear_string
if( model_connector )
{
// CHECK ME what if the stream is being used by something other?
PT::TextStream * out_stream = model_connector->get_stream();
pt::TextStream * out_stream = model_connector->get_stream();
if( out_stream )
{
@@ -336,7 +336,7 @@ std::string Model::to_string()
void Model::generate_insert_query(PT::TextStream & stream, ModelData * model_data)
void Model::generate_insert_query(pt::TextStream & stream, ModelData * model_data)
{
ModelEnv model_env_local;
model_env = &model_env_local;
@@ -424,7 +424,7 @@ bool Model::insert_tree(bool insert_whole_tree)
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();
pt::TextStream * out_stream = model_connector->get_stream();
if( db_connector && out_stream )
{
@@ -470,7 +470,7 @@ bool Model::insert_tree(bool insert_whole_tree)
void Model::generate_update_query(PT::TextStream & stream, ModelData * model_data)
void Model::generate_update_query(pt::TextStream & stream, ModelData * model_data)
{
ModelEnv model_env_local;
model_env = &model_env_local;
@@ -555,7 +555,7 @@ bool Model::update_tree(bool update_whole_tree)
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();
pt::TextStream * out_stream = model_connector->get_stream();
if( db_connector && out_stream )
{
@@ -581,7 +581,7 @@ bool Model::update_tree(bool update_whole_tree)
}
void Model::generate_remove_query(PT::TextStream & stream, ModelData * model_data)
void Model::generate_remove_query(pt::TextStream & stream, ModelData * model_data)
{
ModelEnv model_env_local;
model_env = &model_env_local;
@@ -667,7 +667,7 @@ bool Model::remove_tree(bool remove_whole_tree)
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();
pt::TextStream * out_stream = model_connector->get_stream();
if( db_connector && out_stream )
{
@@ -793,7 +793,7 @@ bool Model::save_tree(bool save_whole_tree)
}
void Model::generate_select_columns(PT::TextStream & stream)
void Model::generate_select_columns(pt::TextStream & stream)
{
if( model_connector && model_env )
{
@@ -979,7 +979,7 @@ void Model::log_table_name(bool put_schema_name)
{
if( model_connector && model_env )
{
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( plog )
{
@@ -1002,7 +1002,7 @@ void Model::log_table_name_with_field(const wchar_t * db_field_name, bool put_sc
{
if( model_connector && model_env )
{
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( plog )
{
@@ -1030,17 +1030,17 @@ void Model::put_to_log(const wchar_t * str)
{
if( model_connector )
{
PT::Log * log = model_connector->get_logger();
pt::Log * log = model_connector->get_logger();
if( log )
{
(*log) << str << PT::Log::logend;
(*log) << str << pt::Log::logend;
}
}
}
void Model::put_fields_to_log(PT::Log & log, const wchar_t * db_field_name, const wchar_t * flat_field_name)
void Model::put_fields_to_log(pt::Log & log, const wchar_t * db_field_name, const wchar_t * flat_field_name)
{
bool was_db_field_put = false;
bool was_flat_field_put = false;
@@ -1077,12 +1077,12 @@ void Model::field_model_left_join(const wchar_t * db_field_name, Model & field_m
if( model_env && field_model.model_env && model_env->finder_helper )
{
model_env->finder_helper->foreign_keys.clear();
PT::TextStream & join_tables_str = model_env->finder_helper->join_tables_str;
pt::TextStream & join_tables_str = model_env->finder_helper->join_tables_str;
field_model.model_env->add_table_name_to_finder_helper();
join_tables_str << "LEFT JOIN ";
PT::TextStream * db_expression_stream = db_expression->get_text_stream();
pt::TextStream * db_expression_stream = db_expression->get_text_stream();
int expr_work_mode = db_expression->get_work_mode();
int expr_output_type = db_expression->get_output_type();
bool expr_allow_prefix = db_expression->get_allow_to_use_prefix();
@@ -1149,7 +1149,7 @@ void Model::field_model_left_join(const wchar_t * db_field_name, Model & field_m
void Model::field_model_save_key(const wchar_t * db_field_name)
{
DbConnector * db_connector = model_connector->get_db_connector();
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( db_connector )
{
@@ -1165,9 +1165,9 @@ void Model::field_model_save_key(const wchar_t * db_field_name)
if( model_env->field_value_helper_tab->empty() && plog )
{
(*plog) << PT::Log::log1 << "Morm: I cannot find a primary key in ";
(*plog) << pt::Log::log1 << "Morm: I cannot find a primary key in ";
log_table_name();
(*plog) << PT::Log::logend;
(*plog) << pt::Log::logend;
}
}
}
@@ -1180,7 +1180,7 @@ void Model::field_model_save_key(const wchar_t * db_field_name)
void Model::field_model_set_parent_key_in_child(const wchar_t * db_field_name, Model & field_model)
{
DbConnector * db_connector = model_connector->get_db_connector();
PT::Log * log = model_connector->get_logger();
pt::Log * log = model_connector->get_logger();
if( db_connector )
{
@@ -1207,19 +1207,19 @@ void Model::field_model_set_parent_key_in_child(const wchar_t * db_field_name, M
{
if( field_model.model_env->field_index == 0 )
{
(*log) << PT::Log::log1 << "Morm: there is no a foreign key in ";
(*log) << pt::Log::log1 << "Morm: there is no a foreign key in ";
field_model.log_table_name();
(*log) << " called " << db_field_name << " pointing to ";
log_table_name();
(*log) << PT::Log::logend;
(*log) << pt::Log::logend;
}
else
{
(*log) << PT::Log::log1 << "Morm: primary key in ";
(*log) << pt::Log::log1 << "Morm: primary key in ";
log_table_name();
(*log) << " consists of " << model_env->field_index << " column(s) but foreign key in ";
field_model.log_table_name();
(*log) << " consists of " << field_model.model_env->field_index << " column(s)" << PT::Log::logend;
(*log) << " consists of " << field_model.model_env->field_index << " column(s)" << pt::Log::logend;
}
}
@@ -1228,10 +1228,10 @@ void Model::field_model_set_parent_key_in_child(const wchar_t * db_field_name, M
else
if( log )
{
(*log) << PT::Log::log1 << "Morm: primary key in ";
(*log) << pt::Log::log1 << "Morm: primary key in ";
log_table_name();
(*log) << " consists of incorrect number of columns, expected " << helper_tab.size()
<< " column(s) but got " << model_env->field_index << PT::Log::logend;
<< " column(s) but got " << model_env->field_index << pt::Log::logend;
}
}
}
@@ -1439,13 +1439,13 @@ void Model::field_model(const wchar_t * db_field_name, const wchar_t * flat_fiel
}
else
{
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( plog )
{
(*plog) << PT::Log::log1 << "Morm: error in ";
(*plog) << pt::Log::log1 << "Morm: error in ";
log_table_name_with_field(db_field_name);
(*plog) << " field, you should set FT::is_foreign_key or FT::is_foreign_key_in_child flag for a model child object" << PT::Log::logend;
(*plog) << " field, you should set FT::is_foreign_key or FT::is_foreign_key_in_child flag for a model child object" << pt::Log::logend;
}
}
}
@@ -1543,7 +1543,7 @@ bool Model::db_query(const std::string & raw_sql)
}
bool Model::db_query(const PT::TextStream & raw_sql)
bool Model::db_query(const pt::TextStream & raw_sql)
{
bool status = false;