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

fixed: generating a correct table names with indices for JOIN statements and column prefixes

Browse Source 
git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1188 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2019-03-31 20:21:12 +00:00
parent ab54a3fc3e
commit 6d9b9045fe
7 changed files with 121 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
src/model.h
View File

@@ -132,12 +132,8 @@ public:
// set object to default values
virtual void clear();
virtual void prepare_to_select();
// will be changed
void clear_table_index()
{
table_index = 0;
}
protected:
@@ -654,7 +650,7 @@ protected:
if( flat_expression && !is_empty_field(flat_field_name) )
{
// insertable, updatable and is_primary_key are ignored here
flat_expression->field(-1, flat_field_name, field_value, insertable, updatable, is_primary_key, true, model_data);
flat_expression->field(flat_field_name, field_value, insertable, updatable, is_primary_key, true, model_data);
}
}
}
@@ -669,7 +665,12 @@ protected:
if( db_expression && !is_empty_field(db_field_name) )
{
db_expression->field(table_index, db_field_name, field_value, insertable, updatable, is_primary_key, true, model_data);
db_expression->field(db_field_name, field_value, insertable, updatable, is_primary_key, true, model_data);
if( model_data )
{
model_data->current_column += 1;
}
}
}
}
@@ -681,7 +682,14 @@ protected:
if( db_connector )
{
if( !is_empty_field(db_field_name) )
{
get_value_by_field_name(db_field_name, field_value);
if( model_data )
{
model_data->current_column += 1;
}
}
}
}
@@ -722,11 +730,8 @@ protected:
model_data->morm_current_max_column += 1;
model_data->morm_foreign_keys.clear();
field_model.table_index = model_data->morm_current_max_column;
model_data->morm_finder_join_tables << "LEFT JOIN ";
field_model.table_name(model_data->morm_finder_join_tables);
model_data->morm_finder_join_tables << " AS ";
@@ -734,41 +739,30 @@ protected:
PT::TextStream join_table_name_this;
table_name_for_join_as(join_table_name_this);
std::string sss1; // improve me
join_table_name_this.to_string(sss1);
if( table_index > 1 )
join_table_name_this << table_index;
int this_index = model_data->find_join_table_index(sss1);
if( this_index > 1 )
join_table_name_this << this_index;
///////////
PT::TextStream join_table_name;
field_model.table_name_for_join_as(join_table_name);
std::string sss; // improve me
join_table_name.to_string(sss);
int table_index = model_data->add_join_table(sss);
field_model.table_index = model_data->add_join_table(join_table_name);
if( table_index > 1 )
join_table_name << table_index;
if( field_model.table_index > 1 )
join_table_name << field_model.table_index;
//////////
model_data->morm_finder_join_tables << join_table_name;
int expr_work_mode = db_expression->get_work_mode();
int expr_output_type = db_expression->get_output_type();
std::string old_prefix = db_expression->get_column_prefix();
db_expression->set_work_mode(MORM_WORK_MODE_MODEL_SAVE_FIELDS);
db_expression->set_output_type(MORM_OUTPUT_TYPE_JOIN_TABLES);
std::string empty;
db_expression->set_column_prefix(empty);
db_expression->allow_to_use_prefix(false);
if( has_foreign_key )
{
@@ -797,9 +791,12 @@ protected:
}
model_data->morm_finder_join_tables << ' ';
db_expression->set_work_mode(expr_work_mode);
db_expression->set_output_type(expr_output_type);
db_expression->set_column_prefix(old_prefix);
db_expression->allow_to_use_prefix(true);
}
}
@@ -848,33 +845,32 @@ protected:
if( db_expression->get_output_type() != MORM_OUTPUT_TYPE_JOIN_TABLES )
{
field_model.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
// they dont have to be copied out, this is the same as current table name and table_index
std::string current_prefix = db_expression->get_column_prefix();
int current_table_index = db_expression->get_column_prefix_index();
///////////
PT::TextStream join_table_name;
field_model.table_name_for_join_as(join_table_name);
field_model.table_name_for_join_as(join_table_name); // RENAME this method
std::string sss; // improve me
join_table_name.to_string(sss);
int table_index = model_data->add_join_table(sss);
if( table_index > 1 )
{
join_table_name << table_index;
join_table_name.to_string(sss);
}
//////////
db_expression->set_column_prefix(sss);
db_expression->set_column_prefix(sss, field_model.table_index);
field_model.map_fields();
db_expression->set_column_prefix(current_prefix);
db_expression->set_column_prefix(current_prefix, current_table_index);
field_model.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
}
field_model.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
if( model_data )
{
model_data->current_column += 1;
}
}
}
}
@@ -944,11 +940,9 @@ protected:
if( db_expression && !is_empty_field(db_field_name) && db_expression->get_output_type() != MORM_OUTPUT_TYPE_JOIN_TABLES )
{
ModelContainerType model_type;
model_type.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_GENERATING_DB_SQL;
field_model(db_field_name, flat_field_name, model_type, insertable, updatable, false);
model_type.model_connector_mode = MORM_MODEL_CONNECTOR_MODE_NONE;
// another select will be used (from another Finder)
// we need only columns name
// but columns are defined in the other model
}
}
}
@@ -1145,7 +1139,7 @@ protected:
virtual bool is_empty_field(const wchar_t * value);
// template<typename ModelClass> friend class Finder;
//template<typename ModelClass> friend class Finder;
template<typename ModelClass> friend class Cursor;
friend class BaseExpression;