added BaseExpression::is_long_field_name()
added BaseExpression::need_to_add_field_prefix() now the fields() methods don't take add_column_prefix parameter but the field_name (wchar_t*) is tested whether is it a long (with a period) or short name added BaseExpression::save_foreign_key() (code moved from field()) removed some default method arguments from BaseExpression added neq() method for Finder added DbExpression::prepare_short_table_name(const PT::TextStream & table_name, PT::TextStream & short_table_name) git-svn-id: svn://ttmath.org/publicrep/morm/branches/join_models@1194 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -46,9 +46,11 @@ class FinderHelper
|
||||
{
|
||||
public:
|
||||
|
||||
PT::TextStream morm_finder_join_tables;
|
||||
std::map<std::string, int> morm_table_join_map;
|
||||
std::list<std::string> morm_foreign_keys;
|
||||
PT::TextStream join_tables_str;
|
||||
|
||||
std::map<std::string, int> join_tables_map;
|
||||
|
||||
std::list<std::string> foreign_keys;
|
||||
|
||||
|
||||
|
||||
@@ -64,9 +66,9 @@ public:
|
||||
|
||||
virtual void clear()
|
||||
{
|
||||
morm_finder_join_tables.clear();
|
||||
morm_table_join_map.clear();
|
||||
morm_foreign_keys.clear();
|
||||
join_tables_str.clear();
|
||||
join_tables_map.clear();
|
||||
foreign_keys.clear();
|
||||
}
|
||||
|
||||
|
||||
@@ -81,7 +83,7 @@ public:
|
||||
|
||||
virtual int add_join_table(const std::string & table_name)
|
||||
{
|
||||
auto res = morm_table_join_map.insert(std::make_pair(table_name, 1));
|
||||
auto res = join_tables_map.insert(std::make_pair(table_name, 1));
|
||||
|
||||
if( !res.second )
|
||||
{
|
||||
|
Reference in New Issue
Block a user