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

54
src/model.h
View File

@@ -86,13 +86,13 @@ public:
void set_connector(ModelConnector * connector);
ModelConnector * get_connector();
virtual void get_table_name(PT::WTextStream & stream, bool with_schema_name = true, ModelData * model_data = nullptr, bool clear_stream = true);
virtual void get_table_name(pt::WTextStream & stream, bool with_schema_name = true, ModelData * model_data = nullptr, bool clear_stream = true);
virtual void get_table_name(std::wstring & str, bool with_schema_name = true, ModelData * model_data = nullptr, bool clear_string = true);
virtual void get_table_name(std::string & str, bool with_schema_name = true, ModelData * model_data = nullptr, bool clear_string = true);
virtual void to_text(PT::TextStream & stream, ModelData * model_data, bool clear_stream = true, bool dump_mode = false);
virtual void to_text(PT::TextStream & stream, ModelData & model_data, bool clear_stream = true, bool dump_mode = false);
virtual void to_text(PT::TextStream & stream, bool clear_stream = true, bool dump_mode = false);
virtual void to_text(pt::TextStream & stream, ModelData * model_data, bool clear_stream = true, bool dump_mode = false);
virtual void to_text(pt::TextStream & stream, ModelData & model_data, bool clear_stream = true, bool dump_mode = false);
virtual void to_text(pt::TextStream & stream, bool clear_stream = true, bool dump_mode = false);
virtual void to_text(std::string & str, ModelData * model_data, bool clear_string = true, bool dump_mode = false);
virtual void to_text(std::string & str, ModelData & model_data, bool clear_string = true, bool dump_mode = false);
@@ -101,17 +101,17 @@ public:
virtual std::string to_text();
virtual std::string to_string();
virtual void generate_insert_query(PT::TextStream & stream, ModelData * model_data = nullptr);
virtual void generate_insert_query(pt::TextStream & stream, ModelData * model_data = nullptr);
virtual bool insert(ModelData * model_data, bool insert_whole_tree = true);
virtual bool insert(ModelData & model_data, bool insert_whole_tree = true);
virtual bool insert(bool insert_whole_tree = true);
virtual void generate_update_query(PT::TextStream & stream, ModelData * model_data = nullptr);
virtual void generate_update_query(pt::TextStream & stream, ModelData * model_data = nullptr);
virtual bool update(ModelData * model_data, bool update_whole_tree = true);
virtual bool update(ModelData & model_data, bool update_whole_tree = true);
virtual bool update(bool update_whole_tree = true);
virtual void generate_remove_query(PT::TextStream & stream, ModelData * model_data = nullptr);
virtual void generate_remove_query(pt::TextStream & stream, ModelData * model_data = nullptr);
virtual bool remove(ModelData * model_data, bool remove_whole_tree = true);
virtual bool remove(ModelData & model_data, bool remove_whole_tree = true);
virtual bool remove(bool remove_whole_tree = true);
@@ -121,7 +121,7 @@ public:
virtual bool save(bool save_whole_tree = true);
virtual void generate_select_columns(PT::TextStream & stream);
virtual void generate_select_columns(pt::TextStream & stream);
// set object to default values
virtual void clear();
@@ -154,13 +154,13 @@ public:
if( !helper_tab.back().found && model_connector )
{
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( plog )
{
(*plog) << PT::Log::log1 << "Morm: I cannot find such a property: ";
(*plog) << pt::Log::log1 << "Morm: I cannot find such a property: ";
put_fields_to_log(*plog, db_field_name, flat_field_name);
(*plog) << PT::Log::logend;
(*plog) << pt::Log::logend;
}
}
@@ -219,7 +219,7 @@ protected:
virtual bool db_query(const char * raw_sql);
virtual bool db_query(const std::string & raw_sql);
virtual bool db_query(const PT::TextStream & raw_sql);
virtual bool db_query(const pt::TextStream & raw_sql);
/////////////////////////////////
/*
@@ -312,12 +312,12 @@ protected:
field_generic(field_name, field_name, field_value, field_type);
}
void field(const wchar_t * field_name, PT::Date & field_value, const FT & field_type = FT::default_type)
void field(const wchar_t * field_name, pt::Date & field_value, const FT & field_type = FT::default_type)
{
field_generic(field_name, field_name, field_value, field_type);
}
void field(const wchar_t * field_name, PT::Space & field_value, const FT & field_type = FT::default_type)
void field(const wchar_t * field_name, pt::Space & field_value, const FT & field_type = FT::default_type)
{
field_generic(field_name, field_name, field_value, field_type);
}
@@ -431,12 +431,12 @@ protected:
field_generic(db_field_name, flat_field_name, field_value, field_type);
}
void field(const wchar_t * db_field_name, const wchar_t * flat_field_name, PT::Date & field_value, const FT & field_type = FT::default_type)
void field(const wchar_t * db_field_name, const wchar_t * flat_field_name, pt::Date & field_value, const FT & field_type = FT::default_type)
{
field_generic(db_field_name, flat_field_name, field_value, field_type);
}
void field(const wchar_t * db_field_name, const wchar_t * flat_field_name, PT::Space & field_value, const FT & field_type = FT::default_type)
void field(const wchar_t * db_field_name, const wchar_t * flat_field_name, pt::Space & field_value, const FT & field_type = FT::default_type)
{
field_generic(db_field_name, flat_field_name, field_value, field_type);
}
@@ -474,7 +474,7 @@ protected:
if( model_env->field_index >= 0 && (size_t)model_env->field_index < model_env->field_value_helper_tab->size() )
{
FieldValueHelper & helper = (*model_env->field_value_helper_tab)[model_env->field_index];
PT::Log * log = model_connector->get_logger();
pt::Log * log = model_connector->get_logger();
if( (!helper.compare_db_field_name || is_the_same_field(db_field_name, helper.db_field_name)) &&
(!helper.compare_flat_field_name || is_the_same_field(flat_field_name, helper.flat_field_name)) )
@@ -489,12 +489,12 @@ protected:
{
if( log )
{
(*log) << PT::Log::log1 << "Morm: incorrect type of a field in ";
(*log) << pt::Log::log1 << "Morm: incorrect type of a field in ";
log_table_name();
(*log) << ", ";
put_fields_to_log(*log, db_field_name, flat_field_name);
(*log) << ", type expected " << typeid(field_value).name()
<< " got " << helper.value_type_info->name() << PT::Log::logend;
<< " got " << helper.value_type_info->name() << pt::Log::logend;
}
}
}
@@ -749,7 +749,7 @@ protected:
{
if( model_connector && model_env )
{
PT::Log * plog = model_connector->get_logger();
pt::Log * plog = model_connector->get_logger();
if( !is_empty_field(db_field_name) )
{
@@ -762,7 +762,7 @@ protected:
{
if( plog )
{
(*plog) << PT::Log::log1 << "Morm: error: FT::is_foreign_key is not implemented for a list/vector yet" << PT::Log::logend;
(*plog) << pt::Log::log1 << "Morm: error: FT::is_foreign_key is not implemented for a list/vector yet" << pt::Log::logend;
return;
}
}
@@ -785,9 +785,9 @@ protected:
{
if( plog )
{
(*plog) << PT::Log::log1 << "Morm: ignoring ";
(*plog) << pt::Log::log1 << "Morm: ignoring ";
log_table_name_with_field(db_field_name);
(*plog) << " as this is not a container with Model objects" << PT::Log::logend;
(*plog) << " as this is not a container with Model objects" << pt::Log::logend;
}
}
}
@@ -795,9 +795,9 @@ protected:
{
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 list of child objects" << PT::Log::logend;
(*plog) << " field, you should set FT::is_foreign_key or FT::is_foreign_key_in_child flag for a list of child objects" << pt::Log::logend;
}
}
}
@@ -861,7 +861,7 @@ protected:
if( db_expression )
{
std::wstring table_field_name;
PT::TextStream table_field_name_str;
pt::TextStream table_field_name_str;
// CHECK ME not tested yet after changing to db_expression->table_with_index_and_field_to_stream()
db_expression->table_with_index_and_field_to_stream(table_field_name_str, model_env->table_name, model_env->table_index, field_name, field_type);
@@ -977,7 +977,7 @@ protected:
virtual bool is_the_same_field(const wchar_t * field1, const wchar_t * field2);
virtual void put_to_log(const wchar_t * str);
virtual void put_fields_to_log(PT::Log & log, const wchar_t * db_field_name, const wchar_t * flat_field_name);
virtual void put_fields_to_log(pt::Log & log, const wchar_t * db_field_name, const wchar_t * flat_field_name);
virtual void log_table_name(bool put_schema_name = true);
virtual void log_table_name_with_field(const wchar_t * db_field_name = nullptr, bool put_schema_name = true);