Ticket #5725: mysql_varchar_length.diff

django/db/backends/mysql/introspection.py

@@ -36 +36 @@
     def get_table_description(self, cursor, table_name):
         "Returns a description of the table, with the DB-API cursor.description interface."
         cursor.execute("SELECT * FROM %s LIMIT 1" % self.connection.ops.quote_name(table_name))
-        return cursor.description
+        description = list(cursor.description)
+        
+        #Fix UTF8 multi-byte charset problem (Ticket #5725)
+        cursor.execute("SELECT * FROM INFORMATION_SCHEMA.COLUMNS \
+                       WHERE table_name = '%s' AND table_schema = DATABASE()" % (table_name, ))
+        
+        new_info = cursor.fetchall()
+        
+        for i, field in enumerate(description):
+            if field[1] == 253 and new_info[i][8] is not None: #character varying
+                field = list(field) #Turn mutable
+                field[3] = int(new_info[i][8])
+                description[i] = field
+            
+        return description
 
     def _name_to_index(self, cursor, table_name):
         """

tests/regressiontests/introspection/tests.py

@@ -89 +89 @@
             [datatype(r[1], r) for r in desc],
             ['IntegerField', 'CharField', 'CharField', 'CharField', 'BigIntegerField']
         )
+        
+        
+    def test_get_table_description_types_varchar_length(self):
+        
+        cursor = connection.cursor()
+        cursor.execute("""CREATE  TABLE django_ixn_test_table_varchars (
+                              id INT NOT NULL ,
+                              name VARCHAR(45) NULL ,
+                              other_charfield VARCHAR(128) NULL );""")
+        
+        desc = connection.introspection.get_table_description( cursor, "django_ixn_test_table_varchars" )
+        cursor.execute("DROP TABLE django_ixn_test_table_varchars;")
+        
+        self.assertEqual(
+            [ field_desc[3] if field_desc[1]==253 else None for field_desc in desc],
+            [ None, 45, 128 ]
+        )
 
     # Oracle forces null=True under the hood in some cases (see
     # https://docs.djangoproject.com/en/dev/ref/databases/#null-and-empty-strings)