Changeset 2985

Timestamp:

05/26/06 00:20:21 (2 years ago)

Author:

adrian

Message:

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

Files:

• django/trunk/AUTHORS (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (2 diffs)

django/trunk/AUTHORS

@@ -66 +66 @@
-    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>

django/trunk/django/core/management.py

@@ -329 +329 @@
-    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)),
@@ -335 +345 @@
-        if os.path.exists(sql_file):
-            fp = open(sql_file)
-append(fp.read(
+extend(sql_expr.findall(fp.read()
-            fp.close()
-