omlish 0.0.0.dev200__py3-none-any.whl → 0.0.0.dev201__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev200'
-__revision__ = '2c496f686e6c5d735b06d5836f93f26d8f63cf4e'
+__version__ = '0.0.0.dev201'
+__revision__ = '77be9dbd97d16b54293dbf9f3803e3fa882ecc5f'
 
 
 #

omlish/sql/queries/building.py

@@ -17,13 +17,13 @@ class StdBuilder(
     SelectBuilder,
     StmtBuilder,
 
+    RelationBuilder,
+
     MultiBuilder,
     BinaryBuilder,
     UnaryBuilder,
     ExprBuilder,
 
-    RelationBuilder,
-
     ParamBuilder,
 
     NameBuilder,

omlish/sql/queries/inserts.py

@@ -30,7 +30,7 @@ class Insert(Stmt, lang.Final):
 CanValues: ta.TypeAlias = Values | ta.Sequence[CanExpr]
 
 
-class InsertBuilder(ExprBuilder, RelationBuilder):
+class InsertBuilder(RelationBuilder, ExprBuilder):
     def values(self, vs: CanValues) -> Values:
         if isinstance(vs, Values):
             return vs

omlish/sql/queries/marshal.py

@@ -17,6 +17,7 @@ from .binary import BinaryOps
 from .exprs import Expr
 from .inserts import Values
 from .multi import MultiKind
+from .relations import JoinKind
 from .relations import Relation
 from .selects import Select
 from .stmts import Stmt
@@ -66,8 +67,12 @@ def _install_standard_marshalling() -> None:
         msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)})]
         msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({ty: OpMarshalerUnmarshaler(ty, ns)})]
 
