From 2ceb10f3b02cbebad6ed908880f49a7c3e901d12 Mon Sep 17 00:00:00 2001 From: Claude Paroz Date: Wed, 24 Dec 2014 15:55:57 +0100 Subject: Fixed #14180 -- Prevented unneeded index creation on MySQL-InnoDB Thanks zimnyx for the report and Simon Charette, Tim Graham for the reviews. --- tests/commands_sql/tests.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'tests/commands_sql') diff --git a/tests/commands_sql/tests.py b/tests/commands_sql/tests.py index e1d4272616..10f0404776 100644 --- a/tests/commands_sql/tests.py +++ b/tests/commands_sql/tests.py @@ -72,14 +72,14 @@ class SQLCommandsTestCase(TestCase): with warnings.catch_warnings(): warnings.simplefilter("ignore", category=RemovedInDjango20Warning) output = sql_indexes(app_config, no_style(), connections[DEFAULT_DB_ALIAS]) - # PostgreSQL creates one additional index for CharField - self.assertIn(self.count_ddl(output, 'CREATE INDEX'), [3, 4]) + # Number of indexes is backend-dependent + self.assertTrue(1 <= self.count_ddl(output, 'CREATE INDEX') <= 4) def test_sql_destroy_indexes(self): app_config = apps.get_app_config('commands_sql') output = sql_destroy_indexes(app_config, no_style(), connections[DEFAULT_DB_ALIAS]) - # PostgreSQL creates one additional index for CharField - self.assertIn(self.count_ddl(output, 'DROP INDEX'), [3, 4]) + # Number of indexes is backend-dependent + self.assertTrue(1 <= self.count_ddl(output, 'DROP INDEX') <= 4) def test_sql_all(self): app_config = apps.get_app_config('commands_sql') @@ -88,8 +88,8 @@ class SQLCommandsTestCase(TestCase): output = sql_all(app_config, no_style(), connections[DEFAULT_DB_ALIAS]) self.assertEqual(self.count_ddl(output, 'CREATE TABLE'), 3) - # PostgreSQL creates one additional index for CharField - self.assertIn(self.count_ddl(output, 'CREATE INDEX'), [3, 4]) + # Number of indexes is backend-dependent + self.assertTrue(1 <= self.count_ddl(output, 'CREATE INDEX') <= 4) class TestRouter(object): -- cgit v1.3