Moved query functions to static query class

This commit is contained in:
2022-09-12 22:53:52 +02:00
parent b16d555e33
commit d8a4210c9b
22 changed files with 438 additions and 542 deletions

View File

@@ -1,8 +1,8 @@
from collections.abc import Callable
from cpl_query._query.order_by import then_by_descending_query, then_by_query
from cpl_query.extension.iterable import Iterable
from cpl_query.extension.ordered_iterable_abc import OrderedIterableABC
from cpl_query.query import Query
class OrderedIterable(Iterable, OrderedIterableABC):
@@ -15,8 +15,8 @@ class OrderedIterable(Iterable, OrderedIterableABC):
def then_by(self, _func: Callable) -> OrderedIterableABC:
self._funcs.append(_func)
return then_by_query(self, lambda *args: [f(*args) for f in self._funcs])
return Query.then_by(self, lambda *args: [f(*args) for f in self._funcs])
def then_by_descending(self, _func: Callable) -> OrderedIterableABC:
self._funcs.append(_func)
return then_by_descending_query(self, lambda *args: [f(*args) for f in self._funcs])
return Query.then_by_descending(self, lambda *args: [f(*args) for f in self._funcs])