Changeset 3406

Timestamp:

08/16/07 16:01:16 (1 year ago)

Author:

paj

Message:

Merge recent SQLAlchemy work into 1.1 branch

Files:

• branches/1.1/turbogears/database.py (modified) (1 diff)
• branches/1.1/turbogears/tests/test_sqlalchemy.py (modified) (1 diff)

branches/1.1/turbogears/database.py

@@ -341 +341 @@
-def sa_rwt(func, *args, **kw):
-    log.debug("New SA transaction")
-    del session.context.current
-    req = cherrypy.request
-    req.sa_transaction = session.create_transaction()

branches/1.1/turbogears/tests/test_sqlalchemy.py

@@ -121 +121 @@
-    assert "SQLError" in output
-    assert cherrypy.response.code == 501
+
+
+#--
+# Check for session freshness, ticket #1419
+# It checks that changes made to the data in thread B are reflected in thread A.
+#--
+fresh_md = MetaData()
+test_table = Table("test", fresh_md,
+    Column("id", Integer, primary_key=True),
+    Column("val", String(40))
+    )
+class Test(object):
+    pass
+mapper(Test, test_table)
+
+class FreshRoot(RootController):
+    def test1(self):
+        assert session.query(Test).get(1).val == 'a'
+        return dict()
+    test1 = expose()(test1)
+    def test2(self):
+        session.query(Test).get(1).val = 'b'
+        return dict()
+    test2 = expose()(test2)        
+    def test3(self):
+        assert session.query(Test).get(1).val == 'b'
+        return dict()
+    test3 = expose()(test3)
+
+def test_session_freshness():
+    if os.path.exists('freshtest.db'):
+        os.unlink('freshtest.db')
+    fresh_md.bind = 'sqlite:///freshtest.db' # :memory: can't be used in multiple threads
+    test_table.create()
+    fresh_md.engine.execute(test_table.insert(), dict(id=1, val='a'))
+
+    cherrypy.root = FreshRoot()
+
+    create_request("/test1")
+
+    # Call test2 in a different thread
+    class ThreadB(threading.Thread):
+        def run(self):
+            create_request("/test2")
+    thrdb = ThreadB()
+    thrdb.start()
+    thrdb.join()
+    
+    create_request("/test3")
+
+    assert 'AssertionError' not in cherrypy.response.body[0]