omlish 0.0.0.dev86__py3-none-any.whl → 0.0.0.dev87__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev86'
-__revision__ = '39be25efaa0206ceb3478be1878e14671f5940f1'
+__version__ = '0.0.0.dev87'
+__revision__ = '116137c4ae1e4aaf7ffb66a2847d4a38d6cce73e'
 
 
 #

omlish/sql/_abc.py

@@ -1,20 +1,20 @@
 import typing as ta
 
 
-DBAPITypeCode: ta.TypeAlias = ta.Any | None
-
-DBAPIColumnDescription: ta.TypeAlias = tuple[
-    str,
-    DBAPITypeCode,
-    int | None,
-    int | None,
-    int | None,
-    int | None,
-    bool | None,
+DbapiTypeCode: ta.TypeAlias = ta.Any | None
+
+DbapiColumnDescription: ta.TypeAlias = tuple[
+    str,  # name
+    DbapiTypeCode,  # type_code
+    int | None,  # display_size
+    int | None,  # internal_size
+    int | None,  # precision
+    int | None,  # scale
+    bool | None,  # null_ok
 ]
 
 
-class DBAPIConnection(ta.Protocol):
+class DbapiConnection(ta.Protocol):
     def close(self) -> object: ...
 
     def commit(self) -> object: ...
@@ -22,12 +22,12 @@ class DBAPIConnection(ta.Protocol):
     # optional:
     # def rollback(self) -> ta.Any: ...
 
-    def cursor(self) -> 'DBAPICursor': ...
+    def cursor(self) -> 'DbapiCursor': ...
 
 
-class DBAPICursor(ta.Protocol):
+class DbapiCursor(ta.Protocol):
     @property
-    def description(self) -> ta.Sequence[DBAPIColumnDescription] | None: ...
+    def description(self) -> ta.Sequence[DbapiColumnDescription] | None: ...
 
     @property
     def rowcount(self) -> int: ...
@@ -60,6 +60,6 @@ class DBAPICursor(ta.Protocol):
 
     arraysize: int
 
-    def setinputsizes(self, sizes: ta.Sequence[DBAPITypeCode | int | None]) -> object: ...
+    def setinputsizes(self, sizes: ta.Sequence[DbapiTypeCode | int | None]) -> object: ...
 
     def setoutputsize(self, size: int, column: int = ...) -> object: ...

omlish/sql/dbapi.py

@@ -0,0 +1,143 @@
+"""
+https://peps.python.org/pep-0249/
+
+==
+
+apilevel = '2.0'
+
+threadsafety:
+ 0 - Threads may not share the module.
+ 1 - Threads may share the module, but not connections.
+ 2 - Threads may share the module and connections.
+ 3 - Threads may share the module, connections and cursors.
+
+paramstyle:
+ qmark - Question mark style, e.g. ...WHERE name=?
+ numeric - Numeric, positional style, e.g. ...WHERE name=:1
+ named - Named style, e.g. ...WHERE name=:name
+ format - ANSI C printf format codes, e.g. ...WHERE name=%s
+ pyformat - Python extended format codes, e.g. ...WHERE name=%(name)s
+
+Exception
+| Warning
+| Error
+ | InterfaceError
+ | DatabaseError
+  | DataError
+  | OperationalError
+  | IntegrityError
+  | InternalError
+  | ProgrammingError
+  | NotSupportedError
+
+Date(year, month, day)
+Time(hour, minute, second)
+Timestamp(year, month, day, hour, minute, second)
+DateFromTicks(ticks)
+TimeFromTicks(ticks)
+TimestampFromTicks(ticks)
+Binary(string)
+
+STRING type
+BINARY type
+NUMBER type
+DATETIME type
+ROWID type
+"""
+import dataclasses as dc
+import enum
+
+from .. import lang
+from .params import ParamStyle
+
+
+class DbapiDialect(enum.Enum):
+    SQLITE = 'sqlite'
+    MYSQL = 'mysql'
+    POSTGRES = 'postgres'
+    SNOWFLAKE = 'snowflake'
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class DbapiDriver:
+    name: str
+    dialect: DbapiDialect
+    param_style: ParamStyle
+
+    package_name: str | None = None
+    module_name: str | None = None
+
+
+class DbapiDrivers(lang.Namespace):
+    SQLITE3 = DbapiDriver(
+        name='sqlite3',
+        dialect=DbapiDialect.SQLITE,
+        param_style=ParamStyle.QMARK,
+    )
+
+    SQLEAN = DbapiDriver(
+        name='sqlean',
+        dialect=DbapiDialect.SQLITE,
+        param_style=ParamStyle.QMARK,
+        package_name='sqlean.py',
+    )
+
+    DUCKDB = DbapiDriver(
+        name='duckdb',
+        dialect=DbapiDialect.SQLITE,
+        param_style=ParamStyle.QMARK,
+    )
+
+    #
+
+    PYMYSQL = DbapiDriver(
+        name='pymysql',
+        dialect=DbapiDialect.MYSQL,
+        param_style=ParamStyle.PYFORMAT,
+    )
+
+    MYSQL = DbapiDriver(
+        name='mysql',
+        dialect=DbapiDialect.MYSQL,
+        param_style=ParamStyle.PYFORMAT,
+        package_name='mysql-connector-python',
+        module_name='mysql.connector',
+    )
+
+    MYSQLCLIENT = DbapiDriver(
+        name='mysqlclient',
+        dialect=DbapiDialect.MYSQL,
+        param_style=ParamStyle.FORMAT,
+        package_name='mysqlclient',
+        module_name='MySQLdb',
+    )
+
+    #
+
+    PG8000 = DbapiDriver(
+        name='pg8000',
+        dialect=DbapiDialect.POSTGRES,
+        param_style=ParamStyle.FORMAT,
+    )
+
+    PSYCOPG2 = DbapiDriver(
+        name='psycopg2',
+        dialect=DbapiDialect.POSTGRES,
+        param_style=ParamStyle.PYFORMAT,
+    )
+
+    PSYCOPG = DbapiDriver(
+        name='psycopg',
+        dialect=DbapiDialect.POSTGRES,
+        param_style=ParamStyle.PYFORMAT,
+    )
+
+    #
+
+    SNOWFLAKE = DbapiDriver(
+        name='snowflake',
+        dialect=DbapiDialect.SNOWFLAKE,
+        param_style=ParamStyle.PYFORMAT,
+        package_name='snowflake-connector-python',
+        module_name='snowflake.connector',
+    )

omlish/sql/params.py

@@ -0,0 +1,159 @@
+import abc
+import enum
+import typing as ta
+
+from .. import check
+from .. import lang
+
+
+##
+
+
+ParamKey: ta.TypeAlias = str | int
+
+
+class ParamsPreparer(lang.Abstract):
+    @abc.abstractmethod
+    def add(self, k: ParamKey) -> str:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def prepare(self) -> lang.Args:
+        raise NotImplementedError
+
+
+class LinearParamsPreparer(ParamsPreparer):
+    def __init__(self, placeholder: str) -> None:
+        super().__init__()
+        self._placeholder = placeholder
+        self._args: list[ParamKey] = []
+
+    def add(self, k: ParamKey) -> str:
+        self._args.append(k)
+        return self._placeholder
+
+    def prepare(self) -> lang.Args:
+        return lang.Args(*self._args)
+
+
+class NumericParamsPreparer(ParamsPreparer):
+    def __init__(self) -> None:
+        super().__init__()
+        self._args: list[ParamKey] = []
+        self._str_by_key: dict[ParamKey, str] = {}
+        self._pos_by_name: dict[str, int] = {}
+        self._pos_by_id: dict[int, int] = {}
+
+    def add(self, k: ParamKey) -> str:
+        try:
+            return self._str_by_key[k]
+        except KeyError:
+            pass
+
+        pos = len(self._args)
+        if isinstance(k, str):
+            check.not_in(k, self._pos_by_name)
+            self._pos_by_name[k] = pos
+        elif isinstance(k, int):
+            check.not_in(k, self._pos_by_id)
+            self._pos_by_id[k] = pos
+        else:
+            raise TypeError(f'Invalid key type: {type(k)}')
+
+        self._args.append(k)
+        ret = self._str_by_key[k] = f':{pos + 1}'
+        return ret
+
+    def prepare(self) -> lang.Args:
+        return lang.Args(*self._args)
+
+
+class NamedParamsPreparer(ParamsPreparer):
+    def __init__(
+            self,
+            render: ta.Callable[[str], str],
+            *,
+            anon: ta.Callable[[int], str] | None = None,
+    ) -> None:
+        super().__init__()
+        self._render = render
+        self._anon = anon if anon is not None else self.underscore_anon
+        self._kwargs: dict[str, ParamKey] = {}
+        self._str_by_key: dict[ParamKey, str] = {}
+        self._kwargs_by_name: dict[str, str] = {}
+        self._kwargs_by_id: dict[int, str] = {}
+
+    @staticmethod
+    def render_named(kwarg: str) -> str:
+        return f':{kwarg}'
+
+    @staticmethod
+    def render_pyformat(kwarg: str) -> str:
+        return f'%({kwarg})s'
+
+    @staticmethod
+    def underscore_anon(n: int) -> str:
+        return f'_{n}'
+
+    def add(self, k: ParamKey) -> str:
+        try:
+            return self._str_by_key[k]
+        except KeyError:
+            pass
+
+        kwarg: str
+        if isinstance(k, str):
+            check.not_in(k, self._kwargs_by_name)
+            kwarg = k  # TODO: collisions
+            self._kwargs_by_name[k] = kwarg
+        elif isinstance(k, int):
+            check.not_in(k, self._kwargs_by_id)
+            kwarg = self._anon(len(self._kwargs_by_id))  # TODO: collisions
+            self._kwargs_by_id[k] = kwarg
+        else:
+            raise TypeError(f'Invalid key type: {type(k)}')
+
+        self._kwargs[kwarg] = k
+        ret = self._str_by_key[k] = self._render(kwarg)
+        return ret
+
+    def prepare(self) -> lang.Args:
+        return lang.Args(**self._kwargs)
+
+
+##
+
+
+class ParamStyle(enum.Enum):
+    QMARK = 'qmark'  # Question mark style, e.g. ...WHERE name=?
+    FORMAT = 'format'  # ANSI C printf format codes, e.g. ...WHERE name=%s
+
+    NUMERIC = 'numeric'  # Numeric, positional style, e.g. ...WHERE name=:1
+
+    NAMED = 'named'  # Named style, e.g. ...WHERE name=:name
+    PYFORMAT = 'pyformat'  # Python extended format codes, e.g. ...WHERE name=%(name)s
+
+
+def make_params_preparer(style: ParamStyle) -> ParamsPreparer:
+    if style is ParamStyle.QMARK:
+        return LinearParamsPreparer('?')
+    elif style is ParamStyle.FORMAT:
+        return LinearParamsPreparer('%s')
+    elif style is ParamStyle.NUMERIC:
+        return NumericParamsPreparer()
+    elif style is ParamStyle.NAMED:
+        return NamedParamsPreparer(NamedParamsPreparer.render_named)
+    elif style is ParamStyle.PYFORMAT:
+        return NamedParamsPreparer(NamedParamsPreparer.render_pyformat)
+    else:
+        raise ValueError(style)
+
+
+##
+
+
+def substitute_params(args: lang.Args, values: ta.Mapping[ParamKey, ta.Any]) -> lang.Args:
+    return lang.Args(
+        *[values[a] for a in args.args],
+        **{k: values[v] for k, v in args.kwargs.items()},
+    )

omlish/sql/queries/marshal.py

@@ -1,3 +1,7 @@
+"""
+FIXME:
+ - refuse to marshal anon params
+"""
 import enum
 import typing as ta
 

omlish/sql/queries/rendering.py

@@ -15,17 +15,21 @@ def needs_parens(self, e: Expr) -> bool:
     else:
         raise TypeError(e)
 """
+import dataclasses as dc
 import io
 import typing as ta
 
 from ... import dispatch
 from ... import lang
+from ..params import ParamStyle
+from ..params import make_params_preparer
 from .base import Node
 from .binary import Binary
 from .binary import BinaryOp
 from .binary import BinaryOps
 from .exprs import Literal
 from .exprs import NameExpr
+from .exprs import Param
 from .idents import Ident
 from .inserts import Insert
 from .inserts import Values
@@ -40,20 +44,40 @@ from .unary import UnaryOp
 from .unary import UnaryOps
 
 
+@dc.dataclass(frozen=True)
+class RenderedQuery(lang.Final):
+    s: str
+    args: lang.Args
+
+
 class Renderer(lang.Abstract):
-    def __init__(self, out: ta.TextIO) -> None:
+    def __init__(
+            self,
+            out: ta.TextIO,
+            *,
+            param_style: ParamStyle | None = None,
+    ) -> None:
         super().__init__()
         self._out = out
+        self._param_style = param_style if param_style is not None else self.default_param_style
+
+        self._params_preparer = make_params_preparer(self._param_style)
+
+    default_param_style: ta.ClassVar[ParamStyle] = ParamStyle.PYFORMAT
+
+    def args(self) -> lang.Args:
+        return self._params_preparer.prepare()
 
     @dispatch.method
-    def render(self, o: ta.Any) -> None:
+    def render(self, o: ta.Any) -> str:
         raise TypeError(o)
 
     @classmethod
-    def render_str(cls, o: ta.Any, *args: ta.Any, **kwargs: ta.Any) -> str:
+    def render_str(cls, o: ta.Any, *args: ta.Any, **kwargs: ta.Any) -> RenderedQuery:
         out = io.StringIO()
-        cls(out, *args, **kwargs).render(o)
-        return out.getvalue()
+        pp = cls(out, *args, **kwargs)
+        pp.render(o)
+        return RenderedQuery(out.getvalue(), pp.args())
 
 
 class StdRenderer(Renderer):
@@ -94,6 +118,10 @@ class StdRenderer(Renderer):
     def render_name_expr(self, o: NameExpr) -> None:
         self.render(o.n)
 
+    @Renderer.render.register
+    def render_param(self, o: Param) -> None:
+        self._out.write(self._params_preparer.add(o.n if o.n is not None else id(o)))
+
     # idents
 
     @Renderer.render.register
@@ -201,5 +229,5 @@ class StdRenderer(Renderer):
         self._out.write(sfx)
 
 
-def render(n: Node) -> str:
-    return StdRenderer.render_str(n)
+def render(n: Node, **kwargs: ta.Any) -> RenderedQuery:
+    return StdRenderer.render_str(n, **kwargs)

{omlish-0.0.0.dev86.dist-info → omlish-0.0.0.dev87.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev86
+Version: 0.0.0.dev87
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev86.dist-info → omlish-0.0.0.dev87.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=bmf1Xnu5T4--9ykGD63NIvhEZE9Fhk9w3IlmwLH40vU,3345
+omlish/__about__.py,sha256=Q99g7Qxo_-Dt6G8U5KsZ2FKuyTgYrxju6TU7S9xtiok,3345
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -396,8 +396,10 @@ omlish/specs/openapi/__init__.py,sha256=zilQhafjvteRDF_TUIRgF293dBC6g-TJChmUb6T9
 omlish/specs/openapi/marshal.py,sha256=ob_qUbT9-de86KhPjFccl_NP0liQcXK7Ao-b5Hn0VQA,2133
 omlish/specs/openapi/openapi.py,sha256=y4h04jeB7ORJSVrcy7apaBdpwLjIyscv1Ub5SderH2c,12682
 omlish/sql/__init__.py,sha256=TpZLsEJKJzvJ0eMzuV8hwOJJbkxBCV1RZPUMLAVB6io,173
-omlish/sql/_abc.py,sha256=HLhnnLZ7l0r_N99I-RCqJe6VHth-9iluU7cR-7-5jfs,1519
+omlish/sql/_abc.py,sha256=kiOitW_ZhTXrJanJ582wD7o9K69v6HXqDPkxuHEAxrc,1606
+omlish/sql/dbapi.py,sha256=j7iTExICb5as82j3OaxQ4ZBqmz0mrpaPCYot2k9JxCc,3127
 omlish/sql/dbs.py,sha256=lpdFmm2vTwLoBiVYGj9yPsVcTEYYNCxlYZZpjfChzkY,1870
+omlish/sql/params.py,sha256=Z4VPet6GhNqD1T_MXSWSHkdy3cpUEhST-OplC4B_fYI,4433
 omlish/sql/qualifiedname.py,sha256=rlW3gVmyucJbqwcxj_7BfK4X2HoXrMroZT2H45zPgJQ,2264
 omlish/sql/alchemy/__init__.py,sha256=1ruDMiviH5fjevn2xVki-QspcE9O3VPy4hxOqpHjI2s,224
 omlish/sql/alchemy/asyncs.py,sha256=C1bIzz9m2Qbgl4qYGQt_FRQg4BKRcxUqMsVg9RtnTPg,3689
@@ -412,12 +414,12 @@ omlish/sql/queries/building.py,sha256=dIQyEqNef2egKAf5qO_aZvXxlAEfxIGWS23qvJ-ozq
 omlish/sql/queries/exprs.py,sha256=kAI5PmvfJ-TqEzzc9H4_womFShT1eA0jWSZH2j2Wg-c,1802
 omlish/sql/queries/idents.py,sha256=erW6fE9UapuvW1ZeLfGFz7yuW6zzktWIWmOuAHeF8_g,496
 omlish/sql/queries/inserts.py,sha256=PS3oqGjDgnjUd4sxHVpfKDQnsjG4_6KTseRzWyiJQl0,1229
-omlish/sql/queries/marshal.py,sha256=Q-N6RcBzpj3FIa2-7eX6dniLjXKzUhRC9g--61UQUbM,2890
+omlish/sql/queries/marshal.py,sha256=uLN_gOqiYHBQioZEvg7OREycY0bzKwzBw5mnbg_0cio,2938
 omlish/sql/queries/multi.py,sha256=7x6x-4jnPzxA6ZasBjnjFuhHFpWt5rGCua3UvuTMIJ0,837
 omlish/sql/queries/names.py,sha256=YiIyS6ehYMYrdLlUxMawV_Xf2zdi7RwVO9Qsxr_W4_4,772
 omlish/sql/queries/ops.py,sha256=B7IDfjr2DW5LJhWoNaY1WW90BJhe5ZtmxIELhWXbW-0,129
 omlish/sql/queries/relations.py,sha256=-d3n-dN17c3TPMZmzSplhWawllUzdq12XPDAuzoeMEQ,838
-omlish/sql/queries/rendering.py,sha256=vpZY6rAjX5MZl72Tk6_tle3CUPi6U28sN4PcQ7aZ1iI,5055
+omlish/sql/queries/rendering.py,sha256=QegTkbSGlGKen4U4XB2lqjpkt1WGaZUmXmVR2gm8UiU,5944
 omlish/sql/queries/selects.py,sha256=EcHlyKl5kGSY1d3GVxnImhGCTB6WvwQnlSA9eZanBqU,1364
 omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,441
 omlish/sql/queries/unary.py,sha256=MEYBDZn_H0bexmUrJeONOv5-gIpYowUaXOsEHeQM4ks,1144
@@ -454,9 +456,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev86.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev86.dist-info/METADATA,sha256=w6dXN4XU0iMfkJxV1fEHQ96o_V5idhf7cy3GApDwdAc,3987
-omlish-0.0.0.dev86.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev86.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev86.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev86.dist-info/RECORD,,
+omlish-0.0.0.dev87.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev87.dist-info/METADATA,sha256=qGRlUmzNWBRYtFD05J2YIWoeH_zcIAR6kKj3hBa6x9s,3987
+omlish-0.0.0.dev87.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omlish-0.0.0.dev87.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev87.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev87.dist-info/RECORD,,