graphql-python/graphene
1
1
Fork 0
mirror of https://github.com/graphql-python/graphene.git synced 2024-11-11 12:16:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fixed tests. Improved sql debugging with params

Browse Source
This commit is contained in:
Syrus Akbary 2016-02-05 18:34:45 -08:00
parent 342511cda0
commit 50ed91326a
2 changed files with 14 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
graphene/contrib/django/debug/sql/tracking.py
View File

@ -117,7 +117,7 @@ class NormalCursorWrapper(object):
'sql': self.db.ops.last_executed_query( 'sql': self.db.ops.last_executed_query(
self.cursor, sql, self._quote_params(params)), self.cursor, sql, self._quote_params(params)),
'duration': duration, 'duration': duration,
'raw_sql': sql, 'raw_sql': sql % params,
'params': _params, 'params': _params,
'start_time': start_time, 'start_time': start_time,
'stop_time': stop_time, 'stop_time': stop_time,

40
graphene/contrib/django/debug/tests/test_query.py
View File

@ -2,26 +2,16 @@ import pytest
import graphene import graphene
from graphene.contrib.django import DjangoNode, DjangoConnectionField from graphene.contrib.django import DjangoNode, DjangoConnectionField
from graphene.contrib.django.filter import DjangoFilterConnectionField from graphene.contrib.django.utils import DJANGO_FILTER_INSTALLED
from ...tests.models import Reporter from ...tests.models import Reporter
from ..plugin import DjangoDebugPlugin from ..plugin import DjangoDebugPlugin
# from examples.starwars_django.models import Character # from examples.starwars_django.models import Character
from django.db.models import Count
pytestmark = pytest.mark.django_db pytestmark = pytest.mark.django_db
def count(qs):
query = qs.query
query.add_annotation(Count('*'), alias='__count', is_summary=True)
query.select = []
query.default_cols = False
return query
def test_should_query_field(): def test_should_query_field():
r1 = Reporter(last_name='ABA') r1 = Reporter(last_name='ABA')
r1.save() r1.save()
@ -154,21 +144,21 @@ def test_should_query_connection():
} }
}] }]
}, },
'__debug': {
'sql': [{
'rawSql': str(count(Reporter.objects.all()))
}, {
'rawSql': str(Reporter.objects.all()[:1].query)
}]
}
} }
schema = graphene.Schema(query=Query, plugins=[DjangoDebugPlugin()]) schema = graphene.Schema(query=Query, plugins=[DjangoDebugPlugin()])
result = schema.execute(query) result = schema.execute(query)
assert not result.errors assert not result.errors
assert result.data == expected assert result.data['allReporters'] == expected['allReporters']
assert 'COUNT' in result.data['__debug']['sql'][0]['rawSql']
query = str(Reporter.objects.all()[:1].query)
assert result.data['__debug']['sql'][1]['rawSql'] == query
@pytest.mark.skipif(not DJANGO_FILTER_INSTALLED,
reason="requires django-filter")
def test_should_query_connectionfilter(): def test_should_query_connectionfilter():
from graphene.contrib.django.filter import DjangoFilterConnectionField
r1 = Reporter(last_name='ABA') r1 = Reporter(last_name='ABA')
r1.save() r1.save()
r2 = Reporter(last_name='Griffin') r2 = Reporter(last_name='Griffin')
@ -209,15 +199,11 @@ def test_should_query_connectionfilter():
} }
}] }]
}, },
'__debug': {
'sql': [{
'rawSql': str(count(Reporter.objects.all()))
}, {
'rawSql': str(Reporter.objects.all()[:1].query)
}]
}
} }
schema = graphene.Schema(query=Query, plugins=[DjangoDebugPlugin()]) schema = graphene.Schema(query=Query, plugins=[DjangoDebugPlugin()])
result = schema.execute(query) result = schema.execute(query)
assert not result.errors assert not result.errors
assert result.data == expected assert result.data['allReporters'] == expected['allReporters']
assert 'COUNT' in result.data['__debug']['sql'][0]['rawSql']
query = str(Reporter.objects.all()[:1].query)
assert result.data['__debug']['sql'][1]['rawSql'] == query