sqlobject-cvs — CVS notification

[SQL-CVS] r3775 - SQLObject/trunk

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

Author: phd
Date: 2009-01-26 11:25:29 -0700 (Mon, 26 Jan 2009)
New Revision: 3775

Modified:
   SQLObject/trunk/setup.cfg
Log:
Merged revision 3774 from the branch 0.10 - added docs/Views.txt.


Modified: SQLObject/trunk/setup.cfg
===================================================================
--- SQLObject/trunk/setup.cfg	2009-01-26 18:24:03 UTC (rev 3774)
+++ SQLObject/trunk/setup.cfg	2009-01-26 18:25:29 UTC (rev 3775)
@@ -14,8 +14,8 @@
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt
        docs/Inheritance.txt docs/News.txt docs/News1.txt docs/SQLBuilder.txt
        docs/SQLObject.txt docs/SelectResults.txt docs/TODO.txt
-       docs/Versioning.txt docs/community.txt docs/download.txt docs/links.txt
-       docs/sqlobject-admin.txt docs/sqlobject-architecture.txt
+       docs/Versioning.txt docs/Views.txt docs/community.txt docs/download.txt
+       docs/links.txt docs/sqlobject-admin.txt docs/sqlobject-architecture.txt
 doc_base = docs/
 dest = docs/html
 modules = sqlobject

[SQL-CVS] r3774 - SQLObject/branches/0.10

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

Author: phd
Date: 2009-01-26 11:24:03 -0700 (Mon, 26 Jan 2009)
New Revision: 3774

Modified:
   SQLObject/branches/0.10/setup.cfg
Log:
Added docs/Views.txt.


Modified: SQLObject/branches/0.10/setup.cfg
===================================================================
--- SQLObject/branches/0.10/setup.cfg	2009-01-26 18:18:48 UTC (rev 3773)
+++ SQLObject/branches/0.10/setup.cfg	2009-01-26 18:24:03 UTC (rev 3774)
@@ -14,8 +14,8 @@
 docs = docs/index.txt docs/Authors.txt docs/DeveloperGuide.txt docs/FAQ.txt
        docs/Inheritance.txt docs/News.txt docs/News1.txt docs/SQLBuilder.txt
        docs/SQLObject.txt docs/SelectResults.txt docs/TODO.txt
-       docs/Versioning.txt docs/community.txt docs/download.txt docs/links.txt
-       docs/sqlobject-admin.txt docs/sqlobject-architecture.txt
+       docs/Versioning.txt docs/Views.txt docs/community.txt docs/download.txt
+       docs/links.txt docs/sqlobject-admin.txt docs/sqlobject-architecture.txt
 doc_base = docs/
 dest = docs/html
 modules = sqlobject

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

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

Author: phd
Date: 2009-01-26 11:18:48 -0700 (Mon, 26 Jan 2009)
New Revision: 3773

Modified:
   SQLObject/trunk/docs/sqlobject-architecture.txt
Log:
Merged revision 3771 from the branch 0.9: documentation update.


Modified: SQLObject/trunk/docs/sqlobject-architecture.txt
===================================================================
--- SQLObject/trunk/docs/sqlobject-architecture.txt	2009-01-26 18:18:12 UTC (rev 3772)
+++ SQLObject/trunk/docs/sqlobject-architecture.txt	2009-01-26 18:18:48 UTC (rev 3773)
@@ -15,7 +15,7 @@
 
 | > How does the select(...) method know what to do?
 
-In short, .select() recusively evaluates the top-most SQLExpression to a
+In short, .select() recursively evaluates the top-most SQLExpression to a
 string:
 
    SQLExpression("foo", ">", 30) => "foo > 30"
@@ -26,12 +26,13 @@
 produces an instance of SelectResults class that upon being iterated over
 produces an instance of Iteration class that upon calling its .next()
 method (it is iterator!) construct the SQL query string, passes it to the
-backend, fetches the results and passes them back to the user.
+backend, fetches the results, wraps every row as SQLObject instance and
+passes them back to the user.
 
 For the details of the implementation see sqlobject/main.py for SQLObject,
-sqlbuilder.py for SQLExpression, sqlobject/dbconnection.py for DBConnection
-class (that constructs the query strings) and Iteration class, and
-different subdirectories of sqlobject for concrete implementations of
+sqlobject/sqlbuilder.py for SQLExpression, sqlobject/dbconnection.py for
+DBConnection class (that constructs the query strings) and Iteration class,
+and different subdirectories of sqlobject for concrete implementations of
 connection classes - different backends require different query strings.
 
 .. image:: http://sourceforge.net/sflogo.php?group_id=74338&type=4

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

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

