Merge remote-tracking branch 'upstream/develop' into optimize-config-…

…password-logging

CHANGELOG.rst

@@ -13,6 +13,7 @@ Changelog
 ------
 Fixed
 ^^^^^
+- Rename pypika to pypika_tortoise for fixing package name conflict (#1829)
 - Concurrent connection pool initialization (#1825)
 
 0.23.0
@@ -1505,4 +1506,4 @@ Docs/examples:
 
       await Tournament.filter(
           events__name__in=['1', '3']
-      ).order_by('-events__participants__name').distinct()
+      ).order_by('-events__participants__name').distinct()

pyproject.toml

@@ -37,7 +37,7 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.8"
-pypika-tortoise = "^0.3.2"
+pypika-tortoise = "^0.4.0"
 iso8601 = "^2.1.0"
 aiosqlite = ">=0.16.0, <0.21.0"
 pytz = "*"

tests/fields/test_db_index.py

@@ -1,6 +1,6 @@
 from typing import Any
 
-from pypika.terms import Field
+from pypika_tortoise.terms import Field
 
 from tortoise import fields
 from tortoise.contrib import test

tests/test_update.py

@@ -3,7 +3,7 @@
 from typing import Any
 
 import pytz
-from pypika.terms import Function as PupikaFunction
+from pypika_tortoise.terms import Function as PupikaFunction
 
 from tests.testmodels import (
     Currency,

tests/test_values.py

@@ -1,4 +1,4 @@
-from pypika import CustomFunction
+from pypika_tortoise import CustomFunction
 
 from tests.testmodels import Event, Team, Tournament
 from tortoise.contrib import test

tortoise/__init__.py

@@ -12,7 +12,7 @@
 from types import ModuleType
 from typing import Any, Callable, Coroutine, Iterable, Type, cast
 
-from pypika import Query, Table
+from pypika_tortoise import Query, Table
 
 from tortoise.backends.base.client import BaseDBAsyncClient
 from tortoise.backends.base.config_generator import expand_db_url, generate_config

tortoise/backends/base/client.py

@@ -15,7 +15,7 @@
     cast,
 )
 
-from pypika import Query
+from pypika_tortoise import Query
 
 from tortoise.backends.base.executor import BaseExecutor
 from tortoise.backends.base.schema_generator import BaseSchemaGenerator

tortoise/backends/base/executor.py

@@ -19,8 +19,8 @@
     cast,
 )
 
-from pypika import JoinType, Parameter, Table
-from pypika.queries import QueryBuilder
+from pypika_tortoise import JoinType, Parameter, Table
+from pypika_tortoise.queries import QueryBuilder
 
 from tortoise.exceptions import OperationalError
 from tortoise.expressions import Expression, ResolveContext

tortoise/backends/base_postgres/client.py

@@ -16,7 +16,7 @@
     Union,
 )
 
