mirror of https://github.com/django/django.git
Fixed #6394: improved comment stripping in initial SQL files. Thanks, Thomas Guttler.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7591 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
5675ae4443
commit
102394b79d
|
@ -446,7 +446,7 @@ def custom_sql_for_model(model):
|
||||||
fp = open(sql_file, 'U')
|
fp = open(sql_file, 'U')
|
||||||
for statement in statements.split(fp.read().decode(settings.FILE_CHARSET)):
|
for statement in statements.split(fp.read().decode(settings.FILE_CHARSET)):
|
||||||
# Remove any comments from the file
|
# Remove any comments from the file
|
||||||
statement = re.sub(ur"--.*[\n\Z]", "", statement)
|
statement = re.sub(ur"--.*([\n\Z]|$)", "", statement)
|
||||||
if statement.strip():
|
if statement.strip():
|
||||||
output.append(statement + u";")
|
output.append(statement + u";")
|
||||||
fp.close()
|
fp.close()
|
||||||
|
|
Loading…
Reference in New Issue