test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #2119 -- fixed problems with splitting SQL statements into separate 

statements. Uses a patch from eaw@woudy.org and some contributions from
jpellerin@gmail.com. Also fixes #2034 and #1935.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@3178 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2006-06-20 08:00:44 +00:00
parent 3e97535907
commit 92571b0d48
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
django/core/management.py
View File

@ -333,14 +333,7 @@ def get_sql_initial_data_for_model(model):
# Some backends can't execute more than one SQL statement at a time, # Some backends can't execute more than one SQL statement at a time,
# so split into separate statements. # so split into separate statements.
sql_expr = re.compile( statements = re.compile(r";[ \t]*$", re.M)
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
| (?:"[^"]*") # something in double quotes
)+)""", re.VERBOSE)
# Find custom SQL, if it's available. # Find custom SQL, if it's available.
sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), settings.DATABASE_ENGINE)), sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), settings.DATABASE_ENGINE)),
@ -348,7 +341,9 @@ def get_sql_initial_data_for_model(model):
for sql_file in sql_files: for sql_file in sql_files:
if os.path.exists(sql_file): if os.path.exists(sql_file):
fp = open(sql_file) fp = open(sql_file)
output.extend(sql_expr.findall(fp.read())) for statement in statements.split(fp.read()):
if statement.strip():
output.append(statement + ";")
fp.close() fp.close()
return output return output

1
tests/regressiontests/initial_sql_regress/sql/simple.sql
View File

@ -2,4 +2,5 @@ INSERT INTO initial_sql_regress_simple (name) VALUES ('John');
INSERT INTO initial_sql_regress_simple (name) VALUES ('Paul'); INSERT INTO initial_sql_regress_simple (name) VALUES ('Paul');
INSERT INTO initial_sql_regress_simple (name) VALUES ('Ringo'); INSERT INTO initial_sql_regress_simple (name) VALUES ('Ringo');
INSERT INTO initial_sql_regress_simple (name) VALUES ('George'); INSERT INTO initial_sql_regress_simple (name) VALUES ('George');
INSERT INTO initial_sql_regress_simple (name) VALUES ('Miles O''Brien');