Ticket #2284: new-patch.diff

django/core/management.py

@@ -337 +337 @@
 
     # Some backends can't execute more than one SQL statement at a time,
     # so split into separate statements.
-    statements = re.compile(r";[ \t]*$", re.M)
+    statements = re.compile(
+        r"""(           # each statement ...
+        [^\r\n;]        # starts with something other than a line ending or ';'
+        (?:             # then has one or more chunks of ...
+            (?:[^;'"]+) # not the end of a statement or start of a quote
+          | (?:'(?:[^']|\\')*') # something in single quotes, but not escaped
+          | (?:"(?:[^"]|\\")") # something in double quotes, but not escaped
+        )+)""", re.VERBOSE)
 
     # Find custom SQL, if it's available.
     sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), settings.DATABASE_ENGINE)),
@@ -345 +352 @@
     for sql_file in sql_files:
         if os.path.exists(sql_file):
             fp = open(sql_file)
-            for statement in statements.split(fp.read()):
-                if statement.strip():
-                    output.append(statement + ";")
+            output.extend(statements.findall(fp.read()))
             fp.close()
 
     return output
@@ -497 +502 @@
                 if initial_sql:
                     print "Installing initial data for %s model" % model._meta.object_name
                     try:
-                        for sql in initial_sql:
+                        for sql in [sql.strip() for sql in initial_sql]:
+                            if not sql: continue
+                            print "Executing '%s'" % sql
                             cursor.execute(sql)
                     except Exception, e:
                         sys.stderr.write("Failed to install initial SQL data for %s model: %s" % \