Changeset 3821

Timestamp:

09/25/06 02:36:46 (2 years ago)

Author:

mtredinnick

Message:

Fixed #2729 -- Handle initial SQL with different line-ending styles (Windows
vs. Unix vs. Mac). Thanks, Simon Greenhill.

Files:

• django/trunk/django/core/management.py (modified) (1 diff)
• django/trunk/tests/regressiontests/initial_sql_regress/sql/simple.sql (modified) (1 diff)

django/trunk/django/core/management.py

@@ -348 +348 @@
-    for sql_file in sql_files:
-        if os.path.exists(sql_file):
-
+, 'U'
-            for statement in statements.split(fp.read()):
-                if statement.strip():

django/trunk/tests/regressiontests/initial_sql_regress/sql/simple.sql

@@ -5 +5 @@
-INSERT INTO initial_sql_regress_simple (name) VALUES ('Miles O''Brien');
-INSERT INTO initial_sql_regress_simple (name) VALUES ('Semicolon;Man');
+INSERT INTO initial_sql_regress_simple (name) VALUES ('This line has a Windows line ending');
-