Merge pull request #10 from waketzheng/fix-enums-not-quoted

Fix enums not quoted

Author: waketzheng

.github/workflows/ci.yml

@@ -3,16 +3,24 @@ on: [ push, pull_request ]
 jobs:
   ci:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        python-version: [3.8, 3.9, "3.10", 3.11, 3.12, 3.13]
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/cache@v4
         with:
-          python-version: "3.x"
+          path: ~/.cache/pip
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/poetry.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: ${{ matrix.python-version }}
+          allow-prereleases: true
       - name: Install and configure Poetry
         run: |
           pip install -U pip poetry
           poetry config virtualenvs.create false
-      - name: Install deps
-        run: make deps
       - name: Run CI
         run: make ci

CHANGELOG.md

@@ -2,6 +2,13 @@
 
 ## 0.2
 
+### 0.2.2
+- Fix enums not quoted. (#7)
+- Drop python3.7 support
+- Move all custom Exception class to `pypika.exceptions`
+- Apply bandit check in ci
+- Pass mypy check and add it to ci
+
 ### 0.2.1
 - Fix stringification of datetime objects
 

Makefile

@@ -1,5 +1,5 @@
 checkfiles = pypika/ tests/ conftest.py
-black_opts = -l 100 -t py37
+black_opts = -l 100 -t py38
 py_warn = PYTHONDEVMODE=1
 
 up:
@@ -8,25 +8,30 @@ up:
 deps:
 	@poetry install
 
-check: deps build
+check: build _check
+_check:
 ifneq ($(shell which black),)
 	black --check $(black_opts) $(checkfiles) || (echo "Please run 'make style' to auto-fix style issues" && false)
 endif
-	ruff $(checkfiles)
+	ruff check $(checkfiles)
+	bandit -c pyproject.toml -r $(checkfiles)
+	mypy $(checkfiles)
 	twine check dist/*
 
-test: deps
+test: deps _test
+_test:
 	$(py_warn) pytest
 
-ci: check test
+ci: build _check _test
 
-style: deps
+style: deps _style
+_style:
 	isort -src $(checkfiles)
 	black $(black_opts) $(checkfiles)
 
 build: deps
 	rm -fR dist/
 	poetry build
 
-publish: deps build
+publish: build
 	twine upload dist/*

poetry.lock

@@ -1,5 +1,14 @@
 from pypika.dialects import MSSQLQuery, MySQLQuery, OracleQuery, PostgreSQLQuery, SQLLiteQuery
 from pypika.enums import DatePart, Dialects, JoinType, Order
+from pypika.exceptions import (
+    CaseException,
+    FunctionException,
+    GroupingException,
+    JoinException,
+    QueryException,
+    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
@@ -26,15 +35,6 @@
     SystemTimeValue,
     Tuple,
 )
-from pypika.utils import (
-    CaseException,
-    FunctionException,
-    GroupingException,
-    JoinException,
-    QueryException,
-    RollupException,
-    SetOperationException,
-)
 
 NULL = NullValue()
 SYSTEM_TIME = SystemTimeValue()

pypika/__init__.py

@@ -1,6 +1,7 @@
 """
 Package for SQL analytic functions wrappers
 """
+
 from pypika.terms import AnalyticFunction, IgnoreNullsAnalyticFunction, WindowFrameAnalyticFunction
 
 
@@ -16,100 +17,100 @@ class Following(WindowFrameAnalyticFunction.Edge):
 
 
 class Rank(AnalyticFunction):
-    def __init__(self, **kwargs):
-        super(Rank, self).__init__("RANK", **kwargs)
+    def __init__(self, **kwargs) -> None:
+        super().__init__("RANK", **kwargs)
 
 
 class DenseRank(AnalyticFunction):
-    def __init__(self, **kwargs):
-        super(DenseRank, self).__init__("DENSE_RANK", **kwargs)
+    def __init__(self, **kwargs) -> None:
+        super().__init__("DENSE_RANK", **kwargs)
 
 
 class RowNumber(AnalyticFunction):
-    def __init__(self, **kwargs):
-        super(RowNumber, self).__init__("ROW_NUMBER", **kwargs)
+    def __init__(self, **kwargs) -> None:
+        super().__init__("ROW_NUMBER", **kwargs)
 
 
 class NTile(AnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(NTile, self).__init__("NTILE", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("NTILE", term, **kwargs)
 
 
 class FirstValue(WindowFrameAnalyticFunction, IgnoreNullsAnalyticFunction):
-    def __init__(self, *terms, **kwargs):
-        super(FirstValue, self).__init__("FIRST_VALUE", *terms, **kwargs)
+    def __init__(self, *terms, **kwargs) -> None:
+        super().__init__("FIRST_VALUE", *terms, **kwargs)
 
 
 class LastValue(WindowFrameAnalyticFunction, IgnoreNullsAnalyticFunction):
-    def __init__(self, *terms, **kwargs):
-        super(LastValue, self).__init__("LAST_VALUE", *terms, **kwargs)
+    def __init__(self, *terms, **kwargs) -> None:
+        super().__init__("LAST_VALUE", *terms, **kwargs)
 
 
 class Median(AnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Median, self).__init__("MEDIAN", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("MEDIAN", term, **kwargs)
 
 
 class Avg(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Avg, self).__init__("AVG", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("AVG", term, **kwargs)
 
 
 class StdDev(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(StdDev, self).__init__("STDDEV", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("STDDEV", term, **kwargs)
 
 
 class StdDevPop(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(StdDevPop, self).__init__("STDDEV_POP", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("STDDEV_POP", term, **kwargs)
 
 
 class StdDevSamp(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(StdDevSamp, self).__init__("STDDEV_SAMP", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("STDDEV_SAMP", term, **kwargs)
 
 
 class Variance(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Variance, self).__init__("VARIANCE", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("VARIANCE", term, **kwargs)
 
 
 class VarPop(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(VarPop, self).__init__("VAR_POP", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("VAR_POP", term, **kwargs)
 
 
 class VarSamp(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(VarSamp, self).__init__("VAR_SAMP", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("VAR_SAMP", term, **kwargs)
 
 
 class Count(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Count, self).__init__("COUNT", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("COUNT", term, **kwargs)
 
 
 class Sum(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Sum, self).__init__("SUM", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("SUM", term, **kwargs)
 
 
 class Max(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Max, self).__init__("MAX", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("MAX", term, **kwargs)
 
 
 class Min(WindowFrameAnalyticFunction):
-    def __init__(self, term, **kwargs):
-        super(Min, self).__init__("MIN", term, **kwargs)
+    def __init__(self, term, **kwargs) -> None:
+        super().__init__("MIN", term, **kwargs)
 
 
 class Lag(AnalyticFunction):
-    def __init__(self, *args, **kwargs):
-        super(Lag, self).__init__("LAG", *args, **kwargs)
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__("LAG", *args, **kwargs)
 
 
 class Lead(AnalyticFunction):
-    def __init__(self, *args, **kwargs):
-        super(Lead, self).__init__("LEAD", *args, **kwargs)
+    def __init__(self, *args, **kwargs) -> None:
+        super().__init__("LEAD", *args, **kwargs)

pypika/analytics.py

@@ -1,8 +1,11 @@
-from typing import Any, Union
+from __future__ import annotations
+
+from typing import Any
 
 from pypika.enums import Dialects
+from pypika.exceptions import QueryException
 from pypika.queries import Query, QueryBuilder
-from pypika.utils import QueryException, builder
+from pypika.utils import builder
 
 
 class MSSQLQuery(Query):
@@ -20,10 +23,10 @@ class MSSQLQueryBuilder(QueryBuilder):
 
     def __init__(self, **kwargs: Any) -> None:
         super().__init__(dialect=Dialects.MSSQL, **kwargs)
-        self._top = None
+        self._top: int | None = None
 
     @builder
-    def top(self, value: Union[str, int]) -> "MSSQLQueryBuilder":
+    def top(self, value: str | int) -> MSSQLQueryBuilder:  # type:ignore[return]
         """
         Implements support for simple TOP clauses.
 
@@ -37,7 +40,7 @@ def top(self, value: Union[str, int]) -> "MSSQLQueryBuilder":
             raise QueryException("TOP value must be an integer")
 
     @builder
-    def fetch_next(self, limit: int) -> "MSSQLQueryBuilder":
+    def fetch_next(self, limit: int) -> MSSQLQueryBuilder:  # type:ignore[return]
         # Overridden to provide a more domain-specific API for T-SQL users
         self._limit = limit