浏览代码

Fixed too many parentheses in inspectdb Meta.unique_together output.

Regression in c76d87427d70f6c91ab855ed688828aa982720d2.
Tim Graham 7 年之前
父节点
当前提交
a170dac887
共有 2 个文件被更改,包括 2 次插入1 次删除
  1. 1 1
      django/core/management/commands/inspectdb.py
  2. 1 0
      tests/inspectdb/tests.py

+ 1 - 1
django/core/management/commands/inspectdb.py

@@ -273,7 +273,7 @@ class Command(BaseCommand):
             if params['unique']:
                 columns = params['columns']
                 if len(columns) > 1:
-                    unique_together.append('(' + str(tuple(column_to_field_name[c] for c in columns)) + ')')
+                    unique_together.append(str(tuple(column_to_field_name[c] for c in columns)))
         managed_comment = "  # Created from a view. Don't remove." if is_view else ""
         meta = ["",
                 "    class Meta:",

+ 1 - 0
tests/inspectdb/tests.py

@@ -211,6 +211,7 @@ class InspectDBTestCase(TestCase):
         out = StringIO()
         call_command('inspectdb', 'inspectdb_uniquetogether', stdout=out)
         output = out.getvalue()
+        self.assertIn("    unique_together = (('", output)
         unique_re = re.compile(r'.*unique_together = \((.+),\).*')
         unique_together_match = re.findall(unique_re, output)
         # There should be one unique_together tuple.