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

fixed: a parent key was not properly set to simple childs (insert statements)

Browse Source 
fixed: a parent key was not set in list of childs (insert statements)




git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1215 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
Tomasz Sowa
2019-09-24 17:08:45 +00:00
parent cff4c1518e
commit 334201fe15
8 changed files with 322 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/model.cpp
View File

@@ -703,10 +703,10 @@ bool Model::is_empty_field(const wchar_t * value)
bool Model::is_the_same_field(const wchar_t * field1, const wchar_t * field2)
{
if( !field1 && !field2 )
if( is_empty_field(field1) && is_empty_field(field2) )
return true;
if( !field1 || !field2 )
if( is_empty_field(field1) || is_empty_field(field2) )
return false;
bool the_same = false;
@@ -763,5 +763,32 @@ void Model::put_table_name_with_index(PT::TextStream & str)
}
void Model::put_fields_to_log(PT::Log & log, const wchar_t * db_field_name, const wchar_t * flat_field_name)
{
bool was_db_field_put = false;
bool was_flat_field_put = false;
if( !is_empty_field(db_field_name) )
{
log << "database field name: " << db_field_name;
was_db_field_put = true;
}
if( !is_empty_field(flat_field_name) )
{
if( was_db_field_put )
log << ", ";
log << "flat field name: " << flat_field_name;
was_flat_field_put = true;
}
if( !was_db_field_put && !was_flat_field_put )
{
log << "(both database field name and flat field name are empty)";
}
}
} // namespace