From 6a75132d54592330be75b06dd64f2c240509e3f2 Mon Sep 17 00:00:00 2001 From: mdipierro Date: Sun, 14 Sep 2014 14:57:12 -0500 Subject: [PATCH] CROSS JOIN, thanks jotbe --- VERSION | 2 +- applications/admin/controllers/appadmin.py | 2 +- applications/examples/controllers/appadmin.py | 2 +- gluon/dal.py | 8 +++++--- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/VERSION b/VERSION index f52853a2..b206bb9e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -Version 2.9.9-stable+timestamp.2014.09.14.11.58.10 +Version 2.9.9-stable+timestamp.2014.09.14.14.57.06 diff --git a/applications/admin/controllers/appadmin.py b/applications/admin/controllers/appadmin.py index 7a26aaa2..8283b9f2 100644 --- a/applications/admin/controllers/appadmin.py +++ b/applications/admin/controllers/appadmin.py @@ -582,7 +582,7 @@ def bg_graph_model(): if hasattr(db[tablename],'_meta_graphmodel'): meta_graphmodel = db[tablename]._meta_graphmodel else: - meta_graphmodel = dict(group='Undefined', color='#ECECEC') + meta_graphmodel = dict(group=request.application, color='#ECECEC') group = meta_graphmodel['group'].replace(' ', '') if not subgraphs.has_key(group): diff --git a/applications/examples/controllers/appadmin.py b/applications/examples/controllers/appadmin.py index 7a26aaa2..8283b9f2 100644 --- a/applications/examples/controllers/appadmin.py +++ b/applications/examples/controllers/appadmin.py @@ -582,7 +582,7 @@ def bg_graph_model(): if hasattr(db[tablename],'_meta_graphmodel'): meta_graphmodel = db[tablename]._meta_graphmodel else: - meta_graphmodel = dict(group='Undefined', color='#ECECEC') + meta_graphmodel = dict(group=request.application, color='#ECECEC') group = meta_graphmodel['group'].replace(' ', '') if not subgraphs.has_key(group): diff --git a/gluon/dal.py b/gluon/dal.py index aab001c3..24b6f0fd 100644 --- a/gluon/dal.py +++ b/gluon/dal.py @@ -1766,18 +1766,20 @@ class BaseAdapter(ConnectionPool): query = self.common_filter(query, tablenames_for_common_filters) sql_w = ' WHERE ' + self.expand(query) if query else '' + JOIN = ' CROSS JOIN ' + if inner_join and not left: # Wrap table references with parenthesis (approach 1) # sql_t = ', '.join([self.table_alias(t) # for t in iexcluded + itables_to_merge.keys()]) # sql_t = '(%s)' % sql_t # or approach 2: Use 'JOIN' instead comma: - sql_t = ' JOIN '.join([self.table_alias(t) + sql_t = JOIN.join([self.table_alias(t) for t in iexcluded + itables_to_merge.keys()]) for t in ijoinon: sql_t += ' %s %s' % (icommand, t) elif not inner_join and left: - sql_t = ' JOIN '.join([self.table_alias(t) + sql_t = JOIN.join([self.table_alias(t) for t in excluded + tables_to_merge.keys()]) if joint: sql_t += ' %s %s' % (command, @@ -1790,7 +1792,7 @@ class BaseAdapter(ConnectionPool): tables_in_joinon = set(joinont + ijoinont) tables_not_in_joinon = \ all_tables_in_query.difference(tables_in_joinon) - sql_t = ' JOIN '.join([self.table_alias(t) for t in tables_not_in_joinon]) + sql_t = JOIN.join([self.table_alias(t) for t in tables_not_in_joinon]) for t in ijoinon: sql_t += ' %s %s' % (icommand, t) if joint: