Ticket #19416: 19416-1.diff

django/core/management/sql.py

@@ -145 +145 @@
 def _split_statements(content):
     comment_re = re.compile(r"^((?:'[^']*'|[^'])*?)--.*$")
     statements = []
-    statement = ""
+    statement = []
     for line in content.split("\n"):
         cleaned_line = comment_re.sub(r"\1", line).strip()
         if not cleaned_line:
             continue
-        statement += cleaned_line
-        if statement.endswith(";"):
-            statements.append(statement)
-            statement = ""
+        statement.append(cleaned_line)
+        if cleaned_line.endswith(";"):
+            statements.append(" ".join(statement))
+            statement = []
     return statements
 
 

tests/regressiontests/initial_sql_regress/sql/simple.sql

@@ -2 +2 @@
 INSERT INTO initial_sql_regress_simple (name) VALUES ('John'); -- another comment
 INSERT INTO initial_sql_regress_simple (name) VALUES ('-- Comment Man');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Paul');
-INSERT INTO initial_sql_regress_simple (name) VALUES ('Ringo');
+INSERT INTO initial_sql_regress_simple
+    VALUES (150, 'Ringo');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('George');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Miles O''Brien');
 INSERT INTO initial_sql_regress_simple (name) VALUES ('Semicolon;Man');