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

changed: SetFieldValueHelper -> FieldValueHelper

Browse Source 
it's a much simpler structure now
removed: FieldValueBase and FieldValueContainer




git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1207 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2019-09-11 18:16:22 +00:00
parent 0be9feda44
commit c133e949ce
7 changed files with 165 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

129
src/model.h
View File

@@ -38,6 +38,7 @@
#include <string>
#include <list>
#include <vector>
#include <typeinfo>
#include "textstream/textstream.h"
#include "modelconnector.h"
@@ -142,11 +143,15 @@ public:
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE;
model_env->field_index = 0;
SetFieldValueHelper set_field_value_helper;
FieldValueContainer<FieldValue> helper_object(field_value);
FieldValueHelper field_value_helper;
field_value_helper.db_field_name = db_field_name;
field_value_helper.flat_field_name = flat_field_name;
field_value_helper.value_object = &field_value;
field_value_helper.value_type_info = &typeid(field_value);
set_field_value_helper.add(db_field_name, flat_field_name, &helper_object, false);
model_env->set_field_value_helper = &set_field_value_helper;
std::vector<FieldValueHelper> helper_tab;
helper_tab.push_back(field_value_helper);
model_env->field_value_helper_tab = &helper_tab;
map_fields();
@@ -673,53 +678,57 @@ protected:
template<typename FieldValue>
void field_generic(const wchar_t * db_field_name, const wchar_t * flat_field_name, FieldValue & field_value, bool insertable, bool updatable, bool is_primary_key)
{
PT::Log * log = model_connector->get_logger();
if( model_connector && model_env )
{
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE )
{
if( model_env->set_field_value_helper )
if( model_env->field_value_helper_tab )
{
if( model_env->field_index >= 0 && (size_t)model_env->field_index < model_env->set_field_value_helper->size() )
if( model_env->field_index >= 0 && (size_t)model_env->field_index < model_env->field_value_helper_tab->size() )
{
if( is_the_same_field(db_field_name, model_env->set_field_value_helper->get_db_field_name(model_env->field_index)) &&
is_the_same_field(flat_field_name, model_env->set_field_value_helper->get_flat_field_name(model_env->field_index)) )
FieldValueHelper & helper = (*model_env->field_value_helper_tab)[model_env->field_index];
PT::Log * log = model_connector->get_logger();
if( is_the_same_field(db_field_name, helper.db_field_name) &&
is_the_same_field(flat_field_name, helper.flat_field_name) )
{
model_env->set_field_value_helper->set_value(model_env->field_index, field_value);
if( helper.value_object && helper.value_type_info )
{
if( typeid(field_value) == *helper.value_type_info )
{
field_value = *(FieldValue*)helper.value_object;
}
else
{
table_name(model_env->table_name);
(*log) << PT::Log::log1 << "Morm: incorrect type of a field in " << model_env->table_name << ", ";
if( !is_empty_field(db_field_name) )
(*log) << "database field name: " << db_field_name << ", ";
if( !is_empty_field(flat_field_name) )
(*log) << "flat field name: " << flat_field_name << ", ";
(*log) << "type expected " << typeid(field_value).name()
<< " got " << helper.value_type_info->name() << PT::Log::logend;
}
}
model_env->field_index += 1;
}
}
else
{
// the log has to be generated by a parent call
// it should compare model_env->field_index with the number of keys
// if( log )
// {
// // IMPROVE ME a better log message is required
// (*log) << PT::Log::log1 << "Morm: incorrect number of keys found in model objects" << PT::Log::logend;
// }
}
}
}
if( model_env->model_connector_mode == MORM_MODEL_CONNECTOR_MODE_ITERATE_PRIMARY_KEY_VALUES && is_primary_key )
{
if( model_env->set_field_value_helper )
if( model_env->field_value_helper_tab )
{
if( model_env->field_index >= 0 && (size_t)model_env->field_index < model_env->set_field_value_helper->size() )
if( model_env->field_index >= 0 && (size_t)model_env->field_index < model_env->field_value_helper_tab->size() )
{
FieldValueBase * helper_object = new FieldValueContainer<FieldValue>(field_value);
model_env->set_field_value_helper->add_field_value_container(model_env->field_index, helper_object, true);
}
else
{
if( log )
{
// IMPROVE ME a better log message is required
// the log can be generated by a parent call
(*log) << PT::Log::log1 << "Morm: incorrect number of keys found in model objects" << PT::Log::logend;
}
FieldValueHelper & helper = (*model_env->field_value_helper_tab)[model_env->field_index];
helper.value_object = &field_value;
helper.value_type_info = &typeid(field_value);
}
}
@@ -1001,6 +1010,7 @@ protected:
void field_model_set_parent_key(const wchar_t * db_field_name, const wchar_t * flat_field_name, Model & field_model)
{
DbConnector * db_connector = model_connector->get_db_connector();
PT::Log * log = model_connector->get_logger();
if( db_connector )
{
@@ -1011,39 +1021,58 @@ protected:
int old_connector_mode = model_env->model_connector_mode;
model_env->model_connector_mode = MORM_MODEL_CONNECTOR_MODE_ITERATE_PRIMARY_KEY_VALUES;
SetFieldValueHelper set_field_value_helper;
set_field_value_helper.add(db_field_name, flat_field_name); // in the future we can have a primary key from more than one column
model_env->set_field_value_helper = &set_field_value_helper;
FieldValueHelper helper; // in the future we can have a primary key from more than one column
helper.db_field_name = db_field_name;
helper.flat_field_name = flat_field_name;
std::vector<FieldValueHelper> helper_tab;
helper_tab.push_back(helper);
model_env->field_value_helper_tab = &helper_tab;
model_env->field_index = 0;
/*
* first we iterate through fields and save primary key values to helper_tab
*/
map_fields();
if( set_field_value_helper.empty() )
{
// IMPROVE ME
// put some log: there is no a primary key in this model
}
else
if( set_field_value_helper.size() == 1 )
if( (size_t)model_env->field_index == helper_tab.size() )
{
ModelEnv model_env_local;
model_env_local.copy_global_objects(*model_env);
model_env_local.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_SET_FIELD_VALUE;
model_env_local.set_field_value_helper = &set_field_value_helper;
model_env_local.field_value_helper_tab = &helper_tab;
model_env_local.field_index = 0;
field_model.model_env = &model_env_local;
/*
* now we iterate through fields in field_model and save primary key values from *this object to the specified fields in field_model
*/
field_model.map_fields();
field_model.model_env = nullptr;
model_env->set_field_value_helper = nullptr;
model_env->model_connector_mode = old_connector_mode;
if( (size_t)field_model.model_env->field_index != helper_tab.size() && log )
{
table_name(model_env->table_name);
field_model.table_name(field_model.model_env->table_name);
(*log) << PT::Log::log1 << "Morm: primary key in " << model_env->table_name << " consists of " << model_env->field_index << " column(s)"
<< " but in " << field_model.model_env->table_name << " there are only "
<< field_model.model_env->field_index << " matching column(s)" << PT::Log::logend;
}
field_model.model_env = nullptr;
}
else
if( log )
{
// IMPROVE ME
// put some log: at the moment we only support a primary key from only one column
table_name(model_env->table_name);
(*log) << PT::Log::log1 << "Morm: primary key in " << model_env->table_name << " consists of incorrect number of columns"
<< ", expected " << helper_tab.size() << " column(s) but got " << model_env->field_index << PT::Log::logend;
}
model_env->field_value_helper_tab = nullptr;
model_env->model_connector_mode = old_connector_mode;
}
}
}