Author: phd
Date: 2009-01-26 11:18:12 -0700 (Mon, 26 Jan 2009)
New Revision: 3772

Modified:
   SQLObject/branches/0.10/docs/sqlobject-architecture.txt
Log:
Merged revision 3771 from the branch 0.9: documentation update.


Modified: SQLObject/branches/0.10/docs/sqlobject-architecture.txt
===================================================================
--- SQLObject/branches/0.10/docs/sqlobject-architecture.txt	2009-01-26 18:16:35 UTC (rev 3771)
+++ SQLObject/branches/0.10/docs/sqlobject-architecture.txt	2009-01-26 18:18:12 UTC (rev 3772)
@@ -15,7 +15,7 @@
 
 | > How does the select(...) method know what to do?
 
-In short, .select() recusively evaluates the top-most SQLExpression to a
+In short, .select() recursively evaluates the top-most SQLExpression to a
 string:
 
    SQLExpression("foo", ">", 30) => "foo > 30"
@@ -26,12 +26,13 @@
 produces an instance of SelectResults class that upon being iterated over
 produces an instance of Iteration class that upon calling its .next()
 method (it is iterator!) construct the SQL query string, passes it to the
-backend, fetches the results and passes them back to the user.
+backend, fetches the results, wraps every row as SQLObject instance and
+passes them back to the user.
 
 For the details of the implementation see sqlobject/main.py for SQLObject,
-sqlbuilder.py for SQLExpression, sqlobject/dbconnection.py for DBConnection
-class (that constructs the query strings) and Iteration class, and
-different subdirectories of sqlobject for concrete implementations of
+sqlobject/sqlbuilder.py for SQLExpression, sqlobject/dbconnection.py for
+DBConnection class (that constructs the query strings) and Iteration class,
+and different subdirectories of sqlobject for concrete implementations of
 connection classes - different backends require different query strings.
 
 .. image:: http://sourceforge.net/sflogo.php?group_id=74338&type=4

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

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

Author: phd
Date: 2009-01-26 11:16:35 -0700 (Mon, 26 Jan 2009)
New Revision: 3771

Modified:
   SQLObject/branches/0.9/docs/sqlobject-architecture.txt
Log:
Documentation update.


Modified: SQLObject/branches/0.9/docs/sqlobject-architecture.txt
===================================================================
--- SQLObject/branches/0.9/docs/sqlobject-architecture.txt	2009-01-13 17:08:23 UTC (rev 3770)
+++ SQLObject/branches/0.9/docs/sqlobject-architecture.txt	2009-01-26 18:16:35 UTC (rev 3771)
@@ -15,7 +15,7 @@
 
 | > How does the select(...) method know what to do?
 
-In short, .select() recusively evaluates the top-most SQLExpression to a
+In short, .select() recursively evaluates the top-most SQLExpression to a
 string:
 
    SQLExpression("foo", ">", 30) => "foo > 30"
@@ -26,12 +26,13 @@
 produces an instance of SelectResults class that upon being iterated over
 produces an instance of Iteration class that upon calling its .next()
 method (it is iterator!) construct the SQL query string, passes it to the
-backend, fetches the results and passes them back to the user.
+backend, fetches the results, wraps every row as SQLObject instance and
+passes them back to the user.
 
 For the details of the implementation see sqlobject/main.py for SQLObject,
-sqlbuilder.py for SQLExpression, sqlobject/dbconnection.py for DBConnection
-class (that constructs the query strings) and Iteration class, and
-different subdirectories of sqlobject for concrete implementations of
+sqlobject/sqlbuilder.py for SQLExpression, sqlobject/dbconnection.py for
+DBConnection class (that constructs the query strings) and Iteration class,
+and different subdirectories of sqlobject for concrete implementations of
 connection classes - different backends require different query strings.
 
 .. image:: http://sourceforge.net/sflogo.php?group_id=74338&type=4

[SQL-CVS] r3770 - in SQLObject/trunk/sqlobject: . firebird maxdb mssql mysql postgres sqlite sybase

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

Author: phd
Date: 2009-01-13 10:08:23 -0700 (Tue, 13 Jan 2009)
New Revision: 3770

Modified:
   SQLObject/trunk/sqlobject/dbconnection.py
   SQLObject/trunk/sqlobject/firebird/__init__.py
   SQLObject/trunk/sqlobject/maxdb/__init__.py
   SQLObject/trunk/sqlobject/mssql/__init__.py
   SQLObject/trunk/sqlobject/mysql/__init__.py
   SQLObject/trunk/sqlobject/postgres/__init__.py
   SQLObject/trunk/sqlobject/sqlite/__init__.py
   SQLObject/trunk/sqlobject/sybase/__init__.py
Log:
Removed unused isSupported.


Modified: SQLObject/trunk/sqlobject/dbconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/dbconnection.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/dbconnection.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -100,10 +100,6 @@
             db = path[1:]
         return uri + db
 
-    def isSupported(cls):
-        raise NotImplemented
-    isSupported = classmethod(isSupported)
-
     def connectionFromURI(cls, uri):
         raise NotImplemented
     connectionFromURI = classmethod(connectionFromURI)
@@ -899,17 +895,15 @@
 
     def __init__(self):
         self.schemeBuilders = {}
-        self.schemeSupported = {}
         self.instanceNames = {}
         self.cachedURIs = {}
 
-    def registerConnection(self, schemes, builder, isSupported):
+    def registerConnection(self, schemes, builder):
         for uriScheme in schemes:
             assert not self.schemeBuilders.has_key(uriScheme) \
                    or self.schemeBuilders[uriScheme] is builder, \
                    "A driver has already been registered for the URI scheme %s" % uriScheme
             self.schemeBuilders[uriScheme] = builder
-            self.schemeSupported = isSupported
 
     def registerConnectionInstance(self, inst):
         if inst.name:

Modified: SQLObject/trunk/sqlobject/firebird/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/firebird/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -4,11 +4,4 @@
     import firebirdconnection
     return firebirdconnection.FirebirdConnection
 
-def isSupported():
-    try:
-        import kinterbasdb
-    except ImportError:
-        return False
-    return True
-
-registerConnection(['firebird', 'interbase'], builder, isSupported)
+registerConnection(['firebird', 'interbase'], builder)

Modified: SQLObject/trunk/sqlobject/maxdb/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/maxdb/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/maxdb/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -4,11 +4,4 @@
     import maxdbconnection
     return maxdbconnection.MaxdbConnection
 
-def isSupported():
-    try:
-        import sapdb
-    except ImportError:
-        return False
-    return True
-
-registerConnection(['maxdb','sapdb'],builder, isSupported)
+registerConnection(['maxdb','sapdb'],builder)

Modified: SQLObject/trunk/sqlobject/mssql/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/mssql/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/mssql/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -4,14 +4,4 @@
     import mssqlconnection
     return mssqlconnection.MSSQLConnection
 
-def isSupported(cls):
-    try:
-        import pymssql
-    except ImportError:
-        try:
-            import adodbapi
-        except ImportError:
-            return False
-    return True
-
-registerConnection(['mssql'], builder, isSupported)
+registerConnection(['mssql'], builder)

Modified: SQLObject/trunk/sqlobject/mysql/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/mysql/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -5,11 +5,4 @@
     import mysqlconnection
     return mysqlconnection.MySQLConnection
 
-def isSupported():
-    try:
-        import MySQLdb
-    except ImportError:
-        return False
-    return True
-
-registerConnection(['mysql'], builder, isSupported)
+registerConnection(['mysql'], builder)

Modified: SQLObject/trunk/sqlobject/postgres/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/postgres/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -4,15 +4,4 @@
     import pgconnection
     return pgconnection.PostgresConnection
 
-def isSupported():
-    try:
-        import psycopg2
-    except ImportError:
-        try:
-            import psycopg
-        except ImportError:
-            return False
-    return True
-
-registerConnection(['postgres', 'postgresql', 'psycopg'],
-                   builder, isSupported)
+registerConnection(['postgres', 'postgresql', 'psycopg'], builder)

Modified: SQLObject/trunk/sqlobject/sqlite/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/sqlite/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -4,14 +4,4 @@
     import sqliteconnection
     return sqliteconnection.SQLiteConnection
 
-def isSupported():
-    try:
-        from pysqlite2 import dbapi2 as sqlite
-    except ImportError:
-        try:
-            import sqlite
-        except ImportError:
-            return False
-    return True
-
-registerConnection(['sqlite'], builder, isSupported)
+registerConnection(['sqlite'], builder)

Modified: SQLObject/trunk/sqlobject/sybase/__init__.py
===================================================================
--- SQLObject/trunk/sqlobject/sybase/__init__.py	2009-01-13 16:36:15 UTC (rev 3769)
+++ SQLObject/trunk/sqlobject/sybase/__init__.py	2009-01-13 17:08:23 UTC (rev 3770)
@@ -4,11 +4,4 @@
     import sybaseconnection
     return sybaseconnection.SybaseConnection
 
-def isSupported(cls):
-    try:
-        import Sybase
-    except ImportError:
-        return False
-    return True
-
-registerConnection(['sybase'], builder, isSupported)
+registerConnection(['sybase'], builder)

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

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

Author: phd
Date: 2009-01-13 09:36:15 -0700 (Tue, 13 Jan 2009)
New Revision: 3769

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
Log:
Changed the order of testing of SQLite modules - look for external PySQLite2 before sqlite3.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-01-10 02:10:18 UTC (rev 3768)
+++ SQLObject/trunk/docs/News.txt	2009-01-13 16:36:15 UTC (rev 3769)
@@ -43,6 +43,9 @@
   indicate no password set. By default, it uses the md5 library for
   hashing, but this can be changed in a HashCol definition.
 
+* Changed the order of testing of SQLite modules - look for external
+  PySQLite2 before sqlite3.
+
 SQLObject 0.10.5
 ================
 

Modified: SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-01-10 02:10:18 UTC (rev 3768)
+++ SQLObject/trunk/sqlobject/sqlite/sqliteconnection.py	2009-01-13 16:36:15 UTC (rev 3769)
@@ -28,11 +28,11 @@
         global using_sqlite2
         if sqlite is None:
             try:
-                import sqlite3 as sqlite
+                from pysqlite2 import dbapi2 as sqlite
                 using_sqlite2 = True
             except ImportError:
                 try:
-                    from pysqlite2 import dbapi2 as sqlite
+                    import sqlite3 as sqlite
                     using_sqlite2 = True
                 except ImportError:
                     import sqlite

[SQL-CVS] [ sqlobject-Bugs-2492641 ] orderBy sorts differ on Enums w/ MultipleJoin vs Select

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

Bugs item #2492641, was opened at 2009-01-07 20:08
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2492641&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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Nobody/Anonymous (nobody)
Assigned to: Nobody/Anonymous (nobody)
Summary: orderBy sorts differ on Enums w/ MultipleJoin vs Select

Initial Comment:
Given a structure like:

class Table(SQLObject):
    text = EnumCol(enumValues=['a','c','b'])
    t2 = ForeignKey("Table2")

When using a regular select query like
    Table.select(orderBy="text")

the resulting rows are ordered based on the ordering of the enumValues (a,c,b)

When using a MultipleJoin like

class Table2(SQLObject):
    t1 = MultipleJoin("Table", joinColumn="t2_id", orderBy="text")

the list yielded from t1 is ordered based on the alphabetical ordering of the enumValues (a,b,c)

I believe this can be traced to the 'sorter' method in joins.py

Thanks,
James


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

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

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

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

Author: phd
Date: 2008-12-25 10:29:12 -0700 (Thu, 25 Dec 2008)
New Revision: 3760

Modified:
   SQLObject/trunk/docs/News.txt
Log:
Added news entries.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2008-12-25 17:28:45 UTC (rev 3759)
+++ SQLObject/trunk/docs/News.txt	2008-12-25 17:29:12 UTC (rev 3760)
@@ -43,6 +43,11 @@
   indicate no password set. By default, it uses the md5 library for
   hashing, but this can be changed in a HashCol definition.
 
+SQLObject 0.10.5
+================
+
+* A number of changes ported from `SQLObject 0.9.10`_.
+
 SQLObject 0.10.4
 ================
 
@@ -144,6 +149,16 @@
 * 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.10
+================
+
+* Another unicode-related patch for MySQL; required because different
+  versions of MySQLdb require different handling::
+
+   - MySQLdb < 1.2.1: only ascii
+   - MySQLdb = 1.2.1: only unicode
+   - MySQLdb > 1.2.1: both ascii and unicode
+
 SQLObject 0.9.9
 ===============
 

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

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

Author: phd
Date: 2008-12-25 10:28:45 -0700 (Thu, 25 Dec 2008)
New Revision: 3759

Modified:
   SQLObject/branches/0.10/docs/News.txt
Log:
Added a news entry.


Modified: SQLObject/branches/0.10/docs/News.txt
===================================================================
--- SQLObject/branches/0.10/docs/News.txt	2008-12-25 17:28:20 UTC (rev 3758)
+++ SQLObject/branches/0.10/docs/News.txt	2008-12-25 17:28:45 UTC (rev 3759)
@@ -7,6 +7,11 @@
 
 .. _start:
 
+SQLObject 0.10.5
+================
+
+* A number of changes ported from `SQLObject 0.9.10`_.
+
 SQLObject 0.10.4
 ================
 
@@ -108,6 +113,16 @@
 * 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.10
+================
+
+* Another unicode-related patch for MySQL; required because different
+  versions of MySQLdb require different handling::
+
+   - MySQLdb < 1.2.1: only ascii
+   - MySQLdb = 1.2.1: only unicode
+   - MySQLdb > 1.2.1: both ascii and unicode
+
 SQLObject 0.9.9
 ===============
 

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

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

Author: phd
Date: 2008-12-25 10:28:20 -0700 (Thu, 25 Dec 2008)
New Revision: 3758

Modified:
   SQLObject/branches/0.9/docs/News.txt
Log:
Added a news entry.


Modified: SQLObject/branches/0.9/docs/News.txt
===================================================================
--- SQLObject/branches/0.9/docs/News.txt	2008-12-25 16:54:25 UTC (rev 3757)
+++ SQLObject/branches/0.9/docs/News.txt	2008-12-25 17:28:20 UTC (rev 3758)
@@ -7,6 +7,16 @@
 
 .. _start:
 
+SQLObject 0.9.10
+================
+
+* Another unicode-related patch for MySQL; required because different
+  versions of MySQLdb require different handling::
+
+   - MySQLdb < 1.2.1: only ascii
+   - MySQLdb = 1.2.1: only unicode
+   - MySQLdb > 1.2.1: both ascii and unicode
+
 SQLObject 0.9.9
 ===============
 

[SQL-CVS] r3757 - SQLObject/trunk/sqlobject/mysql

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

Author: phd
Date: 2008-12-25 09:54:25 -0700 (Thu, 25 Dec 2008)
New Revision: 3757

Modified:
   SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
Log:
Merged a patch by Toshio Kuratomi <a.b...@gm...> from branch 0.9:
   -- MySQLdb < 1.2.1: only ascii
   -- MySQLdb = 1.2.1: only unicode
   -- MySQLdb > 1.2.1: both ascii and unicode


Modified: SQLObject/trunk/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2008-12-25 16:53:34 UTC (rev 3756)
+++ SQLObject/trunk/sqlobject/mysql/mysqlconnection.py	2008-12-25 16:54:25 UTC (rev 3757)
@@ -49,6 +49,12 @@
         if "sqlobject_encoding" in kw:
             del kw["sqlobject_encoding"]
             deprecated("sqlobject_encoding is deprecated and no longer used.")
+
+        # MySQLdb < 1.2.1: only ascii
+        # MySQLdb = 1.2.1: only unicode
+        # MySQLdb > 1.2.1: both ascii and unicode
+        self.need_unicode = (MySQLdb.version_info[:3] >= (1, 2, 1)) and (MySQLdb.version_info[:3] < (1, 2, 2))
+
         DBAPI.__init__(self, **kw)
 
     def connectionFromURI(cls, uri):
@@ -92,6 +98,12 @@
             conn.autocommit(auto)
 
     def _executeRetry(self, conn, cursor, query):
+        if self.need_unicode and not isinstance(query, unicode):
+            try:
+                query = unicode(query, self.dbEncoding)
+            except UnicodeError:
+                pass
+
         # When a server connection is lost and a query is attempted, most of
         # the time the query will raise a SERVER_LOST exception, then at the
         # second attempt to execute it, the mysql lib will reconnect and

[SQL-CVS] r3756 - SQLObject/branches/0.10/sqlobject/mysql

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

Author: phd
Date: 2008-12-25 09:53:34 -0700 (Thu, 25 Dec 2008)
New Revision: 3756

Modified:
   SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py
Log:
Merged a patch by Toshio Kuratomi <a.b...@gm...> from branch 0.9:
   -- MySQLdb < 1.2.1: only ascii
   -- MySQLdb = 1.2.1: only unicode
   -- MySQLdb > 1.2.1: both ascii and unicode


Modified: SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py	2008-12-25 16:50:45 UTC (rev 3755)
+++ SQLObject/branches/0.10/sqlobject/mysql/mysqlconnection.py	2008-12-25 16:53:34 UTC (rev 3756)
@@ -49,6 +49,12 @@
         if "sqlobject_encoding" in kw:
             del kw["sqlobject_encoding"]
             deprecated("sqlobject_encoding is deprecated and no longer used.")
+
+        # MySQLdb < 1.2.1: only ascii
+        # MySQLdb = 1.2.1: only unicode
+        # MySQLdb > 1.2.1: both ascii and unicode
+        self.need_unicode = (MySQLdb.version_info[:3] >= (1, 2, 1)) and (MySQLdb.version_info[:3] < (1, 2, 2))
+
         DBAPI.__init__(self, **kw)
 
     def connectionFromURI(cls, uri):
@@ -92,6 +98,12 @@
             conn.autocommit(auto)
 
     def _executeRetry(self, conn, cursor, query):
