fixed: in cursor in add_models_to_list(): added_model.model_env should be set after added_model.clear()

fixed: when generating: insert, update or remove statements we have used prefixes for columns
       but the table name was not set in ModelEnv (now we do not use prefixes in such statements)
changed: log_queries field moved from PostgreSQLConnector to DbConnector





git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1195 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
2019-06-17 10:59:39 +00:00
parent b6fbe29805
commit 2533b18cfd
6 changed files with 32 additions and 24 deletions

View File

@@ -96,7 +96,7 @@ void DbExpression::field_before()
output_type == MORM_OUTPUT_TYPE_DB_UPDATE ||
output_type == MORM_OUTPUT_TYPE_SELECT_COLUMNS )
{
(*out_stream) << ",";
(*out_stream) << ", ";
}
else
if( output_type == MORM_OUTPUT_TYPE_DB_PRIMARY_KEY )
@@ -137,32 +137,32 @@ void DbExpression::put_name_value_separator()
output_type == MORM_OUTPUT_TYPE_WHERE_EQ ||
output_type == MORM_OUTPUT_TYPE_DB_UPDATE)
{
(*out_stream) << " = ";
(*out_stream) << "=";
}
else
if( output_type == MORM_OUTPUT_TYPE_WHERE_NOT_EQ )
{
(*out_stream) << " <> ";
(*out_stream) << "<>";
}
else
if( output_type == MORM_OUTPUT_TYPE_WHERE_LT )
{
(*out_stream) << " < ";
(*out_stream) << "<";
}
else
if( output_type == MORM_OUTPUT_TYPE_WHERE_GT )
{
(*out_stream) << " > ";
(*out_stream) << ">";
}
else
if( output_type == MORM_OUTPUT_TYPE_WHERE_LE )
{
(*out_stream) << " <= ";
(*out_stream) << "<=";
}
else
if( output_type == MORM_OUTPUT_TYPE_WHERE_GE )
{
(*out_stream) << " >= ";
(*out_stream) << ">=";
}
else
if( output_type == MORM_OUTPUT_TYPE_WHERE_IN )