@vinctus/oql 1.1.7 → 1.1.9

package/main.js

@@ -2330,25 +2330,25 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$ResultNode)) {
     var x$1 = $as_Lcom_vinctus_oql_AbstractOQL$ResultNode(node);
     var this$2 = $n(x$1);
-    var x417 = this$2.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_query;
+    var x420 = this$2.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_query;
     var this$3 = $n(x$1);
-    var x418 = this$3.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_element;
+    var x421 = this$3.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_element;
     var this$4 = $n(builder);
-    $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$4).toOption__s_Option()).get__O())).table__T__s_Option__V($n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table, $m_s_None$());
-    var this$5 = $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_select);
+    $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$4).toOption__s_Option()).get__O())).table__T__s_Option__V($n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table, $m_s_None$());
+    var this$5 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_select);
     if ((!this$5.isEmpty__Z())) {
       var arg1 = this$5.get__O();
       var _$20 = $as_Lcom_vinctus_oql_OQLExpression(arg1);
       var this$6 = $n(builder);
-      $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$6).toOption__s_Option()).get__O())).select__Lcom_vinctus_oql_OQLExpression__T__V(_$20, $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
+      $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$6).toOption__s_Option()).get__O())).select__Lcom_vinctus_oql_OQLExpression__T__V(_$20, $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
     };
     if ($n(fixed).Lcom_vinctus_oql_Fixed__f_operative) {
-      $n($n($as_sc_IterableOps($n($n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).fixing__sci_Map()).apply__O__O($n(fixed).Lcom_vinctus_oql_Fixed__f_entity))).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1$1) => {
+      $n($n($as_sc_IterableOps($n($n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).fixing__sci_Map()).apply__O__O($n(fixed).Lcom_vinctus_oql_Fixed__f_entity))).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1$1) => {
         var x$1$2 = $as_T2(x$1$1);
         return ((x$1$2 !== null) && ($as_Lcom_vinctus_oql_AttributeOQLExpression($n(x$1$2).T2__f__1), $as_sci_List($n(x$1$2).T2__f__2), true))
       })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
         var x$1$3 = $as_T2(x$1$2$1);
-        matchResult26: {
+        matchResult27: {
           if ((x$1$3 !== null)) {
             var attr$1 = $as_Lcom_vinctus_oql_AttributeOQLExpression($n(x$1$3).T2__f__1);
             var nullables$1 = $as_sci_List($n(x$1$3).T2__f__2);
@@ -2373,85 +2373,100 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
               };
               var $$x1 = h
             };
-            var this$12 = $n($$x1);
-            var v = $n(fixed).Lcom_vinctus_oql_Fixed__f_at;
-            var this$9 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n($n(fixed).Lcom_vinctus_oql_Fixed__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
-            var t$1 = $as_Lcom_vinctus_oql_Datatype(this$9);
-            var right = new $c_Lcom_vinctus_oql_TypedOQLExpression(v, t$1);
+            var this$14 = $n($$x1);
+            matchResult26: {
+              var $$x2;
+              var x302 = $n(fixed).Lcom_vinctus_oql_Fixed__f_at;
+              if ($isInt(x302)) {
+                var n$2 = $uI(x302);
+                var $$x2 = new $c_Lcom_vinctus_oql_IntegerOQLExpression(n$2);
+                break matchResult26
+              };
+              if (((typeof x302) === "string")) {
+                var s = $as_T(x302);
+                var $$x2 = new $c_Lcom_vinctus_oql_StringOQLExpression(s);
+                break matchResult26
+              };
+              $m_s_sys_package$().error__T__E((("no type match for creating TypedOQLExpression for fixed.at: '" + x302) + "'"))
+            };
+            var expr = $as_Lcom_vinctus_oql_OQLExpression($$x2);
+            var this$11 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n($n(fixed).Lcom_vinctus_oql_Fixed__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
+            var t$1 = $as_Lcom_vinctus_oql_Datatype(this$11);
+            var right = new $c_Lcom_vinctus_oql_TypedOQLExpression(expr, t$1);
             var elem = new $c_Lcom_vinctus_oql_InfixOQLExpression(attr$1, "=", right);
-            var cond = this.orList__sci_List__Lcom_vinctus_oql_OQLExpression($as_sci_List($f_sc_StrictOptimizedSeqOps__appended__O__O(this$12, elem)));
-            var this$13 = $n(builder);
-            $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$13).toOption__s_Option()).get__O())).select__Lcom_vinctus_oql_OQLExpression__T__V(cond, $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table);
-            break matchResult26
+            var cond = this.orList__sci_List__Lcom_vinctus_oql_OQLExpression($as_sci_List($f_sc_StrictOptimizedSeqOps__appended__O__O(this$14, elem)));
+            var this$15 = $n(builder);
+            $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$15).toOption__s_Option()).get__O())).select__Lcom_vinctus_oql_OQLExpression__T__V(cond, $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table);
+            break matchResult27
           };
           throw new $c_s_MatchError(x$1$3)
         }
       })))
     };
-    var this$14 = $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_group);
-    if ((!this$14.isEmpty__Z())) {
-      var arg1$3 = this$14.get__O();
-      var _$21 = $as_sci_List(arg1$3);
-      var this$15 = $n(builder);
-      $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$15).toOption__s_Option()).get__O())).group__sci_List__T__V(_$21, $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
-    };
-    var this$16 = $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_order);
+    var this$16 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_group);
     if ((!this$16.isEmpty__Z())) {
-      var arg1$4 = this$16.get__O();
-      var _$22 = $as_sci_List(arg1$4);
+      var arg1$3 = this$16.get__O();
+      var _$21 = $as_sci_List(arg1$3);
       var this$17 = $n(builder);
-      $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$17).toOption__s_Option()).get__O())).order__sci_List__T__V(_$22, $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
+      $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$17).toOption__s_Option()).get__O())).group__sci_List__T__V(_$21, $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
     };
-    var this$19 = $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_limit);
-    var this$18 = $n(builder);
-    var \u03b41$ = $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$18).toOption__s_Option()).get__O());
-    if ((!this$19.isEmpty__Z())) {
-      var arg1$5 = this$19.get__O();
-      var n$2 = $uI(arg1$5);
-      $n(\u03b41$).limit__I__V(n$2)
+    var this$18 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_order);
+    if ((!this$18.isEmpty__Z())) {
+      var arg1$4 = this$18.get__O();
+      var _$22 = $as_sci_List(arg1$4);
+      var this$19 = $n(builder);
+      $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$19).toOption__s_Option()).get__O())).order__sci_List__T__V(_$22, $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
     };
-    var this$21 = $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_offset);
+    var this$21 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_limit);
     var this$20 = $n(builder);
-    var \u03b42$ = $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$20).toOption__s_Option()).get__O());
+    var \u03b41$ = $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$20).toOption__s_Option()).get__O());
     if ((!this$21.isEmpty__Z())) {
-      var arg1$6 = this$21.get__O();
-      var n$3 = $uI(arg1$6);
-      $n(\u03b42$).offset__I__V(n$3)
+      var arg1$5 = this$21.get__O();
+      var n$3 = $uI(arg1$5);
+      $n(\u03b41$).limit__I__V(n$3)
     };
-    this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x418, $n($n(x417).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table, builder, oql, ds, fixed, model);
+    var this$23 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_offset);
     var this$22 = $n(builder);
-    return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$22).toOption__s_Option()).get__O())
+    var \u03b42$ = $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$22).toOption__s_Option()).get__O());
+    if ((!this$23.isEmpty__Z())) {
+      var arg1$6 = this$23.get__O();
+      var n$4 = $uI(arg1$6);
+      $n(\u03b42$).offset__I__V(n$4)
+    };
+    this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x421, $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table, builder, oql, ds, fixed, model);
+    var this$24 = $n(builder);
+    return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$24).toOption__s_Option()).get__O())
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$ValueNode)) {
-    var x412 = $as_Lcom_vinctus_oql_AbstractOQL$ValueNode(node);
-    var this$24 = $n(x412);
-    var x414 = this$24.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_value;
-    matchResult27: {
+    var x415 = $as_Lcom_vinctus_oql_AbstractOQL$ValueNode(node);
+    var this$26 = $n(x415);
+    var x417 = this$26.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_value;
+    matchResult28: {
       var \u03b43$___1;
       var \u03b43$___2;
-      var this$25 = $n(builder);
-      var x305 = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$25).toOption__s_Option()).get__O())).projectValue__Lcom_vinctus_oql_OQLExpression__T__T2(x414, table);
-      if ((x305 !== null)) {
-        var idx = $uI($n(x305).T2__f__1);
-        var typed = $uZ($n(x305).T2__f__2);
+      var this$27 = $n(builder);
+      var x308 = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$27).toOption__s_Option()).get__O())).projectValue__Lcom_vinctus_oql_OQLExpression__T__T2(x417, table);
+      if ((x308 !== null)) {
+        var idx = $uI($n(x308).T2__f__1);
+        var typed = $uZ($n(x308).T2__f__2);
         var \u03b43$___1 = idx;
         var \u03b43$___2 = typed;
-        break matchResult27
+        break matchResult28
       };
-      throw new $c_s_MatchError(x305)
+      throw new $c_s_MatchError(x308)
     };
     var idx$2 = $uI(\u03b43$___1);
     var typed$2 = $uZ(\u03b43$___2);
-    $n(x412).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx = idx$2;
-    $n(x412).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed = typed$2;
-    var this$27 = $n(builder);
-    return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$27).toOption__s_Option()).get__O())
+    $n(x415).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx = idx$2;
+    $n(x415).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed = typed$2;
+    var this$29 = $n(builder);
+    return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$29).toOption__s_Option()).get__O())
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$ObjectNode)) {
     var x$1$4 = $as_Lcom_vinctus_oql_AbstractOQL$ObjectNode(node);
-    var this$29 = $n(x$1$4);
-    var x411 = this$29.Lcom_vinctus_oql_AbstractOQL$ObjectNode__f_props;
-    $n(x411).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
+    var this$31 = $n(x$1$4);
+    var x414 = this$31.Lcom_vinctus_oql_AbstractOQL$ObjectNode__f_props;
+    $n(x414).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
       var x$1$5 = $as_T2(x$1$3$1);
       if ((x$1$5 !== null)) {
         var e = $as_Lcom_vinctus_oql_AbstractOQL$Node($n(x$1$5).T2__f__2);
@@ -2459,298 +2474,298 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
       };
       throw new $c_s_MatchError(x$1$5)
     })));
-    var this$30 = $n(builder);
-    return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$30).toOption__s_Option()).get__O())
+    var this$32 = $n(builder);
+    return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$32).toOption__s_Option()).get__O())
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode)) {
-    var x386 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode(node);
-    var this$32 = $n(x386);
-    var x388 = this$32.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_query;
-    var this$33 = $n(x386);
-    var x389 = this$33.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_element;
-    if ((x388 !== null)) {
-      var this$35 = $n(x388);
-      var this$36 = $n(x388);
-      var x392 = this$36.Lcom_vinctus_oql_OQLQuery__f_entity;
-      var this$37 = $n(x388);
-      var x393 = this$37.Lcom_vinctus_oql_OQLQuery__f_attr;
-      var this$38 = $n(x388);
-      var this$39 = $n(x388);
-      var this$40 = $n(x388);
-      var this$41 = $n(x388);
-      var this$42 = $n(x388);
-      var this$43 = $n(x388);
-      if ((x393 !== null)) {
-        var this$45 = $n(x393);
-        var x401 = this$45.Lcom_vinctus_oql_Attribute__f_name;
-        var this$46 = $n(x393);
-        var x402 = this$46.Lcom_vinctus_oql_Attribute__f_column;
-        var this$47 = $n(x393);
-        var this$48 = $n(x393);
-        var this$49 = $n(x393);
-        var x405 = this$49.Lcom_vinctus_oql_Attribute__f_typ;
-        if ((x405 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-          var x$1$6 = $as_Lcom_vinctus_oql_ManyToOneType(x405);
-          var this$51 = $n(x$1$6);
-          var x408 = this$51.Lcom_vinctus_oql_ManyToOneType__f_entity;
-          var alias = ((table + "$") + x401);
-          if ($n(x393).Lcom_vinctus_oql_Attribute__f_required) {
-            $n(x386).Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx = $m_s_None$()
+    var x389 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode(node);
+    var this$34 = $n(x389);
+    var x391 = this$34.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_query;
+    var this$35 = $n(x389);
+    var x392 = this$35.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_element;
+    if ((x391 !== null)) {
+      var this$37 = $n(x391);
+      var this$38 = $n(x391);
+      var x395 = this$38.Lcom_vinctus_oql_OQLQuery__f_entity;
+      var this$39 = $n(x391);
+      var x396 = this$39.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$40 = $n(x391);
+      var this$41 = $n(x391);
+      var this$42 = $n(x391);
+      var this$43 = $n(x391);
+      var this$44 = $n(x391);
+      var this$45 = $n(x391);
+      if ((x396 !== null)) {
+        var this$47 = $n(x396);
+        var x404 = this$47.Lcom_vinctus_oql_Attribute__f_name;
+        var this$48 = $n(x396);
+        var x405 = this$48.Lcom_vinctus_oql_Attribute__f_column;
+        var this$49 = $n(x396);
+        var this$50 = $n(x396);
+        var this$51 = $n(x396);
+        var x408 = this$51.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x408 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+          var x$1$6 = $as_Lcom_vinctus_oql_ManyToOneType(x408);
+          var this$53 = $n(x$1$6);
+          var x411 = this$53.Lcom_vinctus_oql_ManyToOneType__f_entity;
+          var alias = ((table + "$") + x404);
+          if ($n(x396).Lcom_vinctus_oql_Attribute__f_required) {
+            $n(x389).Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx = $m_s_None$()
           } else {
             $n($m_s_package$().s_package$__f_List);
-            var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_Ident.getArrayOf().constr)([new $c_Lcom_vinctus_oql_Ident(x401, null)]));
+            var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_Ident.getArrayOf().constr)([new $c_Lcom_vinctus_oql_Ident(x404, null)]));
             var ids = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems);
             $n($m_s_package$().s_package$__f_List);
-            var elems$1 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(x392, x393)]));
+            var elems$1 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(x395, x396)]));
             var dmrefs = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$1);
             var mtoAttr = new $c_Lcom_vinctus_oql_AttributeOQLExpression(ids, dmrefs);
