Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

wrap_json and wrap_constant type fixes #21

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

wrap_json and wrap_constant type fixes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95f248d
Remove type:ignore[arg-type] for wrap_constant
henadzit Dec 4, 2024
7c28dd8
Fix wrap_json typing
henadzit Dec 4, 2024
a3cc1e2
Remove more unused ignores
henadzit Dec 4, 2024
727a01f
Set warn_unused_ignores = true and remove unused ignores
henadzit Dec 4, 2024
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
4 changes: 1 addition & 3 deletions pypika/dialects/postgresql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,7 @@ def returning(self, *terms: Any) -> "PostgreSQLQueryBuilder": # type:ignore[ret
elif isinstance(term, Function):
raise QueryException("Aggregate functions are not allowed in returning")
else:
self._return_other(
self.wrap_constant(term, self._wrapper_cls) # type:ignore[arg-type]
)
self._return_other(self.wrap_constant(term, self._wrapper_cls))

def _validate_returning_term(self, term: Term) -> None:
for field in term.fields_():
Expand Down
20 changes: 9 additions & 11 deletions pypika/queries.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -944,9 +944,7 @@ def replace_table( # type:ignore[return]
self._wheres.replace_table(current_table, new_table) if self._wheres else None
)
self._prewheres = (
self._prewheres.replace_table(current_table, new_table) # type:ignore[assignment]
if self._prewheres
else None
self._prewheres.replace_table(current_table, new_table) if self._prewheres else None
)
self._groupbys = [
groupby.replace_table(current_table, new_table) for groupby in self._groupbys
Expand Down Expand Up @@ -1090,7 +1088,7 @@ def prewhere(self, criterion: Criterion) -> "Self": # type:ignore[return]
if self._prewheres:
self._prewheres &= criterion
else:
self._prewheres = criterion # type:ignore[assignment]
self._prewheres = criterion

@builder
def where(self, criterion: Term | EmptyCriterion) -> "Self": # type:ignore[return]
Expand All @@ -1100,7 +1098,7 @@ def where(self, criterion: Term | EmptyCriterion) -> "Self": # type:ignore[retu
if not self._validate_table(criterion):
self._foreign_table = True
if self._wheres:
self._wheres &= criterion # type:ignore[assignment,operator]
self._wheres &= criterion # type: ignore
else:
self._wheres = criterion
else:
Expand All @@ -1122,18 +1120,18 @@ def where(self, criterion: Term | EmptyCriterion) -> "Self": # type:ignore[retu
@builder
def having(self, criterion: Criterion) -> "Self": # type:ignore[return]
if self._havings:
self._havings &= criterion # type:ignore[operator]
self._havings &= criterion
else:
self._havings = criterion # type:ignore[assignment]
self._havings = criterion

@builder
def groupby(self, *terms: str | int | Term) -> "Self": # type:ignore[return]
for term in terms:
if isinstance(term, str):
term = Field(term, table=self._from[0]) # type:ignore[assignment]
term = Field(term, table=self._from[0])
elif isinstance(term, int):
field = Field(str(term), table=self._from[0])
term = field.wrap_constant(term) # type:ignore[assignment]
term = field.wrap_constant(term)

self._groupbys.append(term) # type:ignore[arg-type]

Expand Down Expand Up @@ -1167,7 +1165,7 @@ def rollup( # type:ignore[return]

elif 0 < len(self._groupbys) and isinstance(self._groupbys[-1], Rollup):
# If a rollup was added last, then append the new terms to the previous rollup
self._groupbys[-1].args += terms # type:ignore[arg-type]
self._groupbys[-1].args += terms

else:
self._groupbys.append(Rollup(*terms)) # type:ignore[arg-type]
Expand Down Expand Up @@ -2201,7 +2199,7 @@ def _create_table_sql(self, **kwargs: Any) -> str:
return "CREATE {table_type}TABLE {if_not_exists}{table}".format(
table_type=table_type,
if_not_exists=if_not_exists,
table=self._create_table.get_sql(**kwargs), # type:ignore[attr-defined,union-attr]
table=self._create_table.get_sql(**kwargs), # type: ignore
)

def _table_options_sql(self, **kwargs) -> str:
Expand Down
Loading
Loading