Merge pull request #22 from waketzheng/rename-to-pypika_tortoise

Rename package name from `pypika` to `pypika_tortoise`

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

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
 

pypika/__init__.py → 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,

pypika/analytics.py → 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):

pypika/dialects/mssql.py → 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):

pypika/dialects/mysql.py → 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):

pypika/dialects/oracle.py → 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):

pypika/dialects/postgresql.py → 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):

pypika/dialects/sqlite.py → 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):

pypika/functions.py → 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):

pypika/queries.py → 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):

pypika/terms.py → 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))
 

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 <[email protected]>"]
 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"]

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):

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):

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):

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):

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__ = "[email protected]"

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):

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__ = "[email protected]"

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__ = "[email protected]"

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):

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")
 

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__ = "[email protected]"
 
-from pypika.terms import Star
+from pypika_tortoise.terms import Star
 
 
 class DeleteTests(unittest.TestCase):

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):

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):

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):

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__ = "[email protected]"

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):