the new eagerloading test suite mentioned in the previous commit

diff --git a/test/orm/eagertest3.py b/test/orm/eagertest3.py
new file mode 100644 (file)
index 0000000..5cfc9ee
--- /dev/null
+++ b/test/orm/eagertest3.py
@@ -0,0 +1,148 @@
+from testbase import PersistTest, AssertMixin
+import testbase
+from sqlalchemy import *
+from sqlalchemy.ext.selectresults import SelectResults
+
+class EagerTest(AssertMixin):
+    def setUpAll(self):
+        global dbmeta, owners, categories, tests, options, Owner, Category, Test, Option, false
+        dbmeta = BoundMetaData(testbase.db)
+        
+        # determine a literal value for "false" based on the dialect
+        false = Boolean().dialect_impl(testbase.db.dialect).convert_bind_param(False, testbase.db.dialect)
+        
+        owners = Table ( 'owners', dbmeta ,
+               Column ( 'id', Integer, primary_key=True, nullable=False ),
+               Column('data', String(30)) )
+        categories=Table( 'categories', dbmeta,
+               Column ( 'id', Integer,primary_key=True, nullable=False ),
+               Column ( 'name', VARCHAR(20), index=True ) )
+        tests = Table ( 'tests', dbmeta ,
+               Column ( 'id', Integer, primary_key=True, nullable=False ),
+               Column ( 'owner_id',Integer, ForeignKey('owners.id'), nullable=False,index=True ),
+               Column ( 'category_id', Integer, ForeignKey('categories.id'),nullable=False,index=True ))
+        options = Table ( 'options', dbmeta ,
+               Column ( 'test_id', Integer, ForeignKey ( 'tests.id' ), primary_key=True, nullable=False ),
+               Column ( 'owner_id', Integer, ForeignKey ( 'owners.id' ), primary_key=True, nullable=False ),
+               Column ( 'someoption', Boolean, PassiveDefault(str(false)), nullable=False ) )
+
+        dbmeta.create_all()
+
+        class Owner(object):
+               pass
+        class Category(object):
+               pass
+        class Test(object):
+               pass
+        class Option(object):
+               pass
+        mapper(Owner,owners)
+        mapper(Category,categories)
+        mapper(Option,options,properties={'owner':relation(Owner),'test':relation(Test)})
+        mapper(Test,tests,properties={
+            'owner':relation(Owner,backref='tests'),
+            'category':relation(Category),
+            'owner_option': relation(Option,primaryjoin=and_(tests.c.id==options.c.test_id,tests.c.owner_id==options.c.owner_id),uselist=False ) 
+        })
+
+        s=create_session()
+
+        # an owner
+        o=Owner()
+        s.save(o)
+
+        # owner a has 3 tests, one of which he has specified options for
+        c=Category()
+        c.name='Some Category'
+        s.save(c)
+
+        for i in range(3):
+               t=Test()
+               t.owner=o
+               t.category=c
+               s.save(t)
+               if i==1:
+                       op=Option()
+                       op.someoption=True
+                       t.owner_option=op
+               if i==2:
+                       op=Option()
+                       t.owner_option=op
+
+        s.flush()
+        s.close()
+
+    def tearDownAll(self):
+        clear_mappers()
+        dbmeta.drop_all()
+
+    def test_noorm(self):
+        """test the control case"""
+        # I want to display a list of tests owned by owner 1 
+        # if someoption is false or he hasn't specified it yet (null)
+        # but not if he set it to true (example someoption is for hiding)
+
+        # desired output for owner 1
+        # test_id, cat_name
+        # 1 'Some Category'
+        # 3  "
+
+        # not orm style correct query
+        print "Obtaining correct results without orm"
+        result = select( [tests.c.id,categories.c.name],
+               and_(tests.c.owner_id==1,or_(options.c.someoption==None,options.c.someoption==False)),
+               order_by=[tests.c.id],
+               from_obj=[tests.join(categories).outerjoin(options,and_(tests.c.id==options.c.test_id,tests.c.owner_id==options.c.owner_id))] ).execute().fetchall()
+        print result
+        assert result == [(1, u'Some Category'), (3, u'Some Category')]
+    
+    def test_withouteagerload(self):
+        s = create_session()
+        l=s.query(Test).select ( and_(tests.c.owner_id==1,or_(options.c.someoption==None,options.c.someoption==False)),
+               from_obj=[tests.outerjoin(options,and_(tests.c.id==options.c.test_id,tests.c.owner_id==options.c.owner_id))])
+        result = ["%d %s" % ( t.id,t.category.name ) for t in l]
+        print result
+        assert result == [u'1 Some Category', u'3 Some Category']
+
+    def test_witheagerload(self):
+        """test that an eagerload locates the correct "from" clause with 
+        which to attach to, when presented with a query that already has a complicated from clause."""
+        s = create_session()
+        q=s.query(Test).options(eagerload('category'))
+        l=q.select ( and_(tests.c.owner_id==1,or_(options.c.someoption==None,options.c.someoption==False)),
+               from_obj=[tests.outerjoin(options,and_(tests.c.id==options.c.test_id,tests.c.owner_id==options.c.owner_id))])
+        result = ["%d %s" % ( t.id,t.category.name ) for t in l]
+        print result
+        assert result == [u'1 Some Category', u'3 Some Category']
+
+    def test_dslish(self):
+        """test the same as witheagerload except building the query via SelectResults"""
+        s = create_session()
+        q=SelectResults(s.query(Test).options(eagerload('category')))
+        l=q.select ( 
+            and_(tests.c.owner_id==1,or_(options.c.someoption==None,options.c.someoption==False))
+            ).outerjoin_to('owner_option')
+            
+        result = ["%d %s" % ( t.id,t.category.name ) for t in l]
+        print result
+        assert result == [u'1 Some Category', u'3 Some Category']
+
+    def test_withoutouterjoin_literal(self):
+        s = create_session()
+        q=s.query(Test).options(eagerload('category'))
+        l=q.select( (tests.c.owner_id==1) & ('options.someoption is null or options.someoption=%s' % false) & q.join_to('owner_option') )
+        result = ["%d %s" % ( t.id,t.category.name ) for t in l]       
+        print result
+        assert result == [u'3 Some Category']
+
+    def test_withoutouterjoin(self):
+        s = create_session()
+        q=s.query(Test).options(eagerload('category'))
+        l=q.select( (tests.c.owner_id==1) & ((options.c.someoption==None) | (options.c.someoption==False)) & q.join_to('owner_option') )
+        result = ["%d %s" % ( t.id,t.category.name ) for t in l]       
+        print result
+        assert result == [u'3 Some Category']
+
+        
+if __name__ == "__main__":    
+    testbase.main()