-            var this$57 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n(x408).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
-            mtoAttr.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype(this$57);
-            var $$x2 = $n(x386);
-            var this$58 = $n(builder);
-            var value = $n($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$58).toOption__s_Option()).get__O())).projectValue__Lcom_vinctus_oql_OQLExpression__T__T2(mtoAttr, table)).T2__f__1;
-            $$x2.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx = new $c_s_Some(value)
+            var this$59 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n(x411).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
+            mtoAttr.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype(this$59);
+            var $$x3 = $n(x389);
+            var this$60 = $n(builder);
+            var value = $n($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$60).toOption__s_Option()).get__O())).projectValue__Lcom_vinctus_oql_OQLExpression__T__T2(mtoAttr, table)).T2__f__1;
+            $$x3.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx = new $c_s_Some(value)
           };
-          var this$60 = $n(builder);
-          $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$60).toOption__s_Option()).get__O())).leftJoin__T__T__T__T__T__Lcom_vinctus_oql_SQLQueryBuilder(table, x402, $n(x392).Lcom_vinctus_oql_Entity__f_table, alias, $n($as_Lcom_vinctus_oql_Attribute($n($n(x392).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column);
-          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x389, alias, builder, oql, ds, fixed, model);
-          var this$61 = $n(builder);
-          return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$61).toOption__s_Option()).get__O())
+          var this$62 = $n(builder);
+          $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$62).toOption__s_Option()).get__O())).leftJoin__T__T__T__T__T__Lcom_vinctus_oql_SQLQueryBuilder(table, x405, $n(x395).Lcom_vinctus_oql_Entity__f_table, alias, $n($as_Lcom_vinctus_oql_Attribute($n($n(x395).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column);
+          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x392, alias, builder, oql, ds, fixed, model);
+          var this$63 = $n(builder);
+          return $as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$63).toOption__s_Option()).get__O())
         }
       }
     }
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode)) {
-    var x360 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(node);
-    var this$63 = $n(x360);
-    var x362 = this$63.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_query;
-    var this$64 = $n(x360);
-    var x363 = this$64.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_element;
-    if ((x362 !== null)) {
-      var this$66 = $n(x362);
-      var this$67 = $n(x362);
-      var x366 = this$67.Lcom_vinctus_oql_OQLQuery__f_entity;
-      var this$68 = $n(x362);
-      var x367 = this$68.Lcom_vinctus_oql_OQLQuery__f_attr;
-      var this$69 = $n(x362);
-      var this$70 = $n(x362);
-      var x369 = this$70.Lcom_vinctus_oql_OQLQuery__f_select;
-      var this$71 = $n(x362);
-      var x370 = this$71.Lcom_vinctus_oql_OQLQuery__f_group;
-      var this$72 = $n(x362);
-      var x371 = this$72.Lcom_vinctus_oql_OQLQuery__f_order;
-      var this$73 = $n(x362);
-      var x372 = this$73.Lcom_vinctus_oql_OQLQuery__f_limit;
-      var this$74 = $n(x362);
-      var x373 = this$74.Lcom_vinctus_oql_OQLQuery__f_offset;
-      if ((x367 !== null)) {
-        var this$76 = $n(x367);
-        var x375 = this$76.Lcom_vinctus_oql_Attribute__f_name;
-        var this$77 = $n(x367);
-        var this$78 = $n(x367);
-        var this$79 = $n(x367);
-        var this$80 = $n(x367);
-        var x379 = this$80.Lcom_vinctus_oql_Attribute__f_typ;
-        if ((x379 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
-          var x$1$7 = $as_Lcom_vinctus_oql_ManyToManyType(x379);
-          var this$82 = $n(x$1$7);
-          var x382 = this$82.Lcom_vinctus_oql_ManyToManyType__f_entity;
-          var this$83 = $n(x$1$7);
-          var x383 = this$83.Lcom_vinctus_oql_ManyToManyType__f_link;
+    var x363 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(node);
+    var this$65 = $n(x363);
+    var x365 = this$65.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_query;
+    var this$66 = $n(x363);
+    var x366 = this$66.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_element;
+    if ((x365 !== null)) {
+      var this$68 = $n(x365);
+      var this$69 = $n(x365);
+      var x369 = this$69.Lcom_vinctus_oql_OQLQuery__f_entity;
+      var this$70 = $n(x365);
+      var x370 = this$70.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$71 = $n(x365);
+      var this$72 = $n(x365);
+      var x372 = this$72.Lcom_vinctus_oql_OQLQuery__f_select;
+      var this$73 = $n(x365);
+      var x373 = this$73.Lcom_vinctus_oql_OQLQuery__f_group;
+      var this$74 = $n(x365);
+      var x374 = this$74.Lcom_vinctus_oql_OQLQuery__f_order;
+      var this$75 = $n(x365);
+      var x375 = this$75.Lcom_vinctus_oql_OQLQuery__f_limit;
+      var this$76 = $n(x365);
+      var x376 = this$76.Lcom_vinctus_oql_OQLQuery__f_offset;
+      if ((x370 !== null)) {
+        var this$78 = $n(x370);
+        var x378 = this$78.Lcom_vinctus_oql_Attribute__f_name;
+        var this$79 = $n(x370);
+        var this$80 = $n(x370);
+        var this$81 = $n(x370);
+        var this$82 = $n(x370);
+        var x382 = this$82.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x382 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
+          var x$1$7 = $as_Lcom_vinctus_oql_ManyToManyType(x382);
           var this$84 = $n(x$1$7);
-          var x384 = this$84.Lcom_vinctus_oql_ManyToManyType__f_self;
+          var x385 = this$84.Lcom_vinctus_oql_ManyToManyType__f_entity;
           var this$85 = $n(x$1$7);
-          var x385 = this$85.Lcom_vinctus_oql_ManyToManyType__f_target;
-          var alias$2 = ((table + "$") + x375);
+          var x386 = this$85.Lcom_vinctus_oql_ManyToManyType__f_link;
+          var this$86 = $n(x$1$7);
+          var x387 = this$86.Lcom_vinctus_oql_ManyToManyType__f_self;
+          var this$87 = $n(x$1$7);
+          var x388 = this$87.Lcom_vinctus_oql_ManyToManyType__f_target;
+          var alias$2 = ((table + "$") + x378);
           if ($n(builder).isLeft__Z()) {
-            var this$86 = $n(builder);
-            var subquery = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, (($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$86).toOption__s_Option()).get__O())).Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0), false)
+            var this$88 = $n(builder);
+            var subquery = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, (($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$88).toOption__s_Option()).get__O())).Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0), false)
           } else {
             var subquery = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, $uI($n($n(builder).toOption__s_Option()).get__O()), true)
           };
-          var joinAlias = ((alias$2 + "$") + $n(x385).Lcom_vinctus_oql_Attribute__f_name);
+          var joinAlias = ((alias$2 + "$") + $n(x388).Lcom_vinctus_oql_Attribute__f_name);
           if ($n(builder).isLeft__Z()) {
-            var $$x3 = $n(x360);
-            var this$87 = $n(builder);
-            $$x3.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_idx = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$87).toOption__s_Option()).get__O())).projectQuery__Lcom_vinctus_oql_SQLQueryBuilder__I(subquery)
+            var $$x4 = $n(x363);
+            var this$89 = $n(builder);
+            $$x4.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_idx = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$89).toOption__s_Option()).get__O())).projectQuery__Lcom_vinctus_oql_SQLQueryBuilder__I(subquery)
           };
-          $n(subquery).table__T__s_Option__V($n(x383).Lcom_vinctus_oql_Entity__f_table, new $c_s_Some(alias$2));
-          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x363, joinAlias, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery)), oql, ds, fixed, model);
-          var $$x4 = $n(subquery);
-          var s = (((((((("\"" + alias$2) + "\".\"") + $n(x384).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n(x366).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\"");
-          $n($$x4).select__Lcom_vinctus_oql_OQLExpression__T__V(new $c_Lcom_vinctus_oql_RawOQLExpression(s), null);
-          var this$91 = $n(x369);
-          if ((!this$91.isEmpty__Z())) {
-            var arg1$7 = this$91.get__O();
+          $n(subquery).table__T__s_Option__V($n(x386).Lcom_vinctus_oql_Entity__f_table, new $c_s_Some(alias$2));
+          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x366, joinAlias, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery)), oql, ds, fixed, model);
+          var $$x5 = $n(subquery);
+          var s$1 = (((((((("\"" + alias$2) + "\".\"") + $n(x387).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n(x369).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\"");
+          $n($$x5).select__Lcom_vinctus_oql_OQLExpression__T__V(new $c_Lcom_vinctus_oql_RawOQLExpression(s$1), null);
+          var this$93 = $n(x372);
+          if ((!this$93.isEmpty__Z())) {
+            var arg1$7 = this$93.get__O();
             var _$23 = $as_Lcom_vinctus_oql_OQLExpression(arg1$7);
             $n(subquery).select__Lcom_vinctus_oql_OQLExpression__T__V(_$23, joinAlias)
           };
-          var this$92 = $n(x370);
-          if ((!this$92.isEmpty__Z())) {
-            var arg1$8 = this$92.get__O();
+          var this$94 = $n(x373);
+          if ((!this$94.isEmpty__Z())) {
+            var arg1$8 = this$94.get__O();
             var _$24 = $as_sci_List(arg1$8);
             $n(subquery).group__sci_List__T__V(_$24, joinAlias)
           };
-          var this$93 = $n(x371);
-          if ((!this$93.isEmpty__Z())) {
-            var arg1$9 = this$93.get__O();
+          var this$95 = $n(x374);
+          if ((!this$95.isEmpty__Z())) {
+            var arg1$9 = this$95.get__O();
             var _$25 = $as_sci_List(arg1$9);
             $n(subquery).order__sci_List__T__V(_$25, joinAlias)
           };
-          var this$94 = $n(x372);
-          if ((!this$94.isEmpty__Z())) {
-            var arg1$10 = this$94.get__O();
-            var n$4 = $uI(arg1$10);
-            $n(subquery).limit__I__V(n$4)
+          var this$96 = $n(x375);
+          if ((!this$96.isEmpty__Z())) {
+            var arg1$10 = this$96.get__O();
+            var n$5 = $uI(arg1$10);
+            $n(subquery).limit__I__V(n$5)
           };
-          var this$95 = $n(x373);
-          if ((!this$95.isEmpty__Z())) {
-            var arg1$11 = this$95.get__O();
-            var n$5 = $uI(arg1$11);
-            $n(subquery).offset__I__V(n$5)
+          var this$97 = $n(x376);
+          if ((!this$97.isEmpty__Z())) {
+            var arg1$11 = this$97.get__O();
+            var n$6 = $uI(arg1$11);
+            $n(subquery).offset__I__V(n$6)
           };
-          $n(subquery).innerJoin__T__T__T__T__T__Lcom_vinctus_oql_SQLQueryBuilder(alias$2, $n(x385).Lcom_vinctus_oql_Attribute__f_column, $n(x382).Lcom_vinctus_oql_Entity__f_table, joinAlias, $n($as_Lcom_vinctus_oql_Attribute($n($n(x382).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column);
+          $n(subquery).innerJoin__T__T__T__T__T__Lcom_vinctus_oql_SQLQueryBuilder(alias$2, $n(x388).Lcom_vinctus_oql_Attribute__f_column, $n(x385).Lcom_vinctus_oql_Entity__f_table, joinAlias, $n($as_Lcom_vinctus_oql_Attribute($n($n(x385).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column);
           return subquery
         }
       }
     }
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToOneNode)) {
-    var x336 = $as_Lcom_vinctus_oql_AbstractOQL$OneToOneNode(node);
-    var this$97 = $n(x336);
-    var x338 = this$97.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_query;
-    var this$98 = $n(x336);
-    var x339 = this$98.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_element;
-    if ((x338 !== null)) {
-      var this$100 = $n(x338);
-      var this$101 = $n(x338);
-      var x342 = this$101.Lcom_vinctus_oql_OQLQuery__f_entity;
-      var this$102 = $n(x338);
-      var x343 = this$102.Lcom_vinctus_oql_OQLQuery__f_attr;
-      var this$103 = $n(x338);
-      var this$104 = $n(x338);
-      var this$105 = $n(x338);
-      var this$106 = $n(x338);
-      var this$107 = $n(x338);
-      var this$108 = $n(x338);
-      if ((x343 !== null)) {
-        var this$110 = $n(x343);
-        var x351 = this$110.Lcom_vinctus_oql_Attribute__f_name;
-        var this$111 = $n(x343);
-        var this$112 = $n(x343);
-        var this$113 = $n(x343);
-        var this$114 = $n(x343);
-        var x355 = this$114.Lcom_vinctus_oql_Attribute__f_typ;
-        if ((x355 instanceof $c_Lcom_vinctus_oql_OneToOneType)) {
-          var x$1$8 = $as_Lcom_vinctus_oql_OneToOneType(x355);
-          var this$116 = $n(x$1$8);
-          var x358 = this$116.Lcom_vinctus_oql_OneToOneType__f_entity;
-          var this$117 = $n(x$1$8);
-          var x359 = this$117.Lcom_vinctus_oql_OneToOneType__f_attribute;
-          var alias$3 = ((table + "$") + x351);
+    var x339 = $as_Lcom_vinctus_oql_AbstractOQL$OneToOneNode(node);
+    var this$99 = $n(x339);
+    var x341 = this$99.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_query;
+    var this$100 = $n(x339);
+    var x342 = this$100.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_element;
+    if ((x341 !== null)) {
+      var this$102 = $n(x341);
+      var this$103 = $n(x341);
+      var x345 = this$103.Lcom_vinctus_oql_OQLQuery__f_entity;
+      var this$104 = $n(x341);
+      var x346 = this$104.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$105 = $n(x341);
+      var this$106 = $n(x341);
+      var this$107 = $n(x341);
+      var this$108 = $n(x341);
+      var this$109 = $n(x341);
+      var this$110 = $n(x341);
+      if ((x346 !== null)) {
+        var this$112 = $n(x346);
+        var x354 = this$112.Lcom_vinctus_oql_Attribute__f_name;
+        var this$113 = $n(x346);
+        var this$114 = $n(x346);
+        var this$115 = $n(x346);
+        var this$116 = $n(x346);
+        var x358 = this$116.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x358 instanceof $c_Lcom_vinctus_oql_OneToOneType)) {
+          var x$1$8 = $as_Lcom_vinctus_oql_OneToOneType(x358);
+          var this$118 = $n(x$1$8);
+          var x361 = this$118.Lcom_vinctus_oql_OneToOneType__f_entity;
+          var this$119 = $n(x$1$8);
+          var x362 = this$119.Lcom_vinctus_oql_OneToOneType__f_attribute;
+          var alias$3 = ((table + "$") + x354);
           if ($n(builder).isLeft__Z()) {
-            var this$118 = $n(builder);
-            var subquery$7 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, (($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$118).toOption__s_Option()).get__O())).Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0), false)
+            var this$120 = $n(builder);
+            var subquery$7 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, (($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$120).toOption__s_Option()).get__O())).Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0), false)
           } else {
             var subquery$7 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, $uI($n($n(builder).toOption__s_Option()).get__O()), true)
           };
           if ($n(builder).isLeft__Z()) {
-            var $$x5 = $n(x336);
-            var this$119 = $n(builder);
-            $$x5.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_idx = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$119).toOption__s_Option()).get__O())).projectQuery__Lcom_vinctus_oql_SQLQueryBuilder__I(subquery$7)
+            var $$x6 = $n(x339);
+            var this$121 = $n(builder);
+            $$x6.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_idx = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$121).toOption__s_Option()).get__O())).projectQuery__Lcom_vinctus_oql_SQLQueryBuilder__I(subquery$7)
           };
-          $n(subquery$7).table__T__s_Option__V($n(x358).Lcom_vinctus_oql_Entity__f_table, new $c_s_Some(alias$3));
-          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x339, alias$3, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery$7)), oql, ds, fixed, model);
-          var $$x6 = $n(subquery$7);
-          var s$1 = (((((((("\"" + alias$3) + "\".\"") + $n(x359).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n(x342).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\"");
-          $n($$x6).select__Lcom_vinctus_oql_OQLExpression__T__V(new $c_Lcom_vinctus_oql_RawOQLExpression(s$1), null);
+          $n(subquery$7).table__T__s_Option__V($n(x361).Lcom_vinctus_oql_Entity__f_table, new $c_s_Some(alias$3));
+          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x342, alias$3, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery$7)), oql, ds, fixed, model);
+          var $$x7 = $n(subquery$7);
+          var s$2 = (((((((("\"" + alias$3) + "\".\"") + $n(x362).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n(x345).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\"");
+          $n($$x7).select__Lcom_vinctus_oql_OQLExpression__T__V(new $c_Lcom_vinctus_oql_RawOQLExpression(s$2), null);
           return subquery$7
         }
       }
     }
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToManyNode)) {
-    var x312 = $as_Lcom_vinctus_oql_AbstractOQL$OneToManyNode(node);
-    var this$124 = $n(x312);
-    var x314 = this$124.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_query;
-    var this$125 = $n(x312);
-    var x315 = this$125.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_element;
-    if ((x314 !== null)) {
-      var this$127 = $n(x314);
-      var this$128 = $n(x314);
-      var this$129 = $n(x314);
-      var x319 = this$129.Lcom_vinctus_oql_OQLQuery__f_attr;
-      var this$130 = $n(x314);
-      var this$131 = $n(x314);
-      var x321 = this$131.Lcom_vinctus_oql_OQLQuery__f_select;
-      var this$132 = $n(x314);
-      var x322 = this$132.Lcom_vinctus_oql_OQLQuery__f_group;
-      var this$133 = $n(x314);
-      var x323 = this$133.Lcom_vinctus_oql_OQLQuery__f_order;
-      var this$134 = $n(x314);
-      var x324 = this$134.Lcom_vinctus_oql_OQLQuery__f_limit;
-      var this$135 = $n(x314);
-      var x325 = this$135.Lcom_vinctus_oql_OQLQuery__f_offset;
-      if ((x319 !== null)) {
-        var this$137 = $n(x319);
-        var x327 = this$137.Lcom_vinctus_oql_Attribute__f_name;
-        var this$138 = $n(x319);
-        var this$139 = $n(x319);
-        var this$140 = $n(x319);
-        var this$141 = $n(x319);
-        var x331 = this$141.Lcom_vinctus_oql_Attribute__f_typ;
-        if ((x331 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
-          var x$1$9 = $as_Lcom_vinctus_oql_OneToManyType(x331);
-          var this$143 = $n(x$1$9);
-          var x334 = this$143.Lcom_vinctus_oql_OneToManyType__f_entity;
-          var this$144 = $n(x$1$9);
-          var x335 = this$144.Lcom_vinctus_oql_OneToManyType__f_attribute;
-          var alias$4 = ((table + "$") + x327);
+    var x315 = $as_Lcom_vinctus_oql_AbstractOQL$OneToManyNode(node);
+    var this$126 = $n(x315);
+    var x317 = this$126.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_query;
+    var this$127 = $n(x315);
+    var x318 = this$127.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_element;
+    if ((x317 !== null)) {
+      var this$129 = $n(x317);
+      var this$130 = $n(x317);
+      var this$131 = $n(x317);
+      var x322 = this$131.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$132 = $n(x317);
+      var this$133 = $n(x317);
+      var x324 = this$133.Lcom_vinctus_oql_OQLQuery__f_select;
+      var this$134 = $n(x317);
+      var x325 = this$134.Lcom_vinctus_oql_OQLQuery__f_group;
+      var this$135 = $n(x317);
+      var x326 = this$135.Lcom_vinctus_oql_OQLQuery__f_order;
+      var this$136 = $n(x317);
+      var x327 = this$136.Lcom_vinctus_oql_OQLQuery__f_limit;
+      var this$137 = $n(x317);
+      var x328 = this$137.Lcom_vinctus_oql_OQLQuery__f_offset;
+      if ((x322 !== null)) {
+        var this$139 = $n(x322);
+        var x330 = this$139.Lcom_vinctus_oql_Attribute__f_name;
+        var this$140 = $n(x322);
+        var this$141 = $n(x322);
+        var this$142 = $n(x322);
+        var this$143 = $n(x322);
+        var x334 = this$143.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x334 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
+          var x$1$9 = $as_Lcom_vinctus_oql_OneToManyType(x334);
+          var this$145 = $n(x$1$9);
+          var x337 = this$145.Lcom_vinctus_oql_OneToManyType__f_entity;
+          var this$146 = $n(x$1$9);
+          var x338 = this$146.Lcom_vinctus_oql_OneToManyType__f_attribute;
+          var alias$4 = ((table + "$") + x330);
           if ($n(builder).isLeft__Z()) {
-            var this$145 = $n(builder);
-            var subquery$8 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, (($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$145).toOption__s_Option()).get__O())).Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0), false)
+            var this$147 = $n(builder);
+            var subquery$8 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, (($n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$147).toOption__s_Option()).get__O())).Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0), false)
           } else {
             var subquery$8 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, $uI($n($n(builder).toOption__s_Option()).get__O()), true)
           };
           if ($n(builder).isLeft__Z()) {
-            var $$x7 = $n(x312);
-            var this$146 = $n(builder);
-            $$x7.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_idx = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$146).toOption__s_Option()).get__O())).projectQuery__Lcom_vinctus_oql_SQLQueryBuilder__I(subquery$8)
+            var $$x8 = $n(x315);
+            var this$148 = $n(builder);
+            $$x8.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_idx = $n($as_Lcom_vinctus_oql_SQLQueryBuilder($n(new $c_s_util_Either$LeftProjection(this$148).toOption__s_Option()).get__O())).projectQuery__Lcom_vinctus_oql_SQLQueryBuilder__I(subquery$8)
           };
-          $n(subquery$8).table__T__s_Option__V($n(x334).Lcom_vinctus_oql_Entity__f_table, new $c_s_Some(alias$4));
-          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x315, alias$4, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery$8)), oql, ds, fixed, model);
-          var $$x8 = $n(subquery$8);
-          var s$2 = (((((((("\"" + alias$4) + "\".\"") + $n(x335).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n($n($as_Lcom_vinctus_oql_ManyToOneType($n(x335).Lcom_vinctus_oql_Attribute__f_typ)).Lcom_vinctus_oql_ManyToOneType__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\"");
-          $n($$x8).select__Lcom_vinctus_oql_OQLExpression__T__V(new $c_Lcom_vinctus_oql_RawOQLExpression(s$2), null);
-          var this$150 = $n(x321);
-          if ((!this$150.isEmpty__Z())) {
-            var arg1$12 = this$150.get__O();
+          $n(subquery$8).table__T__s_Option__V($n(x337).Lcom_vinctus_oql_Entity__f_table, new $c_s_Some(alias$4));
+          this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLQueryBuilder(x318, alias$4, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery$8)), oql, ds, fixed, model);
+          var $$x9 = $n(subquery$8);
+          var s$3 = (((((((("\"" + alias$4) + "\".\"") + $n(x338).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n($n($as_Lcom_vinctus_oql_ManyToOneType($n(x338).Lcom_vinctus_oql_Attribute__f_typ)).Lcom_vinctus_oql_ManyToOneType__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\"");
+          $n($$x9).select__Lcom_vinctus_oql_OQLExpression__T__V(new $c_Lcom_vinctus_oql_RawOQLExpression(s$3), null);
+          var this$152 = $n(x324);
+          if ((!this$152.isEmpty__Z())) {
+            var arg1$12 = this$152.get__O();
             var _$26 = $as_Lcom_vinctus_oql_OQLExpression(arg1$12);
             $n(subquery$8).select__Lcom_vinctus_oql_OQLExpression__T__V(_$26, alias$4)
           };
-          var this$151 = $n(x322);
-          if ((!this$151.isEmpty__Z())) {
-            var arg1$13 = this$151.get__O();
+          var this$153 = $n(x325);
+          if ((!this$153.isEmpty__Z())) {
+            var arg1$13 = this$153.get__O();
             var _$27 = $as_sci_List(arg1$13);
             $n(subquery$8).group__sci_List__T__V(_$27, alias$4)
           };
-          var this$152 = $n(x323);
-          if ((!this$152.isEmpty__Z())) {
-            var arg1$14 = this$152.get__O();
+          var this$154 = $n(x326);
+          if ((!this$154.isEmpty__Z())) {
+            var arg1$14 = this$154.get__O();
             var _$28 = $as_sci_List(arg1$14);
             $n(subquery$8).order__sci_List__T__V(_$28, alias$4)
           };
-          var this$153 = $n(x324);
-          if ((!this$153.isEmpty__Z())) {
-            var arg1$15 = this$153.get__O();
-            var n$6 = $uI(arg1$15);
-            $n(subquery$8).limit__I__V(n$6)
+          var this$155 = $n(x327);
+          if ((!this$155.isEmpty__Z())) {
+            var arg1$15 = this$155.get__O();
+            var n$7 = $uI(arg1$15);
+            $n(subquery$8).limit__I__V(n$7)
           };
-          var this$154 = $n(x325);
-          if ((!this$154.isEmpty__Z())) {
-            var arg1$16 = this$154.get__O();
-            var n$7 = $uI(arg1$16);
-            $n(subquery$8).offset__I__V(n$7)
+          var this$156 = $n(x328);
+          if ((!this$156.isEmpty__Z())) {
+            var arg1$16 = this$156.get__O();
+            var n$8 = $uI(arg1$16);
+            $n(subquery$8).offset__I__V(n$8)
           };
           return subquery$8
         }
@@ -2984,10 +2999,10 @@ function $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__
         var this$11 = $n(x$1$3);
         var this$12 = $n(x$1$3);
         var this$13 = $n(x$1$3);
-        var x255 = this$13.Lcom_vinctus_oql_Attribute__f_pk;
+        var x264 = this$13.Lcom_vinctus_oql_Attribute__f_pk;
         var this$14 = $n(x$1$3);
         var this$15 = $n(x$1$3);
-        return (!x255)
+        return (!x264)
       };
       throw new $c_s_MatchError(x$1$3)
     })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
@@ -2995,28 +3010,28 @@ function $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__
       matchResult31: {
         if ((x$1$4 !== null)) {
           var this$18 = $n(x$1$4);
-          var x264 = this$18.Lcom_vinctus_oql_Attribute__f_name;
+          var x273 = this$18.Lcom_vinctus_oql_Attribute__f_name;
           var this$19 = $n(x$1$4);
           var this$20 = $n(x$1$4);
           var this$21 = $n(x$1$4);
-          var x267 = this$21.Lcom_vinctus_oql_Attribute__f_required;
+          var x276 = this$21.Lcom_vinctus_oql_Attribute__f_required;
           var this$22 = $n(x$1$4);
-          var x268 = this$22.Lcom_vinctus_oql_Attribute__f_typ;
-          if ((x268 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-            var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x268);
+          var x277 = this$22.Lcom_vinctus_oql_Attribute__f_typ;
+          if ((x277 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+            var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x277);
             var this$24 = $n(x$1$5);
-            var x261 = this$24.Lcom_vinctus_oql_ManyToOneType__f_entity;
+            var x270 = this$24.Lcom_vinctus_oql_ManyToOneType__f_entity;
             var this$25 = $n(ents);
             var newents = new $c_sci_$colon$colon(entity, this$25);
-            if ((!newents.contains__O__Z(x261))) {
-              if ((!x267)) {
+            if ((!newents.contains__O__Z(x270))) {
+              if ((!x276)) {
                 var this$27 = $n(nullablesbuf$1);
                 var this$26 = $n(attrs);
-                var elem$2 = new $c_sci_$colon$colon(x264, this$26).reverse__sci_List();
+                var elem$2 = new $c_sci_$colon$colon(x273, this$26).reverse__sci_List();
                 this$27.addOne__O__scm_ListBuffer(elem$2)
               };
               var this$28 = $n(attrs);
-              $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__sci_List__sci_List__Lcom_vinctus_oql_Entity__V($thiz, idsbuf$1, nullablesbuf$1, new $c_sci_$colon$colon(x264, this$28), newents, x261)
+              $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__sci_List__sci_List__Lcom_vinctus_oql_Entity__V($thiz, idsbuf$1, nullablesbuf$1, new $c_sci_$colon$colon(x273, this$28), newents, x270)
             }
           };
           break matchResult31
@@ -3031,30 +3046,30 @@ function $ps_Lcom_vinctus_oql_DataModel__lookup$1__Lcom_vinctus_oql_OQLExpressio
   var ids$tailLocal1 = ids;
   while (true) {
     matchResult34: {
-      var x286 = ids$tailLocal1;
-      if ((x286 !== null)) {
+      var x295 = ids$tailLocal1;
+      if ((x295 !== null)) {
         $n($m_s_package$().s_package$__f_List);
-        if (($n(x286).lengthCompare__I__I(1) === 0)) {
-          var this$4 = $n(x286);
-          var x291 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$4, 0));
+        if (($n(x295).lengthCompare__I__I(1) === 0)) {
+          var this$4 = $n(x295);
+          var x300 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$4, 0));
           matchResult32: {
-            var x269 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(x291).Lcom_vinctus_oql_Ident__f_s);
-            if ((x269 instanceof $c_s_Some)) {
-              var attr = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x269)).s_Some__f_value);
+            var x278 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(x300).Lcom_vinctus_oql_Ident__f_s);
+            if ((x278 instanceof $c_s_Some)) {
+              var attr = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x278)).s_Some__f_value);
               var this$7 = $n(dmrefs$1);
               var self = entity$tailLocal1;
               var elem = new $c_T2(self, attr);
               this$7.addOne__O__scm_ListBuffer(elem);
               if (ref$1) {
                 if ((!($n(attr).Lcom_vinctus_oql_Attribute__f_typ instanceof $c_Lcom_vinctus_oql_ManyToOneType))) {
-                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x291).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x291).Lcom_vinctus_oql_Ident__f_s) + "' is not many-to-one"), input$1)
+                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x300).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x300).Lcom_vinctus_oql_Ident__f_s) + "' is not many-to-one"), input$1)
                 };
                 var $$x1 = $n(expr$1);
                 var this$8 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n($n($as_Lcom_vinctus_oql_ManyToOneType($n(attr).Lcom_vinctus_oql_Attribute__f_typ)).Lcom_vinctus_oql_ManyToOneType__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
                 $$x1.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype(this$8)
               } else {
                 if ((!$n($n(attr).Lcom_vinctus_oql_Attribute__f_typ).isDataType__Z())) {
-                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x291).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x291).Lcom_vinctus_oql_Ident__f_s) + "' is not a DBMS data type"), input$1)
+                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x300).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x300).Lcom_vinctus_oql_Ident__f_s) + "' is not a DBMS data type"), input$1)
                 };
                 var $$x2 = $n(expr$1);
                 var this$9 = $n($n(attr).Lcom_vinctus_oql_Attribute__f_typ);
@@ -3063,50 +3078,50 @@ function $ps_Lcom_vinctus_oql_DataModel__lookup$1__Lcom_vinctus_oql_OQLExpressio
               break matchResult32
             };
             var x = $m_s_None$();
-            if ((x === x269)) {
-              $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x291).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(x291).Lcom_vinctus_oql_Ident__f_s) + "'"), input$1)
+            if ((x === x278)) {
+              $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x300).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(x300).Lcom_vinctus_oql_Ident__f_s) + "'"), input$1)
             };
-            throw new $c_s_MatchError(x269)
+            throw new $c_s_MatchError(x278)
           };
           break matchResult34
         }
       };
-      if ((x286 instanceof $c_sci_$colon$colon)) {
-        var x287 = $as_sci_$colon$colon(x286);
-        var x289 = $n(x287).sci_$colon$colon__f_next;
-        var head = $as_Lcom_vinctus_oql_Ident($n(x287).sci_$colon$colon__f_head);
-        var x272 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(head).Lcom_vinctus_oql_Ident__f_s);
-        if ((x272 instanceof $c_s_Some)) {
-          var x276 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x272)).s_Some__f_value);
-          if ((x276 !== null)) {
-            var this$11 = $n(x276);
-            var this$12 = $n(x276);
-            var this$13 = $n(x276);
-            var this$14 = $n(x276);
-            var this$15 = $n(x276);
-            var x282 = this$15.Lcom_vinctus_oql_Attribute__f_typ;
-            if ((x282 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-              var x$1 = $as_Lcom_vinctus_oql_ManyToOneType(x282);
+      if ((x295 instanceof $c_sci_$colon$colon)) {
+        var x296 = $as_sci_$colon$colon(x295);
+        var x298 = $n(x296).sci_$colon$colon__f_next;
+        var head = $as_Lcom_vinctus_oql_Ident($n(x296).sci_$colon$colon__f_head);
+        var x281 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(head).Lcom_vinctus_oql_Ident__f_s);
+        if ((x281 instanceof $c_s_Some)) {
+          var x285 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x281)).s_Some__f_value);
+          if ((x285 !== null)) {
+            var this$11 = $n(x285);
+            var this$12 = $n(x285);
+            var this$13 = $n(x285);
+            var this$14 = $n(x285);
+            var this$15 = $n(x285);
+            var x291 = this$15.Lcom_vinctus_oql_Attribute__f_typ;
+            if ((x291 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+              var x$1 = $as_Lcom_vinctus_oql_ManyToOneType(x291);
               var this$17 = $n(x$1);
-              var x285 = this$17.Lcom_vinctus_oql_ManyToOneType__f_entity;
+              var x294 = this$17.Lcom_vinctus_oql_ManyToOneType__f_entity;
               var this$20 = $n(dmrefs$1);
-              var elem$1 = new $c_T2(x285, x276);
+              var elem$1 = new $c_T2(x294, x285);
               this$20.addOne__O__scm_ListBuffer(elem$1);
-              ids$tailLocal1 = x289;
-              entity$tailLocal1 = x285;
+              ids$tailLocal1 = x298;
+              entity$tailLocal1 = x294;
               continue
             }
           };
           $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(head).Lcom_vinctus_oql_Ident__f_pos, (((("attribute '" + $n(head).Lcom_vinctus_oql_Ident__f_s) + "' of entity '") + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have an entity type"), input$1)
         };
         var x$3 = $m_s_None$();
-        if ((x$3 === x272)) {
+        if ((x$3 === x281)) {
           $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(head).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(head).Lcom_vinctus_oql_Ident__f_s) + "'"), input$1)
         };
-        throw new $c_s_MatchError(x272);
+        throw new $c_s_MatchError(x281);
         break matchResult34
       };
-      throw new $c_s_MatchError(x286)
+      throw new $c_s_MatchError(x295)
     };
     return (void 0)
   }
@@ -3220,14 +3235,14 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
         if ((x$1$3 !== null)) {
           $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
           var this$15 = $n(x$1$3);
-          var x105 = this$15.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+          var x114 = this$15.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
           var this$16 = $n(x$1$3);
-          var x106 = this$16.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
+          var x115 = this$16.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
           var this$17 = $n(x$1$3);
-          var x107 = this$17.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
+          var x116 = this$17.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
           var elem = $m_s_None$();
           var pk = new $c_sr_ObjectRef(elem);
-          $n(x106).foreach__F1__V(new $c_sjsr_AnonFunction1(((a$4) => {
+          $n(x115).foreach__F1__V(new $c_sjsr_AnonFunction1(((a$4) => {
             var a$5 = $as_Lcom_vinctus_oql_DMLAttribute(a$4);
             matchResult14: {
               var $$x2;
@@ -3235,8 +3250,8 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLSimpleDataType)) {
                 var x$1$4 = $as_Lcom_vinctus_oql_DMLSimpleDataType(x59);
                 var this$20 = $n(x$1$4);
-                var x102 = this$20.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
-                switch (x102) {
+                var x111 = this$20.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
+                switch (x111) {
                   case "text": {
                     var $$x2 = $m_Lcom_vinctus_oql_TextType$();
                     break matchResult14;
@@ -3258,10 +3273,10 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   default: {
                     matchAlts3: {
                       matchAlts4: {
-                        if ((x102 === "bigint")) {
+                        if ((x111 === "bigint")) {
                           break matchAlts4
                         };
-                        if ((x102 === "int8")) {
+                        if ((x111 === "int8")) {
                           break matchAlts4
                         };
                         break matchAlts3
@@ -3275,16 +3290,16 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLParametricDataType)) {
                 var x$1$5 = $as_Lcom_vinctus_oql_DMLParametricDataType(x59);
                 var this$22 = $n(x$1$5);
-                var x89 = this$22.Lcom_vinctus_oql_DMLParametricDataType__f_typ;
+                var x98 = this$22.Lcom_vinctus_oql_DMLParametricDataType__f_typ;
                 var this$23 = $n(x$1$5);
-                var x90 = this$23.Lcom_vinctus_oql_DMLParametricDataType__f_parameters;
-                if ((x89 === "decimal")) {
+                var x99 = this$23.Lcom_vinctus_oql_DMLParametricDataType__f_parameters;
+                if ((x98 === "decimal")) {
                   $m_sc_StringOps$();
-                  var x = $as_T($n(x90).head__O());
+                  var x = $as_T($n(x99).head__O());
                   var this$26 = $m_jl_Integer$();
                   var precision = this$26.parseInt__T__I__I(x, 10);
                   $m_sc_StringOps$();
-                  var x$2 = $as_T($n($as_sc_IterableOps($n(x90).tail__O())).head__O());
+                  var x$2 = $as_T($n($as_sc_IterableOps($n(x99).tail__O())).head__O());
                   var this$29 = $m_jl_Integer$();
                   var scale = this$29.parseInt__T__I__I(x$2, 10);
                   var $$x2 = new $c_Lcom_vinctus_oql_DecimalType(precision, scale);
@@ -3294,8 +3309,23 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLSimpleDataType)) {
                 var x$1$6 = $as_Lcom_vinctus_oql_DMLSimpleDataType(x59);
                 var this$32 = $n(x$1$6);
-                var x86 = this$32.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
-                switch (x86) {
+                var x95 = this$32.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
+                switch (x95) {
+                  case "date": {
+                    var $$x2 = $m_Lcom_vinctus_oql_DateType$();
+                    break matchResult14;
+                    break
+                  }
+                  case "time": {
+                    var $$x2 = $m_Lcom_vinctus_oql_TimeType$();
+                    break matchResult14;
+                    break
+                  }
+                  case "interval": {
+                    var $$x2 = $m_Lcom_vinctus_oql_IntervalType$();
+                    break matchResult14;
+                    break
+                  }
                   case "float":
                   case "float8": {
                     var $$x2 = $m_Lcom_vinctus_oql_FloatType$();
@@ -3313,7 +3343,7 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                     break
                   }
                   default: {
-                    if ((x86 === "json")) {
+                    if ((x95 === "json")) {
                       var $$x2 = $m_Lcom_vinctus_oql_JSONType$();
                       break matchResult14
                     }
@@ -3463,9 +3493,9 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
               pk.sr_ObjectRef__f_elem = ev$4;
               ev$4 = null
             };
-            $n(x107).update__O__O__V($n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s, attr$3)
+            $n(x116).update__O__O__V($n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s, attr$3)
           })));
-          $n(x105).Lcom_vinctus_oql_Entity__f__pk = $as_s_Option(pk.sr_ObjectRef__f_elem);
+          $n(x114).Lcom_vinctus_oql_Entity__f__pk = $as_s_Option(pk.sr_ObjectRef__f_elem);
           break matchResult15
         };
         throw new $c_s_MatchError(x$1$3)
@@ -3492,28 +3522,28 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
         if ((x$1$12 !== null)) {
           $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
           var this$79 = $n(x$1$12);
-          var x236 = this$79.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+          var x245 = this$79.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
           var this$80 = $n(x$1$12);
-          var x237 = this$80.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
+          var x246 = this$80.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
           var this$81 = $n(x$1$12);
-          var x238 = this$81.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
-          $n(x237).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
+          var x247 = this$81.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
+          $n(x246).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
             var x$1$13 = $as_Lcom_vinctus_oql_DMLAttribute(x$1$2$1);
             matchResult25: {
               if ((x$1$13 !== null)) {
                 var this$83 = $n(x$1$13);
                 var this$84 = $n(x$1$13);
                 var this$85 = $n(x$1$13);
-                var x227 = this$85.Lcom_vinctus_oql_DMLAttribute__f_typ;
+                var x236 = this$85.Lcom_vinctus_oql_DMLAttribute__f_typ;
                 var this$86 = $n(x$1$13);
                 var this$87 = $n(x$1$13);
-                if ((x227 instanceof $c_Lcom_vinctus_oql_DMLManyToManyType)) {
-                  var x$1$14 = $as_Lcom_vinctus_oql_DMLManyToManyType(x227);
+                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLManyToManyType)) {
+                  var x$1$14 = $as_Lcom_vinctus_oql_DMLManyToManyType(x236);
                   var this$89 = $n(x$1$14);
-                  var x232 = this$89.Lcom_vinctus_oql_DMLManyToManyType__f_entity;
+                  var x241 = this$89.Lcom_vinctus_oql_DMLManyToManyType__f_entity;
                   var this$90 = $n(x$1$14);
-                  var x233 = this$90.Lcom_vinctus_oql_DMLManyToManyType__f_link;
-                  var key$1 = $n(x233).Lcom_vinctus_oql_Ident__f_s;
+                  var x242 = this$90.Lcom_vinctus_oql_DMLManyToManyType__f_link;
+                  var key$1 = $n(x242).Lcom_vinctus_oql_Ident__f_s;
                   var linkinfo = $as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$1));
                   var this$91 = $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
                   var this$100 = new $c_sc_MapOps$$anon$1(this$91);
@@ -3525,12 +3555,12 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                       var this$95 = $n(x$1$15);
                       var this$96 = $n(x$1$15);
                       var this$97 = $n(x$1$15);
-                      var x119 = this$97.Lcom_vinctus_oql_Attribute__f_typ;
-                      if ((x119 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                        var x$1$16 = $as_Lcom_vinctus_oql_ManyToOneType(x119);
+                      var x128 = this$97.Lcom_vinctus_oql_Attribute__f_typ;
+                      if ((x128 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                        var x$1$16 = $as_Lcom_vinctus_oql_ManyToOneType(x128);
                         var this$99 = $n(x$1$16);
-                        var x122 = this$99.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                        if (((x236 === null) ? (x122 === null) : $n(x236).equals__O__Z(x122))) {
+                        var x131 = this$99.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                        if (((x245 === null) ? (x131 === null) : $n(x245).equals__O__Z(x131))) {
                           return true
                         }
                       }
@@ -3539,12 +3569,12 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   }));
                   var self = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$100, pred));
                   if (($n(self).size__I() > 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                   };
                   if (($n(self).size__I() < 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                   };
-                  var key$2 = $n(x232).Lcom_vinctus_oql_Ident__f_s;
+                  var key$2 = $n(x241).Lcom_vinctus_oql_Ident__f_s;
                   var targetentity = $n($as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$2))).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                   var this$101 = $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
                   var this$110 = new $c_sc_MapOps$$anon$1(this$101);
@@ -3556,12 +3586,12 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                       var this$105 = $n(x$1$17);
                       var this$106 = $n(x$1$17);
                       var this$107 = $n(x$1$17);
-                      var x129 = this$107.Lcom_vinctus_oql_Attribute__f_typ;
-                      if ((x129 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                        var x$1$18 = $as_Lcom_vinctus_oql_ManyToOneType(x129);
+                      var x138 = this$107.Lcom_vinctus_oql_Attribute__f_typ;
+                      if ((x138 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                        var x$1$18 = $as_Lcom_vinctus_oql_ManyToOneType(x138);
                         var this$109 = $n(x$1$18);
-                        var x132 = this$109.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                        if (((targetentity === null) ? (x132 === null) : $n(targetentity).equals__O__Z(x132))) {
+                        var x141 = this$109.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                        if (((targetentity === null) ? (x141 === null) : $n(targetentity).equals__O__Z(x141))) {
                           return true
                         }
                       }
@@ -3570,14 +3600,14 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   }));
                   var target = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$110, pred$1));
                   if (($n(target).size__I() > 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x232).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x241).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
                   };
                   if (($n(target).size__I() < 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x233).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x232).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x241).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
                   };
-                  var $$x4 = $n(x238);
+                  var $$x4 = $n(x247);
                   var $$x3 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var this$111 = $n(x238);
+                  var this$111 = $n(x247);
                   var key$3 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
                   var \u03b42$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$111, key$3));
                   var link = $n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
@@ -3596,50 +3626,50 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   $n($$x4).update__O__O__V($$x3, new $c_Lcom_vinctus_oql_Attribute(name$1$1, column$1, pk$1$1, required$1, typ$1));
                   break matchResult25
                 };
-                if ((x227 instanceof $c_Lcom_vinctus_oql_DMLNameType)) {
-                  var x$1$19 = $as_Lcom_vinctus_oql_DMLNameType(x227);
+                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLNameType)) {
+                  var x$1$19 = $as_Lcom_vinctus_oql_DMLNameType(x236);
                   var this$119 = $n(x$1$19);
-                  var x223 = this$119.Lcom_vinctus_oql_DMLNameType__f_entity;
-                  if (entities.contains__O__Z($n(x223).Lcom_vinctus_oql_Ident__f_s)) {
-                    var key$4 = $n(x223).Lcom_vinctus_oql_Ident__f_s;
+                  var x232 = this$119.Lcom_vinctus_oql_DMLNameType__f_entity;
+                  if (entities.contains__O__Z($n(x232).Lcom_vinctus_oql_Ident__f_s)) {
+                    var key$4 = $n(x232).Lcom_vinctus_oql_Ident__f_s;
                     var $$x5 = $n($n($n($as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$4))).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).pk__s_Option()).isEmpty__Z()
                   } else {
                     var $$x5 = false
                   };
                   if ($$x5) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x223).Lcom_vinctus_oql_Ident__f_pos, (("target entity '" + $n(x223).Lcom_vinctus_oql_Ident__f_s) + "' has no declared primary key"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x232).Lcom_vinctus_oql_Ident__f_pos, (("target entity '" + $n(x232).Lcom_vinctus_oql_Ident__f_s) + "' has no declared primary key"), dml)
                   };
                   break matchResult25
                 };
-                if ((x227 instanceof $c_Lcom_vinctus_oql_DMLOneToOneType)) {
-                  var x$1$20 = $as_Lcom_vinctus_oql_DMLOneToOneType(x227);
+                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLOneToOneType)) {
+                  var x$1$20 = $as_Lcom_vinctus_oql_DMLOneToOneType(x236);
                   var this$121 = $n(x$1$20);
-                  var x213 = this$121.Lcom_vinctus_oql_DMLOneToOneType__f_entity;
+                  var x222 = this$121.Lcom_vinctus_oql_DMLOneToOneType__f_entity;
                   var this$122 = $n(x$1$20);
-                  var x214 = this$122.Lcom_vinctus_oql_DMLOneToOneType__f_attr;
-                  var key$5 = $n(x213).Lcom_vinctus_oql_Ident__f_s;
+                  var x223 = this$122.Lcom_vinctus_oql_DMLOneToOneType__f_attr;
+                  var key$5 = $n(x222).Lcom_vinctus_oql_Ident__f_s;
                   var entityinfo = $as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$5));
                   matchResult21: {
                     var newtyp;
-                    if ((x214 instanceof $c_s_Some)) {
-                      var id = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x214)).s_Some__f_value);
-                      var x133 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id).Lcom_vinctus_oql_Ident__f_s);
-                      if ((x133 instanceof $c_s_Some)) {
-                        var x137 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x133)).s_Some__f_value);
-                        if ((x137 !== null)) {
-                          var this$124 = $n(x137);
-                          var this$125 = $n(x137);
-                          var this$126 = $n(x137);
-                          var this$127 = $n(x137);
-                          var this$128 = $n(x137);
-                          var x143 = this$128.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x143 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$21 = $as_Lcom_vinctus_oql_ManyToOneType(x143);
+                    if ((x223 instanceof $c_s_Some)) {
+                      var id = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x223)).s_Some__f_value);
+                      var x142 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id).Lcom_vinctus_oql_Ident__f_s);
+                      if ((x142 instanceof $c_s_Some)) {
+                        var x146 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x142)).s_Some__f_value);
+                        if ((x146 !== null)) {
+                          var this$124 = $n(x146);
+                          var this$125 = $n(x146);
+                          var this$126 = $n(x146);
+                          var this$127 = $n(x146);
+                          var this$128 = $n(x146);
+                          var x152 = this$128.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x152 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$21 = $as_Lcom_vinctus_oql_ManyToOneType(x152);
                             var this$130 = $n(x$1$21);
-                            var x146 = this$130.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x236 === null) ? (x146 === null) : $n(x236).equals__O__Z(x146))) {
+                            var x155 = this$130.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x245 === null) ? (x155 === null) : $n(x245).equals__O__Z(x155))) {
                               var entity$2 = $n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                              var newtyp = new $c_Lcom_vinctus_oql_OneToOneType(entity$2, x137);
+                              var newtyp = new $c_Lcom_vinctus_oql_OneToOneType(entity$2, x146);
                               break matchResult21
                             }
                           }
@@ -3648,14 +3678,14 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                         break matchResult21
                       };
                       var x$3$2 = $m_s_None$();
-                      if ((x$3$2 === x133)) {
+                      if ((x$3$2 === x142)) {
                         var newtyp = $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(id).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(id).Lcom_vinctus_oql_Ident__f_s) + "'"), dml);
                         break matchResult21
                       };
-                      throw new $c_s_MatchError(x133)
+                      throw new $c_s_MatchError(x142)
                     };
                     var x$5$1 = $m_s_None$();
-                    if ((x$5$1 === x214)) {
+                    if ((x$5$1 === x223)) {
                       var this$132 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
                       var this$141 = new $c_sc_MapOps$$anon$1(this$132);
                       var pred$2 = new $c_sjsr_AnonFunction1(((x$1$4$2) => {
@@ -3666,12 +3696,12 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                           var this$136 = $n(x$1$22);
                           var this$137 = $n(x$1$22);
                           var this$138 = $n(x$1$22);
-                          var x153 = this$138.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x153 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$23 = $as_Lcom_vinctus_oql_ManyToOneType(x153);
+                          var x162 = this$138.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x162 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$23 = $as_Lcom_vinctus_oql_ManyToOneType(x162);
                             var this$140 = $n(x$1$23);
-                            var x156 = this$140.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x236 === null) ? (x156 === null) : $n(x236).equals__O__Z(x156))) {
+                            var x165 = this$140.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x245 === null) ? (x165 === null) : $n(x245).equals__O__Z(x165))) {
                               return true
                             }
                           }
@@ -3680,21 +3710,21 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                       }));
                       var attrs = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$141, pred$2));
                       if (($n(attrs).size__I() > 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x213).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x222).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       if (($n(attrs).size__I() < 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x213).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x222).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       var entity$3 = $n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                       var attribute = $as_Lcom_vinctus_oql_Attribute($n(attrs).head__O());
                       var newtyp = new $c_Lcom_vinctus_oql_OneToOneType(entity$3, attribute);
                       break matchResult21
                     };
-                    throw new $c_s_MatchError(x214)
+                    throw new $c_s_MatchError(x223)
                   };
-                  var $$x7 = $n(x238);
+                  var $$x7 = $n(x247);
                   var $$x6 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var this$143 = $n(x238);
+                  var this$143 = $n(x247);
                   var key$6 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
                   var \u03b43$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$143, key$6));
                   $n(\u03b43$);
@@ -3709,35 +3739,35 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   $n($$x7).update__O__O__V($$x6, new $c_Lcom_vinctus_oql_Attribute(name$3, column$2, pk$2, required$2, newtyp));
                   break matchResult25
                 };
-                if ((x227 instanceof $c_Lcom_vinctus_oql_DMLOneToManyType)) {
-                  var x$1$24 = $as_Lcom_vinctus_oql_DMLOneToManyType(x227);
+                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLOneToManyType)) {
+                  var x$1$24 = $as_Lcom_vinctus_oql_DMLOneToManyType(x236);
                   var this$150 = $n(x$1$24);
-                  var x203 = this$150.Lcom_vinctus_oql_DMLOneToManyType__f_entity;
+                  var x212 = this$150.Lcom_vinctus_oql_DMLOneToManyType__f_entity;
                   var this$151 = $n(x$1$24);
-                  var x204 = this$151.Lcom_vinctus_oql_DMLOneToManyType__f_attr;
-                  var key$7 = $n(x203).Lcom_vinctus_oql_Ident__f_s;
+                  var x213 = this$151.Lcom_vinctus_oql_DMLOneToManyType__f_attr;
+                  var key$7 = $n(x212).Lcom_vinctus_oql_Ident__f_s;
                   var entityinfo$2 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$7));
                   matchResult24: {
                     var newtyp$2;
-                    if ((x204 instanceof $c_s_Some)) {
-                      var id$2 = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x204)).s_Some__f_value);
-                      var x160 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id$2).Lcom_vinctus_oql_Ident__f_s);
-                      if ((x160 instanceof $c_s_Some)) {
-                        var x164 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x160)).s_Some__f_value);
-                        if ((x164 !== null)) {
-                          var this$153 = $n(x164);
-                          var this$154 = $n(x164);
-                          var this$155 = $n(x164);
-                          var this$156 = $n(x164);
-                          var this$157 = $n(x164);
-                          var x170 = this$157.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x170 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$25 = $as_Lcom_vinctus_oql_ManyToOneType(x170);
+                    if ((x213 instanceof $c_s_Some)) {
+                      var id$2 = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x213)).s_Some__f_value);
+                      var x169 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id$2).Lcom_vinctus_oql_Ident__f_s);
+                      if ((x169 instanceof $c_s_Some)) {
+                        var x173 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x169)).s_Some__f_value);
+                        if ((x173 !== null)) {
+                          var this$153 = $n(x173);
+                          var this$154 = $n(x173);
+                          var this$155 = $n(x173);
+                          var this$156 = $n(x173);
+                          var this$157 = $n(x173);
+                          var x179 = this$157.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x179 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$25 = $as_Lcom_vinctus_oql_ManyToOneType(x179);
                             var this$159 = $n(x$1$25);
-                            var x173 = this$159.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x236 === null) ? (x173 === null) : $n(x236).equals__O__Z(x173))) {
+                            var x182 = this$159.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x245 === null) ? (x182 === null) : $n(x245).equals__O__Z(x182))) {
                               var entity$4 = $n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                              var newtyp$2 = new $c_Lcom_vinctus_oql_OneToManyType(entity$4, x164);
+                              var newtyp$2 = new $c_Lcom_vinctus_oql_OneToManyType(entity$4, x173);
                               break matchResult24
                             }
                           }
@@ -3746,14 +3776,14 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                         break matchResult24
                       };
                       var x$9 = $m_s_None$();
-                      if ((x$9 === x160)) {
+                      if ((x$9 === x169)) {
                         var newtyp$2 = $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(id$2).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(id$2).Lcom_vinctus_oql_Ident__f_s) + "'"), dml);
                         break matchResult24
                       };
-                      throw new $c_s_MatchError(x160)
+                      throw new $c_s_MatchError(x169)
                     };
                     var x$11 = $m_s_None$();
-                    if ((x$11 === x204)) {
+                    if ((x$11 === x213)) {
                       var this$161 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
                       var this$170 = new $c_sc_MapOps$$anon$1(this$161);
                       var pred$3 = new $c_sjsr_AnonFunction1(((x$1$5$1) => {
@@ -3764,12 +3794,12 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                           var this$165 = $n(x$1$26);
                           var this$166 = $n(x$1$26);
                           var this$167 = $n(x$1$26);
-                          var x180 = this$167.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x180 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$27 = $as_Lcom_vinctus_oql_ManyToOneType(x180);
+                          var x189 = this$167.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x189 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$27 = $as_Lcom_vinctus_oql_ManyToOneType(x189);
                             var this$169 = $n(x$1$27);
-                            var x183 = this$169.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x236 === null) ? (x183 === null) : $n(x236).equals__O__Z(x183))) {
+                            var x192 = this$169.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x245 === null) ? (x192 === null) : $n(x245).equals__O__Z(x192))) {
                               return true
                             }
                           }
@@ -3778,21 +3808,21 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                       }));
                       var attrs$2 = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$170, pred$3));
                       if (($n(attrs$2).size__I() > 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x203).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x212).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       if (($n(attrs$2).size__I() < 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x203).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x236).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x212).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       var entity$5 = $n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                       var attribute$1 = $as_Lcom_vinctus_oql_Attribute($n(attrs$2).head__O());
                       var newtyp$2 = new $c_Lcom_vinctus_oql_OneToManyType(entity$5, attribute$1);
                       break matchResult24
                     };
-                    throw new $c_s_MatchError(x204)
+                    throw new $c_s_MatchError(x213)
                   };
-                  var $$x9 = $n(x238);
+                  var $$x9 = $n(x247);
                   var $$x8 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var this$172 = $n(x238);
+                  var this$172 = $n(x247);
                   var key$8 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
                   var \u03b44$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$172, key$8));
                   $n(\u03b44$);
@@ -3807,15 +3837,15 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   $n($$x9).update__O__O__V($$x8, new $c_Lcom_vinctus_oql_Attribute(name$4, column$3, pk$3, required$3, newtyp$2));
                   break matchResult25
                 };
-                if ($is_Lcom_vinctus_oql_DMLDataType(x227)) {
+                if ($is_Lcom_vinctus_oql_DMLDataType(x236)) {
                   break matchResult25
                 }
               };
               throw new $c_s_MatchError(x$1$13)
             }
           })));
-          var $$x10 = $n(x236);
-          var this$179 = $n(x238);
+          var $$x10 = $n(x245);
+          var this$179 = $n(x247);
           var factory = $m_sci_VectorMap$();
           var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
           $$x10.Lcom_vinctus_oql_Entity__f__attributes = $as_sci_Map(factory$1.fromSpecific__sc_IterableOnce__O(this$179));
@@ -3839,17 +3869,17 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
     var _1$1 = factory$3.fromSpecific__sc_IterableOnce__O(this$183);
     var this$184 = $m_s_$less$colon$less$();
     var _2$1 = $m_sci_Map$().from__sc_IterableOnce__sci_Map(enums);
-    var x239 = new $c_T2(_1$1, _2$1);
-    var x240 = $as_sci_VectorMap(x239.T2__f__1);
-    var x241 = $as_sci_Map(x239.T2__f__2);
-    if ((x240 !== null)) {
-      if ((x241 !== null)) {
-        var \u03b41$___1 = x240;
-        var \u03b41$___2 = x241;
+    var x248 = new $c_T2(_1$1, _2$1);
+    var x249 = $as_sci_VectorMap(x248.T2__f__1);
+    var x250 = $as_sci_Map(x248.T2__f__2);
+    if ((x249 !== null)) {
+      if ((x250 !== null)) {
+        var \u03b41$___1 = x249;
+        var \u03b41$___2 = x250;
         break matchResult27
       }
     };
-    throw new $c_s_MatchError(x239)
+    throw new $c_s_MatchError(x248)
   };
   this.Lcom_vinctus_oql_DataModel__f_entities = $as_sci_Map(\u03b41$___1);
   this.Lcom_vinctus_oql_DataModel__f_enums = $as_sci_Map(\u03b41$___2);
@@ -6253,11 +6283,12 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
   if ((expr instanceof $c_Lcom_vinctus_oql_TypedOQLExpression)) {
     var x$1$11 = $as_Lcom_vinctus_oql_TypedOQLExpression(expr);
     var this$47 = $n(x$1$11);
-    var x73 = this$47.Lcom_vinctus_oql_TypedOQLExpression__f_v;
+    var x73 = this$47.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
     var this$48 = $n(x$1$11);
     var x74 = this$48.Lcom_vinctus_oql_TypedOQLExpression__f_t;
     var this$49 = $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds);
-    return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$49, x73, x74)
+    var a = this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x73, table);
+    return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$49, a, x74)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_FloatOQLExpression)) {
     var x$1$12 = $as_Lcom_vinctus_oql_FloatOQLExpression(expr);
@@ -30096,7 +30127,7 @@ function $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS(dm, host, port, database, u
   this.Lcom_vinctus_oql_AbstractOQL__f_model = null;
   this.Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS__f_varRegex = null;
   $ct_Lcom_vinctus_oql_AbstractOQL__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Conversions__s_concurrent_ExecutionContext__(this, dm, new $c_Lcom_vinctus_oql_NodePGDataSource(host, port, database, user, password, ssl, idleTimeoutMillis, max, $m_s_concurrent_ExecutionContext$().global__s_concurrent_ExecutionContextExecutor()), $m_Lcom_vinctus_oql_JSConversions$(), $m_s_concurrent_ExecutionContext$().global__s_concurrent_ExecutionContextExecutor());
-  this.Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS__f_varRegex = ($m_sc_StringOps$(), $ct_s_util_matching_Regex__T__sci_Seq__(new $c_s_util_matching_Regex(), ":([a-zA-Z_][a-zA-Z0-9_]*)", $m_sci_Nil$()))
+  this.Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS__f_varRegex = ($m_sc_StringOps$(), $ct_s_util_matching_Regex__T__sci_Seq__(new $c_s_util_matching_Regex(), "(?<!:):([a-zA-Z_][a-zA-Z0-9_]*)", $m_sci_Nil$()))
 }
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype = new $h_Lcom_vinctus_oql_AbstractOQL();
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.constructor = $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS;
@@ -30265,33 +30296,23 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.render__O__s_Option__T = (
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.render$default$2__s_Option = (function() {
   return $m_s_None$()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
-  return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG(prep0)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
+  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.count = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
   var prep2 = ((rest[1] === (void 0)) ? null : rest[1]);
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
-  return this.jsQueryMany__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+  return this.jsCount__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.count = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
   var prep2 = ((rest[1] === (void 0)) ? null : rest[1]);
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
-  return this.jsCount__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
+  return this.jsQueryMany__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30300,6 +30321,16 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg,
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG(prep0)
+});
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
+});
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
+});
 var $d_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS: 0
 }, false, "com.vinctus.oql.OQL_NodePG_JS", {
@@ -30996,24 +31027,40 @@ function $f_Lcom_vinctus_oql_SQLDataSource__string__T__T($thiz, s) {
 }
 function $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T($thiz, a, typ) {
   if (((typeof a) === "string")) {
-    var x13 = $as_T(a);
+    var x25 = $as_T(a);
     var x = $m_Lcom_vinctus_oql_TextType$();
     if ((x === typ)) {
-      return $thiz.string__T__T(x13)
+      return $thiz.string__T__T(x25)
     };
     var x$3 = $m_Lcom_vinctus_oql_UUIDType$();
     if ((x$3 === typ)) {
-      return (("UUID'" + x13) + "'")
+      return (("'" + x25) + "'::UUID")
+    };
+    var x$5 = $m_Lcom_vinctus_oql_TimestampType$();
+    if ((x$5 === typ)) {
+      return (("'" + x25) + "'::TIMESTAMP")
+    };
+    var x$7 = $m_Lcom_vinctus_oql_DateType$();
+    if ((x$7 === typ)) {
+      return (("'" + x25) + "'::DATE")
+    };
+    var x$9 = $m_Lcom_vinctus_oql_JSONType$();
+    if ((x$9 === typ)) {
+      return (("'" + x25) + "'::JSON")
+    };
+    var x$11 = $m_Lcom_vinctus_oql_IntervalType$();
+    if ((x$11 === typ)) {
+      return (("'" + x25) + "'::INTERVAL")
     }
   };
   matchAlts1: {
     matchAlts2: {
-      var x$5 = $m_Lcom_vinctus_oql_IntegerType$();
-      if ((x$5 === typ)) {
+      var x$13 = $m_Lcom_vinctus_oql_IntegerType$();
+      if ((x$13 === typ)) {
         break matchAlts2
       };
-      var x$7 = $m_Lcom_vinctus_oql_FloatType$();
-      if ((x$7 === typ)) {
+      var x$15 = $m_Lcom_vinctus_oql_FloatType$();
+      if ((x$15 === typ)) {
         break matchAlts2
       };
       break matchAlts1
@@ -41761,7 +41808,7 @@ $c_Lcom_vinctus_oql_DMLParser.prototype.attribute__s_util_parsing_combinator_Par
 });
 $c_Lcom_vinctus_oql_DMLParser.prototype.typeSpecifier__s_util_parsing_combinator_Parsers$Parser = (function() {
   var r = this.kw__T__s_util_matching_Regex("text");
-  return $n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+  return $n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
     var r$1 = this.kw__T__s_util_matching_Regex("json");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$1, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
@@ -41789,23 +41836,29 @@ $c_Lcom_vinctus_oql_DMLParser.prototype.typeSpecifier__s_util_parsing_combinator
     var r$9 = this.kw__T__s_util_matching_Regex("date");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$9, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$10 = this.kw__T__s_util_matching_Regex("float8");
+    var r$10 = this.kw__T__s_util_matching_Regex("time");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$10, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$11 = this.kw__T__s_util_matching_Regex("float");
+    var r$11 = this.kw__T__s_util_matching_Regex("interval");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$11, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$12 = this.kw__T__s_util_matching_Regex("uuid");
+    var r$12 = this.kw__T__s_util_matching_Regex("float8");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$12, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$13 = this.kw__T__s_util_matching_Regex("timestamp");
+    var r$13 = this.kw__T__s_util_matching_Regex("float");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$13, this)
+  })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var r$14 = this.kw__T__s_util_matching_Regex("uuid");
+    return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$14, this)
+  })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var r$15 = this.kw__T__s_util_matching_Regex("timestamp");
+    return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$15, this)
   })))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((typ) => {
     var typ$1 = $as_T(typ);
     return new $c_Lcom_vinctus_oql_DMLSimpleDataType(typ$1)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$14 = this.kw__T__s_util_matching_Regex("decimal");
-    return $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$14, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(",", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var r$16 = this.kw__T__s_util_matching_Regex("decimal");
+    return $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$16, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(",", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -42181,6 +42234,18 @@ function $f_Lcom_vinctus_oql_PGDataSource__reverseMapType__T__Lcom_vinctus_oql_D
       var $$x1 = $m_Lcom_vinctus_oql_BigintType$();
       break
     }
+    case "time": {
+      var $$x1 = $m_Lcom_vinctus_oql_TimeType$();
+      break
+    }
+    case "date": {
+      var $$x1 = $m_Lcom_vinctus_oql_DateType$();
+      break
+    }
+    case "interval": {
+      var $$x1 = $m_Lcom_vinctus_oql_IntervalType$();
+      break
+    }
     case "double precision": {
       var $$x1 = $m_Lcom_vinctus_oql_FloatType$();
       break
@@ -51110,6 +51175,10 @@ function $c_Lcom_vinctus_oql_OQLParser$() {
   this.Lcom_vinctus_oql_OQLParser$__f_attributeNamebitmap$1 = false;
   this.Lcom_vinctus_oql_OQLParser$__f_applyExpression$lzy1 = null;
   this.Lcom_vinctus_oql_OQLParser$__f_applyExpressionbitmap$1 = false;
+  this.Lcom_vinctus_oql_OQLParser$__f_simpleType$lzy1 = null;
+  this.Lcom_vinctus_oql_OQLParser$__f_simpleTypebitmap$1 = false;
+  this.Lcom_vinctus_oql_OQLParser$__f_castExpression$lzy1 = null;
+  this.Lcom_vinctus_oql_OQLParser$__f_castExpressionbitmap$1 = false;
   this.Lcom_vinctus_oql_OQLParser$__f_attributeExpression$lzy1 = null;
   this.Lcom_vinctus_oql_OQLParser$__f_attributeExpressionbitmap$1 = false;
   this.Lcom_vinctus_oql_OQLParser$__f_qualifiedAttributeExpression$lzy1 = null;
@@ -51614,6 +51683,53 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.applyExpression__s_util_parsing_combina
   };
   return this.Lcom_vinctus_oql_OQLParser$__f_applyExpression$lzy1
 });
+$c_Lcom_vinctus_oql_OQLParser$.prototype.simpleType__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
+  if ((!this.Lcom_vinctus_oql_OQLParser$__f_simpleTypebitmap$1)) {
+    var p = new $c_sjsr_AnonFunction0((() => {
+      var r = this.kw__T__s_util_matching_Regex("json");
+      return $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $m_Lcom_vinctus_oql_JSONType$())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+        var r$1 = this.kw__T__s_util_matching_Regex("date");
+        return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$1, this).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $m_Lcom_vinctus_oql_DateType$())))
+      })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+        var r$2 = this.kw__T__s_util_matching_Regex("time");
+        return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$2, this).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $m_Lcom_vinctus_oql_TimeType$())))
+      })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+        var r$3 = this.kw__T__s_util_matching_Regex("interval");
+        return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$3, this).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $m_Lcom_vinctus_oql_IntervalType$())))
+      })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+        var r$4 = this.kw__T__s_util_matching_Regex("uuid");
+        return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$4, this).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $m_Lcom_vinctus_oql_UUIDType$())))
+      })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+        var r$5 = this.kw__T__s_util_matching_Regex("timestamp");
+        return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$5, this).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $m_Lcom_vinctus_oql_TimestampType$())))
+      })))
+    }));
+    this.Lcom_vinctus_oql_OQLParser$__f_simpleType$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
+    this.Lcom_vinctus_oql_OQLParser$__f_simpleTypebitmap$1 = true
+  };
+  return this.Lcom_vinctus_oql_OQLParser$__f_simpleType$lzy1
+});
+$c_Lcom_vinctus_oql_OQLParser$.prototype.castExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
+  if ((!this.Lcom_vinctus_oql_OQLParser$__f_castExpressionbitmap$1)) {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n(this.primary__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("::", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.simpleType__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+      var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
+      if ((x$1$1 !== null)) {
+        $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
+        var x142 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x142 !== null)) {
+          $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
+          var p = $as_Lcom_vinctus_oql_OQLExpression($n(x142).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var t = $as_Lcom_vinctus_oql_Datatype($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          return new $c_Lcom_vinctus_oql_TypedOQLExpression(p, t)
+        }
+      };
+      throw new $c_s_MatchError(x$1$1)
+    })))));
+    this.Lcom_vinctus_oql_OQLParser$__f_castExpression$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p$1);
+    this.Lcom_vinctus_oql_OQLParser$__f_castExpressionbitmap$1 = true
+  };
+  return this.Lcom_vinctus_oql_OQLParser$__f_castExpression$lzy1
+});
 $c_Lcom_vinctus_oql_OQLParser$.prototype.attributeExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lcom_vinctus_oql_OQLParser$__f_attributeExpressionbitmap$1)) {
     var p = new $c_sjsr_AnonFunction0((() => $n(this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((id) => {
@@ -51714,32 +51830,32 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.ordering__s_util_parsing_combinator_Pac
       var x$1$2 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$1);
       if ((x$1$2 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x161 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$2).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x161 !== null)) {
+        var x168 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$2).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x168 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var e = $as_Lcom_vinctus_oql_OQLExpression($n(x161).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          var d = $as_s_Option($n(x161).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var e = $as_Lcom_vinctus_oql_OQLExpression($n(x168).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var d = $as_s_Option($n(x168).s_util_parsing_combinator_Parsers$$tilde__f__2);
           var n = $as_s_Option($n(x$1$2).s_util_parsing_combinator_Parsers$$tilde__f__2);
-          matchResult11: {
+          matchResult12: {
             var ordering;
-            var x140 = new $c_T2(d, n);
+            var x147 = new $c_T2(d, n);
             matchAlts1: {
               matchAlts2: {
-                var x157 = $as_s_Option(x140.T2__f__1);
-                var x158 = $as_s_Option(x140.T2__f__2);
+                var x164 = $as_s_Option(x147.T2__f__1);
+                var x165 = $as_s_Option(x147.T2__f__2);
                 var x$2 = $m_s_None$();
-                if ((x$2 === x157)) {
+                if ((x$2 === x164)) {
                   var x$3 = $m_s_None$();
-                  var $$x1 = (x$3 === x158)
+                  var $$x1 = (x$3 === x165)
                 } else {
                   var $$x1 = false
                 };
                 if ($$x1) {
                   break matchAlts2
                 };
-                if (((x157 instanceof $c_s_Some) && ($n($as_s_Some(x157)).s_Some__f_value === "ASC"))) {
+                if (((x164 instanceof $c_s_Some) && ($n($as_s_Some(x164)).s_Some__f_value === "ASC"))) {
                   var x$5 = $m_s_None$();
-                  var $$x2 = (x$5 === x158)
+                  var $$x2 = (x$5 === x165)
                 } else {
                   var $$x2 = false
                 };
@@ -51749,34 +51865,34 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.ordering__s_util_parsing_combinator_Pac
                 break matchAlts1
               };
               var ordering = "ASC NULLS FIRST";
-              break matchResult11
+              break matchResult12
             };
-            var x149 = $as_s_Option(x140.T2__f__1);
-            var x150 = $as_s_Option(x140.T2__f__2);
+            var x156 = $as_s_Option(x147.T2__f__1);
+            var x157 = $as_s_Option(x147.T2__f__2);
             var x$7 = $m_s_None$();
-            if (((x$7 === x149) && (x150 instanceof $c_s_Some))) {
-              var nulls = $as_T($n($as_s_Some(x150)).s_Some__f_value);
+            if (((x$7 === x156) && (x157 instanceof $c_s_Some))) {
+              var nulls = $as_T($n($as_s_Some(x157)).s_Some__f_value);
               var this$7 = $n(nulls);
               var ordering = ("ASC NULLS " + $as_T(this$7.toUpperCase()));
-              break matchResult11
+              break matchResult12
             };
             var x$9 = $m_s_None$();
-            if ((x$9 === x150)) {
+            if ((x$9 === x157)) {
               var ordering = "DESC NULLS LAST";
-              break matchResult11
+              break matchResult12
             };
-            if ((x149 instanceof $c_s_Some)) {
-              var dir = $as_T($n($as_s_Some(x149)).s_Some__f_value);
-              if ((x150 instanceof $c_s_Some)) {
-                var nulls$2 = $as_T($n($as_s_Some(x150)).s_Some__f_value);
+            if ((x156 instanceof $c_s_Some)) {
+              var dir = $as_T($n($as_s_Some(x156)).s_Some__f_value);
+              if ((x157 instanceof $c_s_Some)) {
+                var nulls$2 = $as_T($n($as_s_Some(x157)).s_Some__f_value);
                 var this$8 = $n(dir);
                 var $$x3 = $as_T(this$8.toUpperCase());
                 var this$9 = $n(nulls$2);
                 var ordering = (($$x3 + " NULLS ") + $as_T(this$9.toUpperCase()));
-                break matchResult11
+                break matchResult12
               }
             };
-            throw new $c_s_MatchError(x140)
+            throw new $c_s_MatchError(x147)
           };
           return new $c_Lcom_vinctus_oql_OQLOrdering(e, ordering)
         }
@@ -51842,10 +51958,10 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.orExpression__s_util_parsing_combinator
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x172 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x172 !== null)) {
+        var x179 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x179 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x172).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x179).s_util_parsing_combinator_Parsers$$tilde__f__1);
           var r$1 = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InfixOQLExpression(l, "OR", r$1)
         }
@@ -51866,10 +51982,10 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.andExpression__s_util_parsing_combinato
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x179 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x179 !== null)) {
+        var x186 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x186 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x179).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x186).s_util_parsing_combinator_Parsers$$tilde__f__1);
           var r$1 = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InfixOQLExpression(l, "AND", r$1)
         }
@@ -51901,11 +52017,11 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x186 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x186 !== null)) {
+        var x193 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x193 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x186).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          var c = $as_T($n(x186).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x193).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var c = $as_T($n(x193).s_util_parsing_combinator_Parsers$$tilde__f__2);
           var r = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InfixOQLExpression(l, c, r)
         }
