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

fixed: getters method (Model::*getter_method)(pt::Stream &) produced boolean value when serializing to flat string

Browse Source 
- changed in Model::field_list_generic(...): message "you should set FT::is_foreign_key or FT::is_foreign_key_in_child flag" print only
  for work mode MORM_MODEL_WORK_MODE_SET_PARENT_ID or MORM_MODEL_WORK_MODE_ITERATE_THROUGH_CHILDS_WITHOUT_FOREIGN_KEY
- pt::TextStream::to_string(...) is now pt::TextStream::to_str(...)
- in Model::get_raw_value() for ezc 'pt::TextStream & stream' changed to 'pt::Stream & stream' (a base class of pt::TextStream)
  similar in field(...) methods which take getters: void (Model::*getter_method)(pt::TextStream &) -> void (Model::*getter_method)(pt::Stream &)
This commit is contained in:
Tomasz Sowa
2021-06-20 17:49:54 +02:00
parent aba454a4bf
commit a8fe798279
8 changed files with 96 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/model.cpp
View File

@@ -227,7 +227,7 @@ void Model::get_table_name(std::wstring & str, bool with_schema_name, ModelData
str.clear();
get_table_name(stream, with_schema_name, model_data, false);
stream.to_string(str);
stream.to_str(str);
}
@@ -317,13 +317,13 @@ ModelWrapper * Model::get_model_wrapper(const wchar_t * db_field_name, const wch
bool Model::get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, pt::TextStream & stream, bool clear_stream, bool put_log_if_not_found)
bool Model::get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, pt::Stream & stream, bool clear_stream, bool put_log_if_not_found)
{
return get_raw_value(db_field_name, flat_field_name, nullptr, stream, clear_stream, put_log_if_not_found);
}
bool Model::get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, ModelData * model_data, pt::TextStream & stream, bool clear_stream, bool put_log_if_not_found)
bool Model::get_raw_value(const wchar_t * db_field_name, const wchar_t * flat_field_name, ModelData * model_data, pt::Stream & stream, bool clear_stream, bool put_log_if_not_found)
{
if( clear_stream )
{
@@ -432,7 +432,7 @@ void Model::to_text(std::string & str, ModelData * model_data, bool clear_string
if( out_stream )
{
to_text(*out_stream, model_data, true, dump_mode);
out_stream->to_string(str, clear_string);
out_stream->to_str(str, clear_string);
}
}
}
@@ -1762,7 +1762,7 @@ void Model::field_member_set_field_value(
void Model::field_member_generate_flat_string(
const wchar_t * flat_field_name,
void (Model::*getter_method)(pt::TextStream &),
void (Model::*getter_method)(pt::Stream &),
const FT & field_type)
{
FlatConnector * flat_connector = model_connector->get_flat_connector();
@@ -1781,7 +1781,7 @@ void Model::field_member_generate_flat_string(
void Model::field_member_generate_db_sql(
const wchar_t * db_field_name,
void (Model::*getter_method)(pt::TextStream &),
void (Model::*getter_method)(pt::Stream &),
const FT & field_type)
{
DbConnector * db_connector = model_connector->get_db_connector();
@@ -1834,7 +1834,7 @@ void Model::field_member_read_value_from_db_resultset(
void Model::field_member_put_field_raw_value_to_stream(
const wchar_t * db_field_name,
const wchar_t * flat_field_name,
void (Model::*getter_method)(pt::TextStream &),
void (Model::*getter_method)(pt::Stream &),
const FT & field_type)
{
if( (is_empty_field(model_env->db_field_name) || is_the_same_field(db_field_name, model_env->db_field_name)) &&
@@ -1862,7 +1862,7 @@ void Model::field_member_clear_value(
void Model::field_member(
const wchar_t * db_field_name,
const wchar_t * flat_field_name,
void (Model::*getter_method)(pt::TextStream &),
void (Model::*getter_method)(pt::Stream &),
void (Model::*setter_method)(const char * input_str),
const FT & field_type)
{