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

changed: ModelData moved outside Model

Browse Source 
added:   using ModelData in BaseExpression so Model::to_text() functions can use a ModelData object now





git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1175 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2019-03-07 18:02:29 +00:00
parent 41684eb969
commit cf0a0c96fe
8 changed files with 188 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/baseexpression.h
View File

@@ -45,6 +45,7 @@
namespace morm
{
class Model;
class ModelData;
class ModelConnector;
@@ -65,7 +66,7 @@ public:
// give me a better name
virtual void put_field_doc(Model & model, const void * field_pointer, bool insertable, bool updatable, bool is_primary_key);
virtual void put_field_doc(Model & model, const void * field_pointer, bool insertable, bool updatable, bool is_primary_key, ModelData * model_data);
@@ -98,7 +99,10 @@ public:
}
template<typename FieldValue>
void field_doc(Model & model, const wchar_t * field_name, const FieldValue & field_value, bool insertable = true, bool updatable = true, bool is_primary_key = false, bool add_column_prefix = true)
void field_doc(Model & model, const wchar_t * field_name, const FieldValue & field_value,
bool insertable = true, bool updatable = true,
bool is_primary_key = false, bool add_column_prefix = true,
ModelData * model_data = nullptr)
{
if( out_stream )
{
@@ -107,7 +111,7 @@ public:
put_field_name(field_name, add_column_prefix);
put_name_value_separator();
put_field_doc(model, reinterpret_cast<const void*>(&field_value), insertable, updatable, is_primary_key);
put_field_doc(model, reinterpret_cast<const void*>(&field_value), insertable, updatable, is_primary_key, model_data);
put_name_value_separator();
put_type(field_value, *out_stream);
@@ -148,7 +152,7 @@ public:
template<typename ModelContainer>
void field_list(const wchar_t * field_name, ModelContainer & field_value, bool insertable, bool updatable, bool is_primary_key,
ModelConnector * model_connector, int model_connector_mode)
ModelConnector * model_connector, int model_connector_mode, ModelData * model_data)
{
if( out_stream && can_field_be_generated(insertable, updatable, is_primary_key) )
{
@@ -158,7 +162,7 @@ public:
{
put_field_name(field_name);
put_name_value_separator();
put_field_value_list(field_value, model_connector, model_connector_mode);
put_field_value_list(field_value, model_connector, model_connector_mode, model_data);
}
field_after();
@@ -271,7 +275,7 @@ protected:
// what about lists with a pod types? e.g. list<int>
template<typename ModelContainer>
void put_field_value_list(ModelContainer & field_value, ModelConnector * model_connector, int model_connector_mode)
void put_field_value_list(ModelContainer & field_value, ModelConnector * model_connector, int model_connector_mode, ModelData * model_data)
{
if( out_stream )
{
@@ -293,8 +297,10 @@ protected:
//before_field_value(field_value);
m.set_connector(model_connector);
m.model_connector_mode = model_connector_mode;
m.model_data = model_data;
generate_from_model(m);
m.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
m.model_data = nullptr;
//after_field_value(field_value);
is_first = false;
}