sqlobject-cvs — CVS notification

[SQL-CVS] [ sqlobject-Bugs-2417338 ] _connection ignored if sqlhub.processConnection set before

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

Bugs item #2417338, was opened at 2008-12-11 18:02
Message generated for change (Settings changed) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2417338&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: General
Group: None
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: Luci Stanescu (luci_stanescu)
Assigned to: Oleg Broytmann (phd)
Summary: _connection ignored if sqlhub.processConnection set before

Initial Comment:
If sqlhub.processConnection is set before a subclass of SQLObject is defined, then the _connection attribute of the new class will be ignored. This is, as far as I could find out, because of:

sqlobject/main.py:768
        if connection and not hasattr(cls, '_connection'):
            cls.setConnection(connection)

This creates a lot of confusion and, if I understood correctly, is not the intended behaviour either (citing from the documentation):
"If you have defined sqlhub.processConnection then this attribute can be omitted from your class and the sqlhub will be used instead. If you have several classes using the same connection that might be an advantage, besides saving a lot of typing."

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

>Comment By: Oleg Broytmann (phd)
Date: 2009-05-18 20:44

Message:
ixed in the revisions 3889:3891.

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

Comment By: Oleg Broytmann (phd)
Date: 2009-04-29 18:58

Message:
The problem is hasattr(cls, '_connection') - even if there is the code del
cls._connection a few lines above hasattr(cls, '_connection') return True
in your case because there is a connection in SQLObject class. To fix this
I propose to replace hasattr(cls, '_connection') with the test
'_connection' not in cls.__dict__:

@@ -768,7 +768,7 @@
             if hasattr(mod, '__connection__'):
                 connection = mod.__connection__
 
-        if connection and not hasattr(cls, '_connection'):
+        if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 
What do you think?

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

Comment By: Luci Stanescu (luci_stanescu)
Date: 2008-12-11 18:31

Message:
testsqlobject.py:
from sqlobject import *

a_connection = connectionForURI('mysql://user:pass@other_host/db')
sqlhub.processConnection = connectionForURI('mysql://user:pass@host/db')

class Foo(SQLObject):
    _connection = a_connection
    bar = StringCol(length=16)

print Foo._connection.uri()


luci@lucifer:~/sandbox$ python testsqlobject.py 
mysql://user:pass@host/db


