Changeset 87

Timestamp:

10/15/07 15:32:02 (15 months ago)

Author:

steadicat

Message:

Added proper trimming of blank lines and removal of control characters.

Files:

• django/trunk/contrib/evolve.py (modified) (4 diffs)

django/trunk/contrib/evolve.py

@@ -23 +23 @@
         self.name = self.getTableName(lines[0])
         self.old_fields = {}
-        for line in lines[1:-1]:
+        for line in lines[1:-1]: # remove create table and closing bracket
             line = line.strip().strip(',')
             self.old_fields[self.getFieldName(line)] = line
@@ -29 +29 @@
 
     def new(self, sql):
-        self.new_fields = [line.strip().strip(',') for line in sql.splitlines()[2:-1]]
+        self.new_fields = [line.strip().strip(',') for line in sql.splitlines()[1:-1]] # remove create table and closing bracket
 
     def getTableName(self, sql):
@@ -88 +88 @@
 
 if __name__=='__main__':
-    new_tables_sql = os.popen('manage.py sql %s' % app).read().split(';')[1:-2]
-    old_tables_sql = os.popen('sqlite3 %s ".schema %s_%%"' % (database, app)).read().split(';')[:-1]
+    new_tables_sql = os.popen('manage.py sql %s' % app).read()
+    old_tables_sql = os.popen('sqlite3 %s ".schema %s_%%"' % (database, app)).read()
 
+    # remove control characters
+    ctrl = re.compile(r'[\000-\011\013-\037]')
+    new_tables_sql = ctrl.sub('', new_tables_sql)
+    old_tables_sql = ctrl.sub('', old_tables_sql)
+
+    new_tables_sql = new_tables_sql.split(';')[1:-2] # remove begin, commit and empty ; at the end
+    old_tables_sql = old_tables_sql.split(';')[:-1] # remove empty ; at the end
+    
     tables = {}
 
@@ -99 +107 @@
     for sql in new_tables_sql:
         t = Table(sql.strip())
-        tables[t.name].new(sql)
+        tables[t.name].new(sql.strip())
 
     for table in tables.values():