[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(','):