- fixes for connection bound sessions, connection-bound compiled objects via metadata

diff --git a/CHANGES b/CHANGES
index 857089902b465452416275ff4cf2e9b7e95f316d..f54ff078be9d3a09540336ef3cca2b46e7299abe 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+0.3.10
+- sql
+    - got connection-bound metadata to work with implicit execution
+    - cleanup to connection-bound sessions, SessionTransaction
+    
 0.3.9
 - general
     - better error message for NoSuchColumnError [ticket:607]

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index dc197eb190bcd011e946129975eb3983555e9b63..3a86001d5eaee1d41609d7788245f7e3b495e154 100644 (file)
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -509,7 +509,7 @@ class Connection(Connectable):
         return self.execute(object, *multiparams, **params).scalar()
 
     def compiler(self, statement, parameters, **kwargs):
-        return self.dialect.compiler(statement, parameters, engine=self.engine, **kwargs)
+        return self.dialect.compiler(statement, parameters, bind=self, **kwargs)
 
     def execute(self, object, *multiparams, **params):
         for c in type(object).__mro__:

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index 9a0438fc93c5e4610f7ab4f7eab8804445970d4f..9e504c104dde55d37c55e3b877a9847dcaf98b66 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -4,7 +4,7 @@
 # This module is part of SQLAlchemy and is released under
 # the MIT License: http://www.opensource.org/licenses/mit-license.php
 
-from sqlalchemy import util, exceptions, sql
+from sqlalchemy import util, exceptions, sql, engine
 from sqlalchemy.orm import unitofwork, query
 from sqlalchemy.orm.mapper import object_mapper as _object_mapper
 from sqlalchemy.orm.mapper import class_mapper as _class_mapper
@@ -30,8 +30,6 @@ class SessionTransaction(object):
     def connection(self, mapper_or_class, entity_name=None):
         if isinstance(mapper_or_class, type):
             mapper_or_class = _class_mapper(mapper_or_class, entity_name=entity_name)
-        if self.parent is not None:
-            return self.parent.connection(mapper_or_class)
         engine = self.session.get_bind(mapper_or_class)
         return self.get_or_add(engine)
 
@@ -39,28 +37,36 @@ class SessionTransaction(object):
         return SessionTransaction(self.session, self)
 
     def add(self, bind):
+        if self.parent is not None:
+            return self.parent.add(bind)
+            
         if self.connections.has_key(bind.engine):
             raise exceptions.InvalidRequestError("Session already has a Connection associated for the given Connection's Engine")
         return self.get_or_add(bind)
 
     def get_or_add(self, bind):
-        # we reference the 'engine' attribute on the given object, which in the case of
-        # Connection, ProxyEngine, Engine, whatever, should return the original
-        # "Engine" object that is handling the connection.
-        if self.connections.has_key(bind.engine):
-            return self.connections[bind.engine][0]
-        e = bind.engine
-        c = bind.contextual_connect()
-        if not self.connections.has_key(e):
-            self.connections[e] = (c, c.begin(), c is not bind)
-        return self.connections[e][0]
+        if self.parent is not None:
+            return self.parent.get_or_add(bind)
+            
+        if self.connections.has_key(bind):
+            return self.connections[bind][0]
+
+        if not isinstance(bind, engine.Connection):
+            e = bind
+            c = bind.contextual_connect()
+        else:
+            e = bind.engine
+            c = bind
+
+        self.connections[bind] = self.connections[e] = (c, c.begin(), c is not bind)
+        return self.connections[bind][0]
 
     def commit(self):
         if self.parent is not None:
             return
         if self.autoflush:
             self.session.flush()
-        for t in self.connections.values():
+        for t in util.Set(self.connections.values()):
             t[1].commit()
         self.close()
 

diff --git a/setup.py b/setup.py
index 6b87acb336f0438c4df5d6601235dee82ce893c3..38b004be224157654517415d563879ce767fe58c 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@ use_setuptools()
 from setuptools import setup, find_packages
 
 setup(name = "SQLAlchemy",
-    version = "0.3.9",
+    version = "0.3.10",
     description = "Database Abstraction Library",
     author = "Mike Bayer",
     author_email = "mike_mp@zzzcomputing.com",

diff --git a/test/engine/bind.py b/test/engine/bind.py
index d8afff3d76765bdae7e3ef399348007aa3470fe9..33b3b0049ae28b51d43cf3cb7fe529f5f0cfe632 100644 (file)
--- a/test/engine/bind.py
+++ b/test/engine/bind.py
@@ -101,6 +101,26 @@ class BindTest(testbase.PersistTest):
                 table.drop()
                 assert not table.exists()
 
+    def test_implicit_execution(self):
+        metadata = MetaData()
+        table = Table('test_table', metadata,   
+            Column('foo', Integer))
+        conn = testbase.db.connect()
+        metadata.create_all(bind=conn)
+        try:
+            trans = conn.begin()
+            metadata.bind = conn
+            t = table.insert()
+            assert t.bind is conn
+            table.insert().execute(foo=5)
+            table.insert().execute(foo=6)
+            table.insert().execute(foo=7)
+            trans.rollback()
+            metadata.bind = None
+            assert testbase.db.execute("select count(1) from test_table").scalar() == 0
+        finally:
+            metadata.drop_all(bind=conn)
+            
 
     def test_clauseelement(self):
         metadata = MetaData()

diff --git a/test/orm/mapper.py b/test/orm/mapper.py
index 063427134b185b2ea12abf14e9882da65d84810d..c0297e51492ffd2a75ca3469d6f60f00e62517c1 100644 (file)
--- a/test/orm/mapper.py
+++ b/test/orm/mapper.py
@@ -975,6 +975,7 @@ class NoLoadTest(MapperSuperTest):
         self.assert_result(l[0], User,
             {'user_id' : 7, 'addresses' : (Address, [])},
             )
+            
     def testoptions(self):
         m = mapper(User, users, properties = dict(
             addresses = relation(mapper(Address, addresses), lazy=None)

diff --git a/test/orm/session.py b/test/orm/session.py
index 7e0229a7c8f59c92f2c242f7af7eec1ebcd77493..eec3e0ca203b6af7bab28887e1fc250faa41af8a 100644 (file)
--- a/test/orm/session.py
+++ b/test/orm/session.py
@@ -83,6 +83,21 @@ class SessionTest(AssertMixin):
         transaction.rollback()
         assert len(sess.query(User).select()) == 0
 
+    def test_bound_connection(self):
+        class User(object):pass
+        mapper(User, users)
+        c = testbase.db.connect()
+        sess = create_session(bind=c)
+        transaction = sess.create_transaction()
+        trans2 = sess.create_transaction()
+        u = User()
+        sess.save(u)
+        sess.flush()
+        assert transaction.get_or_add(testbase.db) is trans2.get_or_add(testbase.db) #is transaction.get_or_add(c) is trans2.get_or_add(c) is c
+        trans2.commit()
+        transaction.rollback()
+        assert len(sess.query(User).select()) == 0
+        
     def test_close_two(self):
         c = testbase.db.connect()
         try: