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

51
src/baseexpression.h
View File

@@ -79,9 +79,22 @@ public:
virtual bool get_allow_to_use_prefix();
template<typename FieldValue>
void field(const wchar_t * field_name, const FieldValue & field_value, const FT & field_type, ModelEnv * model_env)
{
field_generic(field_name, field_value, nullptr, field_type, model_env);
}
virtual void field(const wchar_t * field_name, void (Model::*getter_method)(pt::Stream &), const FT & field_type, ModelEnv * model_env)
{
int tmp_object = 0;
field_generic(field_name, tmp_object, getter_method, field_type, model_env);
}
template<typename FieldValue>
void field_generic(const wchar_t * field_name, const FieldValue & field_value, void (Model::*getter_method)(pt::Stream &), const FT & field_type, ModelEnv * model_env)
{
if( out_stream && can_field_be_generated(field_type) )
{
@@ -99,7 +112,7 @@ public:
else
if( work_mode == MORM_WORK_MODE_MODEL_VALUES )
{
put_field_value_or_null(field_value, field_type, model_env);
put_field_value_or_null(field_value, getter_method, field_type, model_env);
}
else
if( work_mode == MORM_WORK_MODE_MODEL_FIELDS_VALUES )
@@ -110,7 +123,7 @@ public:
{
put_field_name_and_table_if_needed((*model_env->set_field_name_helper)[model_env->field_index], field_type, model_env);
put_name_value_separator();
put_field_value_or_null(field_value, field_type, model_env);
put_field_value_or_null(field_value, getter_method, field_type, model_env);
}
model_env->field_index += 1;
@@ -119,7 +132,7 @@ public:
{
put_field_name_and_table_if_needed(field_name, field_type, model_env);
put_name_value_separator();
put_field_value_or_null(field_value, field_type, model_env);
put_field_value_or_null(field_value, getter_method, field_type, model_env);
}
}
@@ -129,18 +142,25 @@ public:
template<typename FieldValue>
void put_field_value_or_null(const FieldValue & field_value, const FT & field_type, ModelEnv * model_env)
void put_field_value_or_null(const FieldValue & field_value, void (Model::*getter_method)(pt::Stream &), const FT & field_type, ModelEnv * model_env)
{
if( field_type.is_primary_key() )
if( getter_method )
{
if( model_env && model_env->has_primary_key_set )
put_field_value(field_value, field_type);
else
put_null_value();
put_field_value(getter_method, field_type, model_env);
}
else
{
put_field_value(field_value, field_type);
if( field_type.is_primary_key() )
{
if( model_env && model_env->has_primary_key_set )
put_field_value(field_value, field_type);
else
put_null_value();
}
else
{
put_field_value(field_value, field_type);
}
}
}
@@ -321,6 +341,15 @@ protected:
}
}
void put_field_value(void (Model::*getter_method)(pt::Stream &), const FT & field_type, ModelEnv * model_env)
{
if( out_stream && model_env && model_env->model && getter_method )
{
before_field_value_string(field_type);
(model_env->model->*getter_method)(*out_stream);
after_field_value_string(field_type);
}
}
virtual void put_null_value()
{