diff --git a/CHANGELOG.md b/CHANGELOG.md index fda9fa1..aadf406 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # ChangeLog +## 0.4 + +### 0.4.0 +- Rename package name from `pypika` to `pypika_tortoise` + ## 0.3 ### 0.3.2 diff --git a/Makefile b/Makefile index 21d1100..c274a37 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -checkfiles = pypika/ tests/ conftest.py +checkfiles = pypika_tortoise/ tests/ conftest.py black_opts = -l 100 -t py38 py_warn = PYTHONDEVMODE=1 diff --git a/pypika/__init__.py b/pypika_tortoise/__init__.py similarity index 53% rename from pypika/__init__.py rename to pypika_tortoise/__init__.py index b1ef3e5..2bebf65 100644 --- a/pypika/__init__.py +++ b/pypika_tortoise/__init__.py @@ -1,6 +1,6 @@ -from pypika.dialects import MSSQLQuery, MySQLQuery, OracleQuery, PostgreSQLQuery, SQLLiteQuery -from pypika.enums import DatePart, Dialects, JoinType, Order -from pypika.exceptions import ( +from .dialects import MSSQLQuery, MySQLQuery, OracleQuery, PostgreSQLQuery, SQLLiteQuery +from .enums import DatePart, Dialects, JoinType, Order +from .exceptions import ( CaseException, FunctionException, GroupingException, @@ -9,10 +9,10 @@ RollupException, SetOperationException, ) -from pypika.queries import AliasedQuery, Column, Database, Query, Schema, Table -from pypika.queries import make_columns as Columns -from pypika.queries import make_tables as Tables -from pypika.terms import ( +from .queries import AliasedQuery, Column, Database, Query, Schema, Table +from .queries import make_columns as Columns +from .queries import make_tables as Tables +from .terms import ( JSON, Array, Bracket, diff --git a/pypika/analytics.py b/pypika_tortoise/analytics.py similarity index 96% rename from pypika/analytics.py rename to pypika_tortoise/analytics.py index 30a5690..88674d7 100644 --- a/pypika/analytics.py +++ b/pypika_tortoise/analytics.py @@ -2,7 +2,7 @@ Package for SQL analytic functions wrappers """ -from pypika.terms import AnalyticFunction, IgnoreNullsAnalyticFunction, WindowFrameAnalyticFunction +from .terms import AnalyticFunction, IgnoreNullsAnalyticFunction, WindowFrameAnalyticFunction class Preceding(WindowFrameAnalyticFunction.Edge): diff --git a/pypika/dialects/__init__.py b/pypika_tortoise/dialects/__init__.py similarity index 100% rename from pypika/dialects/__init__.py rename to pypika_tortoise/dialects/__init__.py diff --git a/pypika/dialects/mssql.py b/pypika_tortoise/dialects/mssql.py similarity index 93% rename from pypika/dialects/mssql.py rename to pypika_tortoise/dialects/mssql.py index b95cb74..43c3897 100644 --- a/pypika/dialects/mssql.py +++ b/pypika_tortoise/dialects/mssql.py @@ -2,11 +2,11 @@ from typing import Any, cast -from pypika.enums import Dialects -from pypika.exceptions import QueryException -from pypika.queries import Query, QueryBuilder -from pypika.terms import ValueWrapper -from pypika.utils import builder +from ..enums import Dialects +from ..exceptions import QueryException +from ..queries import Query, QueryBuilder +from ..terms import ValueWrapper +from ..utils import builder class MSSQLQuery(Query): diff --git a/pypika/dialects/mysql.py b/pypika_tortoise/dialects/mysql.py similarity index 96% rename from pypika/dialects/mysql.py rename to pypika_tortoise/dialects/mysql.py index fe3c1b5..bb563f8 100644 --- a/pypika/dialects/mysql.py +++ b/pypika_tortoise/dialects/mysql.py @@ -4,10 +4,10 @@ from datetime import time from typing import Any, cast -from pypika.enums import Dialects -from pypika.queries import Query, QueryBuilder, Table -from pypika.terms import ValueWrapper -from pypika.utils import builder, format_alias_sql, format_quotes +from ..enums import Dialects +from ..queries import Query, QueryBuilder, Table +from ..terms import ValueWrapper +from ..utils import builder, format_alias_sql, format_quotes class MySQLQuery(Query): diff --git a/pypika/dialects/oracle.py b/pypika_tortoise/dialects/oracle.py similarity index 93% rename from pypika/dialects/oracle.py rename to pypika_tortoise/dialects/oracle.py index 174fa2c..f4b064a 100644 --- a/pypika/dialects/oracle.py +++ b/pypika_tortoise/dialects/oracle.py @@ -1,7 +1,7 @@ from typing import Any -from pypika.enums import Dialects -from pypika.queries import Query, QueryBuilder +from ..enums import Dialects +from ..queries import Query, QueryBuilder class OracleQuery(Query): diff --git a/pypika/dialects/postgresql.py b/pypika_tortoise/dialects/postgresql.py similarity index 96% rename from pypika/dialects/postgresql.py rename to pypika_tortoise/dialects/postgresql.py index b4bcc10..36b10bd 100644 --- a/pypika/dialects/postgresql.py +++ b/pypika_tortoise/dialects/postgresql.py @@ -5,11 +5,11 @@ from copy import copy from typing import TYPE_CHECKING, Any -from pypika.enums import Dialects -from pypika.exceptions import QueryException -from pypika.queries import Query, QueryBuilder -from pypika.terms import ArithmeticExpression, Field, Function, Star, Term -from pypika.utils import builder +from ..enums import Dialects +from ..exceptions import QueryException +from ..queries import Query, QueryBuilder +from ..terms import ArithmeticExpression, Field, Function, Star, Term +from ..utils import builder if TYPE_CHECKING: if sys.version_info >= (3, 11): diff --git a/pypika/dialects/sqlite.py b/pypika_tortoise/dialects/sqlite.py similarity index 95% rename from pypika/dialects/sqlite.py rename to pypika_tortoise/dialects/sqlite.py index 141313f..f2249b8 100644 --- a/pypika/dialects/sqlite.py +++ b/pypika_tortoise/dialects/sqlite.py @@ -2,9 +2,9 @@ from typing import Any -from pypika.enums import Dialects -from pypika.queries import Query, QueryBuilder -from pypika.terms import ValueWrapper +from ..enums import Dialects +from ..queries import Query, QueryBuilder +from ..terms import ValueWrapper class SQLLiteValueWrapper(ValueWrapper): diff --git a/pypika/enums.py b/pypika_tortoise/enums.py similarity index 100% rename from pypika/enums.py rename to pypika_tortoise/enums.py diff --git a/pypika/exceptions.py b/pypika_tortoise/exceptions.py similarity index 100% rename from pypika/exceptions.py rename to pypika_tortoise/exceptions.py diff --git a/pypika/functions.py b/pypika_tortoise/functions.py similarity index 98% rename from pypika/functions.py rename to pypika_tortoise/functions.py index 1e7f168..186ecaa 100644 --- a/pypika/functions.py +++ b/pypika_tortoise/functions.py @@ -8,9 +8,9 @@ from enum import Enum from typing import TYPE_CHECKING, Any -from pypika.enums import SqlTypes -from pypika.terms import AggregateFunction, Function, Star, Term -from pypika.utils import builder +from .enums import SqlTypes +from .terms import AggregateFunction, Function, Star, Term +from .utils import builder if TYPE_CHECKING: if sys.version_info >= (3, 11): diff --git a/pypika/pseudocolumns.py b/pypika_tortoise/pseudocolumns.py similarity index 100% rename from pypika/pseudocolumns.py rename to pypika_tortoise/pseudocolumns.py diff --git a/pypika/py.typed b/pypika_tortoise/py.typed similarity index 100% rename from pypika/py.typed rename to pypika_tortoise/py.typed diff --git a/pypika/queries.py b/pypika_tortoise/queries.py similarity index 99% rename from pypika/queries.py rename to pypika_tortoise/queries.py index c71a67d..bd400be 100644 --- a/pypika/queries.py +++ b/pypika_tortoise/queries.py @@ -5,9 +5,9 @@ from functools import reduce from typing import TYPE_CHECKING, Any, Sequence, Type, cast, overload -from pypika.enums import Dialects, JoinType, SetOperation -from pypika.exceptions import JoinException, QueryException, RollupException, SetOperationException -from pypika.terms import ( +from .enums import Dialects, JoinType, SetOperation +from .exceptions import JoinException, QueryException, RollupException, SetOperationException +from .terms import ( ArithmeticExpression, Criterion, EmptyCriterion, @@ -24,7 +24,7 @@ Tuple, ValueWrapper, ) -from pypika.utils import builder, format_alias_sql, format_quotes, ignore_copy +from .utils import builder, format_alias_sql, format_quotes, ignore_copy if TYPE_CHECKING: if sys.version_info >= (3, 11): diff --git a/pypika/terms.py b/pypika_tortoise/terms.py similarity index 99% rename from pypika/terms.py rename to pypika_tortoise/terms.py index c0679f1..1c8ce20 100644 --- a/pypika/terms.py +++ b/pypika_tortoise/terms.py @@ -9,7 +9,7 @@ from enum import Enum from typing import TYPE_CHECKING, Any, Callable, Iterable, Iterator, Sequence, Type, TypeVar, cast -from pypika.enums import ( +from .enums import ( Arithmetic, Boolean, Comparator, @@ -20,11 +20,11 @@ Matching, Order, ) -from pypika.exceptions import CaseException, FunctionException -from pypika.utils import builder, format_alias_sql, format_quotes, ignore_copy, resolve_is_aggregate +from .exceptions import CaseException, FunctionException +from .utils import builder, format_alias_sql, format_quotes, ignore_copy, resolve_is_aggregate if TYPE_CHECKING: - from pypika.queries import QueryBuilder, Selectable, Table + from .queries import QueryBuilder, Selectable, Table if sys.version_info >= (3, 11): from typing import Self @@ -59,7 +59,7 @@ def as_(self, alias: str) -> "Self": # type:ignore[return] @property def tables_(self) -> set["Table"]: - from pypika import Table + from . import Table return set(self.find_(Table)) diff --git a/pypika/utils.py b/pypika_tortoise/utils.py similarity index 100% rename from pypika/utils.py rename to pypika_tortoise/utils.py diff --git a/pyproject.toml b/pyproject.toml index e5661ba..5bf26bb 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "pypika-tortoise" -version = "0.3.2" +version = "0.4.0" description = "Forked from pypika and streamline just for tortoise-orm" authors = ["long2ice "] license = "Apache-2.0" @@ -10,7 +10,7 @@ repository = "https://github.com/tortoise/pypika-tortoise.git" documentation = "https://github.com/tortoise/pypika-tortoise" keywords = ["postgresql", "Tortoise-ORM", "mysql", "sqlite", "sql"] packages = [ - { include = "pypika" } + { include = "pypika_tortoise" } ] include = ["CHANGELOG.md", "LICENSE", "README.md"] @@ -46,8 +46,8 @@ ignore_missing_imports = true line-length = 100 [tool.ruff.lint.per-file-ignores] -'pypika/__init__.py' = ['F401'] -'pypika/dialects/__init__.py' = ['F401'] +'pypika_tortoise/__init__.py' = ['F401'] +'pypika_tortoise/dialects/__init__.py' = ['F401'] [tool.bandit] exclude_dirs = ["tests", "conftest.py"] diff --git a/tests/dialects/test_mysql.py b/tests/dialects/test_mysql.py index 7319fed..6318953 100644 --- a/tests/dialects/test_mysql.py +++ b/tests/dialects/test_mysql.py @@ -1,6 +1,6 @@ import unittest -from pypika import MySQLQuery, Table +from pypika_tortoise import MySQLQuery, Table class InsertTests(unittest.TestCase): diff --git a/tests/dialects/test_postgresql.py b/tests/dialects/test_postgresql.py index 8eefdfc..b61f0bc 100644 --- a/tests/dialects/test_postgresql.py +++ b/tests/dialects/test_postgresql.py @@ -1,8 +1,8 @@ import unittest from collections import OrderedDict -from pypika import JSON, Array, Field, QueryException, Table -from pypika.dialects import PostgreSQLQuery +from pypika_tortoise import JSON, Array, Field, QueryException, Table +from pypika_tortoise.dialects import PostgreSQLQuery class InsertTests(unittest.TestCase): diff --git a/tests/dialects/test_sqllite.py b/tests/dialects/test_sqllite.py index 50f0861..52e6e03 100644 --- a/tests/dialects/test_sqllite.py +++ b/tests/dialects/test_sqllite.py @@ -1,7 +1,7 @@ import unittest -from pypika import Table -from pypika.dialects import SQLLiteQuery +from pypika_tortoise import Table +from pypika_tortoise.dialects import SQLLiteQuery class SelectTests(unittest.TestCase): diff --git a/tests/test_aggregate.py b/tests/test_aggregate.py index 629ab2a..c35fb9f 100644 --- a/tests/test_aggregate.py +++ b/tests/test_aggregate.py @@ -1,8 +1,8 @@ import unittest -from pypika import Case, Field, Table -from pypika import functions as fn -from pypika.terms import Negative, ValueWrapper +from pypika_tortoise import Case, Field, Table +from pypika_tortoise import functions as fn +from pypika_tortoise.terms import Negative, ValueWrapper class IsAggregateTests(unittest.TestCase): diff --git a/tests/test_analytic_queries.py b/tests/test_analytic_queries.py index c7d9eaa..734938a 100644 --- a/tests/test_analytic_queries.py +++ b/tests/test_analytic_queries.py @@ -1,8 +1,8 @@ import unittest -from pypika import Criterion, JoinType, Order, Query, Tables -from pypika import analytics as an -from pypika.analytics import Lag, Lead +from pypika_tortoise import Criterion, JoinType, Order, Query, Tables +from pypika_tortoise import analytics as an +from pypika_tortoise.analytics import Lag, Lead __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_create.py b/tests/test_create.py index 68627be..c0c81ad 100644 --- a/tests/test_create.py +++ b/tests/test_create.py @@ -1,7 +1,7 @@ import unittest -from pypika import Column, Columns, Query, Tables -from pypika.terms import ValueWrapper +from pypika_tortoise import Column, Columns, Query, Tables +from pypika_tortoise.terms import ValueWrapper class CreateTableTests(unittest.TestCase): diff --git a/tests/test_criterions.py b/tests/test_criterions.py index 1608ba3..a8bf1f5 100644 --- a/tests/test_criterions.py +++ b/tests/test_criterions.py @@ -1,10 +1,10 @@ import unittest from datetime import date, datetime -from pypika import Criterion, EmptyCriterion, Field, Table -from pypika import functions as fn -from pypika.queries import QueryBuilder -from pypika.terms import Mod +from pypika_tortoise import Criterion, EmptyCriterion, Field, Table +from pypika_tortoise import functions as fn +from pypika_tortoise.queries import QueryBuilder +from pypika_tortoise.terms import Mod __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_custom_functions.py b/tests/test_custom_functions.py index 60ffd3c..dd8047a 100644 --- a/tests/test_custom_functions.py +++ b/tests/test_custom_functions.py @@ -1,6 +1,6 @@ import unittest -from pypika import CustomFunction, FunctionException, Query, Table +from pypika_tortoise import CustomFunction, FunctionException, Query, Table __author__ = "Airton Zanon" __email__ = "me@airton.dev" diff --git a/tests/test_data_types.py b/tests/test_data_types.py index 52fb448..6e2333f 100644 --- a/tests/test_data_types.py +++ b/tests/test_data_types.py @@ -1,7 +1,7 @@ import unittest import uuid -from pypika.terms import ValueWrapper +from pypika_tortoise.terms import ValueWrapper class StringTests(unittest.TestCase): diff --git a/tests/test_date_math.py b/tests/test_date_math.py index a9c998f..4dd00e1 100644 --- a/tests/test_date_math.py +++ b/tests/test_date_math.py @@ -1,8 +1,8 @@ import unittest -from pypika import Field as F -from pypika import Interval -from pypika.enums import Dialects +from pypika_tortoise import Field as F +from pypika_tortoise import Interval +from pypika_tortoise.enums import Dialects dt = F("dt") diff --git a/tests/test_deletes.py b/tests/test_deletes.py index addd39c..b0755f5 100644 --- a/tests/test_deletes.py +++ b/tests/test_deletes.py @@ -1,11 +1,11 @@ import unittest -from pypika import SYSTEM_TIME, MySQLQuery, PostgreSQLQuery, Query, SQLLiteQuery, Table +from pypika_tortoise import SYSTEM_TIME, MySQLQuery, PostgreSQLQuery, Query, SQLLiteQuery, Table __author__ = "Timothy Heys" __email__ = "theys@kayak.com" -from pypika.terms import Star +from pypika_tortoise.terms import Star class DeleteTests(unittest.TestCase): diff --git a/tests/test_drop.py b/tests/test_drop.py index 6a5afd8..d778686 100644 --- a/tests/test_drop.py +++ b/tests/test_drop.py @@ -1,6 +1,6 @@ import unittest -from pypika import Columns, Query, Tables +from pypika_tortoise import Columns, Query, Tables class DropTableTests(unittest.TestCase): diff --git a/tests/test_formats.py b/tests/test_formats.py index c60ed8e..3b617df 100644 --- a/tests/test_formats.py +++ b/tests/test_formats.py @@ -1,7 +1,7 @@ import unittest -from pypika import Query, Tables -from pypika import functions as fn +from pypika_tortoise import Query, Tables +from pypika_tortoise import functions as fn class QuoteTests(unittest.TestCase): diff --git a/tests/test_functions.py b/tests/test_functions.py index cb4ea9b..cf12ff1 100644 --- a/tests/test_functions.py +++ b/tests/test_functions.py @@ -1,13 +1,13 @@ import unittest -from pypika import Case, CaseException, DatePart -from pypika import Field as F -from pypika import Query -from pypika import Query as Q -from pypika import Schema -from pypika import Table as T -from pypika import functions as fn -from pypika.enums import Dialects, SqlTypes +from pypika_tortoise import Case, CaseException, DatePart +from pypika_tortoise import Field as F +from pypika_tortoise import Query +from pypika_tortoise import Query as Q +from pypika_tortoise import Schema +from pypika_tortoise import Table as T +from pypika_tortoise import functions as fn +from pypika_tortoise.enums import Dialects, SqlTypes class FunctionTests(unittest.TestCase): diff --git a/tests/test_groupby_modifiers.py b/tests/test_groupby_modifiers.py index ff0fbda..7adc84f 100644 --- a/tests/test_groupby_modifiers.py +++ b/tests/test_groupby_modifiers.py @@ -1,7 +1,7 @@ import unittest -from pypika import Query, Rollup, RollupException, Table -from pypika import functions as fn +from pypika_tortoise import Query, Rollup, RollupException, Table +from pypika_tortoise import functions as fn __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_immutability.py b/tests/test_immutability.py index f21589d..41faeff 100644 --- a/tests/test_immutability.py +++ b/tests/test_immutability.py @@ -1,6 +1,6 @@ import unittest -from pypika import Query, Tables +from pypika_tortoise import Query, Tables class ImmutabilityTests(unittest.TestCase): diff --git a/tests/test_inserts.py b/tests/test_inserts.py index f9c4467..c1f287c 100644 --- a/tests/test_inserts.py +++ b/tests/test_inserts.py @@ -1,12 +1,12 @@ import unittest -from pypika import AliasedQuery, Case -from pypika import Field as F -from pypika import MySQLQuery, PostgreSQLQuery, Query, Table, Tables -from pypika import functions as fn -from pypika.exceptions import QueryException -from pypika.functions import Avg -from pypika.terms import Values +from pypika_tortoise import AliasedQuery, Case +from pypika_tortoise import Field as F +from pypika_tortoise import MySQLQuery, PostgreSQLQuery, Query, Table, Tables +from pypika_tortoise import functions as fn +from pypika_tortoise.exceptions import QueryException +from pypika_tortoise.functions import Avg +from pypika_tortoise.terms import Values __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_internals.py b/tests/test_internals.py index 54c6d5b..12a8f69 100644 --- a/tests/test_internals.py +++ b/tests/test_internals.py @@ -1,7 +1,7 @@ import unittest -from pypika import Case, Field, Table -from pypika.terms import Star +from pypika_tortoise import Case, Field, Table +from pypika_tortoise.terms import Star class TablesTests(unittest.TestCase): diff --git a/tests/test_joins.py b/tests/test_joins.py index fb95935..41ecfc1 100644 --- a/tests/test_joins.py +++ b/tests/test_joins.py @@ -1,6 +1,6 @@ import unittest -from pypika import ( +from pypika_tortoise import ( SYSTEM_TIME, Field, Interval, @@ -12,7 +12,7 @@ Table, Tables, ) -from pypika import functions as fn +from pypika_tortoise import functions as fn __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_negation.py b/tests/test_negation.py index cb74745..9624dec 100644 --- a/tests/test_negation.py +++ b/tests/test_negation.py @@ -1,8 +1,8 @@ import unittest -from pypika import Tables -from pypika import functions as fn -from pypika.terms import ValueWrapper +from pypika_tortoise import Tables +from pypika_tortoise import functions as fn +from pypika_tortoise.terms import ValueWrapper class NegationTests(unittest.TestCase): diff --git a/tests/test_parameter.py b/tests/test_parameter.py index e3bdc9f..71a9a79 100644 --- a/tests/test_parameter.py +++ b/tests/test_parameter.py @@ -1,13 +1,13 @@ import unittest from datetime import date -from pypika import Parameter, Query, Tables, ValueWrapper -from pypika.dialects.mssql import MSSQLQuery -from pypika.dialects.mysql import MySQLQuery -from pypika.dialects.postgresql import PostgreSQLQuery -from pypika.enums import Dialects -from pypika.functions import Upper -from pypika.terms import Case, Parameterizer +from pypika_tortoise import Parameter, Query, Tables, ValueWrapper +from pypika_tortoise.dialects.mssql import MSSQLQuery +from pypika_tortoise.dialects.mysql import MySQLQuery +from pypika_tortoise.dialects.postgresql import PostgreSQLQuery +from pypika_tortoise.enums import Dialects +from pypika_tortoise.functions import Upper +from pypika_tortoise.terms import Case, Parameterizer class ParametrizedTests(unittest.TestCase): diff --git a/tests/test_pseudocolumns.py b/tests/test_pseudocolumns.py index ce7659c..27a1e6a 100644 --- a/tests/test_pseudocolumns.py +++ b/tests/test_pseudocolumns.py @@ -1,8 +1,8 @@ import unittest -from pypika import Query, Table -from pypika.pseudocolumns import ColumnValue, ObjectID, ObjectValue, RowID, RowNum, SysDate -from pypika.terms import PseudoColumn +from pypika_tortoise import Query, Table +from pypika_tortoise.pseudocolumns import ColumnValue, ObjectID, ObjectValue, RowID, RowNum, SysDate +from pypika_tortoise.terms import PseudoColumn class PseudoColumnsTest(unittest.TestCase): diff --git a/tests/test_query.py b/tests/test_query.py index 3a9df1b..fcf99d8 100644 --- a/tests/test_query.py +++ b/tests/test_query.py @@ -1,8 +1,8 @@ import unittest from copy import copy -from pypika import Case, Query, Tables, Tuple, functions -from pypika.dialects import ( +from pypika_tortoise import Case, Query, Tables, Tuple, functions +from pypika_tortoise.dialects import ( MySQLLoadQueryBuilder, MySQLQuery, MySQLQueryBuilder, @@ -11,7 +11,7 @@ SQLLiteQuery, SQLLiteQueryBuilder, ) -from pypika.queries import CreateQueryBuilder, DropQueryBuilder, QueryBuilder, Table +from pypika_tortoise.queries import CreateQueryBuilder, DropQueryBuilder, QueryBuilder, Table class QueryTablesTests(unittest.TestCase): diff --git a/tests/test_selects.py b/tests/test_selects.py index 37ec907..044e960 100644 --- a/tests/test_selects.py +++ b/tests/test_selects.py @@ -2,9 +2,9 @@ from datetime import date, time from enum import Enum -from pypika import SYSTEM_TIME, AliasedQuery, Case, EmptyCriterion -from pypika import Field as F -from pypika import ( +from pypika_tortoise import SYSTEM_TIME, AliasedQuery, Case, EmptyCriterion +from pypika_tortoise import Field as F +from pypika_tortoise import ( Index, MySQLQuery, NullValue, @@ -16,8 +16,8 @@ Table, Tables, ) -from pypika import functions as fn -from pypika.terms import Field, ValueWrapper +from pypika_tortoise import functions as fn +from pypika_tortoise.terms import Field, ValueWrapper __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_tables.py b/tests/test_tables.py index b8fd2d5..12acf5a 100644 --- a/tests/test_tables.py +++ b/tests/test_tables.py @@ -1,7 +1,16 @@ -# from pypika.terms import ValueWrapper, SystemTimeValue +# from pypika_tortoise.terms import ValueWrapper, SystemTimeValue import unittest -from pypika import SYSTEM_TIME, Database, Dialects, Query, Schema, SQLLiteQuery, Table, Tables +from pypika_tortoise import ( + SYSTEM_TIME, + Database, + Dialects, + Query, + Schema, + SQLLiteQuery, + Table, + Tables, +) __author__ = "Timothy Heys" __email__ = "theys@kayak.com" diff --git a/tests/test_terms.py b/tests/test_terms.py index 295e39d..28f8314 100644 --- a/tests/test_terms.py +++ b/tests/test_terms.py @@ -1,7 +1,7 @@ from unittest import TestCase -from pypika import Field, Query, Table -from pypika.terms import AtTimezone, Parameterizer, ValueWrapper +from pypika_tortoise import Field, Query, Table +from pypika_tortoise.terms import AtTimezone, Parameterizer, ValueWrapper class FieldAliasTests(TestCase): diff --git a/tests/test_tuples.py b/tests/test_tuples.py index fa0dc98..055776b 100644 --- a/tests/test_tuples.py +++ b/tests/test_tuples.py @@ -1,8 +1,8 @@ import unittest -from pypika import Array, Bracket, PostgreSQLQuery, Query, Table, Tables, Tuple -from pypika.functions import Coalesce, NullIf, Sum -from pypika.terms import Field, Parameterizer, Star +from pypika_tortoise import Array, Bracket, PostgreSQLQuery, Query, Table, Tables, Tuple +from pypika_tortoise.functions import Coalesce, NullIf, Sum +from pypika_tortoise.terms import Field, Parameterizer, Star class TupleTests(unittest.TestCase): diff --git a/tests/test_updates.py b/tests/test_updates.py index a722554..bee1d68 100644 --- a/tests/test_updates.py +++ b/tests/test_updates.py @@ -1,6 +1,6 @@ import unittest -from pypika import ( +from pypika_tortoise import ( SYSTEM_TIME, AliasedQuery, MySQLQuery, @@ -13,7 +13,7 @@ __author__ = "Timothy Heys" __email__ = "theys@kayak.com" -from pypika.terms import Star +from pypika_tortoise.terms import Star class UpdateTests(unittest.TestCase):