@@ -51927,18 +52043,18 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
       var x$1$3 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$2);
       if ((x$1$3 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x193 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$3).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x193 !== null)) {
+        var x200 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$3).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x200 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var x196 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x193).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          if ((x196 !== null)) {
+          var x203 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x200).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          if ((x203 !== null)) {
             $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-            var x199 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x196).s_util_parsing_combinator_Parsers$$tilde__f__1);
-            if ((x199 !== null)) {
+            var x206 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x203).s_util_parsing_combinator_Parsers$$tilde__f__1);
+            if ((x206 !== null)) {
               $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-              var e = $as_Lcom_vinctus_oql_OQLExpression($n(x199).s_util_parsing_combinator_Parsers$$tilde__f__1);
-              var b = $as_T($n(x199).s_util_parsing_combinator_Parsers$$tilde__f__2);
-              var l$1 = $as_Lcom_vinctus_oql_OQLExpression($n(x196).s_util_parsing_combinator_Parsers$$tilde__f__2);
+              var e = $as_Lcom_vinctus_oql_OQLExpression($n(x206).s_util_parsing_combinator_Parsers$$tilde__f__1);
+              var b = $as_T($n(x206).s_util_parsing_combinator_Parsers$$tilde__f__2);
+              var l$1 = $as_Lcom_vinctus_oql_OQLExpression($n(x203).s_util_parsing_combinator_Parsers$$tilde__f__2);
               var u = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$3).s_util_parsing_combinator_Parsers$$tilde__f__2);
               return new $c_Lcom_vinctus_oql_BetweenOQLExpression(e, b, l$1, u)
             }
@@ -51959,11 +52075,11 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
       var x$1$7 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$6);
       if ((x$1$7 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x210 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$7).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x210 !== null)) {
+        var x217 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$7).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x217 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var e$2 = $as_Lcom_vinctus_oql_OQLExpression($n(x210).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          var i = $as_T($n(x210).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var e$2 = $as_Lcom_vinctus_oql_OQLExpression($n(x217).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var i = $as_T($n(x217).s_util_parsing_combinator_Parsers$$tilde__f__2);
           var es = $as_sci_List($n(x$1$7).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InArrayOQLExpression(e$2, i, es)
         }
@@ -51973,11 +52089,11 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.booleanPrimary__s_util_parsing_combinat
       var x$1$9 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$8);
       if ((x$1$9 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x217 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$9).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x217 !== null)) {
+        var x224 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$9).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x224 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var e$3 = $as_Lcom_vinctus_oql_OQLExpression($n(x217).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          var i$1 = $as_T($n(x217).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var e$3 = $as_Lcom_vinctus_oql_OQLExpression($n(x224).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var i$1 = $as_T($n(x224).s_util_parsing_combinator_Parsers$$tilde__f__2);
           var q = $as_Lcom_vinctus_oql_OQLQuery($n(x$1$9).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InQueryOQLExpression(e$3, i$1, q)
         }
@@ -52097,11 +52213,11 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.additive__s_util_parsing_combinator_Pac
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x224 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x224 !== null)) {
+        var x231 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x231 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x224).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          var o = $as_T($n(x224).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x231).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var o = $as_T($n(x231).s_util_parsing_combinator_Parsers$$tilde__f__2);
           var r = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InfixOQLExpression(l, o, r)
         }
@@ -52119,11 +52235,11 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.multiplicative__s_util_parsing_combinat
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x231 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x231 !== null)) {
+        var x238 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x238 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x231).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          var o = $as_T($n(x231).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var l = $as_Lcom_vinctus_oql_OQLExpression($n(x238).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var o = $as_T($n(x238).s_util_parsing_combinator_Parsers$$tilde__f__2);
           var r = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_Lcom_vinctus_oql_InfixOQLExpression(l, o, r)
         }
@@ -52174,10 +52290,10 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.pair__s_util_parsing_combinator_Packrat
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x238 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x238 !== null)) {
+        var x245 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x245 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var k = $as_T($n(x238).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          var k = $as_T($n(x245).s_util_parsing_combinator_Parsers$$tilde__f__1);
           var v = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
           return new $c_T2(k, v)
         }
@@ -52232,7 +52348,7 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.jsonExpression__s_util_parsing_combinat
 });
 $c_Lcom_vinctus_oql_OQLParser$.prototype.primary__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lcom_vinctus_oql_OQLParser$__f_primarybitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n(this.literalExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.jsonExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.starExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.applyExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.qualifiedAttributeExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("&", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifiers__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((_$2) => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n(this.literalExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.jsonExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.starExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.applyExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.castExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.qualifiedAttributeExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("&", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifiers__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((_$2) => {
       var _$2$1 = $as_sci_List(_$2);
       return new $c_Lcom_vinctus_oql_ReferenceOQLExpression(_$2$1, null)
     }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("-", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.primary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
@@ -52293,13 +52409,13 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.when__s_util_parsing_combinator_Packrat
         var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
         if ((x$1$1 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var x249 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          if ((x249 !== null)) {
+          var x256 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          if ((x256 !== null)) {
             $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-            var x252 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x249).s_util_parsing_combinator_Parsers$$tilde__f__1);
-            if ((x252 !== null)) {
+            var x259 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x256).s_util_parsing_combinator_Parsers$$tilde__f__1);
+            if ((x259 !== null)) {
               $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-              var l = $as_Lcom_vinctus_oql_OQLExpression($n(x252).s_util_parsing_combinator_Parsers$$tilde__f__2);
+              var l = $as_Lcom_vinctus_oql_OQLExpression($n(x259).s_util_parsing_combinator_Parsers$$tilde__f__2);
               var e = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
               return new $c_Lcom_vinctus_oql_OQLWhen(l, e)
             }
@@ -52427,49 +52543,49 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.parseQuery__T__Lcom_vinctus_oql_OQLQuer
   var p = this.query__s_util_parsing_combinator_PackratParsers$PackratParser();
   var p$1 = $f_s_util_parsing_combinator_PackratParsers__phrase__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
   var in$1 = $ct_s_util_parsing_combinator_PackratParsers$PackratReader__s_util_parsing_combinator_PackratParsers__s_util_parsing_input_Reader__(new $c_s_util_parsing_combinator_PackratParsers$PackratReader(), this, $ct_s_util_parsing_input_CharSequenceReader__jl_CharSequence__(new $c_s_util_parsing_input_CharSequenceReader(), input));
-  var x261 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p$1, in$1);
-  if (((x261 instanceof $c_s_util_parsing_combinator_Parsers$Success) && ($n($as_s_util_parsing_combinator_Parsers$Success(x261)).s_util_parsing_combinator_Parsers$Success__f_$outer === this))) {
+  var x268 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p$1, in$1);
+  if (((x268 instanceof $c_s_util_parsing_combinator_Parsers$Success) && ($n($as_s_util_parsing_combinator_Parsers$Success(x268)).s_util_parsing_combinator_Parsers$Success__f_$outer === this))) {
     $n(this.Success__s_util_parsing_combinator_Parsers$Success$());
-    var x$1 = $as_s_util_parsing_combinator_Parsers$Success(x261);
+    var x$1 = $as_s_util_parsing_combinator_Parsers$Success(x268);
     var this$2 = $n(x$1);
-    var x268 = $as_Lcom_vinctus_oql_OQLQuery(this$2.s_util_parsing_combinator_Parsers$Success__f_result);
+    var x275 = $as_Lcom_vinctus_oql_OQLQuery(this$2.s_util_parsing_combinator_Parsers$Success__f_result);
     var this$3 = $n(x$1);
-    return x268
-  };
-  if ((x261 !== null)) {
-    var x262 = $n(this.NoSuccess__s_util_parsing_combinator_Parsers$NoSuccess$()).unapply__s_util_parsing_combinator_Parsers$ParseResult__s_Option(x261);
-    if ((!$n(x262).isEmpty__Z())) {
-      var x263 = $as_T2($n(x262).get__O());
-      var error = $as_T($n(x263).T2__f__1);
-      var rest = $as_s_util_parsing_input_Reader($n(x263).T2__f__2);
+    return x275
+  };
+  if ((x268 !== null)) {
+    var x269 = $n(this.NoSuccess__s_util_parsing_combinator_Parsers$NoSuccess$()).unapply__s_util_parsing_combinator_Parsers$ParseResult__s_Option(x268);
+    if ((!$n(x269).isEmpty__Z())) {
+      var x270 = $as_T2($n(x269).get__O());
+      var error = $as_T($n(x270).T2__f__1);
+      var rest = $as_s_util_parsing_input_Reader($n(x270).T2__f__2);
       $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(rest).pos__s_util_parsing_input_Position(), error, input)
     }
   };
-  throw new $c_s_MatchError(x261)
+  throw new $c_s_MatchError(x268)
 });
 $c_Lcom_vinctus_oql_OQLParser$.prototype.parseBooleanExpression__T__Lcom_vinctus_oql_OQLExpression = (function(input) {
   var p = this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser();
   var p$1 = $f_s_util_parsing_combinator_PackratParsers__phrase__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
   var in$1 = $ct_s_util_parsing_combinator_PackratParsers$PackratReader__s_util_parsing_combinator_PackratParsers__s_util_parsing_input_Reader__(new $c_s_util_parsing_combinator_PackratParsers$PackratReader(), this, $ct_s_util_parsing_input_CharSequenceReader__jl_CharSequence__(new $c_s_util_parsing_input_CharSequenceReader(), input));
-  var x270 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p$1, in$1);
-  if (((x270 instanceof $c_s_util_parsing_combinator_Parsers$Success) && ($n($as_s_util_parsing_combinator_Parsers$Success(x270)).s_util_parsing_combinator_Parsers$Success__f_$outer === this))) {
+  var x277 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p$1, in$1);
+  if (((x277 instanceof $c_s_util_parsing_combinator_Parsers$Success) && ($n($as_s_util_parsing_combinator_Parsers$Success(x277)).s_util_parsing_combinator_Parsers$Success__f_$outer === this))) {
     $n(this.Success__s_util_parsing_combinator_Parsers$Success$());
-    var x$1 = $as_s_util_parsing_combinator_Parsers$Success(x270);
+    var x$1 = $as_s_util_parsing_combinator_Parsers$Success(x277);
     var this$2 = $n(x$1);
-    var x277 = $as_Lcom_vinctus_oql_OQLExpression(this$2.s_util_parsing_combinator_Parsers$Success__f_result);
+    var x284 = $as_Lcom_vinctus_oql_OQLExpression(this$2.s_util_parsing_combinator_Parsers$Success__f_result);
     var this$3 = $n(x$1);
-    return x277
-  };
-  if ((x270 !== null)) {
-    var x271 = $n(this.NoSuccess__s_util_parsing_combinator_Parsers$NoSuccess$()).unapply__s_util_parsing_combinator_Parsers$ParseResult__s_Option(x270);
-    if ((!$n(x271).isEmpty__Z())) {
-      var x272 = $as_T2($n(x271).get__O());
-      var error = $as_T($n(x272).T2__f__1);
-      var rest = $as_s_util_parsing_input_Reader($n(x272).T2__f__2);
+    return x284
+  };
+  if ((x277 !== null)) {
+    var x278 = $n(this.NoSuccess__s_util_parsing_combinator_Parsers$NoSuccess$()).unapply__s_util_parsing_combinator_Parsers$ParseResult__s_Option(x277);
+    if ((!$n(x278).isEmpty__Z())) {
+      var x279 = $as_T2($n(x278).get__O());
+      var error = $as_T($n(x279).T2__f__1);
+      var rest = $as_s_util_parsing_input_Reader($n(x279).T2__f__2);
       $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(rest).pos__s_util_parsing_input_Position(), error, input)
     }
   };
-  throw new $c_s_MatchError(x270)
+  throw new $c_s_MatchError(x277)
 });
 $c_Lcom_vinctus_oql_OQLParser$.prototype.phrase__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_combinator_Parsers$Parser = (function(p) {
   return $f_s_util_parsing_combinator_PackratParsers__phrase__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_combinator_PackratParsers$PackratParser(this, p)
@@ -66420,11 +66536,11 @@ var $d_Lcom_vinctus_oql_SubtractOQLProject = new $TypeData().initClass({
 });
 $c_Lcom_vinctus_oql_SubtractOQLProject.prototype.$classData = $d_Lcom_vinctus_oql_SubtractOQLProject;
 /** @constructor */
-function $c_Lcom_vinctus_oql_TypedOQLExpression(v, t) {
+function $c_Lcom_vinctus_oql_TypedOQLExpression(expr, t) {
   this.Lcom_vinctus_oql_OQLExpression__f_typ = null;
-  this.Lcom_vinctus_oql_TypedOQLExpression__f_v = null;
+  this.Lcom_vinctus_oql_TypedOQLExpression__f_expr = null;
   this.Lcom_vinctus_oql_TypedOQLExpression__f_t = null;
-  this.Lcom_vinctus_oql_TypedOQLExpression__f_v = v;
+  this.Lcom_vinctus_oql_TypedOQLExpression__f_expr = expr;
   this.Lcom_vinctus_oql_TypedOQLExpression__f_t = t
 }
 $c_Lcom_vinctus_oql_TypedOQLExpression.prototype = new $h_Lcom_vinctus_oql_OQLExpression();
@@ -66446,12 +66562,12 @@ $c_Lcom_vinctus_oql_TypedOQLExpression.prototype.equals__O__Z = (function(x$0) {
     return true
   } else if ((x$0 instanceof $c_Lcom_vinctus_oql_TypedOQLExpression)) {
     var x$0$2 = $as_Lcom_vinctus_oql_TypedOQLExpression(x$0);
-    var x = this.Lcom_vinctus_oql_TypedOQLExpression__f_v;
-    var y = $n(x$0$2).Lcom_vinctus_oql_TypedOQLExpression__f_v;
-    if ($m_sr_BoxesRunTime$().equals__O__O__Z(x, y)) {
-      var x$1 = this.Lcom_vinctus_oql_TypedOQLExpression__f_t;
-      var x$2 = $n(x$0$2).Lcom_vinctus_oql_TypedOQLExpression__f_t;
-      var $$x1 = ((x$1 === null) ? (x$2 === null) : $n(x$1).equals__O__Z(x$2))
+    var x = this.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
+    var x$2 = $n(x$0$2).Lcom_vinctus_oql_TypedOQLExpression__f_expr;
+    if (((x === null) ? (x$2 === null) : $n(x).equals__O__Z(x$2))) {
+      var x$3 = this.Lcom_vinctus_oql_TypedOQLExpression__f_t;
+      var x$4 = $n(x$0$2).Lcom_vinctus_oql_TypedOQLExpression__f_t;
+      var $$x1 = ((x$3 === null) ? (x$4 === null) : $n(x$3).equals__O__Z(x$4))
     } else {
       var $$x1 = false
     };
@@ -66476,7 +66592,7 @@ $c_Lcom_vinctus_oql_TypedOQLExpression.prototype.productPrefix__T = (function()
 });
 $c_Lcom_vinctus_oql_TypedOQLExpression.prototype.productElement__I__O = (function(n) {
   if ((n === 0)) {
-    return this.Lcom_vinctus_oql_TypedOQLExpression__f_v
+    return this.Lcom_vinctus_oql_TypedOQLExpression__f_expr
   };
   if ((n === 1)) {
     return this.Lcom_vinctus_oql_TypedOQLExpression__f_t
@@ -66485,7 +66601,7 @@ $c_Lcom_vinctus_oql_TypedOQLExpression.prototype.productElement__I__O = (functio
 });
 $c_Lcom_vinctus_oql_TypedOQLExpression.prototype.productElementName__I__T = (function(n) {
   if ((n === 0)) {
-    return "v"
+    return "expr"
   };
   if ((n === 1)) {
     return "t"
@@ -102661,6 +102777,82 @@ function $m_Lcom_vinctus_oql_IntegerType$() {
   return $n_Lcom_vinctus_oql_IntegerType$
 }
 /** @constructor */
+function $c_Lcom_vinctus_oql_IntervalType$() {
+  this.Lcom_vinctus_oql_IntervalType$__f_isDataType = false;
+  this.Lcom_vinctus_oql_IntervalType$__f_isColumnType = false;
+  this.Lcom_vinctus_oql_IntervalType$__f_isArrayType = false;
+  $n_Lcom_vinctus_oql_IntervalType$ = this;
+  $f_Lcom_vinctus_oql_Datatype__$init$__V(this)
+}
+$c_Lcom_vinctus_oql_IntervalType$.prototype = new $h_O();
+$c_Lcom_vinctus_oql_IntervalType$.prototype.constructor = $c_Lcom_vinctus_oql_IntervalType$;
+/** @constructor */
+function $h_Lcom_vinctus_oql_IntervalType$() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_IntervalType$.prototype = $c_Lcom_vinctus_oql_IntervalType$.prototype;
+$c_Lcom_vinctus_oql_IntervalType$.prototype.isDataType__Z = (function() {
+  return this.Lcom_vinctus_oql_IntervalType$__f_isDataType
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.isColumnType__Z = (function() {
+  return this.Lcom_vinctus_oql_IntervalType$__f_isColumnType
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.isArrayType__Z = (function() {
+  return this.Lcom_vinctus_oql_IntervalType$__f_isArrayType
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.com$vinctus$oql$Datatype$_setter_$isDataType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_IntervalType$__f_isDataType = x$0
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.com$vinctus$oql$Datatype$_setter_$isColumnType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_IntervalType$__f_isColumnType = x$0
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.com$vinctus$oql$Datatype$_setter_$isArrayType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_IntervalType$__f_isArrayType = x$0
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_s_Product$$anon$1(this)
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.hashCode__I = (function() {
+  return (-1405529665)
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.toString__T = (function() {
+  return "IntervalType"
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.productArity__I = (function() {
+  return 0
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.productPrefix__T = (function() {
+  return "IntervalType"
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.productElement__I__O = (function(n) {
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.productElementName__I__T = (function(n) {
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+var $d_Lcom_vinctus_oql_IntervalType$ = new $TypeData().initClass({
+  Lcom_vinctus_oql_IntervalType$: 0
+}, false, "com.vinctus.oql.IntervalType$", {
+  Lcom_vinctus_oql_IntervalType$: 1,
+  O: 1,
+  Lcom_vinctus_oql_TypeSpecifier: 1,
+  Lcom_vinctus_oql_Datatype: 1,
+  s_Equals: 1,
+  s_Product: 1,
+  Ljava_io_Serializable: 1,
+  s_deriving_Mirror: 1,
+  s_deriving_Mirror$Product: 1,
+  s_deriving_Mirror$Singleton: 1
+});
+$c_Lcom_vinctus_oql_IntervalType$.prototype.$classData = $d_Lcom_vinctus_oql_IntervalType$;
+var $n_Lcom_vinctus_oql_IntervalType$;
+function $m_Lcom_vinctus_oql_IntervalType$() {
+  if ((!$n_Lcom_vinctus_oql_IntervalType$)) {
+    $n_Lcom_vinctus_oql_IntervalType$ = new $c_Lcom_vinctus_oql_IntervalType$()
+  };
+  return $n_Lcom_vinctus_oql_IntervalType$
+}
+/** @constructor */
 function $c_Lcom_vinctus_oql_JSONType$() {
   this.Lcom_vinctus_oql_JSONType$__f_isDataType = false;
   this.Lcom_vinctus_oql_JSONType$__f_isColumnType = false;