omlish 0.0.0.dev297__py3-none-any.whl → 0.0.0.dev299__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev297'
-__revision__ = '60d7844496d6c1b510da1f34cb05a64b5f8c1f6d'
+__version__ = '0.0.0.dev299'
+__revision__ = '73b5419aa5d43e554a35a615d906559440e76d1b'
 
 
 #

omlish/argparse/cli.py

@@ -9,6 +9,7 @@ TODO:
  - auto match all underscores to hyphens
  - pre-run, post-run hooks
  - exitstack?
+ - suggestion - difflib.get_close_matches
 """
 import argparse
 import dataclasses as dc

omlish/lang/functions.py

@@ -211,6 +211,9 @@ class Args:
         self.args = args
         self.kwargs = kwargs
 
+    def __bool__(self) -> bool:
+        return bool(self.args) or bool(self.kwargs)
+
     def update(self, *args: ta.Any, **kwargs: ta.Any) -> 'Args':
         return Args(
             *self.args,

omlish/secrets/all.py

@@ -23,4 +23,5 @@ ref = SecretRef
 
 from ..lang.imports import _register_conditional_import  # noqa
 
+# FIXME: only happens when 'all' is imported lol
 _register_conditional_import('..marshal', '.marshal', __package__)

omlish/sql/__init__.py

@@ -5,9 +5,9 @@ from .. import lang as _lang
 
 
 if _ta.TYPE_CHECKING:
-    from . import api
+    from . import api  # noqa
 else:
-    api = _lang.proxy_import('.api', __package__)
+    globals()['api'] = _lang.proxy_import('.api', __package__)
 
 from .dbs import (  # noqa
     DbLoc,
@@ -24,6 +24,6 @@ from .qualifiedname import (  # noqa
 )
 
 if _ta.TYPE_CHECKING:
-    from . import queries
+    from . import queries  # noqa
 else:
-    queries = _lang.proxy_import('.queries', __package__)
+    globals()['queries'] = _lang.proxy_import('.queries', __package__)

omlish/sql/alchemy/apiadapter.py

@@ -25,10 +25,15 @@ class SqlalchemyApiWrapper(api.ContextCloser, ta.Generic[T]):
         self._u = u
         self._auto_close = auto_close
 
-    def close(self) -> None:
+    @property
+    @ta.override
+    def _is_resourceless(self) -> bool:
+        return not self._auto_close
+
+    def _close(self) -> None:
         if self._auto_close and hasattr(self._u, 'close'):
             self._u.close()
-        super().close()
+        super()._close()
 
 
 ##

omlish/sql/api/__init__.py

@@ -1,7 +1,10 @@
-from .base import (  # noqa
-    Closer,
-    ContextCloser,
+from .asquery import (  # noqa
+    AsQueryParams,
+    as_query,
+    as_query_,
+)
 
+from .base import (  # noqa
     Querier,
     Rows,
     Conn,
@@ -33,6 +36,7 @@ from .errors import (  # noqa
 
 from .funcs import (  # noqa
     query,
+    query_all,
     exec,  # noqa
 )
 
@@ -41,6 +45,25 @@ from .queries import (  # noqa
     Query,
 )
 
+from .resources import (  # noqa
+    get_resource_debug,
+    set_resource_debug,
+
+    UnclosedResourceWarning,
+    Closer,
+
+    ResourceNotEnteredError,
+    ContextCloser,
+)
+
 from .rows import (  # noqa
     Row,
 )
+
+
+##
+
+
+from ...lang.imports import _register_conditional_import  # noqa
+
+_register_conditional_import('..queries', '._queries', __package__)

omlish/sql/api/_queries.py

@@ -0,0 +1,32 @@
+"""
+TODO:
+ - dialect lol
+ - args lol
+"""
+from ..queries import Stmt
+from ..queries.rendering import render
+from .asquery import AsQueryParams
+from .asquery import as_query_
+from .queries import Query
+from .queries import QueryMode
+
+
+##
+
+
+@as_query_.register
+def _(
+        stmt: Stmt,
+        *,
+        params: AsQueryParams,
+) -> Query:
+    rq = render(stmt)
+
+    if rq.args:
+        raise NotImplementedError
+
+    return Query(
+        mode=QueryMode.of(params.mode, QueryMode.QUERY),
+        text=rq.s,
+        args=[],
+    )

omlish/sql/api/asquery.py

@@ -0,0 +1,67 @@
+import dataclasses as dc
+import functools
+import typing as ta
+
+from ... import check
+from .base import Querier
+from .queries import Query
+from .queries import QueryMode
+
+
+##
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class AsQueryParams:
+    mode: QueryMode | str | None = None
+    querier: Querier | None = None
+
+
+def as_query(
+        obj: ta.Any,
+        *args: ta.Any,
+        mode: QueryMode | str | None = None,
+        querier: Querier | None = None,
+) -> Query:
+    return as_query_(
+        obj,
+        *args,
+        params=AsQueryParams(
+            mode=mode,
+            querier=querier,
+        ),
+    )
+
+
+@functools.singledispatch
+def as_query_(
+        obj: ta.Any,
+        *args: ta.Any,
+        params: AsQueryParams,
+) -> Query:
+    raise TypeError(obj)
+
+
+@as_query_.register
+def _(
+        q: Query,
+        *,
+        params: AsQueryParams,
+) -> Query:
+    if params.mode is not None:
+        check.arg(q.mode is QueryMode.of(params.mode))
+
+    return q
+
+
+@as_query_.register
+def _(
+        s: str,
+        *args: ta.Any,
+        params: AsQueryParams,
+) -> Query:
+    return Query(
+        mode=QueryMode.of(params.mode, QueryMode.QUERY),
+        text=s,
+        args=args,
+    )

omlish/sql/api/base.py

@@ -9,29 +9,13 @@ from ... import lang
 from .columns import Column
 from .columns import Columns
 from .queries import Query
+from .resources import ContextCloser
 from .rows import Row
 
 
 ##
 
 
-class Closer(lang.Abstract):
-    def close(self) -> None:
-        pass
-
-
-class ContextCloser(Closer):
-    def __enter__(self) -> ta.Self:
-        return self
-
-    @ta.final
-    def __exit__(self, exc_type, exc_val, exc_tb):
-        self.close()
-
-
-##
-
-
 class Querier(ContextCloser, lang.Abstract):
     @property
     @abc.abstractmethod

omlish/sql/api/dbapi.py

@@ -41,11 +41,16 @@ class DbapiRows(Rows):
         self._cursor = cursor
         self._columns = columns
 
+    def _close(self) -> None:
+        self._cursor.close()
+        super()._close()
+
     @property
     def columns(self) -> Columns:
         return self._columns
 
     def __next__(self) -> Row:
+        self._check_entered()
         values = self._cursor.fetchone()
         if values is None:
             raise StopIteration
@@ -58,11 +63,16 @@ class DbapiConn(Conn):
 
         self._conn = conn
 
+    def _close(self) -> None:
+        self._conn.close()
+        super()._close()
+
     @property
     def adapter(self) -> Adapter:
         raise NotImplementedError
 
     def query(self, query: Query) -> Rows:
+        self._check_entered()
         cursor = self._conn.cursor()
         try:
             cursor.execute(query.text)
@@ -73,9 +83,6 @@ class DbapiConn(Conn):
             cursor.close()
             raise
 
-    def close(self) -> None:
-        self._conn.close()
-
 
 class DbapiDb(Db):
     def __init__(
@@ -92,6 +99,7 @@ class DbapiDb(Db):
         self._adapter = adapter
 
     def connect(self) -> Conn:
+        self._check_entered()
         dbapi_conn = self._conn_fac()
         return DbapiConn(dbapi_conn)
 

omlish/sql/api/funcs.py

@@ -1,73 +1,56 @@
 import typing as ta
 
+from .asquery import as_query
 from .base import Querier
 from .base import Rows
-from .queries import Query
 from .queries import QueryMode
+from .rows import Row
 
 
 ##
 
 
-@ta.overload
 def query(
         querier: Querier,
-        query: Query,  # noqa
-) -> Rows:
-    ...
-
-
-@ta.overload
-def query(
-        querier: Querier,
-        text: str,
+        obj: ta.Any,
         *args: ta.Any,
 ) -> Rows:
-    ...
-
-
-def query(
-        querier,
+    q = as_query(
         obj,
         *args,
-):
-    if isinstance(obj, Query):
-        q = obj
-    else:
-        q = Query.of(obj, *args, mode=QueryMode.QUERY)
+        mode=QueryMode.QUERY,
+        querier=querier,
+    )
 
     return querier.query(q)
 
 
-##
+#
 
 
-@ta.overload
-def exec(  # noqa
+def query_all(
         querier: Querier,
-        query: Query,  # noqa
-) -> None:
-    ...
+        obj: ta.Any,
+        *args: ta.Any,
+) -> list[Row]:
+    with query(querier, obj, *args) as rows:
+        return list(rows)
+
+
+##
 
 
-@ta.overload
 def exec(  # noqa
         querier: Querier,
-        text: str,
+        obj: ta.Any,
         *args: ta.Any,
 ) -> None:
-    ...
-
-
-def exec(  # noqa
-    querier,
-    obj,
-    *args,
-):
-    if isinstance(obj, Query):
-        q = obj
-    else:
-        q = Query.of(obj, *args, mode=QueryMode.EXEC)
+    q = as_query(
+        obj,
+        *args,
+        mode=QueryMode.EXEC,
+        querier=querier,
+    )
 
     with querier.query(q):
         pass

omlish/sql/api/queries.py

@@ -13,51 +13,24 @@ class QueryMode(enum.Enum):
     QUERY = enum.auto()
     EXEC = enum.auto()
 
+    @classmethod
+    def of(
+            cls,
+            o: ta.Union[str, 'QueryMode', None],
+            default: ta.Optional['QueryMode'] = None,
+    ) -> 'QueryMode':
+        if o is None:
+            return check.not_none(check.isinstance(default, cls))
+        elif isinstance(o, str):
+            return cls[o.upper()]  # noqa
+        elif isinstance(o, cls):
+            return o
+        else:
+            raise TypeError(o)
+
 
 @dc.dataclass(frozen=True)
 class Query(lang.Final):
     mode: QueryMode
     text: str
     args: ta.Sequence[ta.Any]
-
-    #
-
-    @classmethod
-    @ta.overload
-    def of(
-            cls,
-            query: 'Query',
-    ) -> 'Query':
-        ...
-
-    @classmethod
-    @ta.overload
-    def of(
-            cls,
-            text: str,
-            *args: ta.Any,
-            mode: str | QueryMode = QueryMode.QUERY,
-    ) -> 'Query':
-        ...
-
-    @classmethod  # type: ignore[misc]
-    def of(cls, obj, *args, **kwargs):
-        if isinstance(obj, Query):
-            check.arg(not args)
-            check.arg(not kwargs)
-            return obj
-
-        elif isinstance(obj, str):
-            mode = kwargs.pop('mode', QueryMode.QUERY)
-            if isinstance(mode, str):
-                mode = QueryMode[mode.upper()]
-            check.arg(not kwargs)
-
-            return cls(
-                mode=mode,
-                text=obj,
-                args=args,
-            )
-
-        else:
-            raise TypeError(obj)

omlish/sql/api/resources.py

@@ -0,0 +1,106 @@
+import traceback
+import typing as ta
+import warnings
+
+from ... import lang
+
+
+##
+
+
+DEBUG = __debug__
+
+
+def get_resource_debug() -> bool:
+    return DEBUG
+
+
+def set_resource_debug(debug: bool) -> None:
+    global DEBUG
+    DEBUG = debug
+
+
+##
+
+
+class UnclosedResourceWarning(Warning):
+    pass
+
+
+class Closer(lang.Abstract):
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.__closed = False
+
+        self.__debug = DEBUG
+        if self.__debug:
+            self.__repr = repr(self)
+            self.__traceback = traceback.format_stack()[:-1]
+
+    @property
+    def _is_resourceless(self) -> bool:
+        return False
+
+    @ta.final
+    def close(self) -> None:
+        self.__closed = True
+        self._close()
+
+    def _close(self) -> None:
+        pass
+
+    def __del__(self) -> None:
+        if (
+                not self._is_resourceless and
+                self.__debug and
+                not self.__closed
+        ):
+            warnings.warn(
+                f'\n\n{(sep := ("=" * 40))}\n'
+                f'{self.__class__.__name__} object {self.__repr} '
+                f'was not properly closed before deletion. Please ensure that `close()` is called before the object is '
+                f'deleted.'
+                f'\n\n'
+                f'{"".join(self.__traceback).rstrip()}'
+                f'\n{sep}\n',
+                UnclosedResourceWarning,
+            )
+
+
+##
+
+
+class ResourceNotEnteredError(Exception):
+    pass
+
+
+class ContextCloser(Closer):
+    def __init__(self, *args: ta.Any, **kwargs: ta.Any) -> None:
+        super().__init__(*args, **kwargs)
+
+        self.__entered = False
+
+    @ta.final
+    def __enter__(self) -> ta.Self:
+        self.__entered = True
+        self._enter()
+        return self
+
+    def _enter(self) -> None:
+        pass
+
+    def _is_entered(self) -> bool:
+        return self.__entered
+
+    def _check_entered(self) -> None:
+        if not self.__entered:
+            try:
+                raise ResourceNotEnteredError(self)  # noqa
+            except Exception:
+                self.close()
+                raise
+
+    @ta.final
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()

omlish/sql/api/rows.py

@@ -33,7 +33,7 @@ class Row(lang.Final, ta.Generic[T]):
     def __contains__(self, item: str | int) -> bool:
         raise TypeError('Row.__contains__ is ambiguous - use .columns.__contains__ or .values.__contains__')
 
-    def __getitem__(self, item) -> T:
+    def __getitem__(self, item: str | int) -> T:
         if isinstance(item, str):
             return self.values[self.columns.index(item)]
         elif isinstance(item, int):
@@ -46,3 +46,6 @@ class Row(lang.Final, ta.Generic[T]):
             return self.values[idx]
         else:
             return None
+
+    def to_dict(self) -> dict[str, ta.Any]:
+        return {c.name: v for c, v in self}

omlish/sql/queries/__init__.py

@@ -107,3 +107,11 @@ Q = StdBuilder()
 from ...lang.imports import _register_conditional_import  # noqa
 
 _register_conditional_import('...marshal', '.marshal', __package__)
+
+
+##
+
+
+from ...lang.imports import _trigger_conditional_imports  # noqa
+
+_trigger_conditional_imports(__package__)

omlish/sql/queries/marshal.py

@@ -26,6 +26,9 @@ from .unary import UnaryOp
 from .unary import UnaryOps
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class OpMarshalerUnmarshaler(msh.Marshaler, msh.Unmarshaler):
     ty: type

omlish/sql/queries/ops.py

@@ -1,6 +1,9 @@
 import enum
 
 
+##
+
+
 class OpKind(enum.Enum):
     CMP = enum.auto()
     ARITH = enum.auto()

omlish/sql/queries/rendering.py

@@ -48,6 +48,9 @@ from .unary import UnaryOp
 from .unary import UnaryOps
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class RenderedQueryParts(lang.Final):
     p: tp.Part

omlish/sql/queries/std.py

@@ -12,6 +12,9 @@ from .stmts import StmtBuilder
 from .unary import UnaryBuilder
 
 
+##
+
+
 class StdBuilder(
     InsertBuilder,
     SelectBuilder,

{omlish-0.0.0.dev297.dist-info → omlish-0.0.0.dev299.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev297
+Version: 0.0.0.dev299
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev297.dist-info → omlish-0.0.0.dev299.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=njktGXItvJUlAo47q_VkLF-Re3G-ca4oRUL7K6mtQtM,3478
+omlish/__about__.py,sha256=tghPJ3r3hoOBraig8kr81p5Jv_kgJPAvrhVaVK8Li7o,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -87,7 +87,7 @@ omlish/antlr/_runtime/xpath/XPathLexer.py,sha256=WvGKQjQnu7pX5C4CFKtsCzba2B2W6ie
 omlish/antlr/_runtime/xpath/__init__.py,sha256=lMd_BbXYdlDhZQN_q0TKN978XW5G0pq618F0NaLkpFE,71
 omlish/argparse/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse/all.py,sha256=NeeMM5MIebY7XDAHaCxUzeesEoUYwsf5i9PrBUcO1cI,1057
-omlish/argparse/cli.py,sha256=vVLlhJPt0PKaNfIBrXTzz9cHyy2dFEY8hlQ3GvtKbwc,8704
+omlish/argparse/cli.py,sha256=KftfiN0fBOdybCWoTW4l967r8OrXe_WtjOQWARcHTv0,8746
 omlish/asyncs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/asyncs/all.py,sha256=MjW0P9K8XBrw6AaH2X_qD5Y7hEZOF0cktqFv5BDGH-k,649
 omlish/asyncs/bridge.py,sha256=oFCqwGY9u9JYB-tee7GS0gjtIFp19rdZD2Z0YPRjj9k,9738
@@ -473,7 +473,7 @@ omlish/lang/contextmanagers.py,sha256=pN8X4ZCagqU9_xWumi8gZPdMIWlInA-_zQrkl7o5VP
 omlish/lang/datetimes.py,sha256=mrTtA67JYpfQwSlzdPcBtvm6dAyYM_dXNnlxFwFQH0M,228
 omlish/lang/descriptors.py,sha256=zBtgO9LjdSTGHNUgiIqswh78WOVoGH6KzS0NbgB1Wls,6572
 omlish/lang/enums.py,sha256=F9tflHfaAoV2MpyuhZzpfX9-H55M3zNa9hCszsngEo8,111
-omlish/lang/functions.py,sha256=bg2IxTFmd_J22qF3XWIRBvSIpLwPRiH_KxGXcm0QVrc,5944
+omlish/lang/functions.py,sha256=51CoKtH_-CXUsKvtCexaR3OLZOtIwSdv4f4DtGBZdpA,6029
 omlish/lang/generators.py,sha256=5tbjVAywiZH6oAdj1sJLRMtIkC9y3rAkecLT7Z3m7_g,5251
 omlish/lang/imports.py,sha256=aC1u2eTrxHhhxShKbJvXswe3aJ7K76vT4YK8LrsvRWU,10476
 omlish/lang/iterables.py,sha256=HOjcxOwyI5bBApDLsxRAGGhTTmw7fdZl2kEckxRVl-0,1994
@@ -626,7 +626,7 @@ omlish/reflect/ops.py,sha256=RJ6jzrM4ieFsXzWyNXWV43O_WgzEaUvlHSc5N2ezW2A,2044
 omlish/reflect/subst.py,sha256=g3q7NmNWsmc67mcchmCE3WFPCMDSBq-FXn4ah-DWL_U,3622
 omlish/reflect/types.py,sha256=Cn9FYGoiCNt0FS0YLiTTAR12WKcesWMapCrVYcb8IDo,9225
 omlish/secrets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/secrets/all.py,sha256=kUTuS4pZVskJe1kFN6m1F1br09BNSjX7MUC2RZRndwc,437
+omlish/secrets/all.py,sha256=gv_d9SfyMxso30HsrSz9XmIrSZOdl3rLA5MSH0ZXfgM,486
 omlish/secrets/crypto.py,sha256=9D21lnvPhStwu8arD4ssT0ih0bDG-nlqIRdVgYL40xA,3708
 omlish/secrets/marshal.py,sha256=u90n1OfRfdpH1T2F0xK_pAPH1ENYL6acFt6XdVd3KvI,1986
 omlish/secrets/openssl.py,sha256=UT_dXJ4zA1s9e-UHoW_NLGHQO7iouUNPnJNkkpuw3JI,6213
@@ -720,27 +720,30 @@ omlish/specs/proto/_antlr/Protobuf3Listener.py,sha256=hjzAJjcj4xWRim-68v-6QwIsPV
 omlish/specs/proto/_antlr/Protobuf3Parser.py,sha256=VmkUyJx3WxIgAecOa1BGwbO9fVNysZt5-arQ-wDubpk,132411
 omlish/specs/proto/_antlr/Protobuf3Visitor.py,sha256=zEVBXly2k9Cqmgdb45QwpLR-fZCEq8hpp2WQj-s7Wps,8782
 omlish/specs/proto/_antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/sql/__init__.py,sha256=AFcSRUcz9sYMqlOsv8oZWai3Oi1PLygJbZ2YSzWUvhc,459
+omlish/sql/__init__.py,sha256=DXK3EjPKXKS0WUV-bIVtzH0GsmOqCYrNLFkvDJGCORM,501
 omlish/sql/abc.py,sha256=3hrCjB4jnPVMef_YXClCblzYUZ9l9yaxJJdd5_Nu9GM,4043
 omlish/sql/dbapi.py,sha256=DfMxCyltpMj6hUiLti1omUvJyMGbrkGxcz2ywolOpPA,2979
 omlish/sql/dbs.py,sha256=65e388987upJpsFX8bNL7uhiYv2sCsmk9Y04V0MXdsI,1873
 omlish/sql/params.py,sha256=Z4VPet6GhNqD1T_MXSWSHkdy3cpUEhST-OplC4B_fYI,4433
 omlish/sql/qualifiedname.py,sha256=c3GQzxh9sNyE_TP32PnlCun_F2bKXvX1ohtt6esTsjo,2269
 omlish/sql/alchemy/__init__.py,sha256=mZiu0F4Y_5qQpl-xz4xnb0feVGZTDp3I4R6k7SVY_7M,760
-omlish/sql/alchemy/apiadapter.py,sha256=DnyCDl2mWbiZPwQ6RAxxFgfMCoVJqQ3Nzut-INhz9x8,2586
+omlish/sql/alchemy/apiadapter.py,sha256=QrkvlzqMl_S2nxOPQ8-g1UaWRSTZNna1-8XouOn8xdY,2696
 omlish/sql/alchemy/asyncs.py,sha256=MwZwWIaZsUCQLcTA8mdHUPZmR-pXEVSAsvd15FCm3W4,3692
 omlish/sql/alchemy/duckdb.py,sha256=kr7pIhiBLNAuZrcigHDtFg9zHkVcrRW3LfryO9VJ4mk,3749
 omlish/sql/alchemy/exprs.py,sha256=gO4Fj4xEY-PuDgV-N8hBMy55glZz7O-4H7v1LWabfZY,323
 omlish/sql/alchemy/secrets.py,sha256=WEeaec1ejQcE3Yaa7p5BSP9AMGEzy1lwr7QMSRL0VBw,180
 omlish/sql/alchemy/sqlean.py,sha256=RbkuOuFIfM4fowwKk8-sQ6Dxk-tTUwxS94nY5Kxt52s,403
-omlish/sql/api/__init__.py,sha256=QmNO4EpT0_xiemhA5u55GHoH17j0k7ezyO_lEyjs34M,570
-omlish/sql/api/base.py,sha256=-AePkKy4uxYuob2J4GEwsSvtbFyvNIunNyE3u7p1Uas,1529
+omlish/sql/api/__init__.py,sha256=Ee-DgQPo_fUqlYL3NBzk6kmj_cXlnZIua5jk85UHWHI,951
+omlish/sql/api/_queries.py,sha256=FqIrtU6JdzQD4S4zv9tdDuzCLHSgJjK8WSfT7Ag4umI,530
+omlish/sql/api/asquery.py,sha256=8eBoJyyu0kHW3k3yytEcT-B6UAI_slKB0QtSK_WQS7g,1203
+omlish/sql/api/base.py,sha256=E_t54OFr0BX604vOfQZGxh_n6EdOBF2Tvnrg25dMKXo,1314
 omlish/sql/api/columns.py,sha256=UBol4bfwZ1nhcjv2gE1JhUMzRFeqtiCDo2T9CUGYb64,1943
-omlish/sql/api/dbapi.py,sha256=H3bFoWI-ox81APX3xBbjylNWyMUXh78ICMQjRrlDNxw,2426
+omlish/sql/api/dbapi.py,sha256=bDVqmljmLMdurMhIy3vx-dJvK1KiZ7XBhZ2Zx6W9aBs,2627
 omlish/sql/api/errors.py,sha256=YtC2gz5DqRTT3uCJniUOufVH1GEnFIc5ElkYLK3BHwM,230
-omlish/sql/api/funcs.py,sha256=-H6V-o9JPSHFXsxdHtutB4mP2LwJfCzlLbRrPHunmB4,990
-omlish/sql/api/queries.py,sha256=IgB8_sDe40-mKE-ByTmZ4GVOCdLLJDzJGJCevMd8R5s,1207
-omlish/sql/api/rows.py,sha256=MEK9LNYEe8vLEJXQJD63MpnSOiE22cawJL-dUWQD6sU,1246
+omlish/sql/api/funcs.py,sha256=kOMMzODkJHyKVmGKFS-6GIgil5I6ha1qjqA3IecgCvI,819
+omlish/sql/api/queries.py,sha256=OVsVqNyXXJQVDPfV3GFE2gwnHyGEenS65rTQRTNGx1Y,735
+omlish/sql/api/resources.py,sha256=DTVQmKjhaLi27jHWYkF20VhwGvIazZWxyKzF0Wn9-dc,2228
+omlish/sql/api/rows.py,sha256=Jo3AA_6Wt7tlwLO6-rp0arzYFqZXSxPudGPkW2xCYgQ,1346
 omlish/sql/parsing/Minisql.g4,sha256=Jw8xT-8UI6ySHAgStyCg5QX9NTCinvTenLJReWiZIJU,4578
 omlish/sql/parsing/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/sql/parsing/parsing.py,sha256=SIbrAkWCgx_ekBOzBGc0eC_HfW--ciAtU_-Vqmyy6vw,3347
@@ -749,21 +752,21 @@ omlish/sql/parsing/_antlr/MinisqlListener.py,sha256=2py_bfDQeEtJaJh9rtpKghbSrQlE
 omlish/sql/parsing/_antlr/MinisqlParser.py,sha256=y9SFjXdQlWYJa2PbPm30d5SfcYM_8M8ts46IHhENbNc,132457
 omlish/sql/parsing/_antlr/MinisqlVisitor.py,sha256=NCPorucLLOZ-Q99BtNbDOAfHytQl8wyroR8pI1uVovg,10030
 omlish/sql/parsing/_antlr/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/sql/queries/__init__.py,sha256=2Wb05RFCKYZR3wO5YM60txNgjiDLJMYXC4gKAIUSsmc,1415
+omlish/sql/queries/__init__.py,sha256=LpBnJOGoT5Dw2C043yo1XXIg0C_eHda-u6DR2ZAKT7c,1530
 omlish/sql/queries/base.py,sha256=pQ6p8dSsHwsWa-lmK2h8RY2UJ1mwJRhByOgrCIW3dBs,3229
 omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,2253
 omlish/sql/queries/exprs.py,sha256=dG9L218QtJM1HtDYIMWqHimK03N6AL1WONk3FvVRcXY,1480
 omlish/sql/queries/idents.py,sha256=w2RxO6SR3K-u30S259OtnAZaPv7YA70PzY9R7RtuCQ8,891
 omlish/sql/queries/inserts.py,sha256=pSQXDSR1oDUmxjeIYuSbxpAZXvYQ-EJF6a62ON5Un-k,1299
-omlish/sql/queries/marshal.py,sha256=TA-wFmLqiK6fhIYwew-9oKa_dfFaIXwNMIE05WVwDd0,3011
+omlish/sql/queries/marshal.py,sha256=yVfN5VgYMYDaYTE6FZ8Sea7GrRobn40Hc8kogrfKmjE,3016
 omlish/sql/queries/multi.py,sha256=7x6x-4jnPzxA6ZasBjnjFuhHFpWt5rGCua3UvuTMIJ0,837
 omlish/sql/queries/names.py,sha256=4sDvgRobMEt_6mDeuYVbCqHzLCOwpXUdEyyB4-QjxKo,1996
-omlish/sql/queries/ops.py,sha256=B7IDfjr2DW5LJhWoNaY1WW90BJhe5ZtmxIELhWXbW-0,129
+omlish/sql/queries/ops.py,sha256=pDZ_2Jo_Fa8DDbtYkc6-9eehkWsZPI-jh-KFlubcY6Y,134
 omlish/sql/queries/params.py,sha256=FXgZO6F_fmRQb9CVo4PkRoypm_fSB_AB_JoM3PxRkKM,1206
 omlish/sql/queries/relations.py,sha256=7YrEC9IjoVpRGLAFKRSRsHHnTmx-g7hBNXsOgP2HOuI,2998
-omlish/sql/queries/rendering.py,sha256=XaNpZY0itHBxT-rWeUtGb0Rg1T4dKaUdCdFC2I-LRq4,7657
+omlish/sql/queries/rendering.py,sha256=iEQGVP1nOhaZy9FYNwKkOUgqFH0pxfvsCsJpHX8E9Vw,7662
 omlish/sql/queries/selects.py,sha256=5CD4qmlv5hysQKmoZuF1bbikA-VcC9opN94Ea1QE3mU,1577
-omlish/sql/queries/std.py,sha256=J2ZDfDyLzRm8q5-TLAN6I_qjhs-7RpfW23yuCYYLf5k,643
+omlish/sql/queries/std.py,sha256=7kF76kq_b6Qaki-lYiBlZiZmtpWYqRqAcLU8x-bBZn0,648
 omlish/sql/queries/stmts.py,sha256=pBqwD7dRlqMu6uh6vR3xaWOEgbZCcFWbOQ9ryYd17T4,441
 omlish/sql/queries/unary.py,sha256=MEYBDZn_H0bexmUrJeONOv5-gIpYowUaXOsEHeQM4ks,1144
 omlish/sql/tabledefs/__init__.py,sha256=TvtQsp-jJu6_ZahyCOFAaElSSBcRftNyJpdiDPGYCDk,190
@@ -840,9 +843,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev297.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev297.dist-info/METADATA,sha256=bH7FMyIVFXinvhjrOVckLE2J0ToLGMIdaH-8HXxM3jU,4416
-omlish-0.0.0.dev297.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-omlish-0.0.0.dev297.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev297.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev297.dist-info/RECORD,,
+omlish-0.0.0.dev299.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev299.dist-info/METADATA,sha256=T9HA9WB2SuPxxk-DiWerqiu1KkDizRIPRBitUe0csao,4416
+omlish-0.0.0.dev299.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+omlish-0.0.0.dev299.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev299.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev299.dist-info/RECORD,,