[patch] sqlinitialdata files with dos line endings error out on Gnu/Linux

[Joeboy]

On my Gnu/Linux box, trying to use sqlinitialdata files provided by my windows-using colleagues, I get:

joe@edward ~/reportlab/libs/rltravelprod/djtravel $ ./manage.py reset holidays

You have requested a database reset.
This will IRREVERSIBLY DESTROY any data in your database.
Are you sure you want to do this?

Type 'yes' to continue, or 'no' to cancel: yes
Error: holidays couldn't be installed. Possible reasons:
  * The database isn't running or isn't configured correctly.
  * At least one of the database tables already exists.
  * The SQL was invalid.
Hint: Look at the output of 'django-admin.py sqlreset holidays'. That's the SQL this command wasn't able to run.
The full error: (1064, "You have an error in your SQL syntax; check the manual that corresponds to your MySQL
server version for the right syntax to use near ';\r\nINSERT INTO `holidays_resort` (id, name, region_id) VALUES
(2,'Cavtat',1);\r\nI' at line 1")

Converting to unix line endings fixes it.

[Joeboy]

sample erroring dos file

[dev@…]

Hmm... using python's "U" mode when reading the file in should fix this by standardising line breaks. I've had a go at this (patch attached), but given that I'm on OSX, I'm not sure that I'm replicating the problem exactly.

[Malcolm Tredinnick]

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