Opened 18 years ago

Last modified 18 years ago

#2119 closed defect

get_sql_initial_data_for_model can't handle quoted quotes — at Initial Version

Reported by: eaw@… Owned by: Adrian Holovaty
Component: Core (Management commands) Version:
Severity: normal Keywords:
Cc: Triage Stage: Unreviewed
Has patch: yes Needs documentation: no
Needs tests: no Patch needs improvement: no
Easy pickings: no UI/UX: no

Description

The RE in get_sql_initial_data_model can't parse data of the form 'Susan O\'Brien' properly (it ends up generating invalid SQL), so I've taken the approach of simply splitting the initial data into separate SQL statements where ";[ \t]*$" occurs (i.e. a ; at the end of line). [This definition of a statement probably needs to be documented.] Here is the svn diff of the change:

Index: management.py
===================================================================
--- management.py (revision 3110)
+++ management.py (working copy)
@@ -341,10 +341,14 @@

# Find custom SQL, if it's available.
sql_files = [os.path.join(app_dir, "%s.%s.sql" % (opts.object_name.lower(), settings.DATABASE_ENGINE)),

os.path.join(app_dir, "%s.sql" % opts.object_name.lower())]

+
+ statements = re.compile(";[ \t]*$", re.M)

for sql_file in sql_files:

if os.path.exists(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()


return output

Change History (1)

by eaw@…, 18 years ago

Attachment: theDiff added

Patch to split initial sql data into statements by ";"

Note: See TracTickets for help on using tickets.
Back to Top