- sqlsoup objects no longer have the 'query' attribute - it's

not needed for sqlsoup's usage paradigm and it gets in the
way of a column that is actually named 'query'.

diff --git a/CHANGES b/CHANGES
index 5db709324d19a19f4b2e29c61f7df9ea6445761c..9e439354e777088f508818bf65291fb95949b58d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -811,6 +811,10 @@ CHANGES
       the Session methods of those names, ensuring that the bind is
       in terms of the SqlSoup object's bind.
     
+    - sqlsoup objects no longer have the 'query' attribute - it's
+      not needed for sqlsoup's usage paradigm and it gets in the
+      way of a column that is actually named 'query'.
+      
     - The signature of the proxy_factory callable passed to 
       association_proxy is now (lazy_collection, creator, 
       value_attr, association_proxy), adding a fourth argument

diff --git a/lib/sqlalchemy/ext/sqlsoup.py b/lib/sqlalchemy/ext/sqlsoup.py
index 592878acddf380999ac1bbe67cc6d563bad27691..b2790c56e36d73abe7390c1e6dbbe9f0e7c9fff1 100644 (file)
--- a/lib/sqlalchemy/ext/sqlsoup.py
+++ b/lib/sqlalchemy/ext/sqlsoup.py
@@ -307,7 +307,10 @@ default schema is used.
 from sqlalchemy import Table, MetaData, join
 from sqlalchemy import schema, sql
 from sqlalchemy.engine.base import Engine
-from sqlalchemy.orm import scoped_session, sessionmaker, mapper, class_mapper, relation, session
+from sqlalchemy.orm import scoped_session, sessionmaker, mapper, \
+                            class_mapper, relation, session,\
+                            object_session
+from sqlalchemy.orm.interfaces import MapperExtension, EXT_CONTINUE
 from sqlalchemy.exceptions import SQLAlchemyError, InvalidRequestError, ArgumentError
 from sqlalchemy.sql import expression
 
@@ -316,6 +319,30 @@ __all__ = ['PKNotFoundError', 'SqlSoup']
 
 Session = scoped_session(sessionmaker(autoflush=True, autocommit=False))
 
+class AutoAdd(MapperExtension):
+    def __init__(self, scoped_session):
+        self.scoped_session = scoped_session
+
+    def instrument_class(self, mapper, class_):
+        class_.__init__ = self._default__init__(mapper)
+
+    def _default__init__(ext, mapper):
+        def __init__(self, **kwargs):
+            for key, value in kwargs.iteritems():
+                setattr(self, key, value)
+        return __init__
+
+    def init_instance(self, mapper, class_, oldinit, instance, args, kwargs):
+        session = self.scoped_session()
+        session._save_without_cascade(instance)
+        return EXT_CONTINUE
+
+    def init_failed(self, mapper, class_, oldinit, instance, args, kwargs):
+        sess = object_session(instance)
+        if sess:
+            sess.expunge(instance)
+        return EXT_CONTINUE
+
 class PKNotFoundError(SQLAlchemyError):
     pass
 
@@ -395,19 +422,19 @@ def class_for_table(selectable, **mapper_kwargs):
         L = ["%s=%r" % (key, getattr(self, key, ''))
              for key in self.__class__.c.keys()]
         return '%s(%s)' % (self.__class__.__name__, ','.join(L))
-
+        
     for m in ['__cmp__', '__repr__']:
         setattr(klass, m, eval(m))
     klass._table = selectable
     klass.c = expression.ColumnCollection()
     mappr = mapper(klass,
                    selectable,
-                   extension=Session.extension,
+                   extension=AutoAdd(Session),
                    **mapper_kwargs)
                    
     for k in mappr.iterate_properties:
         klass.c[k.key] = k.columns[0]
-
+    
     klass._query = Session.query_property()
     return klass
 

diff --git a/test/ext/test_sqlsoup.py b/test/ext/test_sqlsoup.py
index f94a52c817a5e925134adacc84a55a143fc6e011..9904b982d1dcba777a2ca38b9ef101587128ff0f 100644 (file)
--- a/test/ext/test_sqlsoup.py
+++ b/test/ext/test_sqlsoup.py
@@ -29,7 +29,12 @@ class SQLSoupTest(TestBase):
         for sql in _teardown:
             engine.execute(sql)
         
-    
+    def test_bad_names(self):
+        db = sqlsoup.SqlSoup(engine)
+#        print db.bad_names.c.id
+        print db.bad_names.c.query
+        
+        
     def test_load(self):
         db = sqlsoup.SqlSoup(engine)
         MappedUsers = db.users
@@ -329,6 +334,11 @@ CREATE TABLE loans (
 CREATE TABLE nopk (
     i                    int
 );
+
+CREATE TABLE bad_names (
+   id int primary key,
+   query  varchar(100)
+)
 """.split(';')