From fcfa8aa917fe9fe23c9c05e06cdebc505cf8b2bf Mon Sep 17 00:00:00 2001
From: mdipierro <massimo.dipierro@gmail.com>
Date: Fri, 29 Mar 2013 02:08:41 -0500
Subject: [PATCH] added common_filter tests

---
 VERSION                 |  2 +-
 gluon/tests/test_dal.py | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 71da9f7c..6ae1721b 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.4.5-stable+timestamp.2013.03.28.15.17.58
+Version 2.4.5-stable+timestamp.2013.03.29.02.07.58
diff --git a/gluon/tests/test_dal.py b/gluon/tests/test_dal.py
index 7564af5a..c2cca719 100644
--- a/gluon/tests/test_dal.py
+++ b/gluon/tests/test_dal.py
@@ -582,6 +582,32 @@ class TestComputedFields(unittest.TestCase):
         db.tt.drop()
         db.commit()
 
+class TestCommonFilters(unittest.TestCase):
+
+    def testRun(self):
+        db = DAL(DEFAULT_URI, check_reserved=['all'])
+        db.define_table('t1', Field('aa'))
+        db.define_table('t2', Field('aa'), Field('b', db.t1))
+        i1 = db.t1.insert(aa='1')
+        i2 = db.t1.insert(aa='2')
+        i3 = db.t1.insert(aa='3')
+        db.t2.insert(aa='4', b=i1)
+        db.t2.insert(aa='5', b=i2)
+        db.t2.insert(aa='6', b=i2)
+        db.t1._common_filter = lambda q: db.t1.aa>1
+        self.assertEqual(db(db.t1).count(),2)
+        self.assertEqual(len(db(db.t1).select()),2)
+        q = db.t2.b==db.t1.id
+        self.assertEqual(db(q).count(),2)
+        self.assertEqual(len(db(q).select()),2)        
+        self.assertEqual(len(db(db.t1).select(left=db.t2.on(q))),3)
+        db.t2._common_filter = lambda q: db.t2.aa<6
+        self.assertEqual(db(q).count(),1)
+        self.assertEqual(len(db(q).select()),1)
+        self.assertEqual(len(db(db.t1).select(left=db.t2.on(q))),2)
+        db.t2.drop()
+        db.t1.drop()
+
 class TestImportExportFields(unittest.TestCase):
 
     def testRun(self):