From 8073989c988aa2c07438d994da77893a565e657d Mon Sep 17 00:00:00 2001 From: Matthias Date: Wed, 15 Mar 2023 21:10:47 +0100 Subject: [PATCH] Remove more usages of .query --- freqtrade/freqtradebot.py | 2 +- freqtrade/persistence/pairlock_middleware.py | 8 ++++---- freqtrade/rpc/rpc.py | 5 ----- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/freqtrade/freqtradebot.py b/freqtrade/freqtradebot.py index dfac11347..1c181cb26 100644 --- a/freqtrade/freqtradebot.py +++ b/freqtrade/freqtradebot.py @@ -819,7 +819,7 @@ class FreqtradeBot(LoggingMixin): trade.orders.append(order_obj) trade.recalc_trade_from_orders() - Trade.query.session.add(trade) + Trade._session.add(trade) Trade.commit() # Updating wallets diff --git a/freqtrade/persistence/pairlock_middleware.py b/freqtrade/persistence/pairlock_middleware.py index 5ed131a9b..08c947a83 100644 --- a/freqtrade/persistence/pairlock_middleware.py +++ b/freqtrade/persistence/pairlock_middleware.py @@ -51,8 +51,8 @@ class PairLocks(): active=True ) if PairLocks.use_db: - PairLock.query.session.add(lock) - PairLock.query.session.commit() + PairLock._session.add(lock) + PairLock._session.commit() else: PairLocks.locks.append(lock) return lock @@ -106,7 +106,7 @@ class PairLocks(): for lock in locks: lock.active = False if PairLocks.use_db: - PairLock.query.session.commit() + PairLock._session.commit() @staticmethod def unlock_reason(reason: str, now: Optional[datetime] = None) -> None: @@ -130,7 +130,7 @@ class PairLocks(): for lock in locks: logger.info(f"Releasing lock for {lock.pair} with reason '{reason}'.") lock.active = False - PairLock.query.session.commit() + PairLock._session.commit() else: # used in backtesting mode; don't show log messages for speed locksb = PairLocks.get_pair_locks(None) diff --git a/freqtrade/rpc/rpc.py b/freqtrade/rpc/rpc.py index 45150423b..2d29944f8 100644 --- a/freqtrade/rpc/rpc.py +++ b/freqtrade/rpc/rpc.py @@ -347,11 +347,6 @@ class RPC: Trade.close_date < (profitday + time_offset(1))) .order_by(Trade.close_date) ).all() - # trades = Trade.query.session.query(Trade.close_profit_abs).filter( - # Trade.is_open.is_(False), - # Trade.close_date >= profitday, - # Trade.close_date < (profitday + time_offset(1)) - # ).order_by(Trade.close_date).all() curdayprofit = sum( trade.close_profit_abs for trade in trades if trade.close_profit_abs is not None)