sqlobject-cvs — CVS notification

[SQL-CVS] r4113 - SQLObject/branches/0.11/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-03-03 09:48:54 -0700 (Wed, 03 Mar 2010)
New Revision: 4113

Modified:
   SQLObject/branches/0.11/sqlobject/main.py
Log:
Compare identities - connections don't support comparison.


Modified: SQLObject/branches/0.11/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/main.py	2010-03-01 05:59:22 UTC (rev 4112)
+++ SQLObject/branches/0.11/sqlobject/main.py	2010-03-03 16:48:54 UTC (rev 4113)
@@ -922,7 +922,7 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if (connection is not None) and (self._connection != connection):
+        if (connection is not None) and (self._connection is not connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1209,7 +1209,7 @@
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
                 connection = kw.pop('connection')
-                if self._connection != connection:
+                if self._connection is not connection:
                     self._connection = connection
                     self.sqlmeta._perConnection = True
 

[SQL-CVS] r4114 - SQLObject/branches/0.12/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-03-03 09:50:22 -0700 (Wed, 03 Mar 2010)
New Revision: 4114

Modified:
   SQLObject/branches/0.12/sqlobject/main.py
Log:
Merged revision 4113 from branch 0.11: compare identities.


Modified: SQLObject/branches/0.12/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/main.py	2010-03-03 16:48:54 UTC (rev 4113)
+++ SQLObject/branches/0.12/sqlobject/main.py	2010-03-03 16:50:22 UTC (rev 4114)
@@ -920,7 +920,7 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if (connection is not None) and (self._connection != connection):
+        if (connection is not None) and (self._connection is not connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1207,7 +1207,7 @@
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
                 connection = kw.pop('connection')
-                if self._connection != connection:
+                if self._connection is not connection:
                     self._connection = connection
                     self.sqlmeta._perConnection = True
 

[SQL-CVS] r4116 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-03-03 10:02:52 -0700 (Wed, 03 Mar 2010)
New Revision: 4116

Modified:
   SQLObject/trunk/sqlobject/tests/test_pickle.py
Log:
Fixed a test that an instance with a per-instance connection cannot be pickled.


Modified: SQLObject/trunk/sqlobject/tests/test_pickle.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_pickle.py	2010-03-03 16:50:47 UTC (rev 4115)
+++ SQLObject/trunk/sqlobject/tests/test_pickle.py	2010-03-03 17:02:52 UTC (rev 4116)
@@ -23,6 +23,11 @@
     assert test.question == test_question
     assert test.answer == test_answer
 
-    TestPickle._connection.cache.clear()
-    test = TestPickle.get(test.id, connection=TestPickle._connection)
+    connection = TestPickle._connection
+    if (connection.dbName == 'sqlite') and connection._memory:
+        return # The following test requires a different connection
+
+    test = TestPickle.get(test.id,
+        connection=getConnection(registry='')) # to make a different DB URI
+                                               # and open another connection
     raises(pickle.PicklingError, pickle.dumps, test, pickle.HIGHEST_PROTOCOL)

[SQL-CVS] r4110 - in SQLObject/trunk: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-26 14:27:29 -0700 (Fri, 26 Feb 2010)
New Revision: 4110

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/tests/test_select.py
Log:
Merged revisions 4107, 4108 from branch 0.11: fixed a comment;
do not set _perConnection flag if get() or _init() is passed the same
connection; this is often the case with select().


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-02-26 21:27:07 UTC (rev 4109)
+++ SQLObject/trunk/docs/News.txt	2010-02-26 21:27:29 UTC (rev 4110)
@@ -97,6 +97,9 @@
   connection is not a transaction and is in autocommit mode - remove
   parent row(s).
 
+* Do not set _perConnection flag if get() or _init() is passed the same
+  connection; this is often the case with select().
+
 SQLObject 0.11.3
 ================
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-02-26 21:27:07 UTC (rev 4109)
+++ SQLObject/trunk/sqlobject/main.py	2010-02-26 21:27:29 UTC (rev 4110)
@@ -768,7 +768,7 @@
 
         # Do not check hasattr(cls, '_connection') here - it is possible
         # SQLObject parent class has a connection attribute that came
-        # from sqlhub, e.g.; # check __dict__ only.
+        # from sqlhub, e.g.; check __dict__ only.
         if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 
@@ -921,7 +921,7 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if connection is not None:
+        if (connection is not None) and (self._connection != connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1207,9 +1207,10 @@
 
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
-                self._connection = kw['connection']
-                self.sqlmeta._perConnection = True
-                del kw['connection']
+                connection = kw.pop('connection')
+                if self._connection != connection:
+                    self._connection = connection
+                    self.sqlmeta._perConnection = True
 
             self._SO_writeLock = threading.Lock()
 

Modified: SQLObject/trunk/sqlobject/tests/test_select.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_select.py	2010-02-26 21:27:07 UTC (rev 4109)
+++ SQLObject/trunk/sqlobject/tests/test_select.py	2010-02-26 21:27:29 UTC (rev 4110)
@@ -189,3 +189,8 @@
     setupClass(IterTest)
     IterTest(name='sqlobject')
     IterTest.select(IterTest.q.name==u'sqlobject')
+
+def test_select_perConnection():
+    setupClass(IterTest)
+    IterTest(name='a')
+    assert not IterTest.select().getOne().sqlmeta._perConnection

[SQL-CVS] r4109 - in SQLObject/branches/0.12: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-26 14:27:07 -0700 (Fri, 26 Feb 2010)
New Revision: 4109

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/main.py
   SQLObject/branches/0.12/sqlobject/tests/test_select.py
Log:
Merged revisions 4107, 4108 from branch 0.11: fixed a comment;
do not set _perConnection flag if get() or _init() is passed the same
connection; this is often the case with select().


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-02-26 21:25:26 UTC (rev 4108)
+++ SQLObject/branches/0.12/docs/News.txt	2010-02-26 21:27:07 UTC (rev 4109)
@@ -78,6 +78,9 @@
   connection is not a transaction and is in autocommit mode - remove
   parent row(s).
 
+* Do not set _perConnection flag if get() or _init() is passed the same
+  connection; this is often the case with select().
+
 SQLObject 0.11.3
 ================
 

Modified: SQLObject/branches/0.12/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/main.py	2010-02-26 21:25:26 UTC (rev 4108)
+++ SQLObject/branches/0.12/sqlobject/main.py	2010-02-26 21:27:07 UTC (rev 4109)
@@ -768,7 +768,7 @@
 
         # Do not check hasattr(cls, '_connection') here - it is possible
         # SQLObject parent class has a connection attribute that came
-        # from sqlhub, e.g.; # check __dict__ only.
+        # from sqlhub, e.g.; check __dict__ only.
         if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 
@@ -920,7 +920,7 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if connection is not None:
+        if (connection is not None) and (self._connection != connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1206,9 +1206,10 @@
 
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
-                self._connection = kw['connection']
-                self.sqlmeta._perConnection = True
-                del kw['connection']
+                connection = kw.pop('connection')
+                if self._connection != connection:
+                    self._connection = connection
+                    self.sqlmeta._perConnection = True
 
             self._SO_writeLock = threading.Lock()
 

Modified: SQLObject/branches/0.12/sqlobject/tests/test_select.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/tests/test_select.py	2010-02-26 21:25:26 UTC (rev 4108)
+++ SQLObject/branches/0.12/sqlobject/tests/test_select.py	2010-02-26 21:27:07 UTC (rev 4109)
@@ -189,3 +189,8 @@
     setupClass(IterTest)
     IterTest(name='sqlobject')
     IterTest.select(IterTest.q.name==u'sqlobject')
+
+def test_select_perConnection():
+    setupClass(IterTest)
+    IterTest(name='a')
+    assert not IterTest.select().getOne().sqlmeta._perConnection

[SQL-CVS] r4108 - SQLObject/branches/0.11/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-02-26 14:25:26 -0700 (Fri, 26 Feb 2010)
New Revision: 4108

Modified:
   SQLObject/branches/0.11/sqlobject/main.py
Log:
Fixed a comment.


Modified: SQLObject/branches/0.11/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/main.py	2010-02-26 21:22:50 UTC (rev 4107)
+++ SQLObject/branches/0.11/sqlobject/main.py	2010-02-26 21:25:26 UTC (rev 4108)
@@ -768,7 +768,7 @@
 
         # Do not check hasattr(cls, '_connection') here - it is possible
         # SQLObject parent class has a connection attribute that came
-        # from sqlhub, e.g.; # check __dict__ only.
+        # from sqlhub, e.g.; check __dict__ only.
         if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 

[SQL-CVS] r4107 - in SQLObject/branches/0.11: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-26 14:22:50 -0700 (Fri, 26 Feb 2010)
New Revision: 4107

Modified:
   SQLObject/branches/0.11/docs/News.txt
   SQLObject/branches/0.11/sqlobject/main.py
   SQLObject/branches/0.11/sqlobject/tests/test_select.py
Log:
Do not set _perConnection flag if get() or _init() is passed the same
connection; this is often the case with select().


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-02-10 15:49:07 UTC (rev 4106)
+++ SQLObject/branches/0.11/docs/News.txt	2010-02-26 21:22:50 UTC (rev 4107)
@@ -14,6 +14,9 @@
   connection is not a transaction and is in autocommit mode - remove
   parent row(s).
 
+* Do not set _perConnection flag if get() or _init() is passed the same
+  connection; this is often the case with select().
+
 SQLObject 0.11.3
 ================
 

Modified: SQLObject/branches/0.11/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/main.py	2010-02-10 15:49:07 UTC (rev 4106)
+++ SQLObject/branches/0.11/sqlobject/main.py	2010-02-26 21:22:50 UTC (rev 4107)
@@ -922,7 +922,7 @@
         # If no connection was given, we'll inherit the class
         # instance variable which should have a _connection
         # attribute.
-        if connection is not None:
+        if (connection is not None) and (self._connection != connection):
             self._connection = connection
             # Sometimes we need to know if this instance is
             # global or tied to a particular connection.
@@ -1208,9 +1208,10 @@
 
             # Pass the connection object along if we were given one.
             if kw.has_key('connection'):
-                self._connection = kw['connection']
-                self.sqlmeta._perConnection = True
-                del kw['connection']
+                connection = kw.pop('connection')
+                if self._connection != connection:
+                    self._connection = connection
+                    self.sqlmeta._perConnection = True
 
             self._SO_writeLock = threading.Lock()
 

Modified: SQLObject/branches/0.11/sqlobject/tests/test_select.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/tests/test_select.py	2010-02-10 15:49:07 UTC (rev 4106)
+++ SQLObject/branches/0.11/sqlobject/tests/test_select.py	2010-02-26 21:22:50 UTC (rev 4107)
@@ -180,3 +180,8 @@
     setupClass(IterTest)
     IterTest(name='sqlobject')
     IterTest.select(IterTest.q.name==u'sqlobject')
+
+def test_select_perConnection():
+    setupClass(IterTest)
+    IterTest(name='a')
+    assert not IterTest.select().getOne().sqlmeta._perConnection

[SQL-CVS] [ sqlobject-Patches-2954013 ] Rdbhost connection module

[SourceForge.net <no...@so...>]

Patches item #2954013, was opened at 2010-02-17 22:48
Message generated for change (Tracker Item Submitted) made by dvkeeney
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=2954013&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: dkeeney (dvkeeney)
Assigned to: Nobody/Anonymous (nobody)
Summary: Rdbhost connection module

Initial Comment:
Revised rdbconnection.py to simplify setting of database encoding.

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540674&aid=2954013&group_id=74338

[SQL-CVS] r4106 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-10 08:49:07 -0700 (Wed, 10 Feb 2010)
New Revision: 4106

Modified:
   SQLObject/trunk/sqlobject/tests/test_picklecol.py
Log:
Merged a patch from revision 4104 from branch 0.11: PickleCol requires blobData.


Modified: SQLObject/trunk/sqlobject/tests/test_picklecol.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_picklecol.py	2010-02-10 15:48:43 UTC (rev 4105)
+++ SQLObject/trunk/sqlobject/tests/test_picklecol.py	2010-02-10 15:49:07 UTC (rev 4106)
@@ -15,6 +15,8 @@
     pickledata = PickleCol(default=None, length=65535)
 
 def test_pickleCol():
+    if not supports('blobData'):
+        return
     setupClass([PickleContainer], force=True)
     mypickledata = PickleData()
 
@@ -33,4 +35,3 @@
     assert s2.pi == mypickledata.pi
     assert s2.question == mypickledata.question
     assert s2.answer == mypickledata.answer
-

[SQL-CVS] r4105 - SQLObject/branches/0.12/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-10 08:48:43 -0700 (Wed, 10 Feb 2010)
New Revision: 4105

Modified:
   SQLObject/branches/0.12/sqlobject/tests/test_picklecol.py
Log:
Merged a patch from revision 4104 from branch 0.11: PickleCol requires blobData.


Modified: SQLObject/branches/0.12/sqlobject/tests/test_picklecol.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/tests/test_picklecol.py	2010-02-10 15:47:25 UTC (rev 4104)
+++ SQLObject/branches/0.12/sqlobject/tests/test_picklecol.py	2010-02-10 15:48:43 UTC (rev 4105)
@@ -15,6 +15,8 @@
     pickledata = PickleCol(default=None, length=65535)
 
 def test_pickleCol():
+    if not supports('blobData'):
+        return
     setupClass([PickleContainer], force=True)
     mypickledata = PickleData()
 
@@ -33,4 +35,3 @@
     assert s2.pi == mypickledata.pi
     assert s2.question == mypickledata.question
     assert s2.answer == mypickledata.answer
-

[SQL-CVS] r4104 - SQLObject/branches/0.11/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-10 08:47:25 -0700 (Wed, 10 Feb 2010)
New Revision: 4104

Modified:
   SQLObject/branches/0.11/sqlobject/tests/test_picklecol.py
Log:
PickleCol requires blobData.


Modified: SQLObject/branches/0.11/sqlobject/tests/test_picklecol.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/tests/test_picklecol.py	2010-02-08 18:12:07 UTC (rev 4103)
+++ SQLObject/branches/0.11/sqlobject/tests/test_picklecol.py	2010-02-10 15:47:25 UTC (rev 4104)
@@ -15,6 +15,8 @@
     pickledata = PickleCol(default=None, length=65535)
 
 def test_pickleCol():
+    if not supports('blobData'):
+        return
     setupClass([PickleContainer], force=True)
     mypickledata = PickleData()
 
@@ -33,4 +35,3 @@
     assert s2.pi == mypickledata.pi
     assert s2.question == mypickledata.question
     assert s2.answer == mypickledata.answer
-

[SQL-CVS] [ sqlobject-Bugs-1547004 ] SQLObject does not reconnect

[SourceForge.net <no...@so...>]

Bugs item #1547004, was opened at 2006-08-26 08:05
Message generated for change (Settings changed) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1547004&group_id=74338

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: DBM
Group: SQLObject from repository
>Status: Closed
Resolution: Fixed
Priority: 5
Private: No
Submitted By: elpargo (elpargo)
Assigned to: Nobody/Anonymous (nobody)
Summary: SQLObject does not reconnect

Initial Comment:
this is from the 0.7bug fix branch

a lot of background has been created on this in
Turbogears bug tracker.

mainly in
http://trac.turbogears.org/turbogears/ticket/872
http://trac.turbogears.org/turbogears/ticket/781

Basically the connection after being idle is drop and
SO engine is not aware of this. 

Many patches have been proposed but none accepted.



----------------------------------------------------------------------

Comment By: Oleg Broytman (phd)
Date: 2007-03-06 18:23

Message:
Logged In: YES 
user_id=4799
Originator: NO

Partially fixed: in the revisions 2396-2399 there were patches that allows
autoreconnect for MySQLdb 1.2.2+.

----------------------------------------------------------------------

Comment By: sophana (sophana)
Date: 2006-12-10 23:56

Message:
Logged In: YES 
user_id=931678
Originator: NO

I think the best solution is the one included in this mysqldb patch. The
reconnection is handled directly in the mysql C api with an option.
The problem Is that this option is only available from mysql 5.0.x

http://sourceforge.net/tracker/index.php?func=detail&aid=1483074&group_id=22307&atid=374934

Other problem this patch is for mysqldb 1.2.1p2 which has problems with
unicode.

Have to see if the patch is already applied or applicable to 1.2.2

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=1547004&group_id=74338

[SQL-CVS] r4103 - in SQLObject/trunk: docs sqlobject/inheritance sqlobject/inheritance/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-08 11:12:07 -0700 (Mon, 08 Feb 2010)
New Revision: 4103

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/inheritance/__init__.py
   SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py
Log:
Merged a bugfix in inheritance from revision 4102 from branch 0.12.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-02-08 18:10:24 UTC (rev 4102)
+++ SQLObject/trunk/docs/News.txt	2010-02-08 18:12:07 UTC (rev 4103)
@@ -26,6 +26,11 @@
   the case of inherited idName inherited value takes precedence; to allow
   Style to set idName reset inherited idName to None.
 
+SQLObject 0.12.2
+================
+
+* A bugfix ported from `SQLObject 0.11.4`_.
+
 SQLObject 0.12.1
 ================
 
@@ -85,6 +90,13 @@
 
 * Removed the last remained string exceptions.
 
+SQLObject 0.11.4
+================
+
+* Fixed a bug in inheritance - if creation of the row failed and if the
+  connection is not a transaction and is in autocommit mode - remove
+  parent row(s).
+
 SQLObject 0.11.3
 ================
 

Modified: SQLObject/trunk/sqlobject/inheritance/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/inheritance/__init__.py	2010-02-08 18:10:24 UTC (rev 4102)
+++ SQLObject/trunk/sqlobject/inheritance/__init__.py	2010-02-08 18:12:07 UTC (rev 4103)
@@ -1,9 +1,10 @@
+from sqlobject import dbconnection
+from sqlobject import classregistry
+from sqlobject import events
 from sqlobject import sqlbuilder
-from sqlobject import classregistry
 from sqlobject.col import StringCol, ForeignKey
 from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
    makeProperties, unmakeProperties, getterName, setterName
-from sqlobject import events
 import iteration
 
 def tablesUsedSet(obj, db):
@@ -109,7 +110,7 @@
                         def setfunc(self, val):
                             if not self.sqlmeta._creating and not getattr(self.sqlmeta, "row_update_sig_suppress", False):
                                 self.sqlmeta.send(events.RowUpdateSignal, self, {cname : val})
-                                
+
                             result = setattr(self._parent, cname, val)
                         return setfunc
 
@@ -384,7 +385,20 @@
 
             id = self._parent.id
 
-        super(InheritableSQLObject, self)._create(id, **kw)
+        # TC: Create this record and catch all exceptions in order to destroy
+        # TC: the parent if the child can not be created.
+        try:
+            super(InheritableSQLObject, self)._create(id, **kw)
+        except:
+            # If we are outside a transaction and this is a child, destroy the parent
+            connection = self._connection
+            if (not isinstance(connection, dbconnection.Transaction) and
+                    connection.autoCommit) and self.sqlmeta.parentClass:
+                self._parent.destroySelf()
+                #TC: Do we need to do this??
+                self._parent = None
+            # TC: Reraise the original exception
+            raise
 
     def _findAlternateID(cls, name, dbName, value, connection=None):
         result = list(cls.selectBy(connection, **{name: value}))

Modified: SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py
===================================================================
--- SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py	2010-02-08 18:10:24 UTC (rev 4102)
+++ SQLObject/trunk/sqlobject/inheritance/tests/test_deep_inheritance.py	2010-02-08 18:12:07 UTC (rev 4103)
@@ -13,27 +13,54 @@
     manager = ForeignKey("DIManager", default=None)
 
 class DIEmployee(DIPerson):
-    position = StringCol()
+    position = StringCol(unique=True)
 
 class DIManager(DIEmployee):
     subdudes = MultipleJoin("DIPerson", joinColumn="manager_id")
 
 def test_creation_fail():
     """
-    Try to creae an Manager without specifying a position.
-    this should fail without leaving any partial records in
+    Try to create a Manager without specifying a position.
+    This should fail without leaving any partial records in
     the database.
 
     """
     setupClass([DIManager, DIEmployee, DIPerson])
 
-    kwargs ={'firstName':'John', 'lastname':'Doe'}
+    kwargs ={'firstName': 'John', 'lastname': 'Doe'}
     raises(TypeError, DIManager, **kwargs)
-    #what we really need to check for is partial records in the database.
-    #the following is not really adaquate.
     persons = DIEmployee.select(DIPerson.q.firstName == 'John')
     assert persons.count() == 0
 
+def test_creation_fail2():
+    """
+    Try to create two Managers with the same position.
+    This should fail without leaving any partial records in
+    the database.
+
+    """
+    setupClass([DIManager, DIEmployee, DIPerson])
+
+    kwargs ={'firstName': 'John', 'lastName': 'Doe', 'position': 'Project Manager'}
+    DIManager(**kwargs)
+    persons = DIEmployee.select(DIPerson.q.firstName == 'John')
+    assert persons.count() == 1
+
+    kwargs ={'firstName': 'John', 'lastName': 'Doe II', 'position': 'Project Manager'}
+    raises(Exception, DIManager, **kwargs)
+    persons = DIPerson.select(DIPerson.q.firstName == 'John')
+    assert persons.count() == 1
+
+    if not supports('transactions'):
+        return
+    transaction = DIPerson._connection.transaction()
+    kwargs ={'firstName': 'John', 'lastName': 'Doe III', 'position': 'Project Manager'}
+    raises(Exception, DIManager, connection=transaction, **kwargs)
+    transaction.rollback()
+    transaction.begin()
+    persons = DIPerson.select(DIPerson.q.firstName == 'John', connection=transaction)
+    assert persons.count() == 1
+
 def test_deep_inheritance():
     setupClass([DIManager, DIEmployee, DIPerson])
 

[SQL-CVS] r4102 - in SQLObject/branches/0.12: docs sqlobject/inheritance sqlobject/inheritance/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-08 11:10:24 -0700 (Mon, 08 Feb 2010)
New Revision: 4102

Modified:
   SQLObject/branches/0.12/docs/News.txt
   SQLObject/branches/0.12/sqlobject/inheritance/__init__.py
   SQLObject/branches/0.12/sqlobject/inheritance/tests/test_deep_inheritance.py
Log:
Merged a bugfix in inheritance from revision 4101 from branch 0.11.


Modified: SQLObject/branches/0.12/docs/News.txt
===================================================================
--- SQLObject/branches/0.12/docs/News.txt	2010-02-08 18:06:17 UTC (rev 4101)
+++ SQLObject/branches/0.12/docs/News.txt	2010-02-08 18:10:24 UTC (rev 4102)
@@ -7,6 +7,11 @@
 
 .. _start:
 
+SQLObject 0.12.2
+================
+
+* A bugfix ported from `SQLObject 0.11.4`_.
+
 SQLObject 0.12.1
 ================
 
@@ -66,6 +71,13 @@
 
 * Removed the last remained string exceptions.
 
+SQLObject 0.11.4
+================
+
+* Fixed a bug in inheritance - if creation of the row failed and if the
+  connection is not a transaction and is in autocommit mode - remove
+  parent row(s).
+
 SQLObject 0.11.3
 ================
 

Modified: SQLObject/branches/0.12/sqlobject/inheritance/__init__.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/inheritance/__init__.py	2010-02-08 18:06:17 UTC (rev 4101)
+++ SQLObject/branches/0.12/sqlobject/inheritance/__init__.py	2010-02-08 18:10:24 UTC (rev 4102)
@@ -1,9 +1,10 @@
+from sqlobject import dbconnection
+from sqlobject import classregistry
+from sqlobject import events
 from sqlobject import sqlbuilder
-from sqlobject import classregistry
 from sqlobject.col import StringCol, ForeignKey
 from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
    makeProperties, unmakeProperties, getterName, setterName
-from sqlobject import events
 import iteration
 
 def tablesUsedSet(obj, db):
@@ -109,7 +110,7 @@
                         def setfunc(self, val):
                             if not self.sqlmeta._creating and not getattr(self.sqlmeta, "row_update_sig_suppress", False):
                                 self.sqlmeta.send(events.RowUpdateSignal, self, {cname : val})
-                                
+
                             result = setattr(self._parent, cname, val)
                         return setfunc
 
@@ -384,7 +385,20 @@
 
             id = self._parent.id
 
-        super(InheritableSQLObject, self)._create(id, **kw)
+        # TC: Create this record and catch all exceptions in order to destroy
+        # TC: the parent if the child can not be created.
+        try:
+            super(InheritableSQLObject, self)._create(id, **kw)
+        except:
+            # If we are outside a transaction and this is a child, destroy the parent
+            connection = self._connection
+            if (not isinstance(connection, dbconnection.Transaction) and
+                    connection.autoCommit) and self.sqlmeta.parentClass:
+                self._parent.destroySelf()
+                #TC: Do we need to do this??
+                self._parent = None
+            # TC: Reraise the original exception
+            raise
 
     def _findAlternateID(cls, name, dbName, value, connection=None):
         result = list(cls.selectBy(connection, **{name: value}))

Modified: SQLObject/branches/0.12/sqlobject/inheritance/tests/test_deep_inheritance.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/inheritance/tests/test_deep_inheritance.py	2010-02-08 18:06:17 UTC (rev 4101)
+++ SQLObject/branches/0.12/sqlobject/inheritance/tests/test_deep_inheritance.py	2010-02-08 18:10:24 UTC (rev 4102)
@@ -13,27 +13,54 @@
     manager = ForeignKey("DIManager", default=None)
 
 class DIEmployee(DIPerson):
-    position = StringCol()
+    position = StringCol(unique=True)
 
 class DIManager(DIEmployee):
     subdudes = MultipleJoin("DIPerson", joinColumn="manager_id")
 
 def test_creation_fail():
     """
-    Try to creae an Manager without specifying a position.
-    this should fail without leaving any partial records in
+    Try to create a Manager without specifying a position.
+    This should fail without leaving any partial records in
     the database.
 
     """
     setupClass([DIManager, DIEmployee, DIPerson])
 
-    kwargs ={'firstName':'John', 'lastname':'Doe'}
+    kwargs ={'firstName': 'John', 'lastname': 'Doe'}
     raises(TypeError, DIManager, **kwargs)
-    #what we really need to check for is partial records in the database.
-    #the following is not really adaquate.
     persons = DIEmployee.select(DIPerson.q.firstName == 'John')
     assert persons.count() == 0
 
+def test_creation_fail2():
+    """
+    Try to create two Managers with the same position.
+    This should fail without leaving any partial records in
+    the database.
+
+    """
+    setupClass([DIManager, DIEmployee, DIPerson])
+
+    kwargs ={'firstName': 'John', 'lastName': 'Doe', 'position': 'Project Manager'}
+    DIManager(**kwargs)
+    persons = DIEmployee.select(DIPerson.q.firstName == 'John')
+    assert persons.count() == 1
+
+    kwargs ={'firstName': 'John', 'lastName': 'Doe II', 'position': 'Project Manager'}
+    raises(Exception, DIManager, **kwargs)
+    persons = DIPerson.select(DIPerson.q.firstName == 'John')
+    assert persons.count() == 1
+
+    if not supports('transactions'):
+        return
+    transaction = DIPerson._connection.transaction()
+    kwargs ={'firstName': 'John', 'lastName': 'Doe III', 'position': 'Project Manager'}
+    raises(Exception, DIManager, connection=transaction, **kwargs)
+    transaction.rollback()
+    transaction.begin()
+    persons = DIPerson.select(DIPerson.q.firstName == 'John', connection=transaction)
+    assert persons.count() == 1
+
 def test_deep_inheritance():
     setupClass([DIManager, DIEmployee, DIPerson])
 

[SQL-CVS] r4101 - in SQLObject/branches/0.11: docs sqlobject/inheritance sqlobject/inheritance/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-08 11:06:17 -0700 (Mon, 08 Feb 2010)
New Revision: 4101

Modified:
   SQLObject/branches/0.11/docs/News.txt
   SQLObject/branches/0.11/sqlobject/inheritance/__init__.py
   SQLObject/branches/0.11/sqlobject/inheritance/tests/test_deep_inheritance.py
Log:
Fixed a bug in inheritance.


Modified: SQLObject/branches/0.11/docs/News.txt
===================================================================
--- SQLObject/branches/0.11/docs/News.txt	2010-02-05 13:51:02 UTC (rev 4100)
+++ SQLObject/branches/0.11/docs/News.txt	2010-02-08 18:06:17 UTC (rev 4101)
@@ -7,6 +7,13 @@
 
 .. _start:
 
+SQLObject 0.11.4
+================
+
+* Fixed a bug in inheritance - if creation of the row failed and if the
+  connection is not a transaction and is in autocommit mode - remove
+  parent row(s).
+
 SQLObject 0.11.3
 ================
 

Modified: SQLObject/branches/0.11/sqlobject/inheritance/__init__.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/inheritance/__init__.py	2010-02-05 13:51:02 UTC (rev 4100)
+++ SQLObject/branches/0.11/sqlobject/inheritance/__init__.py	2010-02-08 18:06:17 UTC (rev 4101)
@@ -1,9 +1,10 @@
+from sqlobject import dbconnection
+from sqlobject import classregistry
+from sqlobject import events
 from sqlobject import sqlbuilder
-from sqlobject import classregistry
 from sqlobject.col import StringCol, ForeignKey
 from sqlobject.main import sqlmeta, SQLObject, SelectResults, \
    makeProperties, unmakeProperties, getterName, setterName
-from sqlobject import events
 import iteration
 
 def tablesUsedSet(obj, db):
@@ -109,7 +110,7 @@
                         def setfunc(self, val):
                             if not self.sqlmeta._creating and not getattr(self.sqlmeta, "row_update_sig_suppress", False):
                                 self.sqlmeta.send(events.RowUpdateSignal, self, {cname : val})
-                                
+
                             result = setattr(self._parent, cname, val)
                         return setfunc
 
@@ -384,7 +385,20 @@
 
             id = self._parent.id
 
-        super(InheritableSQLObject, self)._create(id, **kw)
+        # TC: Create this record and catch all exceptions in order to destroy
+        # TC: the parent if the child can not be created.
+        try:
+            super(InheritableSQLObject, self)._create(id, **kw)
+        except:
+            # If we are outside a transaction and this is a child, destroy the parent
+            connection = self._connection
+            if (not isinstance(connection, dbconnection.Transaction) and
+                    connection.autoCommit) and self.sqlmeta.parentClass:
+                self._parent.destroySelf()
+                #TC: Do we need to do this??
+                self._parent = None
+            # TC: Reraise the original exception
+            raise
 
     def _findAlternateID(cls, name, dbName, value, connection=None):
         result = list(cls.selectBy(connection, **{name: value}))

Modified: SQLObject/branches/0.11/sqlobject/inheritance/tests/test_deep_inheritance.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/inheritance/tests/test_deep_inheritance.py	2010-02-05 13:51:02 UTC (rev 4100)
+++ SQLObject/branches/0.11/sqlobject/inheritance/tests/test_deep_inheritance.py	2010-02-08 18:06:17 UTC (rev 4101)
@@ -13,27 +13,54 @@
     manager = ForeignKey("DIManager", default=None)
 
 class DIEmployee(DIPerson):
-    position = StringCol()
+    position = StringCol(unique=True)
 
 class DIManager(DIEmployee):
     subdudes = MultipleJoin("DIPerson", joinColumn="manager_id")
 
 def test_creation_fail():
     """
-    Try to creae an Manager without specifying a position.
-    this should fail without leaving any partial records in
+    Try to create a Manager without specifying a position.
+    This should fail without leaving any partial records in
     the database.
 
     """
     setupClass([DIManager, DIEmployee, DIPerson])
 
-    kwargs ={'firstName':'John', 'lastname':'Doe'}
+    kwargs ={'firstName': 'John', 'lastname': 'Doe'}
     raises(TypeError, DIManager, **kwargs)
-    #what we really need to check for is partial records in the database.
-    #the following is not really adaquate.
     persons = DIEmployee.select(DIPerson.q.firstName == 'John')
     assert persons.count() == 0
 
+def test_creation_fail2():
+    """
+    Try to create two Managers with the same position.
+    This should fail without leaving any partial records in
+    the database.
+
+    """
+    setupClass([DIManager, DIEmployee, DIPerson])
+
+    kwargs ={'firstName': 'John', 'lastName': 'Doe', 'position': 'Project Manager'}
+    DIManager(**kwargs)
+    persons = DIEmployee.select(DIPerson.q.firstName == 'John')
+    assert persons.count() == 1
+
+    kwargs ={'firstName': 'John', 'lastName': 'Doe II', 'position': 'Project Manager'}
+    raises(Exception, DIManager, **kwargs)
+    persons = DIPerson.select(DIPerson.q.firstName == 'John')
+    assert persons.count() == 1
+
+    if not supports('transactions'):
+        return
+    transaction = DIPerson._connection.transaction()
+    kwargs ={'firstName': 'John', 'lastName': 'Doe III', 'position': 'Project Manager'}
+    raises(Exception, DIManager, connection=transaction, **kwargs)
+    transaction.rollback()
+    transaction.begin()
+    persons = DIPerson.select(DIPerson.q.firstName == 'John', connection=transaction)
+    assert persons.count() == 1
+
 def test_deep_inheritance():
     setupClass([DIManager, DIEmployee, DIPerson])
 

[SQL-CVS] r4098 - SQLObject/trunk/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-02-05 06:31:14 -0700 (Fri, 05 Feb 2010)
New Revision: 4098

Modified:
   SQLObject/trunk/sqlobject/main.py
Log:
Merged revision 4096 from branch 0.11: a comment for the group of rich comparison methods.


Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-02-05 13:30:35 UTC (rev 4097)
+++ SQLObject/trunk/sqlobject/main.py	2010-02-05 13:31:14 UTC (rev 4098)
@@ -1650,6 +1650,9 @@
     def tablesUsedImmediate(self):
         return [self.__class__.q]
 
+
+    # Comparison
+
     def __eq__(self, other):
         if self.__class__ is other.__class__:
             if self.id == other.id:

[SQL-CVS] r4099 - in SQLObject/trunk: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-05 06:43:30 -0700 (Fri, 05 Feb 2010)
New Revision: 4099

Added:
   SQLObject/trunk/sqlobject/tests/test_pickle.py
Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
Log:
SQLObject instances that don't have a per-instance connection can be pickled and unpickled.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-02-05 13:31:14 UTC (rev 4098)
+++ SQLObject/trunk/docs/News.txt	2010-02-05 13:43:30 UTC (rev 4099)
@@ -13,6 +13,9 @@
 Features & Interface
 --------------------
 
+* SQLObject instances that don't have a per-instance connection can be
+  pickled and unpickled.
+
 * Added TimedeltaCol; currently it's only implemented on PostgreSQL as an
   INTERVAL type.
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-02-05 13:31:14 UTC (rev 4098)
+++ SQLObject/trunk/sqlobject/main.py	2010-02-05 13:43:30 UTC (rev 4099)
@@ -1675,6 +1675,22 @@
        return NotImplemented
 
 
+    def __getstate__(self):
+        if self.sqlmeta._perConnection:
+            from pickle import PicklingError
+            raise PicklingError('Cannot pickle an SQLObject instance that has a per-instance connection')
+        d = self.__dict__.copy()
+        del d['sqlmeta']
+        del d['_SO_writeLock']
+        return d
+
+    def __setstate__(self, d):
+        self.__init__(_SO_fetch_no_create=1)
+        self._SO_writeLock = threading.Lock()
+        self.__dict__.update(d)
+        self.__class__._connection.cache.put(self.id, self.__class__, self)
+
+
 def capitalize(name):
     return name[0].capitalize() + name[1:]
 

Added: SQLObject/trunk/sqlobject/tests/test_pickle.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_pickle.py	                        (rev 0)
+++ SQLObject/trunk/sqlobject/tests/test_pickle.py	2010-02-05 13:43:30 UTC (rev 4099)
@@ -0,0 +1,24 @@
+import pickle
+from sqlobject import *
+from sqlobject.tests.dbtest import *
+
+########################################
+## Pickle instances
+########################################
+
+class TestPickle(SQLObject):
+    question = StringCol()
+    answer = IntCol()
+
+test_question = 'The Ulimate Question of Life, the Universe and Everything'
+test_answer = 42
+
+def test_pickleCol():
+    setupClass(TestPickle)
+    test = TestPickle(question=test_question, answer=test_answer)
+
+    pickle_data = pickle.dumps(test, pickle.HIGHEST_PROTOCOL)
+    test = pickle.loads(pickle_data)
+
+    assert test.question == test_question
+    assert test.answer == test_answer

[SQL-CVS] r4097 - SQLObject/branches/0.12/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-02-05 06:30:35 -0700 (Fri, 05 Feb 2010)
New Revision: 4097

Modified:
   SQLObject/branches/0.12/sqlobject/main.py
Log:
Merged revision 4096 from branch 0.11: a comment for the group of rich comparison methods.


Modified: SQLObject/branches/0.12/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.12/sqlobject/main.py	2010-02-05 13:29:15 UTC (rev 4096)
+++ SQLObject/branches/0.12/sqlobject/main.py	2010-02-05 13:30:35 UTC (rev 4097)
@@ -1649,6 +1649,9 @@
     def tablesUsedImmediate(self):
         return [self.__class__.q]
 
+
+    # Comparison
+
     def __eq__(self, other):
         if self.__class__ is other.__class__:
             if self.id == other.id:

[SQL-CVS] r4100 - SQLObject/trunk/sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-05 06:51:02 -0700 (Fri, 05 Feb 2010)
New Revision: 4100

Modified:
   SQLObject/trunk/sqlobject/tests/test_pickle.py
Log:
Instances with per-instance connections aren't pickleable.


Modified: SQLObject/trunk/sqlobject/tests/test_pickle.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_pickle.py	2010-02-05 13:43:30 UTC (rev 4099)
+++ SQLObject/trunk/sqlobject/tests/test_pickle.py	2010-02-05 13:51:02 UTC (rev 4100)
@@ -22,3 +22,7 @@
 
     assert test.question == test_question
     assert test.answer == test_answer
+
+    TestPickle._connection.cache.clear()
+    test = TestPickle.get(test.id, connection=TestPickle._connection)
+    raises(pickle.PicklingError, pickle.dumps, test, pickle.HIGHEST_PROTOCOL)

[SQL-CVS] r4096 - SQLObject/branches/0.11/sqlobject

[<sub...@co...>]

Author: phd
Date: 2010-02-05 06:29:15 -0700 (Fri, 05 Feb 2010)
New Revision: 4096

Modified:
   SQLObject/branches/0.11/sqlobject/main.py
Log:
Added a comment for the group of rich comparison methods.


Modified: SQLObject/branches/0.11/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.11/sqlobject/main.py	2010-02-03 22:27:42 UTC (rev 4095)
+++ SQLObject/branches/0.11/sqlobject/main.py	2010-02-05 13:29:15 UTC (rev 4096)
@@ -1654,6 +1654,9 @@
     def tablesUsedImmediate(self):
         return [self.__class__.q]
 
+
+    # Comparison
+
     def __eq__(self, other):
         if self.__class__ is other.__class__:
             if self.id == other.id:

[SQL-CVS] r4094 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: 2010-02-01 07:52:49 -0700 (Mon, 01 Feb 2010)
New Revision: 4094

Modified:
   SQLObject/trunk/docs/News.txt
Log:
Fixed misspellings.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-02-01 14:50:22 UTC (rev 4093)
+++ SQLObject/trunk/docs/News.txt	2010-02-01 14:52:49 UTC (rev 4094)
@@ -20,8 +20,8 @@
 --------------
 
 * Do not pollute the base sqlmeta class to allow Style to set idName. In
-  the case of inherited idName inherited value takes precedence; To allow
-  Style to set idName resets inherited idName to None.
+  the case of inherited idName inherited value takes precedence; to allow
+  Style to set idName reset inherited idName to None.
 
 SQLObject 0.12.1
 ================

[SQL-CVS] r4093 - SQLObject/trunk/docs

[<sub...@co...>]

Author: phd
Date: 2010-02-01 07:50:22 -0700 (Mon, 01 Feb 2010)
New Revision: 4093

Modified:
   SQLObject/trunk/docs/Inheritance.txt
Log:
Merged misspelling fixes from revision 4091 from branch 0.11.


Modified: SQLObject/trunk/docs/Inheritance.txt
===================================================================
--- SQLObject/trunk/docs/Inheritance.txt	2010-02-01 14:49:34 UTC (rev 4092)
+++ SQLObject/trunk/docs/Inheritance.txt	2010-02-01 14:50:22 UTC (rev 4093)
@@ -298,12 +298,12 @@
   and override many methods - _SO_setValue(), sync(), syncUpdate() at
   least. Patches will be gladly accepted.
 * You'd better restrain yourself to simple use cases. The inheritance
-  implementation is easiliy choked on more complex cases.
+  implementation is easily choked on more complex cases.
 * A join between tables inherited from the same parent produces incorrect
   result due to joins to the same parent table (they must use different
   aliases).
 * Inheritance works in two stages - first it draws the IDs from the parent
-  table and then it drwas the rows from the children tables. The first
+  table and then it draws the rows from the children tables. The first
   stage could fail if you try to do complex things. For example,
   Children.select(orderBy=Children.q.column, distinct=True)
   could fail because at the first stage inheritance generates a SELECT

[SQL-CVS] r4092 - SQLObject/branches/0.12/docs

[<sub...@co...>]

Author: phd
Date: 2010-02-01 07:49:34 -0700 (Mon, 01 Feb 2010)
New Revision: 4092

Modified:
   SQLObject/branches/0.12/docs/Inheritance.txt
Log:
Merged misspelling fixes from revision 4091 from branch 0.11.


Modified: SQLObject/branches/0.12/docs/Inheritance.txt
===================================================================
--- SQLObject/branches/0.12/docs/Inheritance.txt	2010-02-01 14:48:16 UTC (rev 4091)
+++ SQLObject/branches/0.12/docs/Inheritance.txt	2010-02-01 14:49:34 UTC (rev 4092)
@@ -298,12 +298,12 @@
   and override many methods - _SO_setValue(), sync(), syncUpdate() at
   least. Patches will be gladly accepted.
 * You'd better restrain yourself to simple use cases. The inheritance
-  implementation is easiliy choked on more complex cases.
+  implementation is easily choked on more complex cases.
 * A join between tables inherited from the same parent produces incorrect
   result due to joins to the same parent table (they must use different
   aliases).
 * Inheritance works in two stages - first it draws the IDs from the parent
-  table and then it drwas the rows from the children tables. The first
+  table and then it draws the rows from the children tables. The first
   stage could fail if you try to do complex things. For example,
   Children.select(orderBy=Children.q.column, distinct=True)
   could fail because at the first stage inheritance generates a SELECT

[SQL-CVS] r4091 - SQLObject/branches/0.11/docs

[<sub...@co...>]

Author: phd
Date: 2010-02-01 07:48:16 -0700 (Mon, 01 Feb 2010)
New Revision: 4091

Modified:
   SQLObject/branches/0.11/docs/Inheritance.txt
Log:
Fixed misspellings.


Modified: SQLObject/branches/0.11/docs/Inheritance.txt
===================================================================
--- SQLObject/branches/0.11/docs/Inheritance.txt	2010-02-01 14:45:04 UTC (rev 4090)
+++ SQLObject/branches/0.11/docs/Inheritance.txt	2010-02-01 14:48:16 UTC (rev 4091)
@@ -298,12 +298,12 @@
   and override many methods - _SO_setValue(), sync(), syncUpdate() at
   least. Patches will be gladly accepted.
 * You'd better restrain yourself to simple use cases. The inheritance
-  implementation is easiliy choked on more complex cases.
+  implementation is easily choked on more complex cases.
 * A join between tables inherited from the same parent produces incorrect
   result due to joins to the same parent table (they must use different
   aliases).
 * Inheritance works in two stages - first it draws the IDs from the parent
-  table and then it drwas the rows from the children tables. The first
+  table and then it draws the rows from the children tables. The first
   stage could fail if you try to do complex things. For example,
   Children.select(orderBy=Children.q.column, distinct=True)
   could fail because at the first stage inheritance generates a SELECT

[SQL-CVS] r4090 - in SQLObject/trunk: docs sqlobject sqlobject/tests

[<sub...@co...>]

Author: phd
Date: 2010-02-01 07:45:04 -0700 (Mon, 01 Feb 2010)
New Revision: 4090

Added:
   SQLObject/trunk/sqlobject/tests/test_sqlmeta_idName.py
Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/tests/test_basic.py
Log:
Do not pollute the base sqlmeta class to allow Style to set idName.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2010-01-22 17:54:29 UTC (rev 4089)
+++ SQLObject/trunk/docs/News.txt	2010-02-01 14:45:04 UTC (rev 4090)
@@ -16,6 +16,13 @@
 * Added TimedeltaCol; currently it's only implemented on PostgreSQL as an
   INTERVAL type.
 
+Small Features
+--------------
+
+* Do not pollute the base sqlmeta class to allow Style to set idName. In
+  the case of inherited idName inherited value takes precedence; To allow
+  Style to set idName resets inherited idName to None.
+
 SQLObject 0.12.1
 ================
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2010-01-22 17:54:29 UTC (rev 4089)
+++ SQLObject/trunk/sqlobject/main.py	2010-02-01 14:45:04 UTC (rev 4090)
@@ -853,7 +853,8 @@
                     del values[key]
             cls.sqlmeta = type('sqlmeta', (superclass,), values)
 
-        cls.sqlmeta.setClass(cls)
+        if not is_base: # Do not pollute the base sqlmeta class
+            cls.sqlmeta.setClass(cls)
 
     _SO_setupSqlmeta = classmethod(_SO_setupSqlmeta)
 

Modified: SQLObject/trunk/sqlobject/tests/test_basic.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_basic.py	2010-01-22 17:54:29 UTC (rev 4089)
+++ SQLObject/trunk/sqlobject/tests/test_basic.py	2010-02-01 14:45:04 UTC (rev 4090)
@@ -291,29 +291,17 @@
     else:
         assert 0, "Expected an AttributeError"
 
-class myid_sqlmeta(sqlmeta):
-    idName = "my_id"
-
 class TestSO12(SQLObject):
-    class sqlmeta(myid_sqlmeta):
-        pass
     name = StringCol()
-
-def test_sqlmeta_inherited_idName():
-    setupClass(TestSO12)
-    assert TestSO12.sqlmeta.idName == "my_id"
-
-class TestSO13(SQLObject):
-    name = StringCol()
     value = IntCol(defaultSQL='1')
 
 def test_defaultSQL():
-    setupClass(TestSO13)
-    test = TestSO13(name="test")
+    setupClass(TestSO12)
+    test = TestSO12(name="test")
     assert test.value == 1
 
 def test_connection_override():
     sqlhub.processConnection = connectionForURI('sqlite:///db1')
-    class TestSO14(SQLObject):
+    class TestSO13(SQLObject):
         _connection = connectionForURI('sqlite:///db2')
-    assert TestSO14._connection.uri() == 'sqlite:///db2'
+    assert TestSO13._connection.uri() == 'sqlite:///db2'

Added: SQLObject/trunk/sqlobject/tests/test_sqlmeta_idName.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_sqlmeta_idName.py	                        (rev 0)
+++ SQLObject/trunk/sqlobject/tests/test_sqlmeta_idName.py	2010-02-01 14:45:04 UTC (rev 4090)
@@ -0,0 +1,43 @@
+from sqlobject import *
+from sqlobject.tests.dbtest import *
+
+class myid_sqlmeta(sqlmeta):
+    idName = "my_id"
+
+class TestSqlmeta1(SQLObject):
+    class sqlmeta(myid_sqlmeta):
+        pass
+
+class TestSqlmeta2(SQLObject):
+    class sqlmeta(sqlmeta):
+        style = MixedCaseStyle(longID=True)
+
+class TestSqlmeta3(SQLObject):
+    class sqlmeta(myid_sqlmeta):
+        style = MixedCaseStyle(longID=True)
+
+class TestSqlmeta4(SQLObject):
+    class sqlmeta(myid_sqlmeta):
+        idName = None
+        style = MixedCaseStyle(longID=True)
+
+class longid_sqlmeta(sqlmeta):
+    idName = "my_id"
+    style = MixedCaseStyle(longID=True)
+
+class TestSqlmeta5(SQLObject):
+    class sqlmeta(longid_sqlmeta):
+        pass
+
+class TestSqlmeta6(SQLObject):
+    class sqlmeta(longid_sqlmeta):
+        idName = None
+
+def test_sqlmeta_inherited_idName():
+    setupClass([TestSqlmeta1, TestSqlmeta2])
+    assert TestSqlmeta1.sqlmeta.idName == "my_id"
+    assert TestSqlmeta2.sqlmeta.idName == "TestSqlmeta2ID"
+    assert TestSqlmeta3.sqlmeta.idName == "my_id"
+    assert TestSqlmeta4.sqlmeta.idName == "TestSqlmeta4ID"
+    assert TestSqlmeta5.sqlmeta.idName == "my_id"
+    assert TestSqlmeta6.sqlmeta.idName == "TestSqlmeta6ID"