Commit 3d62eaea authored by Claude Paroz's avatar Claude Paroz
Browse files

[1.5.x] Fixed #19416 -- Fixed multi-line commands in initial SQL files 

Thanks Aymeric Augustin for detecting this regression.
Backport of 5fa5621f from master.
parent c9a47fb3

django/core/management/sql.py

+5 −5
Original line number Diff line number Diff line
@@ -145,15 +145,15 @@ def sql_all(app, style, connection): 
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 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
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');