-from pypika import PostgreSQLQuery
+from pypika_tortoise import PostgreSQLQuery
 
 from tortoise.backends.base.client import (
     BaseDBAsyncClient,

tortoise/backends/base_postgres/executor.py

@@ -1,8 +1,8 @@
 import uuid
 from typing import Optional, Sequence, cast
 
-from pypika.dialects import PostgreSQLQueryBuilder
-from pypika.terms import Term
+from pypika_tortoise.dialects import PostgreSQLQueryBuilder
+from pypika_tortoise.terms import Term
 
 from tortoise import Model
 from tortoise.backends.base.executor import BaseExecutor

tortoise/backends/mssql/client.py

@@ -1,7 +1,7 @@
 from itertools import count
 from typing import Any, Optional, SupportsInt
 
-from pypika.dialects import MSSQLQuery
+from pypika_tortoise.dialects import MSSQLQuery
 
 from tortoise.backends.base.client import (
     Capabilities,

tortoise/backends/mysql/client.py

@@ -24,7 +24,7 @@
     from pymysql.constants import COMMAND
     from pymysql import err as errors
 
-from pypika import MySQLQuery
+from pypika_tortoise import MySQLQuery
 
 from tortoise import timezone
 from tortoise.backends.base.client import (

tortoise/backends/mysql/executor.py

@@ -1,7 +1,7 @@
-from pypika import functions
-from pypika.enums import SqlTypes
-from pypika.terms import BasicCriterion, Criterion
-from pypika.utils import format_quotes
+from pypika_tortoise import functions
+from pypika_tortoise.enums import SqlTypes
+from pypika_tortoise.terms import BasicCriterion, Criterion
+from pypika_tortoise.utils import format_quotes
 
 from tortoise import Model
 from tortoise.backends.base.executor import BaseExecutor

tortoise/backends/oracle/client.py

@@ -11,7 +11,7 @@
     from iso8601 import parse_date
 
     parse_datetime = functools.partial(parse_date, default_timezone=None)
-from pypika import OracleQuery
+from pypika_tortoise import OracleQuery
 
 from tortoise.backends.base.client import (
     Capabilities,

tortoise/backends/psycopg/client.py

@@ -8,8 +8,8 @@
 import psycopg.pq
 import psycopg.rows
 import psycopg_pool
-from pypika.dialects.postgresql import PostgreSQLQuery, PostgreSQLQueryBuilder
-from pypika.terms import Parameterizer
+from pypika_tortoise.dialects.postgresql import PostgreSQLQuery, PostgreSQLQueryBuilder
+from pypika_tortoise.terms import Parameterizer
 
 import tortoise.backends.base.client as base_client
 import tortoise.backends.base_postgres.client as postgres_client

tortoise/backends/psycopg/executor.py

@@ -2,7 +2,7 @@
 
 from typing import Optional
 
-from pypika import Parameter
+from pypika_tortoise import Parameter
 
 from tortoise import Model
 from tortoise.backends.base_postgres.executor import BasePostgresExecutor

tortoise/backends/sqlite/client.py

@@ -16,7 +16,7 @@
 )
 
 import aiosqlite
-from pypika import SQLLiteQuery
+from pypika_tortoise import SQLLiteQuery
 
 from tortoise.backends.base.client import (
     BaseDBAsyncClient,

tortoise/contrib/mysql/functions.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from pypika.terms import Function
+from pypika_tortoise.terms import Function
 
 
 class Rand(Function):

tortoise/contrib/mysql/indexes.py

@@ -1,6 +1,6 @@
 from typing import Optional, Tuple
 
-from pypika.terms import Term
+from pypika_tortoise.terms import Term
 
 from tortoise.indexes import Index
 

tortoise/contrib/mysql/json_functions.py

@@ -4,10 +4,10 @@
 import operator
 from typing import Any, Dict, List
 
-from pypika.functions import Cast
-from pypika.terms import Criterion
-from pypika.terms import Function as PypikaFunction
-from pypika.terms import Term, ValueWrapper
+from pypika_tortoise.functions import Cast
+from pypika_tortoise.terms import Criterion
+from pypika_tortoise.terms import Function as PypikaFunction
+from pypika_tortoise.terms import Term, ValueWrapper
 
 from tortoise.filters import get_json_filter_operator, not_equal
 

tortoise/contrib/mysql/search.py

@@ -1,10 +1,10 @@
 from enum import Enum
 from typing import Any, Optional
 
-from pypika.enums import Comparator
-from pypika.terms import BasicCriterion
-from pypika.terms import Function as PypikaFunction
-from pypika.terms import Term
+from pypika_tortoise.enums import Comparator
+from pypika_tortoise.terms import BasicCriterion
+from pypika_tortoise.terms import Function as PypikaFunction
+from pypika_tortoise.terms import Term
 
 
 class Comp(Comparator):

tortoise/contrib/postgres/functions.py

@@ -1,4 +1,4 @@
-from pypika.terms import Function, Term
+from pypika_tortoise.terms import Function, Term
 
 
 class ToTsVector(Function):

tortoise/contrib/postgres/json_functions.py

@@ -5,9 +5,9 @@
 from decimal import Decimal
 from typing import Any, Callable, Tuple, cast
 
-from pypika.enums import JSONOperators
-from pypika.functions import Cast
-from pypika.terms import BasicCriterion, Criterion, Term, ValueWrapper
+from pypika_tortoise.enums import JSONOperators
+from pypika_tortoise.functions import Cast
+from pypika_tortoise.terms import BasicCriterion, Criterion, Term, ValueWrapper
 
 from tortoise.filters import (
     between_and,

tortoise/contrib/postgres/regex.py

@@ -1,7 +1,7 @@
 import enum
 from typing import cast
 
-from pypika.terms import BasicCriterion, Term
+from pypika_tortoise.terms import BasicCriterion, Term
 
 
 class PostgresRegexMatching(enum.Enum):

tortoise/contrib/postgres/search.py

@@ -1,7 +1,7 @@
 from typing import Union
 
-from pypika.enums import Comparator
-from pypika.terms import BasicCriterion, Function, Term
+from pypika_tortoise.enums import Comparator
+from pypika_tortoise.terms import BasicCriterion, Function, Term
 
 from tortoise.contrib.postgres.functions import ToTsQuery, ToTsVector
 

tortoise/contrib/sqlite/functions.py

@@ -1,4 +1,4 @@
-from pypika.terms import Function
+from pypika_tortoise.terms import Function
 
 
 class Random(Function):

tortoise/expressions.py

@@ -6,14 +6,14 @@
 from enum import Enum
 from typing import TYPE_CHECKING, Any, Iterator, Type, cast
 
-from pypika import Case as PypikaCase
-from pypika import Field as PypikaField
-from pypika import Table
-from pypika.functions import AggregateFunction, DistinctOptionFunction
-from pypika.terms import ArithmeticExpression, Criterion
-from pypika.terms import Function as PypikaFunction
-from pypika.terms import Term, ValueWrapper
-from pypika.utils import format_alias_sql
+from pypika_tortoise import Case as PypikaCase
+from pypika_tortoise import Field as PypikaField
+from pypika_tortoise import Table
+from pypika_tortoise.functions import AggregateFunction, DistinctOptionFunction
+from pypika_tortoise.terms import ArithmeticExpression, Criterion
+from pypika_tortoise.terms import Function as PypikaFunction
+from pypika_tortoise.terms import Term, ValueWrapper
+from pypika_tortoise.utils import format_alias_sql
 
 from tortoise.exceptions import FieldError, OperationalError
 from tortoise.fields.base import Field
@@ -27,7 +27,7 @@
 )
 
 if TYPE_CHECKING:  # pragma: nocoverage
-    from pypika.queries import Selectable
+    from pypika_tortoise.queries import Selectable
 
     from tortoise.models import Model
     from tortoise.queryset import AwaitableQuery

tortoise/fields/base.py

@@ -16,7 +16,7 @@
     overload,
 )
 
-from pypika.terms import Term
+from pypika_tortoise.terms import Term
 
 from tortoise.exceptions import ConfigurationError, ValidationError
 from tortoise.validators import Validator

tortoise/fields/data.py

@@ -7,9 +7,9 @@
 from typing import TYPE_CHECKING, Any, Callable, Optional, Type, TypeVar, Union
 from uuid import UUID, uuid4
 
-from pypika import functions
-from pypika.enums import SqlTypes
-from pypika.terms import Term
+from pypika_tortoise import functions
+from pypika_tortoise.enums import SqlTypes
+from pypika_tortoise.terms import Term
 
 from tortoise import timezone
 from tortoise.exceptions import ConfigurationError, FieldError

tortoise/fields/relational.py

@@ -14,7 +14,7 @@
     overload,
 )
 
-from pypika import Table
+from pypika_tortoise import Table
 from typing_extensions import Literal
 
 from tortoise.exceptions import ConfigurationError, NoValuesFetched, OperationalError

tortoise/filters.py

@@ -13,10 +13,16 @@
     TypedDict,
 )
 
-from pypika import Table
-from pypika.enums import DatePart, Matching, SqlTypes
-from pypika.functions import Cast, Extract, Upper
-from pypika.terms import BasicCriterion, Criterion, Equality, Term, ValueWrapper
+from pypika_tortoise import Table
+from pypika_tortoise.enums import DatePart, Matching, SqlTypes
+from pypika_tortoise.functions import Cast, Extract, Upper
+from pypika_tortoise.terms import (
+    BasicCriterion,
+    Criterion,
+    Equality,
+    Term,
+    ValueWrapper,
+)
 from typing_extensions import NotRequired
 
 from tortoise.fields import Field, JSONField

tortoise/functions.py

@@ -1,4 +1,4 @@
-from pypika import functions
+from pypika_tortoise import functions
 
 from tortoise.expressions import Aggregate, Function
 

tortoise/indexes.py

@@ -2,7 +2,7 @@
 
 from typing import TYPE_CHECKING, Any, Type
 
-from pypika.terms import Term, ValueWrapper
+from pypika_tortoise.terms import Term, ValueWrapper
 
 if TYPE_CHECKING:
     from tortoise import Model

tortoise/models.py

@@ -21,8 +21,8 @@
     cast,
 )
 
