dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allows strings as select args, thanks dhx

Browse Source
This commit is contained in:
mdipierro
2012-08-09 08:57:58 -05:00
parent 3607b960a3
commit 1906817df8
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-08 22:33:45) dev Version 2.00.0 (2012-08-09 08:57:54) dev
gluon/dal.py
+8 -2
View File
@@ -1179,7 +1179,7 @@ class BaseAdapter(ConnectionPool):
def COMMA(self, first, second): def COMMA(self, first, second):
return '%s, %s' % (self.expand(first), self.expand(second)) return '%s, %s' % (self.expand(first), self.expand(second))
def expand(self, expression, field_type=None): def expand(self, expression, field_type=None):
if isinstance(expression, Field): if isinstance(expression, Field):
return '%s.%s' % (expression.tablename, expression.name) return '%s.%s' % (expression.tablename, expression.name)
elif isinstance(expression, (Expression, Query)): elif isinstance(expression, (Expression, Query)):
@@ -1312,6 +1312,12 @@ class BaseAdapter(ConnectionPool):
for item in fields: for item in fields:
if isinstance(item,SQLALL): if isinstance(item,SQLALL):
new_fields += item._table new_fields += item._table
elif isinstance(item,str):
if regex_table_field.match(item):
tablename,fieldname = item.split('.')
new_fields.append(self.db[tablename][fieldname])
else:
new_fields.append(Expression(self.db,item))
else: else:
new_fields.append(item) new_fields.append(item)
# ## if no fields specified take them all from the requested tables # ## if no fields specified take them all from the requested tables
@@ -8436,7 +8442,7 @@ class Set(object):
def count(self,distinct=None): def count(self,distinct=None):
return self.db._adapter.count(self.query,distinct) return self.db._adapter.count(self.query,distinct)
def select(self, *fields, **attributes): def select(self, *fields, **attributes):
if self.query is None:# and fields[0]._table._common_filter != None: if self.query is None:# and fields[0]._table._common_filter != None:
return self(fields[0]._table).select(*fields,**attributes) return self(fields[0]._table).select(*fields,**attributes)
adapter = self.db._adapter adapter = self.db._adapter