[SQL-CVS] r4360 - in SQLObject/trunk: docs sqlobject/mssql

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

Author: phd
Date: Thu Mar 17 10:16:37 2011
New Revision: 4360

Log:
Merged revision 4359 from branch 1.0: a bug was fixed in MSSQLConnection.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/mssql/mssqlconnection.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Thu Mar 17 10:15:11 2011	(r4359)
+++ SQLObject/trunk/docs/News.txt	Thu Mar 17 10:16:37 2011	(r4360)
@@ -29,6 +29,8 @@
 SQLObject 0.15.1
 ================
 
+* A bug was fixed in MSSQLConnection.
+
 * A bugfix was ported from `SQLObject 0.14.2`_.
 
 SQLObject 0.15.0

Modified: SQLObject/trunk/sqlobject/mssql/mssqlconnection.py
==============================================================================
--- SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Thu Mar 17 10:15:11 2011	(r4359)
+++ SQLObject/trunk/sqlobject/mssql/mssqlconnection.py	Thu Mar 17 10:16:37 2011	(r4360)
@@ -8,6 +8,8 @@
     dbName = 'mssql'
     schemes = [dbName]
 
+    limit_re = re.compile('^\s*(select )(.*)', re.IGNORECASE)
+
     def __init__(self, db, user, password='', host='localhost', port=None,
                  autoCommit=0, **kw):
         drivers = kw.pop('driver', None) or 'adodb,pymssql'
@@ -68,7 +70,6 @@
         self.db = db
         self.user = user
         self.password = password
-        self.limit_re = re.compile('^\s*(select )(.*)', re.IGNORECASE)
         self.password = password
         self._can_use_max_types = None
         DBAPI.__init__(self, **kw)