Commit 0fd9eef8 authored by Adrian Holovaty's avatar Adrian Holovaty
Browse files

Fixed #1935 -- Initial SQL data now works in SQLite if there are multiple... 

Fixed #1935 -- Initial SQL data now works in SQLite if there are multiple statements. Thanks, jpellerin@gmail.com

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent f375b545

AUTHORS

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ answer newbie questions, and generally made Django that much better: 
    Robert Rock Howard <http://djangomojo.com/>

    Jason Huggins <http://www.jrandolph.com/blog/>

    Michael Josephson <http://www.sdjournal.com/>

    jpellerin@gmail.com

    junzhang.jn@gmail.com

    Russell Keith-Magee <freakboy@iinet.net.au>

    Garth Kidd <http://www.deadlybloodyserious.com/>

django/core/management.py

+11 −1
Original line number Diff line number Diff line
@@ -328,13 +328,23 @@ def get_sql_initial_data_for_model(model): 
    app_dir = os.path.normpath(os.path.join(os.path.dirname(models.get_app(model._meta.app_label).__file__), 'sql'))

    output = []



    # Some backends can't execute more than one SQL statement at a time,

    # so split into separate statements.

    sql_expr = re.compile(

        r"""(           # each statement is...

        (?:             # one or more chunks of ...

            (?:[^;'"]+) # not the end of a statement or start of a quote

          | (?:'[^']+') # something in single quotes

          | (?:"[^"]+") # something in double quotes

        )+)""", 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)),

                 os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]

    for sql_file in sql_files:

        if os.path.exists(sql_file):

            fp = open(sql_file)

            output.append(fp.read())

            output.extend(sql_expr.findall(fp.read()))

            fp.close()



    return output