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

removed some comments from dal.py

Browse Source
This commit is contained in:
Massimo DiPierro
2012-02-28 13:15:15 -06:00
parent 06ef404a01
commit b22235c4bb
3 changed files with 28 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CHANGELOG
+27
View File
@@ -1,3 +1,30 @@
## 1.99.5
- improved markmin auto-links
- improved ldap support (thanks Omi)
- added TimeCollector (thanks Caleb)
- better cpdb.py (thanks pasxidis)
- db.table.field.like(...,case_sensitive=False) (thanks Floyd)
- db.table.field.regexp(...) for sqlite and postgres
- conditional menu items (reponse.menu=[(title,bool,link,[],condition)]
- out of the box posgresql support with pg8000 diver included (thanks Mariano)
- db(...,ignore_common_filters=True)
- DAL IMAP support (thanks Alan Etkin)
- scripts/services/service.py (thanks Ross)
- populate can now deal with computed fields (thanks mweissen)
- admin in Russian (Bulat), Japanese (Omi) and Slovenian (Robert Valentak)
- sync languages capability (thanks Yair)
- better mongodb support (still experimental)
- auth.user_groups stores user groups
- new rediscache (thanks niphold)
- login_methods/browserid_account.py (thanks Pai)
- new DAL syntax: db(db.dog_id.belongs(db.dogs.owner=='james')).select()
- incuded remote debugger (thanks Mariano)
- gluon/contrib/htmlmin.py for html minimization (thanks kerncece)
- def index(): return dict(a=gluon.tools.Expose(folder))
- new DAL syntax: db(...).select().group_by_value(db.table.field) (thanks Yair)
- auth.is_impersonating()
- 100's of small bug fixes and small improvements
## 1.99.4 ## 1.99.4
Improved mobile admin, thanks Angelo Improved mobile admin, thanks Angelo
Improved examples page, thanks Anthony Improved examples page, thanks Anthony
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 1.99.4 (2012-02-28 12:55:24) stable Version 1.99.4 (2012-02-28 13:15:13) stable
gluon/dal.py
-4
View File
@@ -1233,7 +1233,6 @@ class BaseAdapter(ConnectionPool):
ijoinont = [t.first._tablename for t in ijoinon] ijoinont = [t.first._tablename for t in ijoinon]
[itables_to_merge.pop(t) for t in ijoinont if t in itables_to_merge] #issue 490 [itables_to_merge.pop(t) for t in ijoinont if t in itables_to_merge] #issue 490
iimportant_tablenames = ijoint + ijoinont + itables_to_merge.keys() # issue 490 iimportant_tablenames = ijoint + ijoinont + itables_to_merge.keys() # issue 490
#iexcluded = [t for t in tablenames if not t in ijoint + ijoinont] ## issue 490
iexcluded = [t for t in tablenames if not t in iimportant_tablenames] iexcluded = [t for t in tablenames if not t in iimportant_tablenames]
if left: if left:
join = attributes['left'] join = attributes['left']
@@ -1252,7 +1251,6 @@ class BaseAdapter(ConnectionPool):
def alias(t): def alias(t):
return str(self.db[t]) return str(self.db[t])
if inner_join and not left: if inner_join and not left:
#sql_t = ', '.join(alias(t) for t in iexcluded) ## issue 490
sql_t = ', '.join([alias(t) for t in iexcluded + itables_to_merge.keys()]) # issue 490 sql_t = ', '.join([alias(t) for t in iexcluded + itables_to_merge.keys()]) # issue 490
for t in ijoinon: for t in ijoinon:
sql_t += ' %s %s' % (icommand, str(t)) sql_t += ' %s %s' % (icommand, str(t))
@@ -1263,8 +1261,6 @@ class BaseAdapter(ConnectionPool):
for t in joinon: for t in joinon:
sql_t += ' %s %s' % (command, str(t)) sql_t += ' %s %s' % (command, str(t))
elif inner_join and left: elif inner_join and left:
#sql_t = ','.join([alias(t) for t in excluded + \
# tables_to_merge.keys() if t in iexcluded ]) ## issue 490
all_tables_in_query = set(important_tablenames + \ all_tables_in_query = set(important_tablenames + \
iimportant_tablenames + \ iimportant_tablenames + \
tablenames) # issue 490 tablenames) # issue 490