+        if self.need_unicode and not isinstance(query, unicode):
+            try:
+                query = unicode(query, self.dbEncoding)
+            except UnicodeError:
+                pass
+
         # When a server connection is lost and a query is attempted, most of
         # the time the query will raise a SERVER_LOST exception, then at the
         # second attempt to execute it, the mysql lib will reconnect and

[SQL-CVS] r3755 - SQLObject/branches/0.9/sqlobject/mysql

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

Author: phd
Date: 2008-12-25 09:50:45 -0700 (Thu, 25 Dec 2008)
New Revision: 3755

Modified:
   SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py
Log:
A patch by Toshio Kuratomi <a.b...@gm...>:
   -- MySQLdb < 1.2.1: only ascii
   -- MySQLdb = 1.2.1: only unicode
   -- MySQLdb > 1.2.1: both ascii and unicode


Modified: SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py
===================================================================
--- SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py	2008-12-25 16:17:41 UTC (rev 3754)
+++ SQLObject/branches/0.9/sqlobject/mysql/mysqlconnection.py	2008-12-25 16:50:45 UTC (rev 3755)
@@ -44,6 +44,12 @@
         if "sqlobject_encoding" in kw:
             del kw["sqlobject_encoding"]
             deprecated("sqlobject_encoding is deprecated and no longer used.")
+
+        # MySQLdb < 1.2.1: only ascii
+        # MySQLdb = 1.2.1: only unicode
+        # MySQLdb > 1.2.1: both ascii and unicode
+        self.need_unicode = (MySQLdb.version_info[:3] >= (1, 2, 1)) and (MySQLdb.version_info[:3] < (1, 2, 2))
+
         DBAPI.__init__(self, **kw)
 
     def connectionFromURI(cls, uri):
@@ -87,6 +93,12 @@
             conn.autocommit(auto)
 
     def _executeRetry(self, conn, cursor, query):
+        if self.need_unicode and not isinstance(query, unicode):
+            try:
+                query = unicode(query, self.dbEncoding)
+            except UnicodeError:
+                pass
+
         # When a server connection is lost and a query is attempted, most of
         # the time the query will raise a SERVER_LOST exception, then at the
         # second attempt to execute it, the mysql lib will reconnect and

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

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

Author: phd
Date: 2008-12-25 09:17:41 -0700 (Thu, 25 Dec 2008)
New Revision: 3754

Modified:
   SQLObject/trunk/docs/SQLObject.txt
Log:
Merged revisions 3751:3752 from 0.9 branch:
Fixed a heading. Explain the problem with cross-platform Firebird DB URI string
and how to work around the problem.


Modified: SQLObject/trunk/docs/SQLObject.txt
===================================================================
--- SQLObject/trunk/docs/SQLObject.txt	2008-12-25 16:16:59 UTC (rev 3753)
+++ SQLObject/trunk/docs/SQLObject.txt	2008-12-25 16:17:41 UTC (rev 3754)
@@ -1763,14 +1763,37 @@
 
 .. _kinterbasdb: http://kinterbasdb.sourceforge.net/
 
+There could be a problem if one tries to connect to a server running on w32
+from a program running on Unix; the problem is how to specify the database
+so that SQLObject correctly parses it. Vertical bar is replaces by
+a semicolon only on a w32. On Unix a vertical bar is a pretty normal
+character and must not be processed.
+
+The most correct way to fix the problem is to connect to the DB using
+a database name, not a file name. In the Firebird a DBA can set an alias
+instead of database name in the aliases.conf file
+
+Example from `Firebird 2.0 Administrators Manual`_::
+
+   # fbdb1 is on a Windows server:
+   fbdb1 = c:\Firebird\sample\Employee.fdb
+
+.. _`Firebird 2.0 Administrators Manual`: http://www.janus-software.com/fbmanual/manual.php?book=admin&topic=4
+
+Now a program can connect to firebird://host:port/fbdb1.
+
+One can edit aliases.conf whilst the server is running. There is no need to
+stop and restart the server in order for new aliases.conf entries to be
+recognised.
+
 If you are using indexes and get an error like *key size exceeds
 implementation restriction for index*, see `this page`_ to understand
 the restrictions on your indexing.
 
 .. _this page: http://www.volny.cz/iprenosil/interbase/ip_ib_indexcalculator.htm
 
-SybaseConnection
-----------------
+Sybase
+------
 
 `SybaseConnection` takes the arguments `host`, `db`, `user`, and
 `password`.  It also takes the extra boolean argument `locking` (default

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

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

Author: phd
Date: 2008-12-25 09:16:59 -0700 (Thu, 25 Dec 2008)
New Revision: 3753

Modified:
   SQLObject/branches/0.10/docs/SQLObject.txt
Log:
Merged revisions 3751:3752 from 0.9 branch:
Fixed a heading. Explain the problem with cross-platform Firebird DB URI string
and how to work around the problem.


Modified: SQLObject/branches/0.10/docs/SQLObject.txt
===================================================================
--- SQLObject/branches/0.10/docs/SQLObject.txt	2008-12-25 16:13:43 UTC (rev 3752)
+++ SQLObject/branches/0.10/docs/SQLObject.txt	2008-12-25 16:16:59 UTC (rev 3753)
@@ -1745,14 +1745,37 @@
 
 .. _kinterbasdb: http://kinterbasdb.sourceforge.net/
 
+There could be a problem if one tries to connect to a server running on w32
+from a program running on Unix; the problem is how to specify the database
+so that SQLObject correctly parses it. Vertical bar is replaces by
+a semicolon only on a w32. On Unix a vertical bar is a pretty normal
+character and must not be processed.
+
+The most correct way to fix the problem is to connect to the DB using
+a database name, not a file name. In the Firebird a DBA can set an alias
+instead of database name in the aliases.conf file
+
+Example from `Firebird 2.0 Administrators Manual`_::
+
+   # fbdb1 is on a Windows server:
+   fbdb1 = c:\Firebird\sample\Employee.fdb
+
+.. _`Firebird 2.0 Administrators Manual`: http://www.janus-software.com/fbmanual/manual.php?book=admin&topic=4
+
+Now a program can connect to firebird://host:port/fbdb1.
+
+One can edit aliases.conf whilst the server is running. There is no need to
+stop and restart the server in order for new aliases.conf entries to be
+recognised.
+
 If you are using indexes and get an error like *key size exceeds
 implementation restriction for index*, see `this page`_ to understand
 the restrictions on your indexing.
 
 .. _this page: http://www.volny.cz/iprenosil/interbase/ip_ib_indexcalculator.htm
 
-SybaseConnection
-----------------
+Sybase
+------
 
 `SybaseConnection` takes the arguments `host`, `db`, `user`, and
 `password`.  It also takes the extra boolean argument `locking` (default

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

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

Author: phd
Date: 2008-12-25 09:13:43 -0700 (Thu, 25 Dec 2008)
New Revision: 3752

Modified:
   SQLObject/branches/0.9/docs/SQLObject.txt
Log:
Explain the problem with cross-platform Firebird DB URI string and how to work around the problem.


Modified: SQLObject/branches/0.9/docs/SQLObject.txt
===================================================================
--- SQLObject/branches/0.9/docs/SQLObject.txt	2008-12-25 15:57:42 UTC (rev 3751)
+++ SQLObject/branches/0.9/docs/SQLObject.txt	2008-12-25 16:13:43 UTC (rev 3752)
@@ -1740,6 +1740,29 @@
 
 .. _kinterbasdb: http://kinterbasdb.sourceforge.net/
 
+There could be a problem if one tries to connect to a server running on w32
+from a program running on Unix; the problem is how to specify the database
+so that SQLObject correctly parses it. Vertical bar is replaces by
+a semicolon only on a w32. On Unix a vertical bar is a pretty normal
+character and must not be processed.
+
+The most correct way to fix the problem is to connect to the DB using
+a database name, not a file name. In the Firebird a DBA can set an alias
+instead of database name in the aliases.conf file
+
+Example from `Firebird 2.0 Administrators Manual`_::
+
+   # fbdb1 is on a Windows server:
+   fbdb1 = c:\Firebird\sample\Employee.fdb
+
+.. _`Firebird 2.0 Administrators Manual`: http://www.janus-software.com/fbmanual/manual.php?book=admin&topic=4
+
+Now a program can connect to firebird://host:port/fbdb1.
+
+One can edit aliases.conf whilst the server is running. There is no need to
+stop and restart the server in order for new aliases.conf entries to be
+recognised.
+
 If you are using indexes and get an error like *key size exceeds
 implementation restriction for index*, see `this page`_ to understand
 the restrictions on your indexing.

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

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

Author: phd
Date: 2008-12-25 08:57:42 -0700 (Thu, 25 Dec 2008)
New Revision: 3751

Modified:
   SQLObject/branches/0.9/docs/SQLObject.txt
Log:
Fixed a heading.


Modified: SQLObject/branches/0.9/docs/SQLObject.txt
===================================================================
--- SQLObject/branches/0.9/docs/SQLObject.txt	2008-12-21 18:18:37 UTC (rev 3750)
+++ SQLObject/branches/0.9/docs/SQLObject.txt	2008-12-25 15:57:42 UTC (rev 3751)
@@ -1746,8 +1746,8 @@
 
 .. _this page: http://www.volny.cz/iprenosil/interbase/ip_ib_indexcalculator.htm
 
-SybaseConnection
-----------------
+Sybase
+------
 
 `SybaseConnection` takes the arguments `host`, `db`, `user`, and
 `password`.  It also takes the extra boolean argument `locking` (default

[SQL-CVS] [ sqlobject-Bugs-2432888 ] splicing without a threadConnection breaks with inheritance

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

Bugs item #2432888, was opened at 2008-12-16 10:26
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2432888&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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Iwan Vosloo (iwanvosloo)
Assigned to: Nobody/Anonymous (nobody)
Summary: splicing without a threadConnection breaks with inheritance

Initial Comment:
Using sqlobject 0.10.2, and a class which inherits from a sqlobject.inheritance.InheritableSQLObject, the following happens:

If you do NOT use a threadConnection, but pass an explicit connection to a select, subsequent splicing on that result breaks because it insists on a threadConnection.

This bug is not present in sqlobject 0.9.1.


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

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

[SQL-CVS] [ sqlobject-Bugs-2432880 ] dropTable creates extra connection when used in transaction

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

Bugs item #2432880, was opened at 2008-12-16 10:19
Message generated for change (Tracker Item Submitted) made by Item Submitter
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=540672&aid=2432880&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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Iwan Vosloo (iwanvosloo)
Assigned to: Nobody/Anonymous (nobody)
Summary: dropTable creates extra connection when used in transaction

Initial Comment:
This has been tested with sqlobject (versions 0.9.1 or 0.10.2) and postgresql.
If you start a transaction, and then call dropTable on a class, that call creates an extra postgresql connection, outside of the transaction.

This is caused by the following line in dbconnection.py:
755             attr = getattr(self._dbConnection, attr)

which is called while self is still the Transaction, for attr
'server_version'.

This, however, returns the server_version method on the connection, bound to the _dbconnection the getattr was called on. This bound method gets called, and inside it self.queryOne is called:

304                 server_version = self.queryOne("SELECT version()")[0]

This call creates the second connection.

Attached is a file demonstrating the issue, and a temporary workaround.

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

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

[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 17:02
Message generated for change (Comment added) made by luci_stanescu
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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Lucian 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: Lucian Stanescu (luci_stanescu)
Date: 2008-12-11 17: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 17: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] [ 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 (Comment added) 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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Lucian 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: 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] [ 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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Lucian 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."

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

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

[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 17:02
Message generated for change (Tracker Item Submitted) made by Item Submitter
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: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Lucian Stanescu (luci_stanescu)
Assigned to: Nobody/Anonymous (nobody)
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."

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

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

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

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

Author: phd
Date: 2008-12-10 08:34:15 -0700 (Wed, 10 Dec 2008)
New Revision: 3720

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/docs/SQLObject.txt
Log:
Documentation update.

Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2008-12-10 15:33:55 UTC (rev 3719)
+++ SQLObject/trunk/docs/News.txt	2008-12-10 15:34:15 UTC (rev 3720)
@@ -36,7 +36,7 @@
   to work around problems in some drivers and type affinity problem in
   SQLite.
 
-* Added sqlobject.include.hascol.HashCol - a column type that automatically
+* Added sqlobject.include.hashcol.HashCol - a column type that automatically
   hashes anything going into it, and returns out an object that hashes
   anything being compared to itself. Basically, it's good for really simple
   one-way password fields, and it even supports the assignment of None to

Modified: SQLObject/trunk/docs/SQLObject.txt
===================================================================
--- SQLObject/trunk/docs/SQLObject.txt	2008-12-10 15:33:55 UTC (rev 3719)
+++ SQLObject/trunk/docs/SQLObject.txt	2008-12-10 15:34:15 UTC (rev 3720)
@@ -1484,13 +1484,9 @@
 You can still specify columns (in `_columns`), and only missing
 columns will be added.
 
-*This is not supported in SQLite*
-
 Runtime Column and Join Changes
 -------------------------------
 
-*SQLite does not support this feature*
-
 You can add and remove columns to your class at runtime.  Such changes
 will effect all instances, since changes are made in place to the
 class.  There are two methods of the `class sqlmeta object`_,
@@ -1748,9 +1744,6 @@
 program quits).  SQLite does not restrict the types you can put in a
 column -- strings can go in integer columns, dates in integers, etc.
 
-SQLiteConnection doesn't support `automatic class generation`_ and
-SQLite does not support `runtime column and join changes`_.
-
 SQLite may have concurrency issues, depending on your usage in a
 multi-threaded environment.