Skip to content

Commit 298fa42

Browse files
committed
Fix pytest-dev#34, disable speedups for result wrappers
1 parent ddb55e9 commit 298fa42

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

peewee_async.py

+14-8
Original file line numberDiff line numberDiff line change
@@ -768,16 +768,19 @@ def __len__(self):
768768
def _get_result_wrapper(self, query):
769769
"""Get result wrapper class.
770770
"""
771+
db, speedups = query.database, query.database.use_speedups
772+
db.use_speedups = False
771773
if query._tuples:
772-
QRW = query.database.get_result_wrapper(RESULTS_TUPLES)
774+
QRW = db.get_result_wrapper(RESULTS_TUPLES)
773775
elif query._dicts:
774-
QRW = query.database.get_result_wrapper(RESULTS_DICTS)
776+
QRW = db.get_result_wrapper(RESULTS_DICTS)
775777
elif query._naive or not query._joins or query.verify_naive():
776-
QRW = query.database.get_result_wrapper(RESULTS_NAIVE)
778+
QRW = db.get_result_wrapper(RESULTS_NAIVE)
777779
elif query._aggregate_rows:
778-
QRW = query.database.get_result_wrapper(RESULTS_AGGREGATE_MODELS)
780+
QRW = db.get_result_wrapper(RESULTS_AGGREGATE_MODELS)
779781
else:
780-
QRW = query.database.get_result_wrapper(RESULTS_MODELS)
782+
QRW = db.get_result_wrapper(RESULTS_MODELS)
783+
db.use_speedups = speedups
781784

782785
return QRW(query.model_class, None, query.get_query_meta())
783786

@@ -802,12 +805,15 @@ class AsyncRawQueryWrapper(AsyncQueryWrapper):
802805
def _get_result_wrapper(self, query):
803806
"""Get raw query result wrapper class.
804807
"""
808+
db, speedups = query.database, query.database.use_speedups
809+
db.use_speedups = False
805810
if query._tuples:
806-
QRW = query.database.get_result_wrapper(RESULTS_TUPLES)
811+
QRW = db.get_result_wrapper(RESULTS_TUPLES)
807812
elif query._dicts:
808-
QRW = query.database.get_result_wrapper(RESULTS_DICTS)
813+
QRW = db.get_result_wrapper(RESULTS_DICTS)
809814
else:
810-
QRW = query.database.get_result_wrapper(RESULTS_NAIVE)
815+
QRW = db.get_result_wrapper(RESULTS_NAIVE)
816+
db.use_speedups = speedups
811817

812818
return QRW(query.model_class, None, None)
813819

0 commit comments

Comments
 (0)