-    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({MultiKind: LowerEnumMarshaler(MultiKind)})]
-    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({MultiKind: LowerEnumMarshaler(MultiKind)})]  # noqa
+    ets = [
+        JoinKind,
+        MultiKind,
+    ]
+    msh.STANDARD_MARSHALER_FACTORIES[0:0] = [msh.TypeMapMarshalerFactory({t: LowerEnumMarshaler(t) for t in ets})]
+    msh.STANDARD_UNMARSHALER_FACTORIES[0:0] = [msh.TypeMapUnmarshalerFactory({t: LowerEnumMarshaler(t) for t in ets})]
 
     for cls in [
         Expr,

omlish/sql/queries/relations.py

@@ -3,15 +3,18 @@ TODO:
  - join
  - subquery
 """
+import enum
 import typing as ta
 
 from ... import dataclasses as dc
 from ... import lang
 from .base import Node
+from .exprs import CanExpr
+from .exprs import Expr
 from .idents import Ident
+from .multi import MultiBuilder
 from .names import CanName
 from .names import Name
-from .names import NameBuilder
 
 
 ##
@@ -21,22 +24,100 @@ class Relation(Node, lang.Abstract):
     pass
 
 
+#
+
+
 class Table(Relation, lang.Final):
     n: Name
     a: Ident | None = dc.xfield(None, repr_fn=dc.opt_repr)
 
 
+#
+
+
+class JoinKind(enum.Enum):
+    DEFAULT = enum.auto()
+    INNER = enum.auto()
+    LEFT = enum.auto()
+    LEFT_OUTER = enum.auto()
+    RIGHT = enum.auto()
+    RIGHT_OUTER = enum.auto()
+    FULL = enum.auto()
+    FULL_OUTER = enum.auto()
+    CROSS = enum.auto()
+    NATURAL = enum.auto()
+
+
+class Join(Relation, lang.Final):
+    k: JoinKind
+    l: Relation
+    r: Relation
+
+    c: Expr | None = None
+
+
+##
+
+
 CanTable: ta.TypeAlias = Table | CanName
 CanRelation: ta.TypeAlias = Relation | CanTable
 
 
-class RelationBuilder(NameBuilder):
+class RelationBuilder(MultiBuilder):
     def table(self, n: CanTable) -> Table:
         if isinstance(n, Table):
             return n
         else:
             return Table(self.name(n))
 
+    #
+
+    def join(
+            self,
+            k: JoinKind,
+            l: CanRelation,
+            r: CanRelation,
+            *cs: CanExpr,
+    ) -> Join:
+        return Join(
+            k,
+            self.relation(l),
+            self.relation(r),
+            self.or_(*cs) if cs else None,
+        )
+
+    def default_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.DEFAULT, l, r, *cs)
+
+    def inner_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.INNER, l, r, *cs)
+
+    def left_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.LEFT, l, r, *cs)
+
+    def left_outer_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.LEFT_OUTER, l, r, *cs)
+
+    def right_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.RIGHT, l, r, *cs)
+
+    def right_outer_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.RIGHT_OUTER, l, r, *cs)
+
+    def full_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.FULL, l, r, *cs)
+
+    def full_outer_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.FULL_OUTER, l, r, *cs)
+
+    def cross_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.CROSS, l, r, *cs)
+
+    def natural_join(self, l: CanRelation, r: CanRelation, *cs: CanExpr) -> Join:
+        return self.join(JoinKind.NATURAL, l, r, *cs)
+
+    #
+
     def relation(self, o: CanRelation) -> Relation:
         if isinstance(o, Relation):
             return o

omlish/sql/queries/rendering.py

@@ -36,6 +36,8 @@ from .multi import Multi
 from .multi import MultiKind
 from .names import Name
 from .params import Param
+from .relations import Join
+from .relations import JoinKind
 from .relations import Table
 from .selects import Select
 from .selects import SelectItem
@@ -156,7 +158,6 @@ class StdRenderer(Renderer):
     MULTI_KIND_TO_STR: ta.ClassVar[ta.Mapping[MultiKind, str]] = {
         MultiKind.AND: 'and',
         MultiKind.OR: 'or',
-
     }
 
     @Renderer.render.register
@@ -187,6 +188,30 @@ class StdRenderer(Renderer):
             self._out.write(' as ')
             self.render(o.a)
 
+    JOIN_KIND_TO_STR: ta.ClassVar[ta.Mapping[JoinKind, str]] = {
+        JoinKind.DEFAULT: 'join',
+        JoinKind.INNER: 'inner join',
+        JoinKind.LEFT: 'left join',
+        JoinKind.LEFT_OUTER: 'left outer join',
+        JoinKind.RIGHT: 'right join',
+        JoinKind.RIGHT_OUTER: 'right outer join',
+        JoinKind.FULL: 'full join',
+        JoinKind.FULL_OUTER: 'full outer join',
+        JoinKind.CROSS: 'cross join',
+        JoinKind.NATURAL: 'natural join',
+    }
+
+    @Renderer.render.register
+    def render_join(self, o: Join) -> None:
+        self.render(o.l)
+        self._out.write(' ')
+        self._out.write(self.JOIN_KIND_TO_STR[o.k])
+        self._out.write(' ')
+        self.render(o.r)
+        if o.c is not None:
+            self._out.write(' on ')
+            self.render(o.c)
+
     # selects
 
     @Renderer.render.register

omlish/sql/queries/selects.py

@@ -30,7 +30,7 @@ class Select(Stmt, lang.Final):
 CanSelectItem: ta.TypeAlias = SelectItem | CanExpr
 
 
-class SelectBuilder(ExprBuilder, RelationBuilder):
+class SelectBuilder(RelationBuilder, ExprBuilder):
     def select_item(self, o: CanSelectItem) -> SelectItem:
         if isinstance(o, SelectItem):
             return o

{omlish-0.0.0.dev200.dist-info → omlish-0.0.0.dev201.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev200
+Version: 0.0.0.dev201
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev200.dist-info → omlish-0.0.0.dev201.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=dyIpveH7Z8OnQp2pTn6NVv7LCDXVrozJWAzbk8PBavg,7950
-omlish/__about__.py,sha256=AJX5iNOlWrDlDBEKE35thbObkh7MHjKwPM855AMs7ls,3409
+omlish/__about__.py,sha256=nozjeM6WZjCDpl0YL18Qfh8ve_0Ihl-hf7OLBlfHY70,3409
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -545,18 +545,18 @@ omlish/sql/alchemy/sqlean.py,sha256=RbkuOuFIfM4fowwKk8-sQ6Dxk-tTUwxS94nY5Kxt52s,
 omlish/sql/queries/__init__.py,sha256=8wdq6PBf5YzqQWFu-CE8om6BN38sDAD9UEz9VzkojzM,1337
 omlish/sql/queries/base.py,sha256=_8O3MbH_OEjBnhp2oIJUZ3ClaQ8l4Sj9BdPdsP0Ie-g,224
 omlish/sql/queries/binary.py,sha256=dcEzeEn104AMPuQ7QrJU2O-YCN3SUdxB5S4jaWKOUqY,2253
-omlish/sql/queries/building.py,sha256=lmHItVEi0IkIDEhYL1le8adNhjah0SHhffm59CZtpH4,643
+omlish/sql/queries/building.py,sha256=J2ZDfDyLzRm8q5-TLAN6I_qjhs-7RpfW23yuCYYLf5k,643
 omlish/sql/queries/exprs.py,sha256=THeSyFF8bouDvU-Keej-hyFUwbp63bw0HpAF4lCYuiQ,1187
 omlish/sql/queries/idents.py,sha256=w2RxO6SR3K-u30S259OtnAZaPv7YA70PzY9R7RtuCQ8,891
-omlish/sql/queries/inserts.py,sha256=Uo0ewnLPEt43dnX5AJWOC9ioViou7xYes7sGT9lD_0k,1281
-omlish/sql/queries/marshal.py,sha256=uLN_gOqiYHBQioZEvg7OREycY0bzKwzBw5mnbg_0cio,2938
+omlish/sql/queries/inserts.py,sha256=H0Dv_6l--T7WXuoJQbLFd23PnjXA-3RETegjYnPr9lc,1281
+omlish/sql/queries/marshal.py,sha256=T94501RbQn8UsUiRJkklvehtxJTYm2XTp03urMl1fas,3011
 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/params.py,sha256=iR8tnetkZFWY378iUbPe08d86g-Wf1J3YqfZr_KhIwQ,1175
-omlish/sql/queries/relations.py,sha256=-d3n-dN17c3TPMZmzSplhWawllUzdq12XPDAuzoeMEQ,838
-omlish/sql/queries/rendering.py,sha256=NOJqwxK8yt3Morq5yhgI-zU_51MSyhDvSc8S-8tURVM,5946
-omlish/sql/queries/selects.py,sha256=8dqm4KyrJvOsW3KHSO7qLEfPlZa7sJDp8puuGxrfvoA,1369
+omlish/sql/queries/relations.py,sha256=7YrEC9IjoVpRGLAFKRSRsHHnTmx-g7hBNXsOgP2HOuI,2998
+omlish/sql/queries/rendering.py,sha256=8naCMwxVEFAJaMP5m2bf6kCyhvwFZhXiWYEma51fQ4k,6813
+omlish/sql/queries/selects.py,sha256=RFySZ9sb-nE29QrLLbQ7JYZW_V_ifaFTcl-RQTgQncY,1369
 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
@@ -609,9 +609,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev200.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev200.dist-info/METADATA,sha256=ZStmAEKO4tvTAtBeGJDad2z_76jk0FY_eVEe6fcobNw,4264
-omlish-0.0.0.dev200.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev200.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev200.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev200.dist-info/RECORD,,
+omlish-0.0.0.dev201.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev201.dist-info/METADATA,sha256=_xm1Dh4zcl8xwhcC7IQ83_lZs18KGg7gufxEsCbfPHA,4264
+omlish-0.0.0.dev201.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev201.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev201.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev201.dist-info/RECORD,,