some work in branches/join_models

git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1190 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2019-05-13 03:12:31 +00:00
parent 6d9b9045fe
commit 34ddf11351
9 changed files with 66 additions and 3 deletions

View File

@@ -683,12 +683,15 @@ protected:
{
if( !is_empty_field(db_field_name) )
{
get_value_by_field_name(db_field_name, field_value);
if( model_data )
if( model_data && model_data->has_autogenerated_select )
{
get_value_by_field_index(model_data->current_column, field_value);
model_data->current_column += 1;
}
else
{
get_value_by_field_name(db_field_name, field_value);
}
}
}
}
@@ -978,6 +981,26 @@ protected:
}
template<typename FieldValue>
void get_value_by_field_index(int field_index, FieldValue & field_value)
{
if( query_result )
{
const char * val_str = query_result->get_field_string_value(field_index);
if( val_str )
{
DbConnector * db_connector = model_connector->get_db_connector();
if( db_connector )
{
db_connector->get_value(val_str, field_value);
}
}
}
}
template<typename FieldValue>
void get_value_by_field_name(const wchar_t * field_name, FieldValue & field_value)
{