[SQL-CVS] r4064 - in SQLObject/trunk: docs sqlobject/firebird sqlobject/postgres

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

Author: phd
Date: 2009-12-30 18:26:42 -0700 (Wed, 30 Dec 2009)
New Revision: 4064

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
   SQLObject/trunk/sqlobject/postgres/pgconnection.py
Log:
Merged bugfixed from revision 4063.


Modified: SQLObject/trunk/docs/News.txt
===================================================================
--- SQLObject/trunk/docs/News.txt	2009-12-31 01:18:05 UTC (rev 4063)
+++ SQLObject/trunk/docs/News.txt	2009-12-31 01:26:42 UTC (rev 4064)
@@ -10,6 +10,13 @@
 SQLObject (trunk)
 =================
 
+SQLObject 0.12.1
+================
+
+* Fixed a bug in PostgresConnection.
+
+* A change ported from `SQLObject 0.11.3`_.
+
 SQLObject 0.12
 ==============
 
@@ -63,6 +70,8 @@
 SQLObject 0.11.3
 ================
 
+* Fixed a bug in FirebirdConnection.
+
 * A change ported from `SQLObject 0.10.9`_.
 
 SQLObject 0.11.2

Modified: SQLObject/trunk/sqlobject/firebird/firebirdconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2009-12-31 01:18:05 UTC (rev 4063)
+++ SQLObject/trunk/sqlobject/firebird/firebirdconnection.py	2009-12-31 01:26:42 UTC (rev 4064)
@@ -9,14 +9,14 @@
     dbName = 'firebird'
     schemes = [dbName]
 
+    limit_re = re.compile('^\s*(select )(.*)', re.IGNORECASE)
+
     def __init__(self, host, db, user='sysdba',
                  password='masterkey', autoCommit=1,
                  dialect=None, role=None, charset=None, **kw):
         import kinterbasdb
         self.module = kinterbasdb
 
-        self.limit_re = re.compile('^\s*(select )(.*)', re.IGNORECASE)
-
         self.host = host
         self.db = db
         self.user = user

Modified: SQLObject/trunk/sqlobject/postgres/pgconnection.py
===================================================================
--- SQLObject/trunk/sqlobject/postgres/pgconnection.py	2009-12-31 01:18:05 UTC (rev 4063)
+++ SQLObject/trunk/sqlobject/postgres/pgconnection.py	2009-12-31 01:26:42 UTC (rev 4064)
@@ -13,7 +13,7 @@
     def __init__(self, dsn=None, host=None, port=None, db=None,
                  user=None, password=None, backend='psycopg', unicodeCols=False,
                  **kw):
-        backends = kw.pop('backend', None) or 'psycopg'
+        backends = backend
         for backend in backends.split(','):
             backend = backend.strip()
             if not backend: