Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
443 changes: 225 additions & 218 deletions poetry.lock

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions pypika_tortoise/context.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ class SqlContext:
quote_char: str
secondary_quote_char: str
alias_quote_char: str
dialect: "Dialects"
dialect: Dialects
as_keyword: bool = False
subquery: bool = False
with_alias: bool = False
with_namespace: bool = False
subcriterion: bool = False
parameterizer: "Parameterizer" | None = None
parameterizer: Parameterizer | None = None
groupby_alias: bool = True
orderby_alias: bool = True

Expand Down
2 changes: 1 addition & 1 deletion pypika_tortoise/dialects/mssql.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class MSSQLQuery(Query):
SQL_CONTEXT = DEFAULT_SQL_CONTEXT.copy(dialect=Dialects.MSSQL)

@classmethod
def _builder(cls, **kwargs: Any) -> "MSSQLQueryBuilder":
def _builder(cls, **kwargs: Any) -> MSSQLQueryBuilder:
return MSSQLQueryBuilder(**kwargs)


Expand Down
4 changes: 2 additions & 2 deletions pypika_tortoise/dialects/mysql.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ class MySQLQuery(Query):
SQL_CONTEXT = DEFAULT_SQL_CONTEXT.copy(dialect=Dialects.MYSQL, quote_char="`")

@classmethod
def _builder(cls, **kwargs: Any) -> "MySQLQueryBuilder":
def _builder(cls, **kwargs: Any) -> MySQLQueryBuilder:
return MySQLQueryBuilder(**kwargs)

@classmethod
def load(cls, fp: str) -> "MySQLLoadQueryBuilder":
def load(cls, fp: str) -> MySQLLoadQueryBuilder:
return MySQLLoadQueryBuilder().load(fp)


Expand Down
2 changes: 1 addition & 1 deletion pypika_tortoise/dialects/oracle.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class OracleQuery(Query):
SQL_CONTEXT = DEFAULT_SQL_CONTEXT.copy(dialect=Dialects.ORACLE, alias_quote_char='"')

@classmethod
def _builder(cls, **kwargs: Any) -> "OracleQueryBuilder":
def _builder(cls, **kwargs: Any) -> OracleQueryBuilder:
return OracleQueryBuilder(**kwargs)


Expand Down
8 changes: 4 additions & 4 deletions pypika_tortoise/dialects/postgresql.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ class PostgreSQLQuery(Query):
SQL_CONTEXT = DEFAULT_SQL_CONTEXT.copy(dialect=Dialects.POSTGRESQL, alias_quote_char='"')

@classmethod
def _builder(cls, **kwargs) -> "PostgreSQLQueryBuilder":
def _builder(cls, **kwargs) -> PostgreSQLQueryBuilder:
return PostgreSQLQueryBuilder(**kwargs)


Expand All @@ -41,14 +41,14 @@ def __init__(self, **kwargs: Any) -> None:

self._distinct_on: list[Field | Term] = []

def __copy__(self) -> "Self":
def __copy__(self) -> Self:
newone = super().__copy__()
newone._returns = copy(self._returns)
newone._on_conflict_do_updates = copy(self._on_conflict_do_updates)
return newone

@builder
def distinct_on(self, *fields: str | Term) -> "PostgreSQLQueryBuilder": # type:ignore[return]
def distinct_on(self, *fields: str | Term) -> PostgreSQLQueryBuilder: # type:ignore[return]
for field in fields:
if isinstance(field, str):
self._distinct_on.append(Field(field))
Expand All @@ -64,7 +64,7 @@ def _distinct_sql(self, ctx: SqlContext) -> str:
return super()._distinct_sql(distinct_ctx)

@builder
def returning(self, *terms: Any) -> "PostgreSQLQueryBuilder": # type:ignore[return]
def returning(self, *terms: Any) -> PostgreSQLQueryBuilder: # type:ignore[return]
for term in terms:
if isinstance(term, Field):
self._return_field(term)
Expand Down
2 changes: 1 addition & 1 deletion pypika_tortoise/dialects/sqlite.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class SQLLiteQuery(Query):
SQL_CONTEXT = DEFAULT_SQL_CONTEXT.copy(dialect=Dialects.SQLITE)

@classmethod
def _builder(cls, **kwargs: Any) -> "SQLLiteQueryBuilder":
def _builder(cls, **kwargs: Any) -> SQLLiteQueryBuilder:
return SQLLiteQueryBuilder(**kwargs)


Expand Down
2 changes: 1 addition & 1 deletion pypika_tortoise/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def get_function_sql(self, ctx: SqlContext) -> str:
return s

@builder
def distinct(self) -> "Self": # type:ignore[return]
def distinct(self) -> Self: # type:ignore[return]
self._distinct = True


Expand Down
Loading