Django

Code

Changeset 9545

Show
Ignore:
Timestamp:
12/02/08 07:34:00 (1 month ago)
Author:
russellm
Message:

[1.0.X] Fixed #9736 -- Added quoting to the SQL constraint names generated during table creation. This is to accommodate primary keys with spaces.

Merge of [9543] from trunk.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • django/branches/releases/1.0.X

    • Property svnmerge-integrated changed from /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9523,9535 to /django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9523,9535,9543-9544
  • django/branches/releases/1.0.X/django/db/backends/creation.py

    r8328 r9545  
    127127                r_name = '%s_refs_%s_%x' % (r_col, col, abs(hash((r_table, table)))) 
    128128                final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % \ 
    129                     (qn(r_table), truncate_name(r_name, self.connection.ops.max_name_length()), 
     129                    (qn(r_table), qn(truncate_name(r_name, self.connection.ops.max_name_length())), 
    130130                    qn(r_col), qn(table), qn(col), 
    131131                    self.connection.ops.deferrable_sql())) 
     
    187187                output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % 
    188188                (qn(r_table), 
    189                 truncate_name(r_name, self.connection.ops.max_name_length()), 
     189                qn(truncate_name(r_name, self.connection.ops.max_name_length())), 
    190190                qn(r_col), qn(table), qn(col), 
    191191                self.connection.ops.deferrable_sql()))