diff options
| author | Adam Chainz <adam@adamj.eu> | 2015-09-10 17:07:09 +0100 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-09-14 13:41:35 -0400 |
| commit | 3fe3887a2ed94f7b15be769f6d81571031ec5627 (patch) | |
| tree | aa2b8fa24b4d20fd0782cdf58a04a353d956be2b /tests/test_runner | |
| parent | 4d933ad4181a511f3ced98edba4e17aff054e0e2 (diff) | |
Fixed #25377 -- Changed Count queries to execute COUNT(*) instead of COUNT('*').
Diffstat (limited to 'tests/test_runner')
| -rw-r--r-- | tests/test_runner/test_debug_sql.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/test_runner/test_debug_sql.py b/tests/test_runner/test_debug_sql.py index fa7c7f7401..b943e83e31 100644 --- a/tests/test_runner/test_debug_sql.py +++ b/tests/test_runner/test_debug_sql.py @@ -63,25 +63,25 @@ class TestDebugSQL(unittest.TestCase): if six.PY3: expected_outputs = [ - ('''QUERY = 'SELECT COUNT(%s) AS "__count" ''' + ('''QUERY = 'SELECT COUNT(*) AS "__count" ''' '''FROM "test_runner_person" WHERE ''' '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = ('*', 'error');'''), - ('''QUERY = 'SELECT COUNT(%s) AS "__count" ''' + '''- PARAMS = ('error',);'''), + ('''QUERY = 'SELECT COUNT(*) AS "__count" ''' '''FROM "test_runner_person" WHERE ''' '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = ('*', 'fail');'''), + '''- PARAMS = ('fail',);'''), ] else: expected_outputs = [ - ('''QUERY = u'SELECT COUNT(%s) AS "__count" ''' + ('''QUERY = u'SELECT COUNT(*) AS "__count" ''' '''FROM "test_runner_person" WHERE ''' '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = (u'*', u'error');'''), - ('''QUERY = u'SELECT COUNT(%s) AS "__count" ''' + '''- PARAMS = (u'error',);'''), + ('''QUERY = u'SELECT COUNT(*) AS "__count" ''' '''FROM "test_runner_person" WHERE ''' '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = (u'*', u'fail');'''), + '''- PARAMS = (u'fail',);'''), ] verbose_expected_outputs = [ @@ -94,15 +94,15 @@ class TestDebugSQL(unittest.TestCase): ] if six.PY3: verbose_expected_outputs += [ - ('''QUERY = 'SELECT COUNT(%s) AS "__count" ''' + ('''QUERY = 'SELECT COUNT(*) AS "__count" ''' '''FROM "test_runner_person" WHERE ''' '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = ('*', 'pass');'''), + '''- PARAMS = ('pass',);'''), ] else: verbose_expected_outputs += [ - ('''QUERY = u'SELECT COUNT(%s) AS "__count" ''' + ('''QUERY = u'SELECT COUNT(*) AS "__count" ''' '''FROM "test_runner_person" WHERE ''' '''"test_runner_person"."first_name" = %s' ''' - '''- PARAMS = (u'*', u'pass');'''), + '''- PARAMS = (u'pass',);'''), ] |