Croc/croccybot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rewrite: Fix ORM typing issues.

Browse Source
This commit is contained in:
Conatum
2022-11-11 08:03:13 +02:00
parent 3445bdff3e
commit 2121749238
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bot/data/queries.py
View File

@@ -169,11 +169,11 @@ class JoinMixin(TableQuery[QueryResult]):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._joins: list[Expression, ...] = []
self._joins: list[Expression] = []
def join(self,
target: Union[str, Expression],
on: Optional[Condition] = None, using: Union[Expression, tuple[str, ...]] = None,
on: Optional[Condition] = None, using: Optional[Union[Expression, tuple[str, ...]]] = None,
natural=False):
available = (on is not None) + (using is not None) + natural
if available == 0:
@@ -304,9 +304,10 @@ class OrderMixin(TableQuery[QueryResult]):
@property
def _order_section(self) -> Optional[Expression]:
if self._order is not None:
if self._order:
expr = RawExpr.join(*self._order, joiner=sql.SQL(', '))
expr.expr = sql.SQL("ORDER BY {}").formt(expr.expr)
expr.expr = sql.SQL("ORDER BY {}").format(expr.expr)
return expr
else:
return None