Author: russellm
Date: 2008-12-02 07:34:00 -0600 (Tue, 02 Dec 2008)
New Revision: 9545
Added:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/__init__.py
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
Removed:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/__init__.py
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
Modified:
django/branches/releases/1.0.X/
django/branches/releases/1.0.X/django/db/backends/creation.py
django/branches/releases/1.0.X/tests/regressiontests/generic_inline_admin/
django/branches/releases/1.0.X/tests/regressiontests/managers_regress/
Log:
[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.
Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
-
/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
+
/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
Modified: django/branches/releases/1.0.X/django/db/backends/creation.py
===================================================================
--- django/branches/releases/1.0.X/django/db/backends/creation.py
2008-12-02 13:27:30 UTC (rev 9544)
+++ django/branches/releases/1.0.X/django/db/backends/creation.py
2008-12-02 13:34:00 UTC (rev 9545)
@@ -126,7 +126,7 @@
# So we are careful with character usage here.
r_name = '%s_refs_%s_%x' % (r_col, col, abs(hash((r_table,
table))))
final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s
ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % \
- (qn(r_table), truncate_name(r_name,
self.connection.ops.max_name_length()),
+ (qn(r_table), qn(truncate_name(r_name,
self.connection.ops.max_name_length())),
qn(r_col), qn(table), qn(col),
self.connection.ops.deferrable_sql()))
del pending_references[model]
@@ -186,7 +186,7 @@
abs(hash((r_table, table))))
output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD
CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' %
(qn(r_table),
- truncate_name(r_name, self.connection.ops.max_name_length()),
+ qn(truncate_name(r_name,
self.connection.ops.max_name_length())),
qn(r_col), qn(table), qn(col),
self.connection.ops.deferrable_sql()))
Copied:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress
(from rev 9544, django/trunk/tests/regressiontests/custom_columns_regress)
Property changes on:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Deleted:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/__init__.py
===================================================================
Copied:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/__init__.py
(from rev 9544,
django/trunk/tests/regressiontests/custom_columns_regress/__init__.py)
===================================================================
Deleted:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
===================================================================
--- django/trunk/tests/regressiontests/custom_columns_regress/models.py
2008-12-02 13:27:30 UTC (rev 9544)
+++
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
2008-12-02 13:34:00 UTC (rev 9545)
@@ -1,100 +0,0 @@
-"""
-Regression for #9736.
-
-Checks some pathological column naming to make sure it doesn't break
-table creation or queries.
-
-"""
-
-from django.db import models
-
-class Article(models.Model):
- Article_ID = models.AutoField(primary_key=True, db_column='Article ID')
- headline = models.CharField(max_length=100)
- authors = models.ManyToManyField('Author', db_table='my m2m table')
- primary_author = models.ForeignKey('Author', db_column='Author ID',
related_name='primary_set')
-
- def __unicode__(self):
- return self.headline
-
- class Meta:
- ordering = ('headline',)
-
-class Author(models.Model):
- Author_ID = models.AutoField(primary_key=True, db_column='Author ID')
- first_name = models.CharField(max_length=30, db_column='first name')
- last_name = models.CharField(max_length=30, db_column='last name')
-
- def __unicode__(self):
- return u'%s %s' % (self.first_name, self.last_name)
-
- class Meta:
- db_table = 'my author table'
- ordering = ('last_name','first_name')
-
-
-__test__ = {'API_TESTS':"""
-# Create a Author.
->>> a = Author(first_name='John', last_name='Smith')
->>> a.save()
-
->>> a.Author_ID
-1
-
-# Create another author
->>> a2 = Author(first_name='Peter', last_name='Jones')
->>> a2.save()
-
-# Create an article
->>> art = Article(headline='Django lets you build web apps easily',
primary_author=a)
->>> art.save()
->>> art.authors = [a, a2]
-
-# Although the table and column names on Author have been set to custom values,
-# nothing about using the Author model has changed...
-
-# Query the available authors
->>> Author.objects.all()
-[<Author: Peter Jones>, <Author: John Smith>]
-
->>> Author.objects.filter(first_name__exact='John')
-[<Author: John Smith>]
-
->>> Author.objects.get(first_name__exact='John')
-<Author: John Smith>
-
->>> Author.objects.filter(firstname__exact='John')
-Traceback (most recent call last):
- ...
-FieldError: Cannot resolve keyword 'firstname' into field. Choices are:
Author_ID, article, first_name, last_name, primary_set
-
->>> a = Author.objects.get(last_name__exact='Smith')
->>> a.first_name
-u'John'
->>> a.last_name
-u'Smith'
->>> a.firstname
-Traceback (most recent call last):
- ...
-AttributeError: 'Author' object has no attribute 'firstname'
->>> a.last
-Traceback (most recent call last):
- ...
-AttributeError: 'Author' object has no attribute 'last'
-
-# Although the Article table uses a custom m2m table,
-# nothing about using the m2m relationship has changed...
-
-# Get all the authors for an article
->>> art.authors.all()
-[<Author: Peter Jones>, <Author: John Smith>]
-
-# Get the articles for an author
->>> a.article_set.all()
-[<Article: Django lets you build web apps easily>]
-
-# Query the authors across the m2m relation
->>> art.authors.filter(last_name='Jones')
-[<Author: Peter Jones>]
-
-"""}
Copied:
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
(from rev 9544,
django/trunk/tests/regressiontests/custom_columns_regress/models.py)
===================================================================
---
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
(rev 0)
+++
django/branches/releases/1.0.X/tests/regressiontests/custom_columns_regress/models.py
2008-12-02 13:34:00 UTC (rev 9545)
@@ -0,0 +1,100 @@
+"""
+Regression for #9736.
+
+Checks some pathological column naming to make sure it doesn't break
+table creation or queries.
+
+"""
+
+from django.db import models
+
+class Article(models.Model):
+ Article_ID = models.AutoField(primary_key=True, db_column='Article ID')
+ headline = models.CharField(max_length=100)
+ authors = models.ManyToManyField('Author', db_table='my m2m table')
+ primary_author = models.ForeignKey('Author', db_column='Author ID',
related_name='primary_set')
+
+ def __unicode__(self):
+ return self.headline
+
+ class Meta:
+ ordering = ('headline',)
+
+class Author(models.Model):
+ Author_ID = models.AutoField(primary_key=True, db_column='Author ID')
+ first_name = models.CharField(max_length=30, db_column='first name')
+ last_name = models.CharField(max_length=30, db_column='last name')
+
+ def __unicode__(self):
+ return u'%s %s' % (self.first_name, self.last_name)
+
+ class Meta:
+ db_table = 'my author table'
+ ordering = ('last_name','first_name')
+
+
+__test__ = {'API_TESTS':"""
+# Create a Author.
+>>> a = Author(first_name='John', last_name='Smith')
+>>> a.save()
+
+>>> a.Author_ID
+1
+
+# Create another author
+>>> a2 = Author(first_name='Peter', last_name='Jones')
+>>> a2.save()
+
+# Create an article
+>>> art = Article(headline='Django lets you build web apps easily',
primary_author=a)
+>>> art.save()
+>>> art.authors = [a, a2]
+
+# Although the table and column names on Author have been set to custom values,
+# nothing about using the Author model has changed...
+
+# Query the available authors
+>>> Author.objects.all()
+[<Author: Peter Jones>, <Author: John Smith>]
+
+>>> Author.objects.filter(first_name__exact='John')
+[<Author: John Smith>]
+
+>>> Author.objects.get(first_name__exact='John')
+<Author: John Smith>
+
+>>> Author.objects.filter(firstname__exact='John')
+Traceback (most recent call last):
+ ...
+FieldError: Cannot resolve keyword 'firstname' into field. Choices are:
Author_ID, article, first_name, last_name, primary_set
+
+>>> a = Author.objects.get(last_name__exact='Smith')
+>>> a.first_name
+u'John'
+>>> a.last_name
+u'Smith'
+>>> a.firstname
+Traceback (most recent call last):
+ ...
+AttributeError: 'Author' object has no attribute 'firstname'
+>>> a.last
+Traceback (most recent call last):
+ ...
+AttributeError: 'Author' object has no attribute 'last'
+
+# Although the Article table uses a custom m2m table,
+# nothing about using the m2m relationship has changed...
+
+# Get all the authors for an article
+>>> art.authors.all()
+[<Author: Peter Jones>, <Author: John Smith>]
+
+# Get the articles for an author
+>>> a.article_set.all()
+[<Article: Django lets you build web apps easily>]
+
+# Query the authors across the m2m relation
+>>> art.authors.filter(last_name='Jones')
+[<Author: Peter Jones>]
+
+"""}
Property changes on:
django/branches/releases/1.0.X/tests/regressiontests/generic_inline_admin
___________________________________________________________________
Name: svn:ignore
+ *.pyc
Property changes on:
django/branches/releases/1.0.X/tests/regressiontests/managers_regress
___________________________________________________________________
Name: svn:ignore
+ *.pyc
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
