From 3fe3887a2ed94f7b15be769f6d81571031ec5627 Mon Sep 17 00:00:00 2001 From: Adam Chainz Date: Thu, 10 Sep 2015 17:07:09 +0100 Subject: Fixed #25377 -- Changed Count queries to execute COUNT(*) instead of COUNT('*'). --- tests/test_runner/test_debug_sql.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'tests/test_runner/test_debug_sql.py') 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',);'''), ] -- cgit v1.3