Ticket #4492: ticket-4492_r5743.diff

django/db/backends/postgresql/base.py

@@ -271 +271 @@
                 style.SQL_FIELD(quote_name('id')),
                 style.SQL_KEYWORD('IS NOT'),
                 style.SQL_KEYWORD('FROM'),
-                style.SQL_TABLE(f.m2m_db_table())))
+                style.SQL_TABLE(quote_name(f.m2m_db_table()))))
     return output
 
 def typecast_string(s):

django/db/backends/postgresql_psycopg2/base.py

@@ -221 +221 @@
                 style.SQL_FIELD(quote_name('id')),
                 style.SQL_KEYWORD('IS NOT'),
                 style.SQL_KEYWORD('FROM'),
-                style.SQL_TABLE(f.m2m_db_table())))
+                style.SQL_TABLE(quote_name(f.m2m_db_table()))))
     return output
 
 OPERATOR_MAPPING = {

tests/modeltests/fixtures/fixtures/fixture6.json

@@ +1 @@
+[
+    {
+        "pk": "7", 
+        "model": "fixtures.mixedcasem2m", 
+        "fields": {
+            "relatedItems": [], 
+            "Title": "Poker has no place on ESPN"
+        }
+    },
+    {
+        "pk": "9", 
+        "model": "fixtures.mixedcasem2m", 
+        "fields": {
+            "relatedItems": [7], 
+            "Title": "Time to reform copyright"
+        }
+    }
+]

tests/modeltests/fixtures/models.py

@@ -20 +20 @@
     class Meta:
         ordering = ('-pub_date', 'headline')
 
+class MixedCaseM2M(models.Model):
+    relatedItems = models.ManyToManyField('self', blank=True, null=True)
+    Title = models.CharField(maxlength=100, default='Default title')
+
+    def __unicode__(self):
+        return self.Title
+
+    class Meta:
+        ordering = ('Title',)
+
 __test__ = {'API_TESTS': """
 >>> from django.core import management
 >>> from django.db.models import get_app
@@ -75 +85 @@
 # Dump the current contents of the database as a JSON fixture
 >>> print management.dump_data(['fixtures'], format='json')
 [{"pk": "3", "model": "fixtures.article", "fields": {"headline": "Time to reform copyright", "pub_date": "2006-06-16 13:00:00"}}, {"pk": "2", "model": "fixtures.article", "fields": {"headline": "Poker has no place on ESPN", "pub_date": "2006-06-16 12:00:00"}}, {"pk": "1", "model": "fixtures.article", "fields": {"headline": "Python program becomes self aware", "pub_date": "2006-06-16 11:00:00"}}]
+
+# Load fixture 6: a JSON file with mixed-case column names.
+>>> management.load_data(['fixture6.json'], verbosity=0)
+>>> MixedCaseM2M.objects.all()
+[<MixedCaseM2M: Poker has no place on ESPN>, <MixedCaseM2M: Time to reform copyright>]
+>>> mixed = MixedCaseM2M.objects.get(Title__icontains='poker')
+>>> mixed.relatedItems.all()
+[<MixedCaseM2M: Time to reform copyright>]
 """}
 
 from django.test import TestCase