sqlglotc 30.2.1__tar.gz → 30.3.0__tar.gz

{sqlglotc-30.2.1/sqlglotc.egg-info → sqlglotc-30.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sqlglotc
-Version: 30.2.1
+Version: 30.3.0
 Summary: mypyc-compiled extensions for sqlglot
 Author-email: Toby Mao <toby.mao@gmail.com>
 License-Expression: MIT
@@ -10,4 +10,4 @@ Requires-Python: >=3.9
 Provides-Extra: dev
 Requires-Dist: setuptools>=61.0; extra == "dev"
 Requires-Dist: setuptools_scm; extra == "dev"
-Requires-Dist: sqlglot-mypy>=1.19.1.post1; extra == "dev"
+Requires-Dist: sqlglot-mypy; extra == "dev"

{sqlglotc-30.2.1 → sqlglotc-30.3.0}/pyproject.toml

@@ -7,14 +7,14 @@ license = "MIT"
 requires-python = ">= 3.9"
 
 [project.optional-dependencies]
-dev = ["setuptools >= 61.0", "setuptools_scm", "sqlglot-mypy>=1.19.1.post1"]
+dev = ["setuptools >= 61.0", "setuptools_scm", "sqlglot-mypy"]
 
 [project.urls]
 Homepage = "https://sqlglot.com/"
 Repository = "https://github.com/tobymao/sqlglot"
 
 [build-system]
-requires = ["setuptools >= 61.0", "setuptools_scm", "sqlglot-mypy>=1.19.1.post1", "types-python-dateutil", "sqlglot"]
+requires = ["setuptools >= 61.0", "setuptools_scm", "sqlglot-mypy", "types-python-dateutil", "sqlglot"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools]

{sqlglotc-30.2.1 → sqlglotc-30.3.0}/sqlglot/errors.py

@@ -38,7 +38,7 @@ class ParseError(SqlglotError):
     def __init__(
         self,
         message: str,
-        errors: t.Optional[t.List[t.Dict[str, t.Any]]] = None,
+        errors: list[dict[str, t.Any]] | None = None,
     ):
         super().__init__(message)
         self.errors = errors or []
@@ -47,13 +47,13 @@ class ParseError(SqlglotError):
     def new(
         cls,
         message: str,
-        description: t.Optional[str] = None,
-        line: t.Optional[int] = None,
-        col: t.Optional[int] = None,
-        start_context: t.Optional[str] = None,
-        highlight: t.Optional[str] = None,
-        end_context: t.Optional[str] = None,
-        into_expression: t.Optional[str] = None,
+        description: str | None = None,
+        line: int | None = None,
+        col: int | None = None,
+        start_context: str | None = None,
+        highlight: str | None = None,
+        end_context: str | None = None,
+        into_expression: str | None = None,
     ) -> ParseError:
         return cls(
             message,
@@ -89,9 +89,9 @@ class ExecuteError(SqlglotError):
 
 def highlight_sql(
     sql: str,
-    positions: t.List[t.Tuple[int, int]],
+    positions: list[tuple[int, int]],
     context_length: int = ERROR_MESSAGE_CONTEXT_DEFAULT,
-) -> t.Tuple[str, str, str, str]:
+) -> tuple[str, str, str, str]:
     """
     Highlight a SQL string using ANSI codes at the given positions.
 

{sqlglotc-30.2.1 → sqlglotc-30.3.0}/sqlglot/executor/table.py

@@ -12,7 +12,7 @@ class Table:
         self,
         columns: t.Any = None,
         rows: t.Any = None,
-        column_range: t.Optional[range] = None,
+        column_range: range | None = None,
     ) -> None:
         self.columns: t.Any = tuple(columns) if columns is not None else ()
         self.column_range = column_range
@@ -37,7 +37,7 @@ class Table:
     def pop(self) -> None:
         self.rows.pop()
 
-    def to_pylist(self) -> t.List:
+    def to_pylist(self) -> list:
         return [dict(zip(self.columns, row)) for row in self.rows]
 
     @property
@@ -119,11 +119,11 @@ class Tables(AbstractMappingSchema):
     pass
 
 
-def ensure_tables(d: t.Optional[t.Dict], dialect: DialectType = None) -> Tables:
+def ensure_tables(d: dict | None, dialect: DialectType = None) -> Tables:
     return Tables(_ensure_tables(d, dialect=dialect))
 
 
-def _ensure_tables(d: t.Optional[t.Dict], dialect: DialectType = None) -> t.Dict:
+def _ensure_tables(d: dict | None, dialect: DialectType = None) -> dict:
     if not d:
         return {}
 

{sqlglotc-30.2.1 → sqlglotc-30.3.0}/sqlglot/expressions/array.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-import typing as t
 
 from sqlglot.expressions.core import (
     Expression,
@@ -262,7 +261,7 @@ class Unnest(Expression, Func, UDTF):
     }
 
     @property
-    def selects(self) -> t.List[Expr]:
+    def selects(self) -> list[Expr]:
         columns = super().selects
         offset = self.args.get("offset")
         if offset:
@@ -277,12 +276,12 @@ class Map(Expression, Func):
     arg_types = {"keys": False, "values": False}
 
     @property
-    def keys(self) -> t.List[Expr]:
+    def keys(self) -> list[Expr]:
         keys = self.args.get("keys")
         return keys.expressions if keys else []
 
     @property
-    def values(self) -> t.List[Expr]:
+    def values(self) -> list[Expr]:
         values = self.args.get("values")
         return values.expressions if values else []
 
@@ -334,11 +333,11 @@ class VarMap(Expression, Func):
     is_var_len_args = True
 
     @property
-    def keys(self) -> t.List[Expr]:
+    def keys(self) -> list[Expr]:
         return self.args["keys"].expressions
 
     @property
-    def values(self) -> t.List[Expr]:
+    def values(self) -> list[Expr]:
         return self.args["values"].expressions
 
 

{sqlglotc-30.2.1 → sqlglotc-30.3.0}/sqlglot/expressions/builders.py

@@ -55,12 +55,10 @@ if t.TYPE_CHECKING:
     from sqlglot.dialects.dialect import DialectType
     from sqlglot.expressions.core import ExpOrStr, Func
     from sqlglot.expressions.datatypes import DATA_TYPE
-    from sqlglot._typing import ParserArgs, ParserNoDialectArgs, E
-    from typing_extensions import Unpack, ParamSpec, Concatenate
+    from sqlglot._typing import ParserArgs, ParserNoDialectArgs, E, P
+    from typing_extensions import Unpack, Concatenate
     from sqlglot.expressions.core import Dot
 
-    P = ParamSpec("P")
-
 
 def select(
     *expressions: ExpOrStr,
@@ -118,10 +116,10 @@ def from_(
 
 def update(
     table: str | Table,
-    properties: t.Optional[dict[str, object]] = None,
-    where: t.Optional[ExpOrStr] = None,
-    from_: t.Optional[ExpOrStr] = None,
-    with_: t.Optional[dict[str, ExpOrStr]] = None,
+    properties: dict[str, object] | None = None,
+    where: ExpOrStr | None = None,
+    from_: ExpOrStr | None = None,
+    with_: dict[str, ExpOrStr] | None = None,
     dialect: DialectType = None,
     copy: bool = True,
     **opts: Unpack[ParserNoDialectArgs],
@@ -183,8 +181,8 @@ def update(
 
 def delete(
     table: ExpOrStr,
-    where: t.Optional[ExpOrStr] = None,
-    returning: t.Optional[ExpOrStr] = None,
+    where: ExpOrStr | None = None,
+    returning: ExpOrStr | None = None,
     dialect: DialectType = None,
     **opts: Unpack[ParserNoDialectArgs],
 ) -> Delete:
@@ -215,9 +213,9 @@ def delete(
 def insert(
     expression: ExpOrStr,
     into: str | Table,
-    columns: t.Optional[Sequence[str | Identifier]] = None,
-    overwrite: t.Optional[bool] = None,
-    returning: t.Optional[ExpOrStr] = None,
+    columns: Sequence[str | Identifier] | None = None,
+    overwrite: bool | None = None,
+    returning: ExpOrStr | None = None,
     dialect: DialectType = None,
     copy: bool = True,
     **opts: Unpack[ParserNoDialectArgs],
@@ -261,7 +259,7 @@ def merge(
     into: ExpOrStr,
     using: ExpOrStr,
     on: ExpOrStr,
-    returning: t.Optional[ExpOrStr] = None,
+    returning: ExpOrStr | None = None,
     dialect: DialectType = None,
     copy: bool = True,
     **opts: Unpack[ParserNoDialectArgs],
@@ -384,11 +382,11 @@ def to_table(
 
 def to_column(
     sql_path: str | Column,
-    quoted: t.Optional[bool] = None,
+    quoted: bool | None = None,
     dialect: DialectType = None,
     copy: bool = True,
     **kwargs: t.Any,
-) -> t.Union[Column, Dot]:
+) -> Column | Dot:
     """
     Create a column from a `[table].[column]` sql path. Table is optional.
     If a column is passed in then that column is returned.
@@ -423,7 +421,7 @@ def to_column(
 
 def subquery(
     expression: ExpOrStr,
-    alias: t.Optional[Identifier | str] = None,
+    alias: Identifier | str | None = None,
     dialect: DialectType = None,
     copy: bool = True,
     **opts: Unpack[ParserNoDialectArgs],
@@ -509,10 +507,10 @@ def cast(
 
 def table_(
     table: Identifier | str,
-    db: t.Optional[Identifier | str] = None,
-    catalog: t.Optional[Identifier | str] = None,
-    quoted: t.Optional[bool] = None,
-    alias: t.Optional[Identifier | str] = None,
+    db: Identifier | str | None = None,
+    catalog: Identifier | str | None = None,
+    quoted: bool | None = None,
+    alias: Identifier | str | None = None,
 ) -> Table:
     """Build a Table.
 
@@ -536,8 +534,8 @@ def table_(
 
 def values(
     values: Iterable[tuple[object, ...] | Tuple],
-    alias: t.Optional[str] = None,
-    columns: t.Optional[Iterable[str] | dict[str, DataType]] = None,
+    alias: str | None = None,
+    columns: Iterable[str] | dict[str, DataType] | None = None,
 ) -> Values:
     """Build VALUES statement.
 
@@ -567,7 +565,7 @@ def values(
     )
 
 
-def var(name: t.Optional[ExpOrStr]) -> Var:
+def var(name: ExpOrStr | None) -> Var:
     """Build a SQL variable.
 
     Example:
@@ -621,7 +619,7 @@ def rename_column(
     table_name: str | Table,
     old_column_name: str | Column,
     new_column_name: str | Column,
-    exists: t.Optional[bool] = None,
+    exists: bool | None = None,
     dialect: DialectType = None,
 ) -> Alter:
     """Build ALTER TABLE... RENAME COLUMN... expression
@@ -679,7 +677,7 @@ def replace_children(
 def replace_tree(
     expression: Expr,
     fun: t.Callable[[Expr], Expr],
-    prune: t.Optional[t.Callable[[Expr], bool]] = None,
+    prune: t.Callable[[Expr], bool] | None = None,
 ) -> Expr:
     """
     Replace an entire tree with the result of function calls on each node.
@@ -991,7 +989,7 @@ def func(
 
 
 def case(
-    expression: t.Optional[ExpOrStr] = None,
+    expression: ExpOrStr | None = None,
     copy: bool = True,
     **opts: Unpack[ParserArgs],
 ) -> Case: