p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed #4057 -- Fixed problem with quoting of sequence names on Postgres backends. Thanks, Gary Wilson. 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@5017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Russell Keith-Magee 2007-04-17 11:11:26 +00:00
parent c64f7f065a
commit c5f08954d5
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
django/db/backends/postgresql/base.py
View File

@ -192,7 +192,7 @@ def get_sql_flush(style, tables, sequences):
sql.append("%s %s %s %s %s %s;" % \ sql.append("%s %s %s %s %s %s;" % \
(style.SQL_KEYWORD('ALTER'), (style.SQL_KEYWORD('ALTER'),
style.SQL_KEYWORD('SEQUENCE'), style.SQL_KEYWORD('SEQUENCE'),
style.SQL_FIELD('%s_%s_seq' % (table_name, column_name)), style.SQL_FIELD(quote_name('%s_%s_seq' % (table_name, column_name))),
style.SQL_KEYWORD('RESTART'), style.SQL_KEYWORD('RESTART'),
style.SQL_KEYWORD('WITH'), style.SQL_KEYWORD('WITH'),
style.SQL_FIELD('1') style.SQL_FIELD('1')
@ -203,7 +203,7 @@ def get_sql_flush(style, tables, sequences):
sql.append("%s %s %s %s %s %s;" % \ sql.append("%s %s %s %s %s %s;" % \
(style.SQL_KEYWORD('ALTER'), (style.SQL_KEYWORD('ALTER'),
style.SQL_KEYWORD('SEQUENCE'), style.SQL_KEYWORD('SEQUENCE'),
style.SQL_FIELD('%s_id_seq' % table_name), style.SQL_FIELD(quote_name('%s_id_seq' % table_name)),
style.SQL_KEYWORD('RESTART'), style.SQL_KEYWORD('RESTART'),
style.SQL_KEYWORD('WITH'), style.SQL_KEYWORD('WITH'),
style.SQL_FIELD('1') style.SQL_FIELD('1')

4
django/db/backends/postgresql_psycopg2/base.py
View File

@ -149,7 +149,7 @@ def get_sql_flush(style, tables, sequences):
sql.append("%s %s %s %s %s %s;" % \ sql.append("%s %s %s %s %s %s;" % \
(style.SQL_KEYWORD('ALTER'), (style.SQL_KEYWORD('ALTER'),
style.SQL_KEYWORD('SEQUENCE'), style.SQL_KEYWORD('SEQUENCE'),
style.SQL_FIELD('%s_%s_seq' % (table_name, column_name)), style.SQL_FIELD(quote_name('%s_%s_seq' % (table_name, column_name))),
style.SQL_KEYWORD('RESTART'), style.SQL_KEYWORD('RESTART'),
style.SQL_KEYWORD('WITH'), style.SQL_KEYWORD('WITH'),
style.SQL_FIELD('1') style.SQL_FIELD('1')
@ -160,7 +160,7 @@ def get_sql_flush(style, tables, sequences):
sql.append("%s %s %s %s %s %s;" % \ sql.append("%s %s %s %s %s %s;" % \
(style.SQL_KEYWORD('ALTER'), (style.SQL_KEYWORD('ALTER'),
style.SQL_KEYWORD('SEQUENCE'), style.SQL_KEYWORD('SEQUENCE'),
style.SQL_FIELD('%s_id_seq' % table_name), style.SQL_FIELD(quote_name('%s_id_seq' % table_name)),
style.SQL_KEYWORD('RESTART'), style.SQL_KEYWORD('RESTART'),
style.SQL_KEYWORD('WITH'), style.SQL_KEYWORD('WITH'),
style.SQL_FIELD('1') style.SQL_FIELD('1')

7
tests/regressiontests/fixtures_regress/models.py
View File

@ -7,6 +7,13 @@ class Animal(models.Model):
def __str__(self): def __str__(self):
return self.common_name return self.common_name
class Plant(models.Model):
name = models.CharField(maxlength=150)
class Meta:
# For testing when upper case letter in app name; regression for #4057
db_table = "Fixtures_regress_plant"
__test__ = {'API_TESTS':""" __test__ = {'API_TESTS':"""
>>> from django.core import management >>> from django.core import management