It was supposed to print `mysql://user:pass@other_host/db', which it does,
if I move the line
sqlhub.processConnection = connectionForURI('mysql://user:pass@host/db')
after the class is defined.

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

Comment By: Oleg Broytmann (phd)
Date: 2008-12-11 18:13

Message:
if connection and not hasattr(cls, '_connection')

means "if there is a global connection and there is no _connection
attribute". So I don't see how SQLObject can ignore _connection - there is
no one.

Can you write a short program that demonstrates the problem?

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

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

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

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

Author: phd
Date: 2009-05-18 10:43:37 -0600 (Mon, 18 May 2009)
New Revision: 3891

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/main.py
   SQLObject/trunk/sqlobject/tests/test_basic.py
Log:
Fixed a bug that prevented to override per class _connection if there is sqlhub.processConnection.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-05-18 16:42:32 UTC (rev 3890)
+++ SQLObject/trunk/docs/News.txt	2009-05-18 16:43:37 UTC (rev 3891)
@@ -173,6 +173,9 @@
 
 * Use sqlmeta.idName instead of 'id' in all connection classes.
 
+* Fixed a bug that prevented to override per class _connection if there is
+  sqlhub.processConnection.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/trunk/sqlobject/main.py
===================================================================
--- SQLObject/trunk/sqlobject/main.py	2009-05-18 16:42:32 UTC (rev 3890)
+++ SQLObject/trunk/sqlobject/main.py	2009-05-18 16:43:37 UTC (rev 3891)
@@ -766,7 +766,10 @@
             if hasattr(mod, '__connection__'):
                 connection = mod.__connection__
 
-        if connection and not hasattr(cls, '_connection'):
+        # 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.
+        if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 
         # We have to check if there are columns in the inherited

Modified: SQLObject/trunk/sqlobject/tests/test_basic.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_basic.py	2009-05-18 16:42:32 UTC (rev 3890)
+++ SQLObject/trunk/sqlobject/tests/test_basic.py	2009-05-18 16:43:37 UTC (rev 3891)
@@ -311,3 +311,9 @@
     setupClass(TestSO13)
     test = TestSO13(name="test")
     assert test.value == 1
+
+def test_connection_override():
+    sqlhub.processConnection = connectionForURI('sqlite:///db1')
+    class TestSO14(SQLObject):
+        _connection = connectionForURI('sqlite:///db2')
+    assert TestSO14._connection.uri() == 'sqlite:///db2'

[SQL-CVS] r3890 - in SQLObject/branches/0.10: docs sqlobject sqlobject/tests

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

Author: phd
Date: 2009-05-18 10:42:32 -0600 (Mon, 18 May 2009)
New Revision: 3890

Modified:
   SQLObject/branches/0.10/docs/News.txt
   SQLObject/branches/0.10/sqlobject/main.py
   SQLObject/branches/0.10/sqlobject/tests/test_basic.py
Log:
Fixed a bug that prevented to override per class _connection if there is sqlhub.processConnection.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-18 16:40:39 UTC (rev 3889)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-18 16:42:32 UTC (rev 3890)
@@ -132,6 +132,9 @@
 
 * Use sqlmeta.idName instead of 'id' in all connection classes.
 
+* Fixed a bug that prevented to override per class _connection if there is
+  sqlhub.processConnection.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.10/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/main.py	2009-05-18 16:40:39 UTC (rev 3889)
+++ SQLObject/branches/0.10/sqlobject/main.py	2009-05-18 16:42:32 UTC (rev 3890)
@@ -766,7 +766,10 @@
             if hasattr(mod, '__connection__'):
                 connection = mod.__connection__
 
-        if connection and not hasattr(cls, '_connection'):
+        # 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.
+        if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 
         # We have to check if there are columns in the inherited

Modified: SQLObject/branches/0.10/sqlobject/tests/test_basic.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/tests/test_basic.py	2009-05-18 16:40:39 UTC (rev 3889)
+++ SQLObject/branches/0.10/sqlobject/tests/test_basic.py	2009-05-18 16:42:32 UTC (rev 3890)
@@ -311,3 +311,9 @@
     setupClass(TestSO13)
     test = TestSO13(name="test")
     assert test.value == 1
+
+def test_connection_override():
+    sqlhub.processConnection = connectionForURI('sqlite:///db1')
+    class TestSO14(SQLObject):
+        _connection = connectionForURI('sqlite:///db2')
+    assert TestSO14._connection.uri() == 'sqlite:///db2'

[SQL-CVS] r3889 - in SQLObject/branches/0.9: docs sqlobject sqlobject/tests

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

Author: phd
Date: 2009-05-18 10:40:39 -0600 (Mon, 18 May 2009)
New Revision: 3889

Modified:
   SQLObject/branches/0.9/docs/News.txt
   SQLObject/branches/0.9/sqlobject/main.py
   SQLObject/branches/0.9/sqlobject/tests/test_basic.py
Log:
Fixed a bug that prevented to override per class _connection if there is sqlhub.processConnection.


Modified: SQLObject/branches/0.9/docs/News.txt
===================================================================
--- SQLObject/branches/0.9/docs/News.txt	2009-05-18 16:15:46 UTC (rev 3888)
+++ SQLObject/branches/0.9/docs/News.txt	2009-05-18 16:40:39 UTC (rev 3889)
@@ -15,6 +15,9 @@
 
 * Use sqlmeta.idName instead of 'id' in all connection classes.
 
+* Fixed a bug that prevented to override per class _connection if there is
+  sqlhub.processConnection.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.9/sqlobject/main.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/main.py	2009-05-18 16:15:46 UTC (rev 3888)
+++ SQLObject/branches/0.9/sqlobject/main.py	2009-05-18 16:40:39 UTC (rev 3889)
@@ -768,7 +768,10 @@
             if hasattr(mod, '__connection__'):
                 connection = mod.__connection__
 
-        if connection and not hasattr(cls, '_connection'):
+        # 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.
+        if connection and ('_connection' not in cls.__dict__):
             cls.setConnection(connection)
 
         # We have to check if there are columns in the inherited

Modified: SQLObject/branches/0.9/sqlobject/tests/test_basic.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/tests/test_basic.py	2009-05-18 16:15:46 UTC (rev 3888)
+++ SQLObject/branches/0.9/sqlobject/tests/test_basic.py	2009-05-18 16:40:39 UTC (rev 3889)
@@ -311,3 +311,9 @@
     setupClass(TestSO13)
     test = TestSO13(name="test")
     assert test.value == 1
+
+def test_connection_override():
+    sqlhub.processConnection = connectionForURI('sqlite:///db1')
+    class TestSO14(SQLObject):
+        _connection = connectionForURI('sqlite:///db2')
+    assert TestSO14._connection.uri() == 'sqlite:///db2'

[SQL-CVS] r3888 - in SQLObject/trunk: docs sqlobject/maxdb sqlobject/mssql sqlobject/mysql sqlobject/sqlite sqlobject/sybase

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

Author: phd
Date: 2009-05-18 10:15:46 -0600 (Mon, 18 May 2009)
New Revision: 3888

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
   SQLObject/trunk/sqlobject/sybase/sybaseconnection.py
Log:
Use sqlmeta.idName instead of 'id' in all connection classes.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-05-18 16:14:04 UTC (rev 3887)
+++ SQLObject/trunk/docs/News.txt	2009-05-18 16:15:46 UTC (rev 3888)
@@ -171,6 +171,8 @@
 * Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
   sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
 
+* Use sqlmeta.idName instead of 'id' in all connection classes.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
+++ SQLObject/trunk/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:15:46 UTC (rev 3888)
@@ -257,7 +257,7 @@
             # id is defined as primary key --> ok
             # We let sqlobject raise error if the 'id' is used for another column
             field_name = field.lower()
-            if field_name == 'id' and  pkmap[field_name]:
+            if (field_name == soClass.sqlmeta.idName) and pkmap[field_name]:
                 continue
 
             colClass, kw = self.guessClass(data_type,data_len,data_scale)

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:15:46 UTC (rev 3888)
@@ -217,8 +217,7 @@
                                 % tableName)
         results = []
         for field, size, t, precision, scale, nullAllowed, default, defaultText, is_identity in colData:
-            # Seems strange to skip the pk column?  What if it's not 'id'?
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             # precision is needed for decimal columns
             colClass, kw = self.guessClass(t, size, precision, scale)

Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:15:46 UTC (rev 3888)
@@ -220,7 +220,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, key, default, extra in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             if self.kw.get('use_unicode') and colClass is col.StringCol:

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:15:46 UTC (rev 3888)
@@ -280,7 +280,7 @@
                         for col in sqlmeta.columnList if col.name != column.name]
         cols = ",\n".join(["    %s" % c for c in cols])
         self.query('CREATE TABLE %s (\n%s\n)' % (sqlmeta.table, cols))
-        all_columns = ', '.join(['id'] + [col.dbName for col in sqlmeta.columnList])
+        all_columns = ', '.join([sqlmeta.idName] + [col.dbName for col in sqlmeta.columnList])
         self.query('INSERT INTO %s (%s) SELECT %s FROM %s' % (
             sqlmeta.table, all_columns, all_columns, new_name))
         self.query('DROP TABLE %s' % new_name)

Modified: SQLObject/trunk/sqlobject/sybase/sybaseconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
+++ SQLObject/trunk/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:15:46 UTC (rev 3888)
@@ -139,7 +139,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, default in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)

[SQL-CVS] [ sqlobject-Bugs-2024794 ] Using idName with fromDatabase; id col issues

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

Bugs item #2024794, was opened at 2008-07-22 19:33
Message generated for change (Comment added) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2024794&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: General
Group: SQLObject release (specify)
>Status: Closed
>Resolution: Fixed
Priority: 5
Private: No
Submitted By: Ray Van dolson (rayvd)
>Assigned to: Oleg Broytmann (phd)
Summary: Using idName with fromDatabase; id col issues

Initial Comment:
See this post:

  http://thread.gmane.org/gmane.comp.python.sqlobject/9360

When using fromDatabase = True with idName:

class SystemsInfo(SQLObject):
  class sqlmeta:
    fromDatabase = True
    table = 'SystemsInfo'
    idType = str
    idName = 'SystemName'
    lazyUpdate = True

.. an attempt to insert a new row with all other columns but the index (SystemName) defined results in a duplicate column error:

  item = SystemsInfo(id='uniquename')

SystemName is used both as the id column and is in place in the normal column listing.

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

>Comment By: Oleg Broytmann (phd)
Date: 2009-05-18 20:15

Message:
Fixed in the revisions 3881:3888.

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

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

[SQL-CVS] r3887 - in SQLObject/branches/0.10: docs sqlobject/maxdb sqlobject/mssql sqlobject/mysql sqlobject/sqlite sqlobject/sybase

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

Author: phd
Date: 2009-05-18 10:14:04 -0600 (Mon, 18 May 2009)
New Revision: 3887

Modified:
   SQLObject/branches/0.10/docs/News.txt
   SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py
   SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py
   SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py
   SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
   SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py
Log:
Use sqlmeta.idName instead of 'id' in all connection classes.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-18 16:14:04 UTC (rev 3887)
@@ -130,6 +130,8 @@
 * Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
   sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
 
+* Use sqlmeta.idName instead of 'id' in all connection classes.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -257,7 +257,7 @@
             # id is defined as primary key --> ok
             # We let sqlobject raise error if the 'id' is used for another column
             field_name = field.lower()
-            if field_name == 'id' and  pkmap[field_name]:
+            if (field_name == soClass.sqlmeta.idName) and pkmap[field_name]:
                 continue
 
             colClass, kw = self.guessClass(data_type,data_len,data_scale)

Modified: SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -217,8 +217,7 @@
                                 % tableName)
         results = []
         for field, size, t, precision, scale, nullAllowed, default, defaultText, is_identity in colData:
-            # Seems strange to skip the pk column?  What if it's not 'id'?
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             # precision is needed for decimal columns
             colClass, kw = self.guessClass(t, size, precision, scale)

Modified: SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -220,7 +220,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, key, default, extra in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             if self.kw.get('use_unicode') and colClass is col.StringCol:

Modified: SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -279,7 +279,7 @@
                         for col in sqlmeta.columnList if col.name != column.name]
         cols = ",\n".join(["    %s" % c for c in cols])
         self.query('CREATE TABLE %s (\n%s\n)' % (sqlmeta.table, cols))
-        all_columns = ', '.join(['id'] + [col.dbName for col in sqlmeta.columnList])
+        all_columns = ', '.join([sqlmeta.idName] + [col.dbName for col in sqlmeta.columnList])
         self.query('INSERT INTO %s (%s) SELECT %s FROM %s' % (
             sqlmeta.table, all_columns, all_columns, new_name))
         self.query('DROP TABLE %s' % new_name)

Modified: SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
+++ SQLObject/branches/0.10/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:14:04 UTC (rev 3887)
@@ -139,7 +139,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, default in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)

[SQL-CVS] r3886 - in SQLObject/branches/0.9: docs sqlobject/maxdb sqlobject/mssql sqlobject/mysql sqlobject/sqlite sqlobject/sybase

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

Author: phd
Date: 2009-05-18 10:11:06 -0600 (Mon, 18 May 2009)
New Revision: 3886

Modified:
   SQLObject/branches/0.9/docs/News.txt
   SQLObject/branches/0.9/sqlobject/maxdb/maxdbconnection.py
   SQLObject/branches/0.9/sqlobject/mssql/mssqlconnection.py
   SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py
   SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py
   SQLObject/branches/0.9/sqlobject/sybase/sybaseconnection.py
Log:
Use sqlmeta.idName instead of 'id' in all connection classes.


Modified: SQLObject/branches/0.9/docs/News.txt
===================================================================
--- SQLObject/branches/0.9/docs/News.txt	2009-05-18 16:00:34 UTC (rev 3885)
+++ SQLObject/branches/0.9/docs/News.txt	2009-05-18 16:11:06 UTC (rev 3886)
@@ -13,6 +13,8 @@
 * Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
   sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
 
+* Use sqlmeta.idName instead of 'id' in all connection classes.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.9/sqlobject/maxdb/maxdbconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:00:34 UTC (rev 3885)
+++ SQLObject/branches/0.9/sqlobject/maxdb/maxdbconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
@@ -255,7 +255,7 @@
             # id is defined as primary key --> ok
             # We let sqlobject raise error if the 'id' is used for another column
             field_name = field.lower()
-            if field_name == 'id' and  pkmap[field_name]:
+            if (field_name == soClass.sqlmeta.idName) and pkmap[field_name]:
                 continue
 
             colClass, kw = self.guessClass(data_type,data_len,data_scale)

Modified: SQLObject/branches/0.9/sqlobject/mssql/mssqlconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:00:34 UTC (rev 3885)
+++ SQLObject/branches/0.9/sqlobject/mssql/mssqlconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
@@ -216,8 +216,7 @@
                                 % tableName)
         results = []
         for field, size, t, precision, scale, nullAllowed, default, defaultText, is_identity in colData:
-            # Seems strange to skip the pk column?  What if it's not 'id'?
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             # precision is needed for decimal columns
             colClass, kw = self.guessClass(t, size, precision, scale)

Modified: SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:00:34 UTC (rev 3885)
+++ SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
@@ -214,7 +214,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, key, default, extra in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             if self.kw.get('use_unicode') and colClass is col.StringCol:

Modified: SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:00:34 UTC (rev 3885)
+++ SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
@@ -279,7 +279,7 @@
                         for col in sqlmeta.columnList if col.name != column.name]
         cols = ",\n".join(["    %s" % c for c in cols])
         self.query('CREATE TABLE %s (\n%s\n)' % (sqlmeta.table, cols))
-        all_columns = ', '.join(['id'] + [col.dbName for col in sqlmeta.columnList])
+        all_columns = ', '.join([sqlmeta.idName] + [col.dbName for col in sqlmeta.columnList])
         self.query('INSERT INTO %s (%s) SELECT %s FROM %s' % (
             sqlmeta.table, all_columns, all_columns, new_name))
         self.query('DROP TABLE %s' % new_name)

Modified: SQLObject/branches/0.9/sqlobject/sybase/sybaseconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:00:34 UTC (rev 3885)
+++ SQLObject/branches/0.9/sqlobject/sybase/sybaseconnection.py	2009-05-18 16:11:06 UTC (rev 3886)
@@ -138,7 +138,7 @@
                                 % tableName)
         results = []
         for field, t, nullAllowed, default in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)

[SQL-CVS] r3885 - in SQLObject/trunk: docs sqlobject/sqlite

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

Author: phd
Date: 2009-05-18 10:00:34 -0600 (Mon, 18 May 2009)
New Revision: 3885

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
sqlmeta.idName instead of 'id'; convert default 'NULL' to None.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-05-18 15:59:35 UTC (rev 3884)
+++ SQLObject/trunk/docs/News.txt	2009-05-18 16:00:34 UTC (rev 3885)
@@ -53,6 +53,8 @@
 
 * Better support for Python 2.6: do not import the deprecated sets module.
 
+* A number of changes ported from `SQLObject 0.9.11`_.
+
 SQLObject 0.10.5
 ================
 
@@ -163,6 +165,12 @@
 * Under MySQL, PickleCol no longer used TEXT column types; the smallest
   column is now BLOB - it is not possible to create TINYBLOB column.
 
+SQLObject 0.9.11
+================
+
+* Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
+  sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-05-18 15:59:35 UTC (rev 3884)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-05-18 16:00:34 UTC (rev 3885)
@@ -295,9 +295,12 @@
         colData = self.queryAll("PRAGMA table_info(%s)" % tableName)
         results = []
         for index, field, t, nullAllowed, default, key in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
+            if default == 'NULL':
+                nullAllowed = True
+                default = None
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
             kw['dbName'] = field
             kw['notNone'] = not nullAllowed

[SQL-CVS] r3884 - SQLObject/branches/0.10/docs

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

Author: phd
Date: 2009-05-18 09:59:35 -0600 (Mon, 18 May 2009)
New Revision: 3884

Modified:
   SQLObject/branches/0.10/docs/News.txt
Log:
Forward port.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-18 15:58:01 UTC (rev 3883)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-18 15:59:35 UTC (rev 3884)
@@ -12,6 +12,8 @@
 
 * Better support for Python 2.6: do not import the deprecated sets module.
 
+* A number of changes ported from `SQLObject 0.9.11`_.
+
 SQLObject 0.10.5
 ================
 

[SQL-CVS] r3883 - in SQLObject/branches/0.10: docs sqlobject/sqlite

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

Author: phd
Date: 2009-05-18 09:58:01 -0600 (Mon, 18 May 2009)
New Revision: 3883

Modified:
   SQLObject/branches/0.10/docs/News.txt
   SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
Log:
Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
sqlmeta.idName instead of 'id'; convert default 'NULL' to None.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-18 15:53:15 UTC (rev 3882)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-18 15:58:01 UTC (rev 3883)
@@ -122,6 +122,12 @@
 * Under MySQL, PickleCol no longer uses TEXT column types; the smallest
   column is now BLOB - it is not possible to create TINYBLOB column.
 
+SQLObject 0.9.11
+================
+
+* Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
+  sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-05-18 15:53:15 UTC (rev 3882)
+++ SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-05-18 15:58:01 UTC (rev 3883)
@@ -294,9 +294,12 @@
         colData = self.queryAll("PRAGMA table_info(%s)" % tableName)
         results = []
         for index, field, t, nullAllowed, default, key in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
+            if default == 'NULL':
+                nullAllowed = True
+                default = None
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
             kw['dbName'] = field
             kw['notNone'] = not nullAllowed

[SQL-CVS] r3882 - in SQLObject/branches/0.9: docs sqlobject/sqlite

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

Author: phd
Date: 2009-05-18 09:53:15 -0600 (Mon, 18 May 2009)
New Revision: 3882

Modified:
   SQLObject/branches/0.9/docs/News.txt
   SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py
Log:
Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
sqlmeta.idName instead of 'id'; convert default 'NULL' to None.


Modified: SQLObject/branches/0.9/docs/News.txt
===================================================================
--- SQLObject/branches/0.9/docs/News.txt	2009-05-11 07:03:48 UTC (rev 3881)
+++ SQLObject/branches/0.9/docs/News.txt	2009-05-18 15:53:15 UTC (rev 3882)
@@ -7,6 +7,12 @@
 
 .. _start:
 
+SQLObject 0.9.11
+================
+
+* Two bug in SQLiteConnection.columnsFromSchema() were fixed: use
+  sqlmeta.idName instead of 'id'; convert default 'NULL' to None.
+
 SQLObject 0.9.10
 ================
 

Modified: SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py	2009-05-11 07:03:48 UTC (rev 3881)
+++ SQLObject/branches/0.9/sqlobject/sqlite/sqliteconnection.py	2009-05-18 15:53:15 UTC (rev 3882)
@@ -294,9 +294,12 @@
         colData = self.queryAll("PRAGMA table_info(%s)" % tableName)
         results = []
         for index, field, t, nullAllowed, default, key in colData:
-            if field == 'id':
+            if field == soClass.sqlmeta.idName:
                 continue
             colClass, kw = self.guessClass(t)
+            if default == 'NULL':
+                nullAllowed = True
+                default = None
             kw['name'] = soClass.sqlmeta.style.dbColumnToPythonAttr(field)
             kw['dbName'] = field
             kw['notNone'] = not nullAllowed

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

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

Author: phd
Date: 2009-05-11 01:03:48 -0600 (Mon, 11 May 2009)
New Revision: 3881

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/converters.py
   SQLObject/trunk/sqlobject/tests/test_converters.py
Log:
Better support for Python 2.6: do not import the deprecated sets module.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-05-11 06:53:04 UTC (rev 3880)
+++ SQLObject/trunk/docs/News.txt	2009-05-11 07:03:48 UTC (rev 3881)
@@ -48,6 +48,11 @@
 * Changed the order of testing of SQLite modules - look for external
   PySQLite2 before sqlite3.
 
+SQLObject 0.10.6
+================
+
+* Better support for Python 2.6: do not import the deprecated sets module.
+
 SQLObject 0.10.5
 ================
 

Modified: SQLObject/trunk/sqlobject/converters.py
===================================================================
--- SQLObject/trunk/sqlobject/converters.py	2009-05-11 06:53:04 UTC (rev 3880)
+++ SQLObject/trunk/sqlobject/converters.py	2009-05-11 07:03:48 UTC (rev 3881)
@@ -1,3 +1,4 @@
+import sys
 from array import array
 
 try:
@@ -24,7 +25,6 @@
     NumericType = None
 
 from decimal import Decimal
-from sets import Set, ImmutableSet
 from types import ClassType, InstanceType, NoneType
 
 ########################################
@@ -153,8 +153,10 @@
 registerConverter(dict, SequenceConverter)
 registerConverter(set, SequenceConverter)
 registerConverter(frozenset, SequenceConverter)
-registerConverter(Set, SequenceConverter)
-registerConverter(ImmutableSet, SequenceConverter)
+if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+   from sets import Set, ImmutableSet
+   registerConverter(Set, SequenceConverter)
+   registerConverter(ImmutableSet, SequenceConverter)
 
 if hasattr(time, 'struct_time'):
     def StructTimeConverter(value, db):

Modified: SQLObject/trunk/sqlobject/tests/test_converters.py
===================================================================
--- SQLObject/trunk/sqlobject/tests/test_converters.py	2009-05-11 06:53:04 UTC (rev 3880)
+++ SQLObject/trunk/sqlobject/tests/test_converters.py	2009-05-11 07:03:48 UTC (rev 3881)
@@ -1,3 +1,4 @@
+import sys
 from sqlobject.sqlbuilder import sqlrepr
 from sqlobject.sqlbuilder import SQLExpression, SQLObjectField, \
      Select, Insert, Update, Delete, Replace, \
@@ -187,9 +188,10 @@
         pass
     else:
         assert sqlrepr(set([1])) == "(1)"
-    try:
-        from sets import Set
-    except ImportError:
-        pass
-    else:
-        assert sqlrepr(Set([1])) == "(1)"
+    if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+        try:
+            from sets import Set
+        except ImportError:
+            pass
+        else:
+            assert sqlrepr(Set([1])) == "(1)"

[SQL-CVS] r3880 - in SQLObject/branches/0.10: docs sqlobject sqlobject/tests

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

Author: phd
Date: 2009-05-11 00:53:04 -0600 (Mon, 11 May 2009)
New Revision: 3880

Modified:
   SQLObject/branches/0.10/docs/News.txt
   SQLObject/branches/0.10/sqlobject/converters.py
   SQLObject/branches/0.10/sqlobject/tests/test_converters.py
Log:
Better support for Python 2.6: do not import the deprecated sets module.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-06 12:14:03 UTC (rev 3879)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-11 06:53:04 UTC (rev 3880)
@@ -7,6 +7,11 @@
 
 .. _start:
 
+SQLObject 0.10.6
+================
+
+* Better support for Python 2.6: do not import the deprecated sets module.
+
 SQLObject 0.10.5
 ================
 

Modified: SQLObject/branches/0.10/sqlobject/converters.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/converters.py	2009-05-06 12:14:03 UTC (rev 3879)
+++ SQLObject/branches/0.10/sqlobject/converters.py	2009-05-11 06:53:04 UTC (rev 3880)
@@ -1,3 +1,4 @@
+import sys
 from array import array
 
 try:
@@ -161,13 +162,14 @@
 else:
     registerConverter(set, SequenceConverter)
     registerConverter(frozenset, SequenceConverter)
-try:
-    from sets import Set, ImmutableSet
-except ImportError:
-    pass
-else:
-    registerConverter(Set, SequenceConverter)
-    registerConverter(ImmutableSet, SequenceConverter)
+if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+    try:
+        from sets import Set, ImmutableSet
+    except ImportError:
+        pass
+    else:
+        registerConverter(Set, SequenceConverter)
+        registerConverter(ImmutableSet, SequenceConverter)
 
 if hasattr(time, 'struct_time'):
     def StructTimeConverter(value, db):

Modified: SQLObject/branches/0.10/sqlobject/tests/test_converters.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/tests/test_converters.py	2009-05-06 12:14:03 UTC (rev 3879)
+++ SQLObject/branches/0.10/sqlobject/tests/test_converters.py	2009-05-11 06:53:04 UTC (rev 3880)
@@ -1,3 +1,4 @@
+import sys
 from sqlobject.sqlbuilder import sqlrepr
 from sqlobject.sqlbuilder import SQLExpression, SQLObjectField, \
      Select, Insert, Update, Delete, Replace, \
@@ -187,9 +188,10 @@
         pass
     else:
         assert sqlrepr(set([1])) == "(1)"
-    try:
-        from sets import Set
-    except ImportError:
-        pass
-    else:
-        assert sqlrepr(Set([1])) == "(1)"
+    if sys.version_info[:3] < (2, 6, 0): # Module sets was deprecated in Python 2.6
+        try:
+            from sets import Set
+        except ImportError:
+            pass
+        else:
+            assert sqlrepr(Set([1])) == "(1)"

[SQL-CVS] r3878 - SQLObject/tags

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

Author: phd
Date: 2009-05-06 06:12:31 -0600 (Wed, 06 May 2009)
New Revision: 3878

Added:
   SQLObject/tags/0.10.5/
Log:
Tagging 0.10.5

Copied: SQLObject/tags/0.10.5 (from rev 3877, SQLObject/branches/0.10)

[SQL-CVS] r3879 - in SQLObject/tags/0.10.5: . sqlobject

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

Author: phd
Date: 2009-05-06 06:14:03 -0600 (Wed, 06 May 2009)
New Revision: 3879

Modified:
   SQLObject/tags/0.10.5/setup.cfg
   SQLObject/tags/0.10.5/setup.py
   SQLObject/tags/0.10.5/sqlobject/__init__.py
   SQLObject/tags/0.10.5/sqlobject/main.py
Log:
Version 0.10.5.


Modified: SQLObject/tags/0.10.5/setup.cfg
===================================================================
--- SQLObject/tags/0.10.5/setup.cfg	2009-05-06 12:12:31 UTC (rev 3878)
+++ SQLObject/tags/0.10.5/setup.cfg	2009-05-06 12:14:03 UTC (rev 3879)
@@ -5,10 +5,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt

Modified: SQLObject/tags/0.10.5/setup.py
===================================================================
--- SQLObject/tags/0.10.5/setup.py	2009-05-06 12:12:31 UTC (rev 3878)
+++ SQLObject/tags/0.10.5/setup.py	2009-05-06 12:14:03 UTC (rev 3879)
@@ -21,7 +21,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.10",
+      version="0.10.5",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -49,7 +49,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.10",
+      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.10.5",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin"],

Modified: SQLObject/tags/0.10.5/sqlobject/__init__.py
===================================================================
--- SQLObject/tags/0.10.5/sqlobject/__init__.py	2009-05-06 12:12:31 UTC (rev 3878)
+++ SQLObject/tags/0.10.5/sqlobject/__init__.py	2009-05-06 12:14:03 UTC (rev 3879)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.10
+SQLObject 0.10.5
 """
 
 from main import *

Modified: SQLObject/tags/0.10.5/sqlobject/main.py
===================================================================
--- SQLObject/tags/0.10.5/sqlobject/main.py	2009-05-06 12:12:31 UTC (rev 3878)
+++ SQLObject/tags/0.10.5/sqlobject/main.py	2009-05-06 12:14:03 UTC (rev 3879)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.10
---------------
+SQLObject 0.10.5
+----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r3877 - in SQLObject/tags/0.9.10: . sqlobject

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

Author: phd
Date: 2009-05-06 06:05:16 -0600 (Wed, 06 May 2009)
New Revision: 3877

Modified:
   SQLObject/tags/0.9.10/setup.cfg
   SQLObject/tags/0.9.10/setup.py
   SQLObject/tags/0.9.10/sqlobject/__init__.py
   SQLObject/tags/0.9.10/sqlobject/main.py
Log:
Version 0.9.10.


Modified: SQLObject/tags/0.9.10/setup.cfg
===================================================================
--- SQLObject/tags/0.9.10/setup.cfg	2009-05-06 12:02:38 UTC (rev 3876)
+++ SQLObject/tags/0.9.10/setup.cfg	2009-05-06 12:05:16 UTC (rev 3877)
@@ -5,10 +5,6 @@
 [easy_install]
 #find_links = http://svn.pythonpaste.org/package_index.html
 
-[egg_info]
-tag_build = dev
-tag_svn_revision = true
-
 [pudge]
 theme = pythonpaste.org
 docs = docs/index.txt docs/SQLObject.txt docs/TODO.txt

Modified: SQLObject/tags/0.9.10/setup.py
===================================================================
--- SQLObject/tags/0.9.10/setup.py	2009-05-06 12:02:38 UTC (rev 3876)
+++ SQLObject/tags/0.9.10/setup.py	2009-05-06 12:05:16 UTC (rev 3877)
@@ -28,7 +28,7 @@
     """
 
 setup(name="SQLObject",
-      version="0.9",
+      version="0.9.10",
       description="Object-Relational Manager, aka database wrapper",
       long_description="""\
 SQLObject is a popular *Object Relational Manager* for providing an
@@ -56,7 +56,7 @@
       author="Ian Bicking",
       author_email="ia...@co...",
       url="http://sqlobject.org/",
-      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.9",
+      download_url="http://cheeseshop.python.org/pypi/SQLObject/0.9.10",
       license="LGPL",
       packages=["sqlobject"] + ['sqlobject.%s' % package for package in subpackages],
       scripts=["scripts/sqlobject-admin"],

Modified: SQLObject/tags/0.9.10/sqlobject/__init__.py
===================================================================
--- SQLObject/tags/0.9.10/sqlobject/__init__.py	2009-05-06 12:02:38 UTC (rev 3876)
+++ SQLObject/tags/0.9.10/sqlobject/__init__.py	2009-05-06 12:05:16 UTC (rev 3877)
@@ -1,5 +1,5 @@
 """
-SQLObject 0.9
+SQLObject 0.9.10
 """
 
 from main import *

Modified: SQLObject/tags/0.9.10/sqlobject/main.py
===================================================================
--- SQLObject/tags/0.9.10/sqlobject/main.py	2009-05-06 12:02:38 UTC (rev 3876)
+++ SQLObject/tags/0.9.10/sqlobject/main.py	2009-05-06 12:05:16 UTC (rev 3877)
@@ -1,6 +1,6 @@
 """
-SQLObject 0.9
--------------
+SQLObject 0.9.10
+----------------
 
 :author: Ian Bicking <ia...@co...>
 

[SQL-CVS] r3876 - SQLObject/tags

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

Author: phd
Date: 2009-05-06 06:02:38 -0600 (Wed, 06 May 2009)
New Revision: 3876

Added:
   SQLObject/tags/0.9.10/
Log:
Tagging 0.9.10

Copied: SQLObject/tags/0.9.10 (from rev 3875, SQLObject/branches/0.9)

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

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

Author: phd
Date: 2009-05-06 06:01:40 -0600 (Wed, 06 May 2009)
New Revision: 3875

Modified:
   SQLObject/trunk/docs/News.txt
Log:
Merged revision 3874 from 0.10 branch.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-05-06 12:00:00 UTC (rev 3874)
+++ SQLObject/trunk/docs/News.txt	2009-05-06 12:01:40 UTC (rev 3875)
@@ -51,6 +51,8 @@
 SQLObject 0.10.5
 ================
 
+Released 6 May 2009
+
 * A number of changes ported from `SQLObject 0.9.10`_.
 
 * sqlmeta.getColumns() becomes classmethod.
@@ -159,6 +161,8 @@
 SQLObject 0.9.10
 ================
 
+Released 6 May 2009
+
 * Another unicode-related patch for MySQL; required because different
   versions of MySQLdb require different handling::
 

[SQL-CVS] r3874 - SQLObject/branches/0.10/docs

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

Author: phd
Date: 2009-05-06 06:00:00 -0600 (Wed, 06 May 2009)
New Revision: 3874

Modified:
   SQLObject/branches/0.10/docs/News.txt
Log:
Going to release SQLObject 0.9.10 and SQLObject 0.10.5.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-05-06 11:55:51 UTC (rev 3873)
+++ SQLObject/branches/0.10/docs/News.txt	2009-05-06 12:00:00 UTC (rev 3874)
@@ -10,6 +10,8 @@
 SQLObject 0.10.5
 ================
 
+Released 6 May 2009
+
 * A number of changes ported from `SQLObject 0.9.10`_.
 
 * sqlmeta.getColumns() becomes classmethod.
@@ -118,6 +120,8 @@
 SQLObject 0.9.10
 ================
 
+Released 6 May 2009
+
 * Another unicode-related patch for MySQL; required because different
   versions of MySQLdb require different handling::
 

[SQL-CVS] r3873 - SQLObject/branches/0.9/docs

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

Author: phd
Date: 2009-05-06 05:55:51 -0600 (Wed, 06 May 2009)
New Revision: 3873

Modified:
   SQLObject/branches/0.9/docs/News.txt
Log:
Going to release SQLObject 0.9.10.


Modified: SQLObject/branches/0.9/docs/News.txt
===================================================================
--- SQLObject/branches/0.9/docs/News.txt	2009-04-29 16:08:22 UTC (rev 3872)
+++ SQLObject/branches/0.9/docs/News.txt	2009-05-06 11:55:51 UTC (rev 3873)
@@ -10,6 +10,8 @@
 SQLObject 0.9.10
 ================
 
+Released 6 May 2009
+
 * Another unicode-related patch for MySQL; required because different
   versions of MySQLdb require different handling::
 

[SQL-CVS] [ sqlobject-Bugs-2785740 ] Grom

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

Bugs item #2785740, was opened at 2009-05-02 23:22
Message generated for change (Settings changed) made by phd
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2785740&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: Deleted
>Resolution: Rejected
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: Grom

Initial Comment:
Very good resourse :
[url=http://usuarios.lycos.es/wolahs/cory-heart-naked.html]cory heart naked[/url] [url=http://mitglied.lycos.de/maloga/devil-naked-webcams-women.html]devil naked webcams women[/url] 
<a href=http://utenti.lycos.it/bedogr/girls-naked-and-sail-boats.html>girls naked and sail boats</a> <a href=http://members.lycos.nl/bonaft/black-celebrity-naked-nude-pictures.html>black celebrity naked nude pictures</a> 
http://usuarios.lycos.es/numega/big-brother-07-emma-naked.html  
 
 Thanks!

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

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

[SQL-CVS] [ sqlobject-Bugs-2785740 ] Grom

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

Bugs item #2785740, was opened at 2009-05-02 19:22
Message generated for change (Tracker Item Submitted) made by nobody
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2785740&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: Postgres
Group: None
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: Grom

Initial Comment:
Very good resourse :
[url=http://usuarios.lycos.es/wolahs/cory-heart-naked.html]cory heart naked[/url] [url=http://mitglied.lycos.de/maloga/devil-naked-webcams-women.html]devil naked webcams women[/url] 
<a href=http://utenti.lycos.it/bedogr/girls-naked-and-sail-boats.html>girls naked and sail boats</a> <a href=http://members.lycos.nl/bonaft/black-celebrity-naked-nude-pictures.html>black celebrity naked nude pictures</a> 
http://usuarios.lycos.es/numega/big-brother-07-emma-naked.html  
 
 Thanks!

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

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

[SQL-CVS] r3872 - in SQLObject/trunk: docs sqlobject/sqlite

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

Author: phd
Date: 2009-04-29 10:08:22 -0600 (Wed, 29 Apr 2009)
New Revision: 3872

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
Merged revision 3870 from 0.9 branch:
a bug in SQLiteConnection.columnsFromSchema() that led to an infinite loop was fixed.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-04-29 16:07:35 UTC (rev 3871)
+++ SQLObject/trunk/docs/News.txt	2009-04-29 16:08:22 UTC (rev 3872)
@@ -188,6 +188,9 @@
   without this calling Transaction.close() calls connection.close() which
   is wrong.
 
+* A bug in SQLiteConnection.columnsFromSchema() that led to an infinite
+  loop was fixed.
+
 SQLObject 0.9.9
 ===============
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-04-29 16:07:35 UTC (rev 3871)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-04-29 16:08:22 UTC (rev 3872)
@@ -313,9 +313,11 @@
         if not colData:
             raise ValueError('The table %s was not found in the database. Load failed.' % tableName)
         colData = colData[0].split('(', 1)[1].strip()[:-2]
-        while colData.find('(') > -1:
+        while True:
             start = colData.find('(')
+            if start == -1: break
             end = colData.find(')', start)
+            if end == -1: break
             colData = colData[:start] + colData[end+1:]
         results = []
         for colDesc in colData.split(','):

[SQL-CVS] r3871 - in SQLObject/branches/0.10: docs sqlobject/sqlite

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

Author: phd
Date: 2009-04-29 10:07:35 -0600 (Wed, 29 Apr 2009)
New Revision: 3871

Modified:
   SQLObject/branches/0.10/docs/News.txt
   SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
Log:
Merged revision 3870 from 0.9 branch:
a bug in SQLiteConnection.columnsFromSchema() that led to an infinite loop was fixed.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2009-04-29 16:05:52 UTC (rev 3870)
+++ SQLObject/branches/0.10/docs/News.txt	2009-04-29 16:07:35 UTC (rev 3871)
@@ -147,6 +147,9 @@
   without this calling Transaction.close() calls connection.close() which
   is wrong.
 
+* A bug in SQLiteConnection.columnsFromSchema() that led to an infinite
+  loop was fixed.
+
 SQLObject 0.9.9
 ===============
 

Modified: SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-04-29 16:05:52 UTC (rev 3870)
+++ SQLObject/branches/0.10/sqlobject/sqlite/sqliteconnection.py	2009-04-29 16:07:35 UTC (rev 3871)
@@ -312,9 +312,11 @@
         if not colData:
             raise ValueError('The table %s was not found in the database. Load failed.' % tableName)
         colData = colData[0].split('(', 1)[1].strip()[:-2]
-        while colData.find('(') > -1:
+        while True:
             start = colData.find('(')
+            if start == -1: break
             end = colData.find(')', start)
+            if end == -1: break
             colData = colData[:start] + colData[end+1:]
         results = []
         for colDesc in colData.split(','):