From b22235c4bb9059ecf208277647559e1eb31dc643 Mon Sep 17 00:00:00 2001
From: Massimo DiPierro <massimodipierro@Massimos-MacBook-Air.local>
Date: Tue, 28 Feb 2012 13:15:15 -0600
Subject: [PATCH] removed some comments from dal.py

---
 CHANGELOG    | 27 +++++++++++++++++++++++++++
 VERSION      |  2 +-
 gluon/dal.py |  4 ----
 3 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 04b1e815..cc57318d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -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
 Improved mobile admin, thanks Angelo
 Improved examples page, thanks Anthony
diff --git a/VERSION b/VERSION
index 7909fb4b..a914791d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 1.99.4 (2012-02-28 12:55:24) stable
+Version 1.99.4 (2012-02-28 13:15:13) stable
diff --git a/gluon/dal.py b/gluon/dal.py
index aa6136d3..8276b00b 100644
--- a/gluon/dal.py
+++ b/gluon/dal.py
@@ -1233,7 +1233,6 @@ class BaseAdapter(ConnectionPool):
             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
             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]
         if left:
             join = attributes['left']
@@ -1252,7 +1251,6 @@ class BaseAdapter(ConnectionPool):
         def alias(t):
             return str(self.db[t])
         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
             for t in ijoinon:
                 sql_t += ' %s %s' % (icommand, str(t))
@@ -1263,8 +1261,6 @@ class BaseAdapter(ConnectionPool):
             for t in joinon:
                 sql_t += ' %s %s' % (command, str(t))
         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 + \
                                       iimportant_tablenames + \
                                       tablenames) # issue 490