-from pypika import Order, Query, Table
-from pypika.terms import Term
+from pypika_tortoise import Order, Query, Table
+from pypika_tortoise.terms import Term
 from typing_extensions import Self
 
 from tortoise import connections

tortoise/query_utils.py

@@ -3,8 +3,8 @@
 from copy import copy
 from typing import TYPE_CHECKING, List, Optional, Tuple, Type, cast
 
-from pypika import Table
-from pypika.terms import Criterion, Term
+from pypika_tortoise import Table
+from pypika_tortoise.terms import Criterion, Term
 
 from tortoise.exceptions import ConfigurationError, OperationalError
 from tortoise.fields.base import Field

tortoise/queryset.py

@@ -20,11 +20,11 @@
     overload,
 )
 
-from pypika import JoinType, Order, Table
-from pypika.analytics import Count
-from pypika.functions import Cast
-from pypika.queries import QueryBuilder
-from pypika.terms import Case, Field, Star, Term, ValueWrapper
+from pypika_tortoise import JoinType, Order, Table
+from pypika_tortoise.analytics import Count
+from pypika_tortoise.functions import Cast
+from pypika_tortoise.queries import QueryBuilder
+from pypika_tortoise.terms import Case, Field, Star, Term, ValueWrapper
 from typing_extensions import Literal, Protocol
 
 from tortoise.backends.base.client import BaseDBAsyncClient, Capabilities