@vinctus/oql 1.1.18 → 1.1.20

package/main.js

@@ -282,6 +282,13 @@ function $dp_indexOf__I__I(instance, x0) {
     return instance.indexOf__I__I(x0)
   }
 }
+function $dp_indexOf__I__I__I(instance, x0, x1) {
+  if (((typeof instance) === "string")) {
+    return $f_T__indexOf__I__I__I(instance, x0, x1)
+  } else {
+    return instance.indexOf__I__I__I(x0, x1)
+  }
+}
 function $dp_intValue__I(instance) {
   if (((typeof instance) === "number")) {
     return $f_jl_Double__intValue__I(instance)
@@ -1137,6 +1144,7 @@ function $ct_Lcom_vinctus_oql_AbstractOQL__T__Lcom_vinctus_oql_SQLDataSource__Lc
   $thiz.Lcom_vinctus_oql_AbstractOQL__f_ec = ec;
   $thiz.Lcom_vinctus_oql_AbstractOQL__f__transpileOnly = false;
   $thiz.Lcom_vinctus_oql_AbstractOQL__f__showQuery = false;
+  $thiz.Lcom_vinctus_oql_AbstractOQL__f_macros = $ct_scm_HashMap__(new $c_scm_HashMap());
   $thiz.Lcom_vinctus_oql_AbstractOQL__f_model = new $c_Lcom_vinctus_oql_DataModel(new $c_Lcom_vinctus_oql_DMLParser().parseModel__T__Lcom_vinctus_oql_DMLModel(dm), dm);
   return $thiz
 }
@@ -1144,147 +1152,147 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
   var resultSet$tailLocal1 = resultSet;
   var node$tailLocal1 = node;
   while (true) {
-    var x60 = node$tailLocal1;
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ResultNode)) {
-      var x$1 = $as_Lcom_vinctus_oql_AbstractOQL$ResultNode(x60);
+    var x78 = node$tailLocal1;
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ResultNode)) {
+      var x$1 = $as_Lcom_vinctus_oql_AbstractOQL$ResultNode(x78);
       var this$2 = $n(x$1);
       var this$3 = $n(x$1);
-      var x86 = this$3.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_element;
+      var x104 = this$3.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_element;
       var result = $n($as_Lcom_vinctus_oql_ResultBuilder($n(newResultBuilder$2).apply__O())).newArray__Lcom_vinctus_oql_ResultBuilder();
       while ($n(resultSet$tailLocal1).next__Z()) {
-        $n(result).$plus$eq__O__Lcom_vinctus_oql_ResultBuilder($p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O($thiz, oql$10, newResultBuilder$2, x86, resultSet$tailLocal1))
+        $n(result).$plus$eq__O__Lcom_vinctus_oql_ResultBuilder($p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O($thiz, oql$10, newResultBuilder$2, x104, resultSet$tailLocal1))
       };
       return result
     };
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode)) {
-      var x79 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode(x60);
-      var this$5 = $n(x79);
-      var this$6 = $n(x79);
-      var x82 = this$6.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_element;
-      var this$7 = $n($n(x79).Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx);
-      if (((!this$7.isEmpty__Z()) && ($n($n(resultSet$tailLocal1).get__I__Lcom_vinctus_oql_OQLResultSetValue($uI($n($n(x79).Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx).get__O()))).value__O() === null))) {
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode)) {
+      var x97 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode(x78);
+      var this$5 = $n(x97);
+      var this$6 = $n(x97);
+      var x100 = this$6.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_element;
+      var this$7 = $n($n(x97).Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx);
+      if (((!this$7.isEmpty__Z()) && ($n($n(resultSet$tailLocal1).get__I__Lcom_vinctus_oql_OQLResultSetValue($uI($n($n(x97).Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_idx).get__O()))).value__O() === null))) {
         return null
       } else {
-        node$tailLocal1 = x82;
+        node$tailLocal1 = x100;
         continue
       }
     };
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToOneNode)) {
-      var x75 = $as_Lcom_vinctus_oql_AbstractOQL$OneToOneNode(x60);
-      var this$9 = $n(x75);
-      var x77 = this$9.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_query;
-      var this$10 = $n(x75);
-      var x78 = this$10.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_element;
-      var sequenceResultSet = $n(resultSet$tailLocal1).getResultSet__I__Lcom_vinctus_oql_OQLResultSet($n(x75).Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_idx);
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToOneNode)) {
+      var x93 = $as_Lcom_vinctus_oql_AbstractOQL$OneToOneNode(x78);
+      var this$9 = $n(x93);
+      var x95 = this$9.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_query;
+      var this$10 = $n(x93);
+      var x96 = this$10.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_element;
+      var sequenceResultSet = $n(resultSet$tailLocal1).getResultSet__I__Lcom_vinctus_oql_OQLResultSet($n(x93).Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_idx);
       var rows = 0;
       while ($n(sequenceResultSet).next__Z()) {
         rows = ((1 + rows) | 0)
       };
       if ((rows > 1)) {
-        $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x77).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (((("attribute '" + $n($n(x77).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + "' had a result set consisting of ") + rows) + " rows"), oql$10)
+        $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x95).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (((("attribute '" + $n($n(x95).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + "' had a result set consisting of ") + rows) + " rows"), oql$10)
       };
       if ((rows === 0)) {
         return null
       } else {
-        node$tailLocal1 = x78;
+        node$tailLocal1 = x96;
         resultSet$tailLocal1 = sequenceResultSet;
         continue
       }
     };
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToManyNode)) {
-      var x71 = $as_Lcom_vinctus_oql_AbstractOQL$OneToManyNode(x60);
-      var this$12 = $n(x71);
-      var this$13 = $n(x71);
-      var x74 = this$13.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_element;
-      var sequenceResultSet$2 = $n(resultSet$tailLocal1).getResultSet__I__Lcom_vinctus_oql_OQLResultSet($n(x71).Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_idx);
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToManyNode)) {
+      var x89 = $as_Lcom_vinctus_oql_AbstractOQL$OneToManyNode(x78);
+      var this$12 = $n(x89);
+      var this$13 = $n(x89);
+      var x92 = this$13.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_element;
+      var sequenceResultSet$2 = $n(resultSet$tailLocal1).getResultSet__I__Lcom_vinctus_oql_OQLResultSet($n(x89).Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_idx);
       var result$2 = $n($as_Lcom_vinctus_oql_ResultBuilder($n(newResultBuilder$2).apply__O())).newArray__Lcom_vinctus_oql_ResultBuilder();
       while ($n(sequenceResultSet$2).next__Z()) {
-        $n(result$2).$plus$eq__O__Lcom_vinctus_oql_ResultBuilder($p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O($thiz, oql$10, newResultBuilder$2, x74, sequenceResultSet$2))
+        $n(result$2).$plus$eq__O__Lcom_vinctus_oql_ResultBuilder($p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O($thiz, oql$10, newResultBuilder$2, x92, sequenceResultSet$2))
       };
       return $n(result$2).arrayResult__O()
     };
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode)) {
-      var x67 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(x60);
-      var this$15 = $n(x67);
-      var this$16 = $n(x67);
-      var x70 = this$16.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_element;
-      var sequenceResultSet$3 = $n(resultSet$tailLocal1).getResultSet__I__Lcom_vinctus_oql_OQLResultSet($n(x67).Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_idx);
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode)) {
+      var x85 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(x78);
+      var this$15 = $n(x85);
+      var this$16 = $n(x85);
+      var x88 = this$16.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_element;
+      var sequenceResultSet$3 = $n(resultSet$tailLocal1).getResultSet__I__Lcom_vinctus_oql_OQLResultSet($n(x85).Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_idx);
       var result$3 = $n($as_Lcom_vinctus_oql_ResultBuilder($n(newResultBuilder$2).apply__O())).newArray__Lcom_vinctus_oql_ResultBuilder();
       while ($n(sequenceResultSet$3).next__Z()) {
-        $n(result$3).$plus$eq__O__Lcom_vinctus_oql_ResultBuilder($p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O($thiz, oql$10, newResultBuilder$2, x70, sequenceResultSet$3))
+        $n(result$3).$plus$eq__O__Lcom_vinctus_oql_ResultBuilder($p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O($thiz, oql$10, newResultBuilder$2, x88, sequenceResultSet$3))
       };
       return $n(result$3).arrayResult__O()
     };
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ValueNode)) {
-      var x64 = $as_Lcom_vinctus_oql_AbstractOQL$ValueNode(x60);
-      var this$18 = $n(x64);
-      var x66 = this$18.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_value;
-      var v = $n(resultSet$tailLocal1).get__I__Lcom_vinctus_oql_OQLResultSetValue($n(x64).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx);
-      var typ = ($n(x64).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed ? $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_ds).reverseMapType__T__Lcom_vinctus_oql_Datatype($n(resultSet$tailLocal1).getString__I__T(((1 + $n(x64).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx) | 0))) : $n(x66).Lcom_vinctus_oql_OQLExpression__f_typ);
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ValueNode)) {
+      var x82 = $as_Lcom_vinctus_oql_AbstractOQL$ValueNode(x78);
+      var this$18 = $n(x82);
+      var x84 = this$18.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_value;
+      var v = $n(resultSet$tailLocal1).get__I__Lcom_vinctus_oql_OQLResultSetValue($n(x82).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx);
+      var typ = ($n(x82).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed ? $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_ds).reverseMapType__T__Lcom_vinctus_oql_Datatype($n(resultSet$tailLocal1).getString__I__T(((1 + $n(x82).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx) | 0))) : $n(x84).Lcom_vinctus_oql_OQLExpression__f_typ);
       var _2 = $n(v).value__O();
       if (((typeof _2) === "string")) {
-        var x53 = $as_T(_2);
+        var x71 = $as_T(_2);
         var x = $m_Lcom_vinctus_oql_IntegerType$();
         if ((x === typ)) {
           $m_sc_StringOps$();
           var this$22 = $m_jl_Integer$();
-          return this$22.parseInt__T__I__I(x53, 10)
+          return this$22.parseInt__T__I__I(x71, 10)
         };
         var x$3 = $m_Lcom_vinctus_oql_FloatType$();
         if ((x$3 === typ)) {
           $m_sc_StringOps$();
-          return $m_jl_Double$().parseDouble__T__D(x53)
+          return $m_jl_Double$().parseDouble__T__D(x71)
         };
         var x$5 = $m_Lcom_vinctus_oql_BigintType$();
         if ((x$5 === typ)) {
-          return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).bigint__T__O(x53)
+          return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).bigint__T__O(x71)
         };
         var x$7 = $m_Lcom_vinctus_oql_UUIDType$();
         if ((x$7 === typ)) {
           $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv);
-          return x53
+          return x71
         };
         var x$9 = $m_Lcom_vinctus_oql_TimestampType$();
         if ((x$9 === typ)) {
-          return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).timestamp__T__O(x53)
+          return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).timestamp__T__O(x71)
         };
         if ((typ instanceof $c_Lcom_vinctus_oql_DecimalType)) {
           var x$1$1 = $as_Lcom_vinctus_oql_DecimalType(typ);
           var this$27 = $n(x$1$1);
-          var x31 = this$27.Lcom_vinctus_oql_DecimalType__f_precision;
+          var x49 = this$27.Lcom_vinctus_oql_DecimalType__f_precision;
           var this$28 = $n(x$1$1);
-          var x32 = this$28.Lcom_vinctus_oql_DecimalType__f_scale;
-          return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).decimal__T__I__I__O(x53, x31, x32)
+          var x50 = this$28.Lcom_vinctus_oql_DecimalType__f_scale;
+          return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).decimal__T__I__I__O(x71, x49, x50)
         }
       };
       if ((v instanceof $c_Lcom_vinctus_oql_NodePGResultSetValue)) {
         var x$1$2 = $as_Lcom_vinctus_oql_NodePGResultSetValue(v);
         var this$30 = $n(x$1$2);
-        var x25 = this$30.Lcom_vinctus_oql_NodePGResultSetValue__f_value;
+        var x43 = this$30.Lcom_vinctus_oql_NodePGResultSetValue__f_value;
         var x$11 = $m_Lcom_vinctus_oql_JSONType$();
         if ((x$11 === typ)) {
           $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv);
-          return x25
+          return x43
         }
       };
       if ((v instanceof $c_Lcom_vinctus_oql_SequenceResultSetValue)) {
         var x$1$3 = $as_Lcom_vinctus_oql_SequenceResultSetValue(v);
         var this$33 = $n(x$1$3);
-        var x19 = this$33.Lcom_vinctus_oql_SequenceResultSetValue__f_value;
+        var x37 = this$33.Lcom_vinctus_oql_SequenceResultSetValue__f_value;
         var x$13 = $m_Lcom_vinctus_oql_JSONType$();
         if ((x$13 === typ)) {
           $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv);
-          return $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(x19)
+          return $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(x37)
         }
       };
       return $n(v).value__O()
     };
-    if ((x60 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ObjectNode)) {
-      var x$1$4 = $as_Lcom_vinctus_oql_AbstractOQL$ObjectNode(x60);
+    if ((x78 instanceof $c_Lcom_vinctus_oql_AbstractOQL$ObjectNode)) {
+      var x$1$4 = $as_Lcom_vinctus_oql_AbstractOQL$ObjectNode(x78);
       var this$36 = $n(x$1$4);
-      var x63 = this$36.Lcom_vinctus_oql_AbstractOQL$ObjectNode__f_props;
+      var x81 = this$36.Lcom_vinctus_oql_AbstractOQL$ObjectNode__f_props;
       var result$4 = $n($as_Lcom_vinctus_oql_ResultBuilder($n(newResultBuilder$2).apply__O())).newObject__Lcom_vinctus_oql_ResultBuilder();
-      var $$x1 = $n($n(x63).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1$5) => {
+      var $$x1 = $n($n(x81).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1$5) => {
         var x$1$6 = $as_T2(x$1$5);
         return ((x$1$6 !== null) && ($as_T($n(x$1$6).T2__f__1), $as_Lcom_vinctus_oql_AbstractOQL$Node($n(x$1$6).T2__f__2), true))
       }))));
@@ -1300,7 +1308,7 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
       }))(oql$10, newResultBuilder$2, result$4, resultSet$tailLocal1$2$1)));
       return $n(result$4).objectResult__O()
     };
-    throw new $c_s_MatchError(x60)
+    throw new $c_s_MatchError(x78)
   }
 }
 /** @constructor */
@@ -1310,6 +1318,7 @@ function $c_Lcom_vinctus_oql_AbstractOQL() {
   this.Lcom_vinctus_oql_AbstractOQL__f_ec = null;
   this.Lcom_vinctus_oql_AbstractOQL__f__transpileOnly = false;
   this.Lcom_vinctus_oql_AbstractOQL__f__showQuery = false;
+  this.Lcom_vinctus_oql_AbstractOQL__f_macros = null;
   this.Lcom_vinctus_oql_AbstractOQL__f_model = null
 }
 $c_Lcom_vinctus_oql_AbstractOQL.prototype = new $h_O();
@@ -1319,6 +1328,75 @@ function $h_Lcom_vinctus_oql_AbstractOQL() {
   /*<skip>*/
 }
 $h_Lcom_vinctus_oql_AbstractOQL.prototype = $c_Lcom_vinctus_oql_AbstractOQL.prototype;
+$c_Lcom_vinctus_oql_AbstractOQL.prototype.define__T__T__sci_Seq__V = (function(name, definition, parameters) {
+  matchResult3: {
+    var this$1 = $n(parameters);
+    var m = $as_scm_Map($m_scm_Map$().empty__O());
+    var it = this$1.iterator__sc_Iterator();
+    while ($n(it).hasNext__Z()) {
+      var elem = $n(it).next__O();
+      var x = $as_T(elem);
+      var bldr = $as_scm_Builder($n(m).getOrElseUpdate__O__F0__O(x, new $c_sjsr_AnonFunction0(((this$1) => (() => this$1.newSpecificBuilder__scm_Builder()))(this$1))));
+      var this$3 = $n(bldr);
+      this$3.addOne__O__scm_Growable(elem)
+    };
+    var this$4 = $m_sci_HashMap$();
+    var result = this$4.sci_HashMap$__f_EmptyMap;
+    var mapIt = $n(m).iterator__sc_Iterator();
+    while ($n(mapIt).hasNext__Z()) {
+      var x1 = $as_T2($n(mapIt).next__O());
+      if ((x1 === null)) {
+        throw new $c_s_MatchError(x1)
+      };
+      var k = $n(x1).T2__f__1;
+      var v = $as_scm_Builder($n(x1).T2__f__2);
+      result = $n(result).updated__O__O__sci_HashMap(k, $n(v).result__O())
+    };
+    var this$5 = $n(result);
+    var pf = new $c_Lcom_vinctus_oql_AbstractOQL$$anon$1();
+    var x17 = $as_sci_Iterable($f_sc_StrictOptimizedIterableOps__collect__s_PartialFunction__O(this$5, pf));
+    var x$2 = $m_s_package$().s_package$__f_Nil;
+    if (((x$2 === null) ? (x17 === null) : $n(x$2).equals__O__Z(x17))) {
+      break matchResult3
+    };
+    var $$x1 = $m_s_sys_package$();
+    var this$6 = $n(x17);
+    $n($$x1).error__T__E(("duplicate parameters: " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$6, "'", "', '", "'")))
+  };
+  var encounteredSet = $ct_scm_HashSet__(new $c_scm_HashSet());
+  var this$7 = $n(parameters);
+  var parameterSet = $m_sci_Set$().from__sc_IterableOnce__sci_Set(this$7);
+  var this$8 = $n($n($m_Lcom_vinctus_oql_Macro$package$().Lcom_vinctus_oql_Macro$package$__f_macroSubstitutionRegex).findAllMatchIn__jl_CharSequence__sc_Iterator(definition));
+  while (this$8.hasNext__Z()) {
+    var arg1 = this$8.next__O();
+    var m$1 = $as_s_util_matching_Regex$Match(arg1);
+    var this$9 = $n(m$1);
+    var this$10 = $n(this$9.s_util_matching_Regex$Match__f_matcher);
+    if (($n(this$10.ju_regex_Matcher__f_pattern0).ju_regex_Pattern__f_groupCount > 0)) {
+      var this$11 = $n(m$1);
+      var group = $f_s_util_matching_Regex$MatchData__group__I__T(this$11, 1);
+      encounteredSet.add__O__Z(group);
+      var this$12 = $n(parameterSet);
+      if ((!this$12.contains__O__Z(group))) {
+        $m_s_sys_package$().error__T__E((("substitution '" + group) + "' is not listed as a parameter"))
+      }
+    }
+  };
+  var x18 = $as_sci_Set($n(parameterSet).diff__sc_Set__sci_SetOps(encounteredSet));
+  var this$13 = $n(x18);
+  if ((!this$13.isEmpty__Z())) {
+    var $$x2 = $m_s_sys_package$();
+    var this$14 = $n(x18);
+    $n($$x2).error__T__E(("parameter(s) not encountered in the definition: " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$14, "'", "', '", "'")))
+  };
+  if ($n(this.Lcom_vinctus_oql_AbstractOQL__f_macros).contains__O__Z(name)) {
+    $m_s_sys_package$().error__T__E((("macro '" + name) + "' is already defined"))
+  } else {
+    var this$16 = $n(this.Lcom_vinctus_oql_AbstractOQL__f_macros);
+    var value = new $c_Lcom_vinctus_oql_Macro(definition, parameters);
+    $p_scm_HashMap__put0__O__O__Z__s_Some(this$16, name, value, false)
+  }
+});
 $c_Lcom_vinctus_oql_AbstractOQL.prototype.create__s_concurrent_Future = (function() {
   return this.execute__F1__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$1) => {
     var _$1$1 = $as_Lcom_vinctus_oql_OQLConnection(_$1);
@@ -1358,13 +1436,13 @@ $c_Lcom_vinctus_oql_AbstractOQL.prototype.processQuery__Lcom_vinctus_oql_OQLQuer
     while ((!$n(these$1).isEmpty__Z())) {
       var arg1$4 = $n(these$1).head__O();
       var x$1 = $as_Lcom_vinctus_oql_OQLOrdering(arg1$4);
-      matchResult1: {
+      matchResult5: {
         if ((x$1 !== null)) {
           var this$7 = $n(x$1);
-          var x3 = this$7.Lcom_vinctus_oql_OQLOrdering__f_expr;
+          var x21 = this$7.Lcom_vinctus_oql_OQLOrdering__f_expr;
           var this$8 = $n(x$1);
-          $m_Lcom_vinctus_oql_AbstractOQL$().decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(query).Lcom_vinctus_oql_OQLQuery__f_entity, x3, this.Lcom_vinctus_oql_AbstractOQL__f_model, this.Lcom_vinctus_oql_AbstractOQL__f_ds, oql);
-          break matchResult1
+          $m_Lcom_vinctus_oql_AbstractOQL$().decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(query).Lcom_vinctus_oql_OQLQuery__f_entity, x21, this.Lcom_vinctus_oql_AbstractOQL__f_model, this.Lcom_vinctus_oql_AbstractOQL__f_ds, oql);
+          break matchResult5
         };
         throw new $c_s_MatchError(x$1)
       };
@@ -1433,21 +1511,21 @@ $c_Lcom_vinctus_oql_AbstractOQL.prototype.count__Lcom_vinctus_oql_OQLQuery__T__L
   $n(query);
   return $n(this.queryMany__Lcom_vinctus_oql_OQLQuery__T__F0__Lcom_vinctus_oql_Fixed__s_concurrent_Future(new $c_Lcom_vinctus_oql_OQLQuery(source$1, entity$1, attr$1, project$1, select$1, group$1, order$1, limit$1, offset$1), oql, new $c_sjsr_AnonFunction0((() => new $c_Lcom_vinctus_oql_ScalaPlainResultBuilder())), fixed)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$9) => {
     var _$9$1 = $as_Lcom_vinctus_oql_ResultBuilder(_$9);
-    var x5 = $n(_$9$1).arrayResult__O();
+    var x23 = $n(_$9$1).arrayResult__O();
     var x = $m_s_package$().s_package$__f_Nil;
-    if (((x === null) ? (x5 === null) : $n(x).equals__O__Z(x5))) {
+    if (((x === null) ? (x23 === null) : $n(x).equals__O__Z(x23))) {
       $m_s_sys_package$().error__T__E("count: zero rows were found")
     };
-    if ((x5 instanceof $c_sci_List)) {
+    if ((x23 instanceof $c_sci_List)) {
       $n($m_s_package$().s_package$__f_List);
-      var x$1 = $as_sci_List(x5);
+      var x$1 = $as_sci_List(x23);
       if (($n(x$1).lengthCompare__I__I(1) === 0)) {
         var this$22 = $n(x$1);
-        var x8 = $f_sc_LinearSeqOps__apply__I__O(this$22, 0);
-        return $dp_intValue__I($n($as_jl_Number($n($as_sci_Map(x8)).apply__O__O("count"))))
+        var x26 = $f_sc_LinearSeqOps__apply__I__O(this$22, 0);
+        return $dp_intValue__I($n($as_jl_Number($n($as_sci_Map(x26)).apply__O__O("count"))))
       }
     };
-    $m_s_sys_package$().error__T__E(("count: more than one row was found: " + x5))
+    $m_s_sys_package$().error__T__E(("count: more than one row was found: " + x23))
   })), this.Lcom_vinctus_oql_AbstractOQL__f_ec)
 });
 $c_Lcom_vinctus_oql_AbstractOQL.prototype.showQuery__V = (function() {
@@ -1475,8 +1553,8 @@ $c_Lcom_vinctus_oql_AbstractOQL.prototype.fixedEntity__T__O__Lcom_vinctus_oql_Fi
 $c_Lcom_vinctus_oql_AbstractOQL.prototype.queryMany__Lcom_vinctus_oql_OQLQuery__T__F0__Lcom_vinctus_oql_Fixed__s_concurrent_Future = (function(query, oql, newResultBuilder, fixed) {
   var element = $m_Lcom_vinctus_oql_AbstractOQL$().objectNode__sci_List__Lcom_vinctus_oql_AbstractOQL$ObjectNode($n(query).Lcom_vinctus_oql_OQLQuery__f_project);
   var root = new $c_Lcom_vinctus_oql_AbstractOQL$ResultNode(query, element);
-  var sqlBuilder = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, this.Lcom_vinctus_oql_AbstractOQL__f_ds, fixed, this.Lcom_vinctus_oql_AbstractOQL__f_model, 0, false);
-  $m_Lcom_vinctus_oql_AbstractOQL$().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(root, null, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(sqlBuilder)), oql, this.Lcom_vinctus_oql_AbstractOQL__f_ds, fixed, this.Lcom_vinctus_oql_AbstractOQL__f_model);
+  var sqlBuilder = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, this.Lcom_vinctus_oql_AbstractOQL__f_ds, fixed, this.Lcom_vinctus_oql_AbstractOQL__f_model, this.Lcom_vinctus_oql_AbstractOQL__f_macros, 0, false);
+  $m_Lcom_vinctus_oql_AbstractOQL$().writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(root, null, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(sqlBuilder)), oql, this.Lcom_vinctus_oql_AbstractOQL__f_ds, fixed, this.Lcom_vinctus_oql_AbstractOQL__f_model, this.Lcom_vinctus_oql_AbstractOQL__f_macros);
   var sql = sqlBuilder.toString__T();
   this.show__T__V(sql);
   return (this.exec__Z() ? this.execute__F1__s_concurrent_Future(new $c_sjsr_AnonFunction1(((c) => {
@@ -1499,30 +1577,30 @@ function $h_Lcom_vinctus_oql_AbstractOQL$() {
 }
 $h_Lcom_vinctus_oql_AbstractOQL$.prototype = $c_Lcom_vinctus_oql_AbstractOQL$.prototype;
 $c_Lcom_vinctus_oql_AbstractOQL$.prototype.innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node = (function(query) {
-  matchResult8: {
+  matchResult12: {
     var $$x1;
-    var x87 = $n($n(query).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ;
-    if ((x87 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+    var x105 = $n($n(query).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ;
+    if ((x105 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
       var element = this.objectNode__sci_List__Lcom_vinctus_oql_AbstractOQL$ObjectNode($n(query).Lcom_vinctus_oql_OQLQuery__f_project);
       var $$x1 = new $c_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode(query, element);
-      break matchResult8
+      break matchResult12
     };
-    if ((x87 instanceof $c_Lcom_vinctus_oql_OneToOneType)) {
+    if ((x105 instanceof $c_Lcom_vinctus_oql_OneToOneType)) {
       var element$1 = this.objectNode__sci_List__Lcom_vinctus_oql_AbstractOQL$ObjectNode($n(query).Lcom_vinctus_oql_OQLQuery__f_project);
       var $$x1 = new $c_Lcom_vinctus_oql_AbstractOQL$OneToOneNode(query, element$1);
-      break matchResult8
+      break matchResult12
     };
-    if ((x87 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
+    if ((x105 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
       var element$2 = this.objectNode__sci_List__Lcom_vinctus_oql_AbstractOQL$ObjectNode($n(query).Lcom_vinctus_oql_OQLQuery__f_project);
       var $$x1 = new $c_Lcom_vinctus_oql_AbstractOQL$OneToManyNode(query, element$2);
-      break matchResult8
+      break matchResult12
     };
-    if ((x87 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
+    if ((x105 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
       var element$3 = this.objectNode__sci_List__Lcom_vinctus_oql_AbstractOQL$ObjectNode($n(query).Lcom_vinctus_oql_OQLQuery__f_project);
       var $$x1 = new $c_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(query, element$3);
-      break matchResult8
+      break matchResult12
     };
-    throw new $c_s_MatchError(x87)
+    throw new $c_s_MatchError(x105)
   };
   return $as_Lcom_vinctus_oql_AbstractOQL$Node($$x1)
 });
@@ -1531,23 +1609,23 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.objectNode__sci_List__Lcom_vinctus_oq
   var f = ((p) => {
     var p$1 = $as_Lcom_vinctus_oql_OQLProject(p);
     var _1 = $n($n(p$1).label__Lcom_vinctus_oql_Ident()).Lcom_vinctus_oql_Ident__f_s;
-    matchResult9: {
+    matchResult13: {
       var _2;
       if ((p$1 instanceof $c_Lcom_vinctus_oql_ExpressionOQLProject)) {
         var x$1 = $as_Lcom_vinctus_oql_ExpressionOQLProject(p$1);
         var this$3 = $n(x$1);
         var this$4 = $n(x$1);
-        var x100 = this$4.Lcom_vinctus_oql_ExpressionOQLProject__f_expr;
-        var _2 = new $c_Lcom_vinctus_oql_AbstractOQL$ValueNode(x100);
-        break matchResult9
+        var x118 = this$4.Lcom_vinctus_oql_ExpressionOQLProject__f_expr;
+        var _2 = new $c_Lcom_vinctus_oql_AbstractOQL$ValueNode(x118);
+        break matchResult13
       };
       if ((p$1 instanceof $c_Lcom_vinctus_oql_QueryOQLProject)) {
         var x$1$1 = $as_Lcom_vinctus_oql_QueryOQLProject(p$1);
         var this$7 = $n(x$1$1);
         var this$8 = $n(x$1$1);
-        var x96 = this$8.Lcom_vinctus_oql_QueryOQLProject__f_query;
-        var _2 = this.innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x96);
-        break matchResult9
+        var x114 = this$8.Lcom_vinctus_oql_QueryOQLProject__f_query;
+        var _2 = this.innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x114);
+        break matchResult13
       };
       throw new $c_s_MatchError(p$1)
     };
@@ -1575,22 +1653,22 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
   if ((expr instanceof $c_Lcom_vinctus_oql_ExistsOQLExpression)) {
     var x$1 = $as_Lcom_vinctus_oql_ExistsOQLExpression(expr);
     var this$2 = $n(x$1);
-    var x190 = this$2.Lcom_vinctus_oql_ExistsOQLExpression__f_query;
-    var $$x1 = $n(x190);
+    var x208 = this$2.Lcom_vinctus_oql_ExistsOQLExpression__f_query;
+    var $$x1 = $n(x208);
     $n($m_s_package$().s_package$__f_List);
     var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_SQLStarOQLProject$.getArrayOf().constr)([$m_Lcom_vinctus_oql_SQLStarOQLProject$()]));
     $$x1.Lcom_vinctus_oql_OQLQuery__f_project = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems);
-    this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x190, model, ds, oql);
-    if ((!$n($n($n(x190).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ).isArrayType__Z())) {
-      $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x190).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("attribute " + $n($n(x190).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + " does not have an array type"), oql)
+    this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x208, model, ds, oql);
+    if ((!$n($n($n(x208).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ).isArrayType__Z())) {
+      $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x208).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("attribute " + $n($n(x208).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + " does not have an array type"), oql)
     };
-    var this$5 = $n($n(x190).Lcom_vinctus_oql_OQLQuery__f_select);
+    var this$5 = $n($n(x208).Lcom_vinctus_oql_OQLQuery__f_select);
     if ((!this$5.isEmpty__Z())) {
       var arg1 = this$5.get__O();
       var _$11 = $as_Lcom_vinctus_oql_OQLExpression(arg1);
-      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x190).Lcom_vinctus_oql_OQLQuery__f_entity, _$11, model, ds, oql)
+      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x208).Lcom_vinctus_oql_OQLQuery__f_entity, _$11, model, ds, oql)
     };
-    var this$6 = $n($n(x190).Lcom_vinctus_oql_OQLQuery__f_order);
+    var this$6 = $n($n(x208).Lcom_vinctus_oql_OQLQuery__f_order);
     if ((!this$6.isEmpty__Z())) {
       var arg1$1 = this$6.get__O();
       var _$12 = $as_sci_List(arg1$1);
@@ -1599,13 +1677,13 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
       while ((!$n(these).isEmpty__Z())) {
         var arg1$2 = $n(these).head__O();
         var x$1$1 = $as_Lcom_vinctus_oql_OQLOrdering(arg1$2);
-        matchResult10: {
+        matchResult14: {
           if ((x$1$1 !== null)) {
             var this$9 = $n(x$1$1);
-            var x103 = this$9.Lcom_vinctus_oql_OQLOrdering__f_expr;
+            var x121 = this$9.Lcom_vinctus_oql_OQLOrdering__f_expr;
             var this$10 = $n(x$1$1);
-            this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x190).Lcom_vinctus_oql_OQLQuery__f_entity, x103, model, ds, oql);
-            break matchResult10
+            this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x208).Lcom_vinctus_oql_OQLQuery__f_entity, x121, model, ds, oql);
+            break matchResult14
           };
           throw new $c_s_MatchError(x$1$1)
         };
@@ -1617,18 +1695,18 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
   if ((expr instanceof $c_Lcom_vinctus_oql_QueryOQLExpression)) {
     var x$1$2 = $as_Lcom_vinctus_oql_QueryOQLExpression(expr);
     var this$12 = $n(x$1$2);
-    var x187 = this$12.Lcom_vinctus_oql_QueryOQLExpression__f_query;
-    this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x187, model, ds, oql);
-    if ((!$n($n($n(x187).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ).isArrayType__Z())) {
-      $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x187).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("attribute " + $n($n(x187).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + " does not have an array type"), oql)
+    var x205 = this$12.Lcom_vinctus_oql_QueryOQLExpression__f_query;
+    this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x205, model, ds, oql);
+    if ((!$n($n($n(x205).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ).isArrayType__Z())) {
+      $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x205).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("attribute " + $n($n(x205).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + " does not have an array type"), oql)
     };
-    var this$14 = $n($n(x187).Lcom_vinctus_oql_OQLQuery__f_select);
+    var this$14 = $n($n(x205).Lcom_vinctus_oql_OQLQuery__f_select);
     if ((!this$14.isEmpty__Z())) {
       var arg1$3 = this$14.get__O();
       var _$13 = $as_Lcom_vinctus_oql_OQLExpression(arg1$3);
-      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x187).Lcom_vinctus_oql_OQLQuery__f_entity, _$13, model, ds, oql)
+      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x205).Lcom_vinctus_oql_OQLQuery__f_entity, _$13, model, ds, oql)
     };
-    var this$15 = $n($n(x187).Lcom_vinctus_oql_OQLQuery__f_order);
+    var this$15 = $n($n(x205).Lcom_vinctus_oql_OQLQuery__f_order);
     if ((!this$15.isEmpty__Z())) {
       var arg1$4 = this$15.get__O();
       var _$14 = $as_sci_List(arg1$4);
@@ -1637,13 +1715,13 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
       while ((!$n(these$1).isEmpty__Z())) {
         var arg1$5 = $n(these$1).head__O();
         var x$1$3 = $as_Lcom_vinctus_oql_OQLOrdering(arg1$5);
-        matchResult11: {
+        matchResult15: {
           if ((x$1$3 !== null)) {
             var this$18 = $n(x$1$3);
-            var x107 = this$18.Lcom_vinctus_oql_OQLOrdering__f_expr;
+            var x125 = this$18.Lcom_vinctus_oql_OQLOrdering__f_expr;
             var this$19 = $n(x$1$3);
-            this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x187).Lcom_vinctus_oql_OQLQuery__f_entity, x107, model, ds, oql);
-            break matchResult11
+            this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x205).Lcom_vinctus_oql_OQLQuery__f_entity, x125, model, ds, oql);
+            break matchResult15
           };
           throw new $c_s_MatchError(x$1$3)
         };
@@ -1653,253 +1731,230 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ApplyOQLExpression)) {
-    var x181 = $as_Lcom_vinctus_oql_ApplyOQLExpression(expr);
-    var this$21 = $n(x181);
-    var x183 = this$21.Lcom_vinctus_oql_ApplyOQLExpression__f_f;
-    var this$22 = $n(x181);
-    var x184 = this$22.Lcom_vinctus_oql_ApplyOQLExpression__f_args;
-    var this$23 = $n(x184);
-    var these$2 = this$23;
-    while ((!$n(these$2).isEmpty__Z())) {
-      var arg1$6 = $n(these$2).head__O();
-      var expr$1 = $as_Lcom_vinctus_oql_OQLExpression(arg1$6);
-      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr$1, model, ds, oql);
-      these$2 = $as_sci_List($n(these$2).tail__O())
-    };
+    var x199 = $as_Lcom_vinctus_oql_ApplyOQLExpression(expr);
+    var this$21 = $n(x199);
+    var x201 = this$21.Lcom_vinctus_oql_ApplyOQLExpression__f_f;
+    var this$22 = $n(x199);
+    var x202 = this$22.Lcom_vinctus_oql_ApplyOQLExpression__f_args;
+    $n(x202).foreach__F1__V(new $c_sjsr_AnonFunction1(((expr$2) => {
+      var expr$1 = $as_Lcom_vinctus_oql_OQLExpression(expr$2);
+      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr$1, model, ds, oql)
+    })));
     if ($n(ds).caseSensitive__Z()) {
-      var fname = $n(x183).Lcom_vinctus_oql_Ident__f_s
+      var fname = $n(x201).Lcom_vinctus_oql_Ident__f_s
     } else {
-      var this$24 = $n($n(x183).Lcom_vinctus_oql_Ident__f_s);
-      var fname = $as_T(this$24.toLowerCase())
+      var this$23 = $n($n(x201).Lcom_vinctus_oql_Ident__f_s);
+      var fname = $as_T(this$23.toLowerCase())
     };
-    matchResult12: {
+    matchResult16: {
       var $$x2 = $n($n(ds).functionReturnType__sci_Map());
-      var _2 = $n(x184).length__I();
-      var x109 = $n($$x2).get__O__s_Option(new $c_T2(fname, _2));
+      var _2 = $n(x202).length__I();
+      var x127 = $n($$x2).get__O__s_Option(new $c_T2(fname, _2));
       var x = $m_s_None$();
-      if ((x === x109)) {
-        if ((((((fname === "sum") || (fname === "avg")) || (fname === "min")) || (fname === "max")) && ($n(x184).length__I() === 1))) {
-          $n(x181).Lcom_vinctus_oql_OQLExpression__f_typ = $n($as_Lcom_vinctus_oql_OQLExpression($n(x184).head__O())).Lcom_vinctus_oql_OQLExpression__f_typ
+      if ((x === x127)) {
+        if ((((((fname === "sum") || (fname === "avg")) || (fname === "min")) || (fname === "max")) && ($n(x202).length__I() === 1))) {
+          $n(x199).Lcom_vinctus_oql_OQLExpression__f_typ = $n($as_Lcom_vinctus_oql_OQLExpression($n(x202).head__O())).Lcom_vinctus_oql_OQLExpression__f_typ
         };
-        break matchResult12
+        break matchResult16
       };
-      if ((x109 instanceof $c_s_Some)) {
-        var t = $as_F1($n($as_s_Some(x109)).s_Some__f_value);
-        var $$x4 = $n(x181);
-        var this$26 = $n(x184);
-        var f = ((_$15) => {
+      if ((x127 instanceof $c_s_Some)) {
+        var t = $as_F1($n($as_s_Some(x127)).s_Some__f_value);
+        $n(x199).Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype($n(t).apply__O__O($n(x202).map__F1__O(new $c_sjsr_AnonFunction1(((_$15) => {
           var _$15$1 = $as_Lcom_vinctus_oql_OQLExpression(_$15);
           return $n(_$15$1).Lcom_vinctus_oql_OQLExpression__f_typ
-        });
-        if ((this$26 === $m_sci_Nil$())) {
-          var $$x3 = $m_sci_Nil$()
-        } else {
-          var arg1$7 = this$26.head__O();
-          var h = new $c_sci_$colon$colon(f(arg1$7), $m_sci_Nil$());
-          var t$1 = h;
-          var rest = $as_sci_List(this$26.tail__O());
-          while ((rest !== $m_sci_Nil$())) {
-            var arg1$8 = $n(rest).head__O();
-            var nx = new $c_sci_$colon$colon(f(arg1$8), $m_sci_Nil$());
-            $n(t$1).sci_$colon$colon__f_next = nx;
-            t$1 = nx;
-            rest = $as_sci_List($n(rest).tail__O())
-          };
-          var $$x3 = h
-        };
-        $$x4.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype($n(t).apply__O__O($$x3));
-        break matchResult12
+        })))));
+        break matchResult16
       };
-      throw new $c_s_MatchError(x109)
+      throw new $c_s_MatchError(x127)
     };
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_BetweenOQLExpression)) {
     var x$1$4 = $as_Lcom_vinctus_oql_BetweenOQLExpression(expr);
+    var this$26 = $n(x$1$4);
+    var x195 = this$26.Lcom_vinctus_oql_BetweenOQLExpression__f_expr;
+    var this$27 = $n(x$1$4);
     var this$28 = $n(x$1$4);
-    var x177 = this$28.Lcom_vinctus_oql_BetweenOQLExpression__f_expr;
+    var x197 = this$28.Lcom_vinctus_oql_BetweenOQLExpression__f_lower;
     var this$29 = $n(x$1$4);
-    var this$30 = $n(x$1$4);
-    var x179 = this$30.Lcom_vinctus_oql_BetweenOQLExpression__f_lower;
-    var this$31 = $n(x$1$4);
-    var x180 = this$31.Lcom_vinctus_oql_BetweenOQLExpression__f_upper;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x177, model, ds, oql);
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x179, model, ds, oql);
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x180, model, ds, oql);
+    var x198 = this$29.Lcom_vinctus_oql_BetweenOQLExpression__f_upper;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x195, model, ds, oql);
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x197, model, ds, oql);
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x198, model, ds, oql);
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_GroupedOQLExpression)) {
-    var x172 = $as_Lcom_vinctus_oql_GroupedOQLExpression(expr);
-    var this$33 = $n(x172);
-    var x174 = this$33.Lcom_vinctus_oql_GroupedOQLExpression__f_expr;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x174, model, ds, oql);
-    $n(x172).Lcom_vinctus_oql_OQLExpression__f_typ = $n(x174).Lcom_vinctus_oql_OQLExpression__f_typ;
+    var x190 = $as_Lcom_vinctus_oql_GroupedOQLExpression(expr);
+    var this$31 = $n(x190);
+    var x192 = this$31.Lcom_vinctus_oql_GroupedOQLExpression__f_expr;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x192, model, ds, oql);
+    $n(x190).Lcom_vinctus_oql_OQLExpression__f_typ = $n(x192).Lcom_vinctus_oql_OQLExpression__f_typ;
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_CaseOQLExpression)) {
     var x$1$5 = $as_Lcom_vinctus_oql_CaseOQLExpression(expr);
-    var this$35 = $n(x$1$5);
-    var x170 = this$35.Lcom_vinctus_oql_CaseOQLExpression__f_whens;
-    var this$36 = $n(x$1$5);
-    var x171 = this$36.Lcom_vinctus_oql_CaseOQLExpression__f_els;
-    var this$37 = $n(x170);
-    var these$3 = this$37;
-    while ((!$n(these$3).isEmpty__Z())) {
-      var arg1$9 = $n(these$3).head__O();
-      var x$1$6 = $as_Lcom_vinctus_oql_OQLWhen(arg1$9);
-      matchResult13: {
+    var this$33 = $n(x$1$5);
+    var x188 = this$33.Lcom_vinctus_oql_CaseOQLExpression__f_whens;
+    var this$34 = $n(x$1$5);
+    var x189 = this$34.Lcom_vinctus_oql_CaseOQLExpression__f_els;
+    var this$35 = $n(x188);
+    var these$2 = this$35;
+    while ((!$n(these$2).isEmpty__Z())) {
+      var arg1$6 = $n(these$2).head__O();
+      var x$1$6 = $as_Lcom_vinctus_oql_OQLWhen(arg1$6);
+      matchResult17: {
         if ((x$1$6 !== null)) {
-          var this$39 = $n(x$1$6);
-          var x114 = this$39.Lcom_vinctus_oql_OQLWhen__f_cond;
-          var this$40 = $n(x$1$6);
-          var x115 = this$40.Lcom_vinctus_oql_OQLWhen__f_expr;
-          this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x114, model, ds, oql);
-          this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x115, model, ds, oql);
-          break matchResult13
+          var this$37 = $n(x$1$6);
+          var x132 = this$37.Lcom_vinctus_oql_OQLWhen__f_cond;
+          var this$38 = $n(x$1$6);
+          var x133 = this$38.Lcom_vinctus_oql_OQLWhen__f_expr;
+          this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x132, model, ds, oql);
+          this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x133, model, ds, oql);
+          break matchResult17
         };
         throw new $c_s_MatchError(x$1$6)
       };
-      these$3 = $as_sci_List($n(these$3).tail__O())
+      these$2 = $as_sci_List($n(these$2).tail__O())
     };
-    var this$41 = $n(x171);
-    if ((!this$41.isEmpty__Z())) {
-      var arg1$10 = this$41.get__O();
-      var expr$2 = $as_Lcom_vinctus_oql_OQLExpression(arg1$10);
-      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr$2, model, ds, oql)
+    var this$39 = $n(x189);
+    if ((!this$39.isEmpty__Z())) {
+      var arg1$7 = this$39.get__O();
+      var expr$3 = $as_Lcom_vinctus_oql_OQLExpression(arg1$7);
+      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr$3, model, ds, oql)
     };
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_PrefixOQLExpression)) {
-    var x164 = $as_Lcom_vinctus_oql_PrefixOQLExpression(expr);
-    var this$43 = $n(x164);
-    var this$44 = $n(x164);
-    var x167 = this$44.Lcom_vinctus_oql_PrefixOQLExpression__f_expr;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x167, model, ds, oql);
-    $n(x164).Lcom_vinctus_oql_OQLExpression__f_typ = $n(x167).Lcom_vinctus_oql_OQLExpression__f_typ;
+    var x182 = $as_Lcom_vinctus_oql_PrefixOQLExpression(expr);
+    var this$41 = $n(x182);
+    var this$42 = $n(x182);
+    var x185 = this$42.Lcom_vinctus_oql_PrefixOQLExpression__f_expr;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x185, model, ds, oql);
+    $n(x182).Lcom_vinctus_oql_OQLExpression__f_typ = $n(x185).Lcom_vinctus_oql_OQLExpression__f_typ;
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_PostfixOQLExpression)) {
     var x$1$7 = $as_Lcom_vinctus_oql_PostfixOQLExpression(expr);
-    var this$46 = $n(x$1$7);
-    var x162 = this$46.Lcom_vinctus_oql_PostfixOQLExpression__f_expr;
-    var this$47 = $n(x$1$7);
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x162, model, ds, oql);
+    var this$44 = $n(x$1$7);
+    var x180 = this$44.Lcom_vinctus_oql_PostfixOQLExpression__f_expr;
+    var this$45 = $n(x$1$7);
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x180, model, ds, oql);
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_InArrayOQLExpression)) {
     var x$1$8 = $as_Lcom_vinctus_oql_InArrayOQLExpression(expr);
+    var this$47 = $n(x$1$8);
+    var x175 = this$47.Lcom_vinctus_oql_InArrayOQLExpression__f_left;
+    var this$48 = $n(x$1$8);
     var this$49 = $n(x$1$8);
-    var x157 = this$49.Lcom_vinctus_oql_InArrayOQLExpression__f_left;
-    var this$50 = $n(x$1$8);
-    var this$51 = $n(x$1$8);
-    var x159 = this$51.Lcom_vinctus_oql_InArrayOQLExpression__f_right;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x157, model, ds, oql);
-    var this$52 = $n(x159);
-    var these$4 = this$52;
-    while ((!$n(these$4).isEmpty__Z())) {
-      var arg1$11 = $n(these$4).head__O();
-      var expr$3 = $as_Lcom_vinctus_oql_OQLExpression(arg1$11);
-      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr$3, model, ds, oql);
-      these$4 = $as_sci_List($n(these$4).tail__O())
+    var x177 = this$49.Lcom_vinctus_oql_InArrayOQLExpression__f_right;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x175, model, ds, oql);
+    var this$50 = $n(x177);
+    var these$3 = this$50;
+    while ((!$n(these$3).isEmpty__Z())) {
+      var arg1$8 = $n(these$3).head__O();
+      var expr$4 = $as_Lcom_vinctus_oql_OQLExpression(arg1$8);
+      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, expr$4, model, ds, oql);
+      these$3 = $as_sci_List($n(these$3).tail__O())
     };
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_InfixOQLExpression)) {
-    var x150 = $as_Lcom_vinctus_oql_InfixOQLExpression(expr);
-    var this$54 = $n(x150);
-    var x152 = this$54.Lcom_vinctus_oql_InfixOQLExpression__f_left;
-    var this$55 = $n(x150);
-    var this$56 = $n(x150);
-    var x154 = this$56.Lcom_vinctus_oql_InfixOQLExpression__f_right;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x152, model, ds, oql);
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x154, model, ds, oql);
-    var x$3 = $n(x152).Lcom_vinctus_oql_OQLExpression__f_typ;
-    var x$4 = $n(x154).Lcom_vinctus_oql_OQLExpression__f_typ;
+    var x168 = $as_Lcom_vinctus_oql_InfixOQLExpression(expr);
+    var this$52 = $n(x168);
+    var x170 = this$52.Lcom_vinctus_oql_InfixOQLExpression__f_left;
+    var this$53 = $n(x168);
+    var this$54 = $n(x168);
+    var x172 = this$54.Lcom_vinctus_oql_InfixOQLExpression__f_right;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x170, model, ds, oql);
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x172, model, ds, oql);
+    var x$3 = $n(x170).Lcom_vinctus_oql_OQLExpression__f_typ;
+    var x$4 = $n(x172).Lcom_vinctus_oql_OQLExpression__f_typ;
     if (((x$3 === null) ? (x$4 === null) : $n(x$3).equals__O__Z(x$4))) {
-      $n(x150).Lcom_vinctus_oql_OQLExpression__f_typ = $n(x152).Lcom_vinctus_oql_OQLExpression__f_typ
+      $n(x168).Lcom_vinctus_oql_OQLExpression__f_typ = $n(x170).Lcom_vinctus_oql_OQLExpression__f_typ
     };
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ReferenceOQLExpression)) {
-    var x146 = $as_Lcom_vinctus_oql_ReferenceOQLExpression(expr);
-    var this$58 = $n(x146);
-    var x148 = this$58.Lcom_vinctus_oql_ReferenceOQLExpression__f_ids;
-    var this$59 = $n(x146);
-    $n(x146).Lcom_vinctus_oql_ReferenceOQLExpression__f_dmrefs = $n(model).lookup__Lcom_vinctus_oql_OQLExpression__sci_List__Z__Lcom_vinctus_oql_Entity__T__sci_List(x146, x148, true, entity, oql);
+    var x164 = $as_Lcom_vinctus_oql_ReferenceOQLExpression(expr);
+    var this$56 = $n(x164);
+    var x166 = this$56.Lcom_vinctus_oql_ReferenceOQLExpression__f_ids;
+    var this$57 = $n(x164);
+    $n(x164).Lcom_vinctus_oql_ReferenceOQLExpression__f_dmrefs = $n(model).lookup__Lcom_vinctus_oql_OQLExpression__sci_List__Z__Lcom_vinctus_oql_Entity__T__sci_List(x164, x166, true, entity, oql);
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_AttributeOQLExpression)) {
-    var x140 = $as_Lcom_vinctus_oql_AttributeOQLExpression(expr);
-    var this$61 = $n(x140);
-    var x142 = this$61.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
-    var this$62 = $n(x140);
-    if ((x142 !== null)) {
+    var x158 = $as_Lcom_vinctus_oql_AttributeOQLExpression(expr);
+    var this$59 = $n(x158);
+    var x160 = this$59.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
+    var this$60 = $n(x158);
+    if ((x160 !== null)) {
       $n($m_s_package$().s_package$__f_List);
-      if (($n(x142).lengthCompare__I__I(1) === 0)) {
-        var this$66 = $n(x142);
-        var x145 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$66, 0));
-        var $$x6 = $n(ds).builtinVariables__sci_Map();
+      if (($n(x160).lengthCompare__I__I(1) === 0)) {
+        var this$64 = $n(x160);
+        var x163 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$64, 0));
+        var $$x4 = $n(ds).builtinVariables__sci_Map();
         if ($n(ds).caseSensitive__Z()) {
-          var $$x5 = $n(x145).Lcom_vinctus_oql_Ident__f_s
+          var $$x3 = $n(x163).Lcom_vinctus_oql_Ident__f_s
         } else {
-          var this$67 = $n($n(x145).Lcom_vinctus_oql_Ident__f_s);
-          var $$x5 = $as_T(this$67.toLowerCase())
+          var this$65 = $n($n(x163).Lcom_vinctus_oql_Ident__f_s);
+          var $$x3 = $as_T(this$65.toLowerCase())
         };
-        if ($n($$x6).contains__O__Z($$x5)) {
-          var $$x9 = $n(expr);
-          var $$x8 = $n(ds).builtinVariables__sci_Map();
+        if ($n($$x4).contains__O__Z($$x3)) {
+          var $$x7 = $n(expr);
+          var $$x6 = $n(ds).builtinVariables__sci_Map();
           if ($n(ds).caseSensitive__Z()) {
-            var $$x7 = $n(x145).Lcom_vinctus_oql_Ident__f_s
+            var $$x5 = $n(x163).Lcom_vinctus_oql_Ident__f_s
           } else {
-            var this$68 = $n($n(x145).Lcom_vinctus_oql_Ident__f_s);
-            var $$x7 = $as_T(this$68.toLowerCase())
+            var this$66 = $n($n(x163).Lcom_vinctus_oql_Ident__f_s);
+            var $$x5 = $as_T(this$66.toLowerCase())
           };
-          $$x9.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype($n($$x8).apply__O__O($$x7));
+          $$x7.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype($n($$x6).apply__O__O($$x5));
           return (void 0)
         }
       }
     };
-    $n(x140).Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs = $n(model).lookup__Lcom_vinctus_oql_OQLExpression__sci_List__Z__Lcom_vinctus_oql_Entity__T__sci_List(x140, x142, false, entity, oql);
+    $n(x158).Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs = $n(model).lookup__Lcom_vinctus_oql_OQLExpression__sci_List__Z__Lcom_vinctus_oql_Entity__T__sci_List(x158, x160, false, entity, oql);
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_InQueryOQLExpression)) {
     var x$1$9 = $as_Lcom_vinctus_oql_InQueryOQLExpression(expr);
+    var this$68 = $n(x$1$9);
+    var x151 = this$68.Lcom_vinctus_oql_InQueryOQLExpression__f_left;
+    var this$69 = $n(x$1$9);
     var this$70 = $n(x$1$9);
-    var x133 = this$70.Lcom_vinctus_oql_InQueryOQLExpression__f_left;
-    var this$71 = $n(x$1$9);
-    var this$72 = $n(x$1$9);
-    var x135 = this$72.Lcom_vinctus_oql_InQueryOQLExpression__f_query;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x133, model, ds, oql);
-    this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x135, model, ds, oql);
-    if ((!$n($n($n(x135).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ).isArrayType__Z())) {
-      $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x135).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("attribute " + $n($n(x135).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + " does not have an array type"), oql)
-    };
-    var this$74 = $n($n(x135).Lcom_vinctus_oql_OQLQuery__f_select);
-    if ((!this$74.isEmpty__Z())) {
-      var arg1$12 = this$74.get__O();
-      var _$16 = $as_Lcom_vinctus_oql_OQLExpression(arg1$12);
-      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x135).Lcom_vinctus_oql_OQLQuery__f_entity, _$16, model, ds, oql)
-    };
-    var this$75 = $n($n(x135).Lcom_vinctus_oql_OQLQuery__f_order);
-    if ((!this$75.isEmpty__Z())) {
-      var arg1$13 = this$75.get__O();
-      var _$17 = $as_sci_List(arg1$13);
-      var this$76 = $n(_$17);
-      var these$5 = this$76;
-      while ((!$n(these$5).isEmpty__Z())) {
-        var arg1$14 = $n(these$5).head__O();
-        var x$1$10 = $as_Lcom_vinctus_oql_OQLOrdering(arg1$14);
-        matchResult14: {
+    var x153 = this$70.Lcom_vinctus_oql_InQueryOQLExpression__f_query;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x151, model, ds, oql);
+    this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x153, model, ds, oql);
+    if ((!$n($n($n(x153).Lcom_vinctus_oql_OQLQuery__f_attr).Lcom_vinctus_oql_Attribute__f_typ).isArrayType__Z())) {
+      $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x153).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("attribute " + $n($n(x153).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + " does not have an array type"), oql)
+    };
+    var this$72 = $n($n(x153).Lcom_vinctus_oql_OQLQuery__f_select);
+    if ((!this$72.isEmpty__Z())) {
+      var arg1$9 = this$72.get__O();
+      var _$16 = $as_Lcom_vinctus_oql_OQLExpression(arg1$9);
+      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x153).Lcom_vinctus_oql_OQLQuery__f_entity, _$16, model, ds, oql)
+    };
+    var this$73 = $n($n(x153).Lcom_vinctus_oql_OQLQuery__f_order);
+    if ((!this$73.isEmpty__Z())) {
+      var arg1$10 = this$73.get__O();
+      var _$17 = $as_sci_List(arg1$10);
+      var this$74 = $n(_$17);
+      var these$4 = this$74;
+      while ((!$n(these$4).isEmpty__Z())) {
+        var arg1$11 = $n(these$4).head__O();
+        var x$1$10 = $as_Lcom_vinctus_oql_OQLOrdering(arg1$11);
+        matchResult18: {
           if ((x$1$10 !== null)) {
-            var this$78 = $n(x$1$10);
-            var x118 = this$78.Lcom_vinctus_oql_OQLOrdering__f_expr;
-            var this$79 = $n(x$1$10);
-            this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x135).Lcom_vinctus_oql_OQLQuery__f_entity, x118, model, ds, oql);
-            break matchResult14
+            var this$76 = $n(x$1$10);
+            var x136 = this$76.Lcom_vinctus_oql_OQLOrdering__f_expr;
+            var this$77 = $n(x$1$10);
+            this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x153).Lcom_vinctus_oql_OQLQuery__f_entity, x136, model, ds, oql);
+            break matchResult18
           };
           throw new $c_s_MatchError(x$1$10)
         };
-        these$5 = $as_sci_List($n(these$5).tail__O())
+        these$4 = $as_sci_List($n(these$4).tail__O())
       }
     };
     return (void 0)
@@ -1930,13 +1985,13 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
     return (void 0)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_TypedOQLExpression)) {
-    var x122 = $as_Lcom_vinctus_oql_TypedOQLExpression(expr);
-    var this$81 = $n(x122);
-    var x124 = this$81.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
-    var this$82 = $n(x122);
-    var x125 = this$82.Lcom_vinctus_oql_TypedOQLExpression__f_t;
-    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x124, model, ds, oql);
-    $n(x122).Lcom_vinctus_oql_OQLExpression__f_typ = x125;
+    var x140 = $as_Lcom_vinctus_oql_TypedOQLExpression(expr);
+    var this$79 = $n(x140);
+    var x142 = this$79.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
+    var this$80 = $n(x140);
+    var x143 = this$80.Lcom_vinctus_oql_TypedOQLExpression__f_t;
+    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x142, model, ds, oql);
+    $n(x140).Lcom_vinctus_oql_OQLExpression__f_typ = x143;
     return (void 0)
   };
   matchAlts1: {
@@ -1961,24 +2016,24 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
     if (($n(query).Lcom_vinctus_oql_OQLQuery__f_entity !== null)) {
       var entity = $n(query).Lcom_vinctus_oql_OQLQuery__f_entity
     } else {
-      matchResult16: {
+      matchResult20: {
         var entity;
-        var x191 = $n($n($as_Lcom_vinctus_oql_Entity($n(outer).get__O())).attributes__sci_Map()).get__O__s_Option($n($n(query).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
-        if ((x191 instanceof $c_s_Some)) {
-          var x193 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x191)).s_Some__f_value);
-          if ((x193 !== null)) {
-            var this$3 = $n(x193);
-            var this$4 = $n(x193);
-            var this$5 = $n(x193);
-            var this$6 = $n(x193);
-            var this$7 = $n(x193);
-            var x199 = this$7.Lcom_vinctus_oql_Attribute__f_typ;
-            if ($is_Lcom_vinctus_oql_RelationalType(x199)) {
-              var typ = $as_Lcom_vinctus_oql_RelationalType(x199);
+        var x209 = $n($n($as_Lcom_vinctus_oql_Entity($n(outer).get__O())).attributes__sci_Map()).get__O__s_Option($n($n(query).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
+        if ((x209 instanceof $c_s_Some)) {
+          var x211 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x209)).s_Some__f_value);
+          if ((x211 !== null)) {
+            var this$3 = $n(x211);
+            var this$4 = $n(x211);
+            var this$5 = $n(x211);
+            var this$6 = $n(x211);
+            var this$7 = $n(x211);
+            var x217 = this$7.Lcom_vinctus_oql_Attribute__f_typ;
+            if ($is_Lcom_vinctus_oql_RelationalType(x217)) {
+              var typ = $as_Lcom_vinctus_oql_RelationalType(x217);
               $n(query).Lcom_vinctus_oql_OQLQuery__f_entity = $n(typ).entity__Lcom_vinctus_oql_Entity();
-              $n(query).Lcom_vinctus_oql_OQLQuery__f_attr = x193;
+              $n(query).Lcom_vinctus_oql_OQLQuery__f_attr = x211;
               var entity = $n(typ).entity__Lcom_vinctus_oql_Entity();
-              break matchResult16
+              break matchResult20
             }
           }
         };
@@ -1986,20 +2041,20 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
       }
     }
   } else {
-    matchResult17: {
+    matchResult21: {
       var entity;
-      var x201 = $n($n(model).Lcom_vinctus_oql_DataModel__f_entities).get__O__s_Option($n($n(query).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
-      if ((x201 instanceof $c_s_Some)) {
-        var e = $as_Lcom_vinctus_oql_Entity($n($as_s_Some(x201)).s_Some__f_value);
+      var x219 = $n($n(model).Lcom_vinctus_oql_DataModel__f_entities).get__O__s_Option($n($n(query).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
+      if ((x219 instanceof $c_s_Some)) {
+        var e = $as_Lcom_vinctus_oql_Entity($n($as_s_Some(x219)).s_Some__f_value);
         $n(query).Lcom_vinctus_oql_OQLQuery__f_entity = e;
         var entity = e;
-        break matchResult17
+        break matchResult21
       };
       var x = $m_s_None$();
-      if ((x === x201)) {
+      if ((x === x219)) {
         $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(query).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (("unknown entity '" + $n($n(query).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
       };
-      throw new $c_s_MatchError(x201)
+      throw new $c_s_MatchError(x219)
     }
   };
   var subtracts = $ct_scm_HashSet__(new $c_scm_HashSet());
@@ -2008,44 +2063,44 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
   while ((!$n(these).isEmpty__Z())) {
     var arg1 = $n(these).head__O();
     var x$1 = $as_Lcom_vinctus_oql_OQLProject(arg1);
-    matchResult23: {
+    matchResult27: {
       if ((x$1 instanceof $c_Lcom_vinctus_oql_QueryOQLProject)) {
-        var x289 = $as_Lcom_vinctus_oql_QueryOQLProject(x$1);
-        var this$10 = $n(x289);
-        var x291 = this$10.Lcom_vinctus_oql_QueryOQLProject__f_label;
-        var this$11 = $n(x289);
-        var x292 = this$11.Lcom_vinctus_oql_QueryOQLProject__f_query;
-        var $$x4 = $n(x291).Lcom_vinctus_oql_Ident__f_s;
-        matchResult19: {
+        var x307 = $as_Lcom_vinctus_oql_QueryOQLProject(x$1);
+        var this$10 = $n(x307);
+        var x309 = this$10.Lcom_vinctus_oql_QueryOQLProject__f_label;
+        var this$11 = $n(x307);
+        var x310 = this$11.Lcom_vinctus_oql_QueryOQLProject__f_query;
+        var $$x4 = $n(x309).Lcom_vinctus_oql_Ident__f_s;
+        matchResult23: {
           var $$x1;
-          var x208 = $n($n(entity).attributes__sci_Map()).get__O__s_Option($n($n(x292).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
-          if ((x208 instanceof $c_s_Some)) {
-            var x212 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x208)).s_Some__f_value);
-            if ((x212 !== null)) {
-              var this$13 = $n(x212);
-              var this$14 = $n(x212);
-              var this$15 = $n(x212);
-              var this$16 = $n(x212);
-              var this$17 = $n(x212);
-              var x218 = this$17.Lcom_vinctus_oql_Attribute__f_typ;
-              if ($is_Lcom_vinctus_oql_Datatype(x218)) {
+          var x226 = $n($n(entity).attributes__sci_Map()).get__O__s_Option($n($n(x310).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
+          if ((x226 instanceof $c_s_Some)) {
+            var x230 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x226)).s_Some__f_value);
+            if ((x230 !== null)) {
+              var this$13 = $n(x230);
+              var this$14 = $n(x230);
+              var this$15 = $n(x230);
+              var this$16 = $n(x230);
+              var this$17 = $n(x230);
+              var x236 = this$17.Lcom_vinctus_oql_Attribute__f_typ;
+              if ($is_Lcom_vinctus_oql_Datatype(x236)) {
                 $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)([$n(x292).Lcom_vinctus_oql_OQLQuery__f_source]));
+                var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_Ident.getArrayOf().constr)([$n(x310).Lcom_vinctus_oql_OQLQuery__f_source]));
                 var ids = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems);
                 var attr = new $c_Lcom_vinctus_oql_AttributeOQLExpression(ids, null);
                 this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, attr, model, ds, oql);
-                var $$x1 = new $c_Lcom_vinctus_oql_ExpressionOQLProject(x291, attr);
-                break matchResult19
+                var $$x1 = new $c_Lcom_vinctus_oql_ExpressionOQLProject(x309, attr);
+                break matchResult23
               }
             };
-            this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x292, model, ds, oql);
-            var this$22 = $n($n(x292).Lcom_vinctus_oql_OQLQuery__f_select);
+            this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery(new $c_s_Some(entity), x310, model, ds, oql);
+            var this$22 = $n($n(x310).Lcom_vinctus_oql_OQLQuery__f_select);
             if ((!this$22.isEmpty__Z())) {
               var arg1$1 = this$22.get__O();
               var _$18 = $as_Lcom_vinctus_oql_OQLExpression(arg1$1);
-              this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x292).Lcom_vinctus_oql_OQLQuery__f_entity, _$18, model, ds, oql)
+              this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x310).Lcom_vinctus_oql_OQLQuery__f_entity, _$18, model, ds, oql)
             };
-            var this$23 = $n($n(x292).Lcom_vinctus_oql_OQLQuery__f_order);
+            var this$23 = $n($n(x310).Lcom_vinctus_oql_OQLQuery__f_order);
             if ((!this$23.isEmpty__Z())) {
               var arg1$2 = this$23.get__O();
               var _$19 = $as_sci_List(arg1$2);
@@ -2054,139 +2109,139 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
               while ((!$n(these$1).isEmpty__Z())) {
                 var arg1$3 = $n(these$1).head__O();
                 var x$1$1 = $as_Lcom_vinctus_oql_OQLOrdering(arg1$3);
-                matchResult18: {
+                matchResult22: {
                   if ((x$1$1 !== null)) {
                     var this$26 = $n(x$1$1);
-                    var x206 = this$26.Lcom_vinctus_oql_OQLOrdering__f_expr;
+                    var x224 = this$26.Lcom_vinctus_oql_OQLOrdering__f_expr;
                     var this$27 = $n(x$1$1);
-                    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x292).Lcom_vinctus_oql_OQLQuery__f_entity, x206, model, ds, oql);
-                    break matchResult18
+                    this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V($n(x310).Lcom_vinctus_oql_OQLQuery__f_entity, x224, model, ds, oql);
+                    break matchResult22
                   };
                   throw new $c_s_MatchError(x$1$1)
                 };
                 these$1 = $as_sci_List($n(these$1).tail__O())
               }
             };
-            var $$x1 = x289;
-            break matchResult19
+            var $$x1 = x307;
+            break matchResult23
           };
           var x$2 = $m_s_None$();
-          if ((x$2 === x208)) {
+          if ((x$2 === x226)) {
             var $$x3 = $n(ds).builtinVariables__sci_Map();
             if ($n(ds).caseSensitive__Z()) {
-              var $$x2 = $n($n(x292).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s
+              var $$x2 = $n($n(x310).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s
             } else {
-              var this$28 = $n($n($n(x292).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
+              var this$28 = $n($n($n(x310).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s);
               var $$x2 = $as_T(this$28.toLowerCase())
             };
             if ($n($$x3).contains__O__Z($$x2)) {
-              var s = $n($n(x292).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s;
+              var s = $n($n(x310).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s;
               var expr = new $c_Lcom_vinctus_oql_RawOQLExpression(s);
-              var $$x1 = new $c_Lcom_vinctus_oql_ExpressionOQLProject(x291, expr);
-              break matchResult19
+              var $$x1 = new $c_Lcom_vinctus_oql_ExpressionOQLProject(x309, expr);
+              break matchResult23
             };
-            $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x292).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n($n(x292).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
+            $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n($n(x310).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n($n(x310).Lcom_vinctus_oql_OQLQuery__f_source).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
           };
-          throw new $c_s_MatchError(x208)
+          throw new $c_s_MatchError(x226)
         };
         map.update__O__O__V($$x4, $$x1);
-        break matchResult23
+        break matchResult27
       };
       var x$3 = $m_Lcom_vinctus_oql_StarOQLProject$();
       if ((x$3 === x$1)) {
         $n($n($n(entity).attributes__sci_Map()).values__sc_Iterable()).foreach__F1__V(new $c_sjsr_AnonFunction1(((map, entity) => ((x$1$2) => {
           var x$1$3 = $as_Lcom_vinctus_oql_Attribute(x$1$2);
-          matchResult20: {
+          matchResult24: {
             if ((x$1$3 !== null)) {
               var this$32 = $n(x$1$3);
-              var x222 = this$32.Lcom_vinctus_oql_Attribute__f_name;
+              var x240 = this$32.Lcom_vinctus_oql_Attribute__f_name;
               var this$33 = $n(x$1$3);
               var this$34 = $n(x$1$3);
               var this$35 = $n(x$1$3);
               var this$36 = $n(x$1$3);
-              var x226 = this$36.Lcom_vinctus_oql_Attribute__f_typ;
-              if ($n(x226).isDataType__Z()) {
+              var x244 = this$36.Lcom_vinctus_oql_Attribute__f_typ;
+              if ($n(x244).isDataType__Z()) {
                 $n($m_s_package$().s_package$__f_List);
-                var elems$1 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_Ident.getArrayOf().constr)([new $c_Lcom_vinctus_oql_Ident(x222, null)]));
+                var elems$1 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_Ident.getArrayOf().constr)([new $c_Lcom_vinctus_oql_Ident(x240, null)]));
                 var ids$1 = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$1);
                 $n($m_s_package$().s_package$__f_List);
                 var elems$2 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(entity, x$1$3)]));
                 var dmrefs = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$2);
                 var expr$1 = new $c_Lcom_vinctus_oql_AttributeOQLExpression(ids$1, dmrefs);
-                var this$42 = $n(x226);
+                var this$42 = $n(x244);
                 expr$1.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype(this$42);
-                var label = new $c_Lcom_vinctus_oql_Ident(x222, null);
-                map.update__O__O__V(x222, new $c_Lcom_vinctus_oql_ExpressionOQLProject(label, expr$1));
-                break matchResult20
+                var label = new $c_Lcom_vinctus_oql_Ident(x240, null);
+                map.update__O__O__V(x240, new $c_Lcom_vinctus_oql_ExpressionOQLProject(label, expr$1));
+                break matchResult24
               }
             }
           }
         }))(map, entity)));
-        break matchResult23
+        break matchResult27
       };
       if ((x$1 instanceof $c_Lcom_vinctus_oql_SubtractOQLProject)) {
         var x$1$4 = $as_Lcom_vinctus_oql_SubtractOQLProject(x$1);
         var this$46 = $n(x$1$4);
-        var x288 = this$46.Lcom_vinctus_oql_SubtractOQLProject__f_id;
-        var elem = $n(x288).Lcom_vinctus_oql_Ident__f_s;
+        var x306 = this$46.Lcom_vinctus_oql_SubtractOQLProject__f_id;
+        var elem = $n(x306).Lcom_vinctus_oql_Ident__f_s;
         if (subtracts.contains__O__Z(elem)) {
-          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x288).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x288).Lcom_vinctus_oql_Ident__f_s) + "' already removed"), oql)
+          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x306).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x306).Lcom_vinctus_oql_Ident__f_s) + "' already removed"), oql)
         };
-        var elem$1 = $n(x288).Lcom_vinctus_oql_Ident__f_s;
+        var elem$1 = $n(x306).Lcom_vinctus_oql_Ident__f_s;
         subtracts.add__O__Z(elem$1);
-        if (map.contains__O__Z($n(x288).Lcom_vinctus_oql_Ident__f_s)) {
-          var elem$2 = $n(x288).Lcom_vinctus_oql_Ident__f_s;
+        if (map.contains__O__Z($n(x306).Lcom_vinctus_oql_Ident__f_s)) {
+          var elem$2 = $n(x306).Lcom_vinctus_oql_Ident__f_s;
           map.subtractOne__O__scm_LinkedHashMap(elem$2);
-          break matchResult23
+          break matchResult27
         } else {
-          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x288).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x288).Lcom_vinctus_oql_Ident__f_s) + "' not added with '*'"), oql)
+          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x306).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x306).Lcom_vinctus_oql_Ident__f_s) + "' not added with '*'"), oql)
         }
       };
       if ((x$1 instanceof $c_Lcom_vinctus_oql_ExpressionOQLProject)) {
-        var x282 = $as_Lcom_vinctus_oql_ExpressionOQLProject(x$1);
-        var this$48 = $n(x282);
-        var x284 = this$48.Lcom_vinctus_oql_ExpressionOQLProject__f_label;
-        var this$49 = $n(x282);
-        var x285 = this$49.Lcom_vinctus_oql_ExpressionOQLProject__f_expr;
-        if (map.contains__O__Z($n(x284).Lcom_vinctus_oql_Ident__f_s)) {
-          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x284).Lcom_vinctus_oql_Ident__f_pos, (("duplicate attribute label '" + $n(x284).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
+        var x300 = $as_Lcom_vinctus_oql_ExpressionOQLProject(x$1);
+        var this$48 = $n(x300);
+        var x302 = this$48.Lcom_vinctus_oql_ExpressionOQLProject__f_label;
+        var this$49 = $n(x300);
+        var x303 = this$49.Lcom_vinctus_oql_ExpressionOQLProject__f_expr;
+        if (map.contains__O__Z($n(x302).Lcom_vinctus_oql_Ident__f_s)) {
+          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x302).Lcom_vinctus_oql_Ident__f_pos, (("duplicate attribute label '" + $n(x302).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
         };
-        var $$x13 = $n(x284).Lcom_vinctus_oql_Ident__f_s;
-        matchResult22: {
+        var $$x13 = $n(x302).Lcom_vinctus_oql_Ident__f_s;
+        matchResult26: {
           var $$x5;
-          if ((x285 instanceof $c_Lcom_vinctus_oql_AttributeOQLExpression)) {
-            var x275 = $as_Lcom_vinctus_oql_AttributeOQLExpression(x285);
-            var this$51 = $n(x275);
-            var x277 = this$51.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
-            var this$52 = $n(x275);
-            if ((x277 !== null)) {
+          if ((x303 instanceof $c_Lcom_vinctus_oql_AttributeOQLExpression)) {
+            var x293 = $as_Lcom_vinctus_oql_AttributeOQLExpression(x303);
+            var this$51 = $n(x293);
+            var x295 = this$51.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
+            var this$52 = $n(x293);
+            if ((x295 !== null)) {
               $n($m_s_package$().s_package$__f_List);
-              if (($n(x277).lengthCompare__I__I(1) === 0)) {
-                var this$56 = $n(x277);
-                var x280 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$56, 0));
-                var x227 = $n($n(entity).attributes__sci_Map()).get__O__s_Option($n(x280).Lcom_vinctus_oql_Ident__f_s);
-                if ((x227 instanceof $c_s_Some)) {
-                  var x266 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x227)).s_Some__f_value);
-                  if ((x266 !== null)) {
-                    var this$58 = $n(x266);
-                    var this$59 = $n(x266);
-                    var this$60 = $n(x266);
-                    var this$61 = $n(x266);
-                    var this$62 = $n(x266);
-                    var x272 = this$62.Lcom_vinctus_oql_Attribute__f_typ;
-                    if ($is_Lcom_vinctus_oql_Datatype(x272)) {
-                      var $$x6 = $n(x275);
+              if (($n(x295).lengthCompare__I__I(1) === 0)) {
+                var this$56 = $n(x295);
+                var x298 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$56, 0));
+                var x245 = $n($n(entity).attributes__sci_Map()).get__O__s_Option($n(x298).Lcom_vinctus_oql_Ident__f_s);
+                if ((x245 instanceof $c_s_Some)) {
+                  var x284 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x245)).s_Some__f_value);
+                  if ((x284 !== null)) {
+                    var this$58 = $n(x284);
+                    var this$59 = $n(x284);
+                    var this$60 = $n(x284);
+                    var this$61 = $n(x284);
+                    var this$62 = $n(x284);
+                    var x290 = this$62.Lcom_vinctus_oql_Attribute__f_typ;
+                    if ($is_Lcom_vinctus_oql_Datatype(x290)) {
+                      var $$x6 = $n(x293);
                       $n($m_s_package$().s_package$__f_List);
-                      var elems$3 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(entity, x266)]));
+                      var elems$3 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(entity, x284)]));
                       $$x6.Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$3);
-                      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x275, model, ds, oql);
-                      var $$x5 = x282;
-                      break matchResult22
+                      this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x293, model, ds, oql);
+                      var $$x5 = x300;
+                      break matchResult26
                     };
-                    if ((x272 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
-                      var x$1$5 = $as_Lcom_vinctus_oql_ManyToManyType(x272);
+                    if ((x290 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
+                      var x$1$5 = $as_Lcom_vinctus_oql_ManyToManyType(x290);
                       var this$66 = $n(x$1$5);
-                      var x261 = this$66.Lcom_vinctus_oql_ManyToManyType__f_entity;
+                      var x279 = this$66.Lcom_vinctus_oql_ManyToManyType__f_entity;
                       var this$67 = $n(x$1$5);
                       var this$68 = $n(x$1$5);
                       var this$69 = $n(x$1$5);
@@ -2199,14 +2254,14 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
                       var order = $m_s_None$();
                       var limit = $m_s_None$();
                       var offset = $m_s_None$();
-                      var query$1 = this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery($$x7, new $c_Lcom_vinctus_oql_OQLQuery(x280, x261, x266, project, select, group, order, limit, offset), model, ds, oql);
-                      var $$x5 = new $c_Lcom_vinctus_oql_QueryOQLProject(x284, query$1);
-                      break matchResult22
+                      var query$1 = this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery($$x7, new $c_Lcom_vinctus_oql_OQLQuery(x298, x279, x284, project, select, group, order, limit, offset), model, ds, oql);
+                      var $$x5 = new $c_Lcom_vinctus_oql_QueryOQLProject(x302, query$1);
+                      break matchResult26
                     };
-                    if ((x272 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                      var x$1$6 = $as_Lcom_vinctus_oql_ManyToOneType(x272);
+                    if ((x290 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                      var x$1$6 = $as_Lcom_vinctus_oql_ManyToOneType(x290);
                       var this$75 = $n(x$1$6);
-                      var x250 = this$75.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                      var x268 = this$75.Lcom_vinctus_oql_ManyToOneType__f_entity;
                       var $$x8 = new $c_s_Some(entity);
                       $n($m_s_package$().s_package$__f_List);
                       var elems$5 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_StarOQLProject$.getArrayOf().constr)([$m_Lcom_vinctus_oql_StarOQLProject$()]));
@@ -2216,14 +2271,14 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
                       var order$1 = $m_s_None$();
                       var limit$1 = $m_s_None$();
                       var offset$1 = $m_s_None$();
-                      var query$2 = this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery($$x8, new $c_Lcom_vinctus_oql_OQLQuery(x280, x250, x266, project$1, select$1, group$1, order$1, limit$1, offset$1), model, ds, oql);
-                      var $$x5 = new $c_Lcom_vinctus_oql_QueryOQLProject(x284, query$2);
-                      break matchResult22
+                      var query$2 = this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery($$x8, new $c_Lcom_vinctus_oql_OQLQuery(x298, x268, x284, project$1, select$1, group$1, order$1, limit$1, offset$1), model, ds, oql);
+                      var $$x5 = new $c_Lcom_vinctus_oql_QueryOQLProject(x302, query$2);
+                      break matchResult26
                     };
-                    if ((x272 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
-                      var x$1$7 = $as_Lcom_vinctus_oql_OneToManyType(x272);
+                    if ((x290 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
+                      var x$1$7 = $as_Lcom_vinctus_oql_OneToManyType(x290);
                       var this$81 = $n(x$1$7);
-                      var x238 = this$81.Lcom_vinctus_oql_OneToManyType__f_entity;
+                      var x256 = this$81.Lcom_vinctus_oql_OneToManyType__f_entity;
                       var this$82 = $n(x$1$7);
                       var $$x9 = new $c_s_Some(entity);
                       $n($m_s_package$().s_package$__f_List);
@@ -2234,19 +2289,19 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
                       var order$2 = $m_s_None$();
                       var limit$2 = $m_s_None$();
                       var offset$2 = $m_s_None$();
-                      var query$3 = this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery($$x9, new $c_Lcom_vinctus_oql_OQLQuery(x280, x238, x266, project$2, select$2, group$2, order$2, limit$2, offset$2), model, ds, oql);
-                      var $$x5 = new $c_Lcom_vinctus_oql_QueryOQLProject(x284, query$3);
-                      break matchResult22
+                      var query$3 = this.preprocessQuery__s_Option__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__Lcom_vinctus_oql_OQLQuery($$x9, new $c_Lcom_vinctus_oql_OQLQuery(x298, x256, x284, project$2, select$2, group$2, order$2, limit$2, offset$2), model, ds, oql);
+                      var $$x5 = new $c_Lcom_vinctus_oql_QueryOQLProject(x302, query$3);
+                      break matchResult26
                     }
                   }
                 };
                 var x$5 = $m_s_None$();
-                if ((x$5 === x227)) {
+                if ((x$5 === x245)) {
                   var $$x12 = $n($n(ds).builtinVariables__sci_Map());
                   if ($n(ds).caseSensitive__Z()) {
-                    var $$x11 = $n(x280).Lcom_vinctus_oql_Ident__f_s
+                    var $$x11 = $n(x298).Lcom_vinctus_oql_Ident__f_s
                   } else {
-                    var this$87 = $n($n(x280).Lcom_vinctus_oql_Ident__f_s);
+                    var this$87 = $n($n(x298).Lcom_vinctus_oql_Ident__f_s);
                     var $$x11 = $as_T(this$87.toLowerCase())
                   };
                   var $$x10 = $n($$x12).contains__O__Z($$x11)
@@ -2254,25 +2309,25 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
                   var $$x10 = false
                 };
                 if ($$x10) {
-                  var $$x5 = x282;
-                  break matchResult22
+                  var $$x5 = x300;
+                  break matchResult26
                 };
-                $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x280).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(x280).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
+                $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x298).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(x298).Lcom_vinctus_oql_Ident__f_s) + "'"), oql)
               }
             }
           };
-          this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x285, model, ds, oql);
-          var $$x5 = x282
+          this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x303, model, ds, oql);
+          var $$x5 = x300
         };
         map.update__O__O__V($$x13, $$x5);
-        break matchResult23
+        break matchResult27
       };
       var x$7 = $m_Lcom_vinctus_oql_SQLStarOQLProject$();
       if ((x$7 === x$1)) {
         var label$1 = new $c_Lcom_vinctus_oql_Ident(null, null);
         var expr$2 = $m_Lcom_vinctus_oql_StarOQLExpression$();
         map.update__O__O__V(null, new $c_Lcom_vinctus_oql_ExpressionOQLProject(label$1, expr$2));
-        break matchResult23
+        break matchResult27
       };
       throw new $c_s_MatchError(x$1)
     };
@@ -2289,42 +2344,42 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.orList__sci_List__Lcom_vinctus_oql_OQ
     $n($m_s_package$().s_package$__f_List);
     if (($n(exprs).lengthCompare__I__I(1) === 0)) {
       var this$4 = $n(exprs);
-      var x298 = $as_Lcom_vinctus_oql_OQLExpression($f_sc_LinearSeqOps__apply__I__O(this$4, 0));
-      return x298
+      var x316 = $as_Lcom_vinctus_oql_OQLExpression($f_sc_LinearSeqOps__apply__I__O(this$4, 0));
+      return x316
     }
   };
   if ((exprs instanceof $c_sci_$colon$colon)) {
-    var x294 = $as_sci_$colon$colon(exprs);
-    var x296 = $n(x294).sci_$colon$colon__f_next;
-    var head = $as_Lcom_vinctus_oql_OQLExpression($n(x294).sci_$colon$colon__f_head);
-    var right = this.orList__sci_List__Lcom_vinctus_oql_OQLExpression(x296);
+    var x312 = $as_sci_$colon$colon(exprs);
+    var x314 = $n(x312).sci_$colon$colon__f_next;
+    var head = $as_Lcom_vinctus_oql_OQLExpression($n(x312).sci_$colon$colon__f_head);
+    var right = this.orList__sci_List__Lcom_vinctus_oql_OQLExpression(x314);
     return new $c_Lcom_vinctus_oql_InfixOQLExpression(head, "OR", right)
   };
   $m_s_sys_package$().error__T__E("orList: problem")
 });
-$c_Lcom_vinctus_oql_AbstractOQL$.prototype.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 = (function(node, table, builder, oql, ds, fixed, model) {
+$c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder = (function(node, table, builder, oql, ds, fixed, model, macros) {
   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 x420 = this$2.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_query;
+    var x438 = this$2.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_query;
     var this$3 = $n(x$1);
-    var x421 = this$3.Lcom_vinctus_oql_AbstractOQL$ResultNode__f_element;
+    var x439 = 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(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);
+    $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(x438).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table, $m_s_None$());
+    var this$5 = $n($n(x438).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(x420).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(x438).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(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) => {
+      $n($n($as_sc_IterableOps($n($n($n(x438).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);
-        matchResult27: {
+        matchResult31: {
           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);
@@ -2350,20 +2405,20 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
               var $$x1 = h
             };
             var this$14 = $n($$x1);
-            matchResult26: {
+            matchResult30: {
               var $$x2;
-              var x302 = $n(fixed).Lcom_vinctus_oql_Fixed__f_at;
-              if ($isInt(x302)) {
-                var n$2 = $uI(x302);
+              var x320 = $n(fixed).Lcom_vinctus_oql_Fixed__f_at;
+              if ($isInt(x320)) {
+                var n$2 = $uI(x320);
                 var $$x2 = new $c_Lcom_vinctus_oql_IntegerOQLExpression(n$2);
-                break matchResult26
+                break matchResult30
               };
-              if (((typeof x302) === "string")) {
-                var s = $as_T(x302);
+              if (((typeof x320) === "string")) {
+                var s = $as_T(x320);
                 var $$x2 = new $c_Lcom_vinctus_oql_StringOQLExpression(s);
-                break matchResult26
+                break matchResult30
               };
-              $m_s_sys_package$().error__T__E((("no type match for creating TypedOQLExpression for fixed.at: '" + x302) + "'"))
+              $m_s_sys_package$().error__T__E((("no type match for creating TypedOQLExpression for fixed.at: '" + x320) + "'"))
             };
             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);
@@ -2372,28 +2427,28 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
             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$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
+            $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(x438).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table);
+            break matchResult31
           };
           throw new $c_s_MatchError(x$1$3)
         }
       })))
     };
-    var this$16 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_group);
+    var this$16 = $n($n(x438).Lcom_vinctus_oql_OQLQuery__f_group);
     if ((!this$16.isEmpty__Z())) {
       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())).group__sci_List__T__V(_$21, $n($n(x420).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(x438).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
     };
-    var this$18 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_order);
+    var this$18 = $n($n(x438).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)
+      $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(x438).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table)
     };
-    var this$21 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_limit);
+    var this$21 = $n($n(x438).Lcom_vinctus_oql_OQLQuery__f_limit);
     var this$20 = $n(builder);
     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())) {
@@ -2401,7 +2456,7 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
       var n$3 = $uI(arg1$5);
       $n(\u03b41$).limit__I__V(n$3)
     };
-    var this$23 = $n($n(x420).Lcom_vinctus_oql_OQLQuery__f_offset);
+    var this$23 = $n($n(x438).Lcom_vinctus_oql_OQLQuery__f_offset);
     var this$22 = $n(builder);
     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())) {
@@ -2409,44 +2464,44 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
       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);
+    this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(x439, $n($n(x438).Lcom_vinctus_oql_OQLQuery__f_entity).Lcom_vinctus_oql_Entity__f_table, builder, oql, ds, fixed, model, macros);
     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 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 x433 = $as_Lcom_vinctus_oql_AbstractOQL$ValueNode(node);
+    var this$26 = $n(x433);
+    var x435 = this$26.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_value;
+    matchResult32: {
       var \u03b43$___1;
       var \u03b43$___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 x326 = $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(x435, table);
+      if ((x326 !== null)) {
+        var idx = $uI($n(x326).T2__f__1);
+        var typed = $uZ($n(x326).T2__f__2);
         var \u03b43$___1 = idx;
         var \u03b43$___2 = typed;
-        break matchResult28
+        break matchResult32
       };
-      throw new $c_s_MatchError(x308)
+      throw new $c_s_MatchError(x326)
     };
     var idx$2 = $uI(\u03b43$___1);
     var typed$2 = $uZ(\u03b43$___2);
-    $n(x415).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx = idx$2;
-    $n(x415).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed = typed$2;
+    $n(x433).Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx = idx$2;
+    $n(x433).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$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 x432 = this$31.Lcom_vinctus_oql_AbstractOQL$ObjectNode__f_props;
+    $n(x432).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);
-        return 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(e, table, builder, oql, ds, fixed, model)
+        return this.writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(e, table, builder, oql, ds, fixed, model, macros)
       };
       throw new $c_s_MatchError(x$1$5)
     })));
@@ -2454,57 +2509,57 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
     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 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 x407 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToOneNode(node);
+    var this$34 = $n(x407);
+    var x409 = this$34.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_query;
+    var this$35 = $n(x407);
+    var x410 = this$35.Lcom_vinctus_oql_AbstractOQL$ManyToOneNode__f_element;
+    if ((x409 !== null)) {
+      var this$37 = $n(x409);
+      var this$38 = $n(x409);
+      var x413 = this$38.Lcom_vinctus_oql_OQLQuery__f_entity;
+      var this$39 = $n(x409);
+      var x414 = this$39.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$40 = $n(x409);
+      var this$41 = $n(x409);
+      var this$42 = $n(x409);
+      var this$43 = $n(x409);
+      var this$44 = $n(x409);
+      var this$45 = $n(x409);
+      if ((x414 !== null)) {
+        var this$47 = $n(x414);
+        var x422 = this$47.Lcom_vinctus_oql_Attribute__f_name;
+        var this$48 = $n(x414);
+        var x423 = this$48.Lcom_vinctus_oql_Attribute__f_column;
+        var this$49 = $n(x414);
+        var this$50 = $n(x414);
+        var this$51 = $n(x414);
+        var x426 = this$51.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x426 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+          var x$1$6 = $as_Lcom_vinctus_oql_ManyToOneType(x426);
           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$()
+          var x429 = this$53.Lcom_vinctus_oql_ManyToOneType__f_entity;
+          var alias = ((table + "$") + x422);
+          if ($n(x414).Lcom_vinctus_oql_Attribute__f_required) {
+            $n(x407).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(x404, null)]));
+            var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lcom_vinctus_oql_Ident.getArrayOf().constr)([new $c_Lcom_vinctus_oql_Ident(x422, 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(x395, x396)]));
+            var elems$1 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(x413, x414)]));
             var dmrefs = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$1);
             var mtoAttr = new $c_Lcom_vinctus_oql_AttributeOQLExpression(ids, dmrefs);
-            var this$59 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n(x411).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
+            var this$59 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n(x429).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 $$x3 = $n(x407);
             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$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);
+          $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, x423, $n(x413).Lcom_vinctus_oql_Entity__f_table, alias, $n($as_Lcom_vinctus_oql_Attribute($n($n(x413).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__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(x410, alias, builder, oql, ds, fixed, model, macros);
           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())
         }
@@ -2512,148 +2567,148 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
     }
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode)) {
-    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 x381 = $as_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(node);
+    var this$65 = $n(x381);
+    var x383 = this$65.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_query;
+    var this$66 = $n(x381);
+    var x384 = this$66.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_element;
+    if ((x383 !== null)) {
+      var this$68 = $n(x383);
+      var this$69 = $n(x383);
+      var x387 = this$69.Lcom_vinctus_oql_OQLQuery__f_entity;
+      var this$70 = $n(x383);
+      var x388 = this$70.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$71 = $n(x383);
+      var this$72 = $n(x383);
+      var x390 = this$72.Lcom_vinctus_oql_OQLQuery__f_select;
+      var this$73 = $n(x383);
+      var x391 = this$73.Lcom_vinctus_oql_OQLQuery__f_group;
+      var this$74 = $n(x383);
+      var x392 = this$74.Lcom_vinctus_oql_OQLQuery__f_order;
+      var this$75 = $n(x383);
+      var x393 = this$75.Lcom_vinctus_oql_OQLQuery__f_limit;
+      var this$76 = $n(x383);
+      var x394 = this$76.Lcom_vinctus_oql_OQLQuery__f_offset;
+      if ((x388 !== null)) {
+        var this$78 = $n(x388);
+        var x396 = this$78.Lcom_vinctus_oql_Attribute__f_name;
+        var this$79 = $n(x388);
+        var this$80 = $n(x388);
+        var this$81 = $n(x388);
+        var this$82 = $n(x388);
+        var x400 = this$82.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x400 instanceof $c_Lcom_vinctus_oql_ManyToManyType)) {
+          var x$1$7 = $as_Lcom_vinctus_oql_ManyToManyType(x400);
           var this$84 = $n(x$1$7);
-          var x385 = this$84.Lcom_vinctus_oql_ManyToManyType__f_entity;
+          var x403 = this$84.Lcom_vinctus_oql_ManyToManyType__f_entity;
           var this$85 = $n(x$1$7);
-          var x386 = this$85.Lcom_vinctus_oql_ManyToManyType__f_link;
+          var x404 = 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 x405 = 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);
+          var x406 = this$87.Lcom_vinctus_oql_ManyToManyType__f_target;
+          var alias$2 = ((table + "$") + x396);
           if ($n(builder).isLeft__Z()) {
             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)
+            var subquery = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, (($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 subquery = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, $uI($n($n(builder).toOption__s_Option()).get__O()), true)
           };
-          var joinAlias = ((alias$2 + "$") + $n(x388).Lcom_vinctus_oql_Attribute__f_name);
+          var joinAlias = ((alias$2 + "$") + $n(x406).Lcom_vinctus_oql_Attribute__f_name);
           if ($n(builder).isLeft__Z()) {
-            var $$x4 = $n(x363);
+            var $$x4 = $n(x381);
             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(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);
+          $n(subquery).table__T__s_Option__V($n(x404).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__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(x384, joinAlias, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery)), oql, ds, fixed, model, macros);
           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) + "\"");
+          var s$1 = (((((((("\"" + alias$2) + "\".\"") + $n(x405).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n(x387).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);
+          var this$93 = $n(x390);
           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$94 = $n(x373);
+          var this$94 = $n(x391);
           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$95 = $n(x374);
+          var this$95 = $n(x392);
           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$96 = $n(x375);
+          var this$96 = $n(x393);
           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$97 = $n(x376);
+          var this$97 = $n(x394);
           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(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);
+          $n(subquery).innerJoin__T__T__T__T__T__Lcom_vinctus_oql_SQLQueryBuilder(alias$2, $n(x406).Lcom_vinctus_oql_Attribute__f_column, $n(x403).Lcom_vinctus_oql_Entity__f_table, joinAlias, $n($as_Lcom_vinctus_oql_Attribute($n($n(x403).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column);
           return subquery
         }
       }
     }
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToOneNode)) {
-    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 x357 = $as_Lcom_vinctus_oql_AbstractOQL$OneToOneNode(node);
+    var this$99 = $n(x357);
+    var x359 = this$99.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_query;
+    var this$100 = $n(x357);
+    var x360 = this$100.Lcom_vinctus_oql_AbstractOQL$OneToOneNode__f_element;
+    if ((x359 !== null)) {
+      var this$102 = $n(x359);
+      var this$103 = $n(x359);
+      var x363 = this$103.Lcom_vinctus_oql_OQLQuery__f_entity;
+      var this$104 = $n(x359);
+      var x364 = this$104.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$105 = $n(x359);
+      var this$106 = $n(x359);
+      var this$107 = $n(x359);
+      var this$108 = $n(x359);
+      var this$109 = $n(x359);
+      var this$110 = $n(x359);
+      if ((x364 !== null)) {
+        var this$112 = $n(x364);
+        var x372 = this$112.Lcom_vinctus_oql_Attribute__f_name;
+        var this$113 = $n(x364);
+        var this$114 = $n(x364);
+        var this$115 = $n(x364);
+        var this$116 = $n(x364);
+        var x376 = this$116.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x376 instanceof $c_Lcom_vinctus_oql_OneToOneType)) {
+          var x$1$8 = $as_Lcom_vinctus_oql_OneToOneType(x376);
           var this$118 = $n(x$1$8);
-          var x361 = this$118.Lcom_vinctus_oql_OneToOneType__f_entity;
+          var x379 = 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);
+          var x380 = this$119.Lcom_vinctus_oql_OneToOneType__f_attribute;
+          var alias$3 = ((table + "$") + x372);
           if ($n(builder).isLeft__Z()) {
             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)
+            var subquery$7 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, (($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)
+            var subquery$7 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, $uI($n($n(builder).toOption__s_Option()).get__O()), true)
           };
           if ($n(builder).isLeft__Z()) {
-            var $$x6 = $n(x339);
+            var $$x6 = $n(x357);
             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(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);
+          $n(subquery$7).table__T__s_Option__V($n(x379).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__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(x360, alias$3, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery$7)), oql, ds, fixed, model, macros);
           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) + "\"");
+          var s$2 = (((((((("\"" + alias$3) + "\".\"") + $n(x380).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n(x363).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
         }
@@ -2661,83 +2716,83 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.writeQuery__Lcom_vinctus_oql_Abstract
     }
   };
   if ((node instanceof $c_Lcom_vinctus_oql_AbstractOQL$OneToManyNode)) {
-    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 x333 = $as_Lcom_vinctus_oql_AbstractOQL$OneToManyNode(node);
+    var this$126 = $n(x333);
+    var x335 = this$126.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_query;
+    var this$127 = $n(x333);
+    var x336 = this$127.Lcom_vinctus_oql_AbstractOQL$OneToManyNode__f_element;
+    if ((x335 !== null)) {
+      var this$129 = $n(x335);
+      var this$130 = $n(x335);
+      var this$131 = $n(x335);
+      var x340 = this$131.Lcom_vinctus_oql_OQLQuery__f_attr;
+      var this$132 = $n(x335);
+      var this$133 = $n(x335);
+      var x342 = this$133.Lcom_vinctus_oql_OQLQuery__f_select;
+      var this$134 = $n(x335);
+      var x343 = this$134.Lcom_vinctus_oql_OQLQuery__f_group;
+      var this$135 = $n(x335);
+      var x344 = this$135.Lcom_vinctus_oql_OQLQuery__f_order;
+      var this$136 = $n(x335);
+      var x345 = this$136.Lcom_vinctus_oql_OQLQuery__f_limit;
+      var this$137 = $n(x335);
+      var x346 = this$137.Lcom_vinctus_oql_OQLQuery__f_offset;
+      if ((x340 !== null)) {
+        var this$139 = $n(x340);
+        var x348 = this$139.Lcom_vinctus_oql_Attribute__f_name;
+        var this$140 = $n(x340);
+        var this$141 = $n(x340);
+        var this$142 = $n(x340);
+        var this$143 = $n(x340);
+        var x352 = this$143.Lcom_vinctus_oql_Attribute__f_typ;
+        if ((x352 instanceof $c_Lcom_vinctus_oql_OneToManyType)) {
+          var x$1$9 = $as_Lcom_vinctus_oql_OneToManyType(x352);
           var this$145 = $n(x$1$9);
-          var x337 = this$145.Lcom_vinctus_oql_OneToManyType__f_entity;
+          var x355 = 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);
+          var x356 = this$146.Lcom_vinctus_oql_OneToManyType__f_attribute;
+          var alias$4 = ((table + "$") + x348);
           if ($n(builder).isLeft__Z()) {
             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)
+            var subquery$8 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, (($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)
+            var subquery$8 = new $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, $uI($n($n(builder).toOption__s_Option()).get__O()), true)
           };
           if ($n(builder).isLeft__Z()) {
-            var $$x8 = $n(x315);
+            var $$x8 = $n(x333);
             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(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);
+          $n(subquery$8).table__T__s_Option__V($n(x355).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__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder(x336, alias$4, ($n($m_s_package$().s_package$__f_Left), new $c_s_util_Left(subquery$8)), oql, ds, fixed, model, macros);
           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) + "\"");
+          var s$3 = (((((((("\"" + alias$4) + "\".\"") + $n(x356).Lcom_vinctus_oql_Attribute__f_column) + "\" = \"") + table) + "\".\"") + $n($as_Lcom_vinctus_oql_Attribute($n($n($n($as_Lcom_vinctus_oql_ManyToOneType($n(x356).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);
+          var this$152 = $n(x342);
           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$153 = $n(x325);
+          var this$153 = $n(x343);
           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$154 = $n(x326);
+          var this$154 = $n(x344);
           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$155 = $n(x327);
+          var this$155 = $n(x345);
           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$156 = $n(x328);
+          var this$156 = $n(x346);
           if ((!this$156.isEmpty__Z())) {
             var arg1$16 = this$156.get__O();
             var n$8 = $uI(arg1$16);
@@ -4626,6 +4681,33 @@ function $m_Lcom_vinctus_oql_JSON$() {
 function $f_Lcom_vinctus_oql_JSONResultSet__getResultSet__I__Lcom_vinctus_oql_OQLResultSet($thiz, idx) {
   return $m_Lcom_vinctus_oql_SequenceResultSet$().fromJSON__T__Lcom_vinctus_oql_SequenceResultSet($n($as_Lcom_vinctus_oql_OQLResultSet($thiz)).getString__I__T(idx))
 }
+/** @constructor */
+function $c_Lcom_vinctus_oql_Macro$package$() {
+  this.Lcom_vinctus_oql_Macro$package$__f_macroSubstitutionRegex = null;
+  $n_Lcom_vinctus_oql_Macro$package$ = this;
+  this.Lcom_vinctus_oql_Macro$package$__f_macroSubstitutionRegex = ($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_Macro$package$.prototype = new $h_O();
+$c_Lcom_vinctus_oql_Macro$package$.prototype.constructor = $c_Lcom_vinctus_oql_Macro$package$;
+/** @constructor */
+function $h_Lcom_vinctus_oql_Macro$package$() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_Macro$package$.prototype = $c_Lcom_vinctus_oql_Macro$package$.prototype;
+var $d_Lcom_vinctus_oql_Macro$package$ = new $TypeData().initClass({
+  Lcom_vinctus_oql_Macro$package$: 0
+}, false, "com.vinctus.oql.Macro$package$", {
+  Lcom_vinctus_oql_Macro$package$: 1,
+  O: 1
+});
+$c_Lcom_vinctus_oql_Macro$package$.prototype.$classData = $d_Lcom_vinctus_oql_Macro$package$;
+var $n_Lcom_vinctus_oql_Macro$package$;
+function $m_Lcom_vinctus_oql_Macro$package$() {
+  if ((!$n_Lcom_vinctus_oql_Macro$package$)) {
+    $n_Lcom_vinctus_oql_Macro$package$ = new $c_Lcom_vinctus_oql_Macro$package$()
+  };
+  return $n_Lcom_vinctus_oql_Macro$package$
+}
 function $s_Lcom_vinctus_oql_Main__main__AT__V(args) {
   var this$1 = $m_Lcom_vinctus_oql_Main$();
   $f_s_App__main__AT__V(this$1, args)
@@ -5252,6 +5334,13 @@ function $isArrayOf_Lcom_vinctus_oql_OQLExpression(obj, depth) {
 function $asArrayOf_Lcom_vinctus_oql_OQLExpression(obj, depth) {
   return (($isArrayOf_Lcom_vinctus_oql_OQLExpression(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lcom.vinctus.oql.OQLExpression;", depth))
 }
+var $d_Lcom_vinctus_oql_OQLExpression = new $TypeData().initClass({
+  Lcom_vinctus_oql_OQLExpression: 0
+}, false, "com.vinctus.oql.OQLExpression", {
+  Lcom_vinctus_oql_OQLExpression: 1,
+  O: 1
+});
+$c_Lcom_vinctus_oql_OQLExpression.prototype.$classData = $d_Lcom_vinctus_oql_OQLExpression;
 function $is_Lcom_vinctus_oql_OQLProject(obj) {
   return (!(!((obj && obj.$classData) && obj.$classData.ancestors.Lcom_vinctus_oql_OQLProject)))
 }
@@ -5907,11 +5996,12 @@ function $p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T($thiz, yes, no) {
   return ($thiz.Lcom_vinctus_oql_SQLQueryBuilder__f_projectQuery ? yes : no)
 }
 /** @constructor */
-function $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, margin, subquery) {
+function $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, macros, margin, subquery) {
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql = null;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds = null;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed = null;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_model = null;
+  this.Lcom_vinctus_oql_SQLQueryBuilder__f_macros = null;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin = 0;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_subquery = false;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_projectQuery = false;
@@ -5932,6 +6022,7 @@ function $c_Lcom_vinctus_oql_SQLQueryBuilder(oql, ds, fixed, model, margin, subq
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds = ds;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed = fixed;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_model = model;
+  this.Lcom_vinctus_oql_SQLQueryBuilder__f_macros = macros;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin = margin;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_subquery = subquery;
   this.Lcom_vinctus_oql_SQLQueryBuilder__f_ValueProject$lzy1 = new $c_Lcom_vinctus_oql_SQLQueryBuilder$ValueProject$(this);
@@ -6031,53 +6122,53 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
   if ((expr instanceof $c_Lcom_vinctus_oql_ExistsOQLExpression)) {
     var x$1 = $as_Lcom_vinctus_oql_ExistsOQLExpression(expr);
     var this$2 = $n(x$1);
-    var x128 = this$2.Lcom_vinctus_oql_ExistsOQLExpression__f_query;
+    var x134 = this$2.Lcom_vinctus_oql_ExistsOQLExpression__f_query;
     var $$x2 = $m_Lcom_vinctus_oql_AbstractOQL$();
-    var $$x1 = $m_Lcom_vinctus_oql_AbstractOQL$().innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x128);
+    var $$x1 = $m_Lcom_vinctus_oql_AbstractOQL$().innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x134);
     $n($m_s_package$().s_package$__f_Right);
     var value = ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0);
-    var subquery = $n($$x2).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($$x1, table, new $c_s_util_Right(value), this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds, this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed, this.Lcom_vinctus_oql_SQLQueryBuilder__f_model);
+    var subquery = $n($$x2).writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder($$x1, table, new $c_s_util_Right(value), this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds, this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed, this.Lcom_vinctus_oql_SQLQueryBuilder__f_model, this.Lcom_vinctus_oql_SQLQueryBuilder__f_macros);
     var sql = $n(subquery).toString__T();
     return ((("EXISTS (\n" + sql) + $m_sc_StringOps$().$times$extension__T__I__T(" ", ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0))) + ")")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_QueryOQLExpression)) {
     var x$1$1 = $as_Lcom_vinctus_oql_QueryOQLExpression(expr);
     var this$6 = $n(x$1$1);
-    var x125 = this$6.Lcom_vinctus_oql_QueryOQLExpression__f_query;
+    var x131 = this$6.Lcom_vinctus_oql_QueryOQLExpression__f_query;
     var $$x4 = $m_Lcom_vinctus_oql_AbstractOQL$();
-    var $$x3 = $m_Lcom_vinctus_oql_AbstractOQL$().innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x125);
+    var $$x3 = $m_Lcom_vinctus_oql_AbstractOQL$().innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x131);
     $n($m_s_package$().s_package$__f_Right);
     var value$1 = ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0);
-    var subquery$2 = $n($$x4).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($$x3, table, new $c_s_util_Right(value$1), this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds, this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed, this.Lcom_vinctus_oql_SQLQueryBuilder__f_model);
+    var subquery$2 = $n($$x4).writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder($$x3, table, new $c_s_util_Right(value$1), this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds, this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed, this.Lcom_vinctus_oql_SQLQueryBuilder__f_model, this.Lcom_vinctus_oql_SQLQueryBuilder__f_macros);
     var sql$2 = $n(subquery$2).toString__T();
     return ((("(\n" + sql$2) + $m_sc_StringOps$().$times$extension__T__I__T(" ", ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0))) + ")")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_InQueryOQLExpression)) {
     var x$1$2 = $as_Lcom_vinctus_oql_InQueryOQLExpression(expr);
     var this$10 = $n(x$1$2);
-    var x120 = this$10.Lcom_vinctus_oql_InQueryOQLExpression__f_left;
+    var x126 = this$10.Lcom_vinctus_oql_InQueryOQLExpression__f_left;
     var this$11 = $n(x$1$2);
-    var x121 = this$11.Lcom_vinctus_oql_InQueryOQLExpression__f_op;
+    var x127 = this$11.Lcom_vinctus_oql_InQueryOQLExpression__f_op;
     var this$12 = $n(x$1$2);
-    var x122 = this$12.Lcom_vinctus_oql_InQueryOQLExpression__f_query;
+    var x128 = this$12.Lcom_vinctus_oql_InQueryOQLExpression__f_query;
     var $$x6 = $m_Lcom_vinctus_oql_AbstractOQL$();
-    var $$x5 = $m_Lcom_vinctus_oql_AbstractOQL$().innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x122);
+    var $$x5 = $m_Lcom_vinctus_oql_AbstractOQL$().innerQuery__Lcom_vinctus_oql_OQLQuery__Lcom_vinctus_oql_AbstractOQL$Node(x128);
     $n($m_s_package$().s_package$__f_Right);
     var value$2 = ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0);
-    var subquery$3 = $n($$x6).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($$x5, table, new $c_s_util_Right(value$2), this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds, this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed, this.Lcom_vinctus_oql_SQLQueryBuilder__f_model);
+    var subquery$3 = $n($$x6).writeQuery__Lcom_vinctus_oql_AbstractOQL$Node__T__s_util_Either__T__Lcom_vinctus_oql_SQLDataSource__Lcom_vinctus_oql_Fixed__Lcom_vinctus_oql_DataModel__scm_HashMap__Lcom_vinctus_oql_SQLQueryBuilder($$x5, table, new $c_s_util_Right(value$2), this.Lcom_vinctus_oql_SQLQueryBuilder__f_oql, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds, this.Lcom_vinctus_oql_SQLQueryBuilder__f_fixed, this.Lcom_vinctus_oql_SQLQueryBuilder__f_model, this.Lcom_vinctus_oql_SQLQueryBuilder__f_macros);
     var sql$3 = $n(subquery$3).toString__T();
-    return ((((((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x120, table) + " ") + x121) + " (\n") + sql$3) + $m_sc_StringOps$().$times$extension__T__I__T(" ", ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0))) + ")")
+    return ((((((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x126, table) + " ") + x127) + " (\n") + sql$3) + $m_sc_StringOps$().$times$extension__T__I__T(" ", ((this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin + ($m_Lcom_vinctus_oql_SQLQueryBuilder$().Lcom_vinctus_oql_SQLQueryBuilder$__f_INDENT << 1)) | 0))) + ")")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_InArrayOQLExpression)) {
     var x$1$3 = $as_Lcom_vinctus_oql_InArrayOQLExpression(expr);
     var this$16 = $n(x$1$3);
-    var x115 = this$16.Lcom_vinctus_oql_InArrayOQLExpression__f_left;
+    var x121 = this$16.Lcom_vinctus_oql_InArrayOQLExpression__f_left;
     var this$17 = $n(x$1$3);
-    var x116 = this$17.Lcom_vinctus_oql_InArrayOQLExpression__f_op;
+    var x122 = this$17.Lcom_vinctus_oql_InArrayOQLExpression__f_op;
     var this$18 = $n(x$1$3);
-    var x117 = this$18.Lcom_vinctus_oql_InArrayOQLExpression__f_right;
-    var $$x8 = this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x115, table);
-    var this$20 = $n(x117);
+    var x123 = this$18.Lcom_vinctus_oql_InArrayOQLExpression__f_right;
+    var $$x8 = this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x121, table);
+    var this$20 = $n(x123);
     var f = ((_$2) => {
       var _$2$1 = $as_Lcom_vinctus_oql_OQLExpression(_$2);
       return this.expression__Lcom_vinctus_oql_OQLExpression__T__T(_$2$1, table)
@@ -6099,170 +6190,188 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
       var $$x7 = h
     };
     var this$21 = $n($$x7);
-    return ((((($$x8 + " ") + x116) + " (") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$21, "", ", ", "")) + ")")
+    return ((((($$x8 + " ") + x122) + " (") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$21, "", ", ", "")) + ")")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ApplyOQLExpression)) {
     var x$1$4 = $as_Lcom_vinctus_oql_ApplyOQLExpression(expr);
     var this$23 = $n(x$1$4);
-    var x111 = this$23.Lcom_vinctus_oql_ApplyOQLExpression__f_f;
+    var x117 = this$23.Lcom_vinctus_oql_ApplyOQLExpression__f_f;
     var this$24 = $n(x$1$4);
-    var x112 = this$24.Lcom_vinctus_oql_ApplyOQLExpression__f_args;
-    var $$x10 = $n(x111).Lcom_vinctus_oql_Ident__f_s;
-    var this$25 = $n(x112);
-    var f$1 = ((_$3) => {
+    var x118 = this$24.Lcom_vinctus_oql_ApplyOQLExpression__f_args;
+    var expandedArgs = $as_sci_Seq($n(x118).map__F1__O(new $c_sjsr_AnonFunction1(((_$3) => {
       var _$3$1 = $as_Lcom_vinctus_oql_OQLExpression(_$3);
       return this.expression__Lcom_vinctus_oql_OQLExpression__T__T(_$3$1, table)
-    });
-    if ((this$25 === $m_sci_Nil$())) {
-      var $$x9 = $m_sci_Nil$()
-    } else {
-      var arg1$2 = this$25.head__O();
-      var h$1 = new $c_sci_$colon$colon(f$1(arg1$2), $m_sci_Nil$());
-      var t$1 = h$1;
-      var rest$1 = $as_sci_List(this$25.tail__O());
-      while ((rest$1 !== $m_sci_Nil$())) {
-        var arg1$3 = $n(rest$1).head__O();
-        var nx$1 = new $c_sci_$colon$colon(f$1(arg1$3), $m_sci_Nil$());
-        $n(t$1).sci_$colon$colon__f_next = nx$1;
-        t$1 = nx$1;
-        rest$1 = $as_sci_List($n(rest$1).tail__O())
-      };
-      var $$x9 = h$1
+    }))));
+    var x24 = $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_macros).get__O__s_Option($n(x117).Lcom_vinctus_oql_Ident__f_s);
+    var x = $m_s_None$();
+    if ((x === x24)) {
+      var $$x9 = $n(x117).Lcom_vinctus_oql_Ident__f_s;
+      var this$25 = $n(expandedArgs);
+      return ((($$x9 + "(") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$25, "", ", ", "")) + ")")
+    };
+    if ((x24 instanceof $c_s_Some)) {
+      var x26 = $as_Lcom_vinctus_oql_Macro($n($as_s_Some(x24)).s_Some__f_value);
+      if ((x26 !== null)) {
+        var this$27 = $n(x26);
+        var x28 = this$27.Lcom_vinctus_oql_Macro__f_definition;
+        var this$28 = $n(x26);
+        var x29 = this$28.Lcom_vinctus_oql_Macro__f_parameters;
+        if (($n(x29).length__I() !== $n(x118).length__I())) {
+          $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x117).Lcom_vinctus_oql_Ident__f_pos, "number of arguments doesn't equal number of parameters in macro definition", null)
+        };
+        var this$29 = $n($m_Lcom_vinctus_oql_Macro$package$().Lcom_vinctus_oql_Macro$package$__f_macroSubstitutionRegex);
+        var this$30 = new $c_s_util_matching_Regex$MatchIterator(x28, this$29, this$29.s_util_matching_Regex__f_scala$util$matching$Regex$$groupNames);
+        var it = new $c_s_util_matching_Regex$MatchIterator$$anon$4(this$30);
+        while (it.hasNext__Z()) {
+          var arg1$2 = it.next__s_util_matching_Regex$Match();
+          var this$31 = $n(arg1$2);
+          var this$32 = $n(this$31.s_util_matching_Regex$Match__f_matcher);
+          if (($n(this$32.ju_regex_Matcher__f_pattern0).ju_regex_Pattern__f_groupCount === 0)) {
+            var rs = "$"
+          } else {
+            var this$34 = $n(x29);
+            var this$33 = $n(arg1$2);
+            var elem = $f_s_util_matching_Regex$MatchData__group__I__T(this$33, 1);
+            var rs = $as_T($n(expandedArgs).apply__I__O(this$34.indexOf__O__I__I(elem, 0)))
+          };
+          $n(it.matcher__ju_regex_Matcher()).appendReplacement__jl_StringBuffer__T__ju_regex_Matcher(it.s_util_matching_Regex$MatchIterator$$anon$4__f_scala$util$matching$Regex$Replacement$$sb, rs)
+        };
+        return $f_s_util_matching_Regex$Replacement__replaced__T(it)
+      }
     };
-    var this$26 = $n($$x9);
-    return ((($$x10 + "(") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$26, "", ", ", "")) + ")")
+    throw new $c_s_MatchError(x24)
   };
-  var x = $m_Lcom_vinctus_oql_StarOQLExpression$();
-  if ((x === expr)) {
+  var x$3 = $m_Lcom_vinctus_oql_StarOQLExpression$();
+  if ((x$3 === expr)) {
     return "*"
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_RawOQLExpression)) {
     var x$1$5 = $as_Lcom_vinctus_oql_RawOQLExpression(expr);
-    var this$28 = $n(x$1$5);
-    var x108 = this$28.Lcom_vinctus_oql_RawOQLExpression__f_s;
-    return x108
+    var this$36 = $n(x$1$5);
+    var x114 = this$36.Lcom_vinctus_oql_RawOQLExpression__f_s;
+    return x114
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_InfixOQLExpression)) {
     var x$1$6 = $as_Lcom_vinctus_oql_InfixOQLExpression(expr);
-    var this$30 = $n(x$1$6);
-    var x103 = this$30.Lcom_vinctus_oql_InfixOQLExpression__f_left;
-    var this$31 = $n(x$1$6);
-    var x104 = this$31.Lcom_vinctus_oql_InfixOQLExpression__f_op;
-    var this$32 = $n(x$1$6);
-    var x105 = this$32.Lcom_vinctus_oql_InfixOQLExpression__f_right;
+    var this$38 = $n(x$1$6);
+    var x109 = this$38.Lcom_vinctus_oql_InfixOQLExpression__f_left;
+    var this$39 = $n(x$1$6);
+    var x110 = this$39.Lcom_vinctus_oql_InfixOQLExpression__f_op;
+    var this$40 = $n(x$1$6);
+    var x111 = this$40.Lcom_vinctus_oql_InfixOQLExpression__f_right;
     matchAlts1: {
       matchAlts2: {
-        if ((x104 === "*")) {
+        if ((x110 === "*")) {
           break matchAlts2
         };
-        if ((x104 === "/")) {
+        if ((x110 === "/")) {
           break matchAlts2
         };
         break matchAlts1
       };
-      return ((("" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x103, table)) + x104) + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x105, table))
+      return ((("" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x109, table)) + x110) + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x111, table))
     };
-    return ((((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x103, table) + " ") + x104) + " ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x105, table))
+    return ((((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x109, table) + " ") + x110) + " ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x111, table))
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_PrefixOQLExpression)) {
     var x$1$7 = $as_Lcom_vinctus_oql_PrefixOQLExpression(expr);
-    var this$34 = $n(x$1$7);
-    var x94 = this$34.Lcom_vinctus_oql_PrefixOQLExpression__f_op;
-    var this$35 = $n(x$1$7);
-    var x95 = this$35.Lcom_vinctus_oql_PrefixOQLExpression__f_expr;
-    if ((x94 === "-")) {
-      return ("-" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x95, table))
+    var this$42 = $n(x$1$7);
+    var x100 = this$42.Lcom_vinctus_oql_PrefixOQLExpression__f_op;
+    var this$43 = $n(x$1$7);
+    var x101 = this$43.Lcom_vinctus_oql_PrefixOQLExpression__f_expr;
+    if ((x100 === "-")) {
+      return ("-" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x101, table))
     };
-    return ((x94 + " ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x95, table))
+    return ((x100 + " ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x101, table))
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_PostfixOQLExpression)) {
     var x$1$8 = $as_Lcom_vinctus_oql_PostfixOQLExpression(expr);
-    var this$37 = $n(x$1$8);
-    var x86 = this$37.Lcom_vinctus_oql_PostfixOQLExpression__f_expr;
-    var this$38 = $n(x$1$8);
-    var x87 = this$38.Lcom_vinctus_oql_PostfixOQLExpression__f_op;
-    return ((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x86, table) + " ") + x87)
+    var this$45 = $n(x$1$8);
+    var x92 = this$45.Lcom_vinctus_oql_PostfixOQLExpression__f_expr;
+    var this$46 = $n(x$1$8);
+    var x93 = this$46.Lcom_vinctus_oql_PostfixOQLExpression__f_op;
+    return ((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x92, table) + " ") + x93)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_BetweenOQLExpression)) {
     var x$1$9 = $as_Lcom_vinctus_oql_BetweenOQLExpression(expr);
-    var this$40 = $n(x$1$9);
-    var x80 = this$40.Lcom_vinctus_oql_BetweenOQLExpression__f_expr;
-    var this$41 = $n(x$1$9);
-    var x81 = this$41.Lcom_vinctus_oql_BetweenOQLExpression__f_op;
-    var this$42 = $n(x$1$9);
-    var x82 = this$42.Lcom_vinctus_oql_BetweenOQLExpression__f_lower;
-    var this$43 = $n(x$1$9);
-    var x83 = this$43.Lcom_vinctus_oql_BetweenOQLExpression__f_upper;
-    return ((((((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x80, table) + " ") + x81) + " ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x82, table)) + " AND ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x83, table))
+    var this$48 = $n(x$1$9);
+    var x86 = this$48.Lcom_vinctus_oql_BetweenOQLExpression__f_expr;
+    var this$49 = $n(x$1$9);
+    var x87 = this$49.Lcom_vinctus_oql_BetweenOQLExpression__f_op;
+    var this$50 = $n(x$1$9);
+    var x88 = this$50.Lcom_vinctus_oql_BetweenOQLExpression__f_lower;
+    var this$51 = $n(x$1$9);
+    var x89 = this$51.Lcom_vinctus_oql_BetweenOQLExpression__f_upper;
+    return ((((((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x86, table) + " ") + x87) + " ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x88, table)) + " AND ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x89, table))
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_GroupedOQLExpression)) {
     var x$1$10 = $as_Lcom_vinctus_oql_GroupedOQLExpression(expr);
-    var this$45 = $n(x$1$10);
-    var x77 = this$45.Lcom_vinctus_oql_GroupedOQLExpression__f_expr;
-    return (("(" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x77, table)) + ")")
+    var this$53 = $n(x$1$10);
+    var x83 = this$53.Lcom_vinctus_oql_GroupedOQLExpression__f_expr;
+    return (("(" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x83, table)) + ")")
   };
   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_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);
-    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)
+    var this$55 = $n(x$1$11);
+    var x79 = this$55.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
+    var this$56 = $n(x$1$11);
+    var x80 = this$56.Lcom_vinctus_oql_TypedOQLExpression__f_t;
+    var this$57 = $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds);
+    var a = this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x79, table);
+    return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$57, a, x80)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_FloatOQLExpression)) {
     var x$1$12 = $as_Lcom_vinctus_oql_FloatOQLExpression(expr);
-    var this$51 = $n(x$1$12);
-    var x70 = this$51.Lcom_vinctus_oql_FloatOQLExpression__f_n;
-    return ("" + x70)
+    var this$59 = $n(x$1$12);
+    var x76 = this$59.Lcom_vinctus_oql_FloatOQLExpression__f_n;
+    return ("" + x76)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_IntegerOQLExpression)) {
     var x$1$13 = $as_Lcom_vinctus_oql_IntegerOQLExpression(expr);
-    var this$54 = $n(x$1$13);
-    var x67 = this$54.Lcom_vinctus_oql_IntegerOQLExpression__f_n;
-    return ("" + x67)
+    var this$62 = $n(x$1$13);
+    var x73 = this$62.Lcom_vinctus_oql_IntegerOQLExpression__f_n;
+    return ("" + x73)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_JSONOQLExpression)) {
     var x$1$14 = $as_Lcom_vinctus_oql_JSONOQLExpression(expr);
-    var this$57 = $n(x$1$14);
-    var x64 = this$57.Lcom_vinctus_oql_JSONOQLExpression__f_expr;
-    return (("'" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x64, table)) + "'")
+    var this$65 = $n(x$1$14);
+    var x70 = this$65.Lcom_vinctus_oql_JSONOQLExpression__f_expr;
+    return (("'" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x70, table)) + "'")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ArrayOQLExpression)) {
     var x$1$15 = $as_Lcom_vinctus_oql_ArrayOQLExpression(expr);
-    var this$59 = $n(x$1$15);
-    var x61 = this$59.Lcom_vinctus_oql_ArrayOQLExpression__f_elems;
-    var this$60 = $n(x61);
-    var f$2 = ((e$2) => {
+    var this$67 = $n(x$1$15);
+    var x67 = this$67.Lcom_vinctus_oql_ArrayOQLExpression__f_elems;
+    var this$68 = $n(x67);
+    var f$1 = ((e$2) => {
       var e = $as_Lcom_vinctus_oql_OQLExpression(e$2);
       return this.expression__Lcom_vinctus_oql_OQLExpression__T__T(e, table)
     });
-    if ((this$60 === $m_sci_Nil$())) {
-      var $$x11 = $m_sci_Nil$()
+    if ((this$68 === $m_sci_Nil$())) {
+      var $$x10 = $m_sci_Nil$()
     } else {
-      var arg1$4 = this$60.head__O();
-      var h$2 = new $c_sci_$colon$colon(f$2(arg1$4), $m_sci_Nil$());
-      var t$2 = h$2;
-      var rest$2 = $as_sci_List(this$60.tail__O());
-      while ((rest$2 !== $m_sci_Nil$())) {
-        var arg1$5 = $n(rest$2).head__O();
-        var nx$2 = new $c_sci_$colon$colon(f$2(arg1$5), $m_sci_Nil$());
-        $n(t$2).sci_$colon$colon__f_next = nx$2;
-        t$2 = nx$2;
-        rest$2 = $as_sci_List($n(rest$2).tail__O())
+      var arg1$3 = this$68.head__O();
+      var h$1 = new $c_sci_$colon$colon(f$1(arg1$3), $m_sci_Nil$());
+      var t$1 = h$1;
+      var rest$1 = $as_sci_List(this$68.tail__O());
+      while ((rest$1 !== $m_sci_Nil$())) {
+        var arg1$4 = $n(rest$1).head__O();
+        var nx$1 = new $c_sci_$colon$colon(f$1(arg1$4), $m_sci_Nil$());
+        $n(t$1).sci_$colon$colon__f_next = nx$1;
+        t$1 = nx$1;
+        rest$1 = $as_sci_List($n(rest$1).tail__O())
       };
-      var $$x11 = h$2
+      var $$x10 = h$1
     };
-    var this$61 = $n($$x11);
-    return (("[" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$61, "", ", ", "")) + "]")
+    var this$69 = $n($$x10);
+    return (("[" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$69, "", ", ", "")) + "]")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ObjectOQLExpression)) {
     var x$1$16 = $as_Lcom_vinctus_oql_ObjectOQLExpression(expr);
-    var this$63 = $n(x$1$16);
-    var x58 = this$63.Lcom_vinctus_oql_ObjectOQLExpression__f_pairs;
-    var this$64 = $n(x58);
-    var f$3 = ((x$1$17) => {
+    var this$71 = $n(x$1$16);
+    var x64 = this$71.Lcom_vinctus_oql_ObjectOQLExpression__f_pairs;
+    var this$72 = $n(x64);
+    var f$2 = ((x$1$17) => {
       var x$1$18 = $as_T2(x$1$17);
       if ((x$1$18 !== null)) {
         var k = $as_T($n(x$1$18).T2__f__1);
@@ -6271,100 +6380,100 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
       };
       throw new $c_s_MatchError(x$1$18)
     });
-    if ((this$64 === $m_sci_Nil$())) {
-      var $$x12 = $m_sci_Nil$()
+    if ((this$72 === $m_sci_Nil$())) {
+      var $$x11 = $m_sci_Nil$()
     } else {
-      var arg1$6 = this$64.head__O();
-      var h$3 = new $c_sci_$colon$colon(f$3(arg1$6), $m_sci_Nil$());
-      var t$3 = h$3;
-      var rest$3 = $as_sci_List(this$64.tail__O());
-      while ((rest$3 !== $m_sci_Nil$())) {
-        var arg1$7 = $n(rest$3).head__O();
-        var nx$3 = new $c_sci_$colon$colon(f$3(arg1$7), $m_sci_Nil$());
-        $n(t$3).sci_$colon$colon__f_next = nx$3;
-        t$3 = nx$3;
-        rest$3 = $as_sci_List($n(rest$3).tail__O())
+      var arg1$5 = this$72.head__O();
+      var h$2 = new $c_sci_$colon$colon(f$2(arg1$5), $m_sci_Nil$());
+      var t$2 = h$2;
+      var rest$2 = $as_sci_List(this$72.tail__O());
+      while ((rest$2 !== $m_sci_Nil$())) {
+        var arg1$6 = $n(rest$2).head__O();
+        var nx$2 = new $c_sci_$colon$colon(f$2(arg1$6), $m_sci_Nil$());
+        $n(t$2).sci_$colon$colon__f_next = nx$2;
+        t$2 = nx$2;
+        rest$2 = $as_sci_List($n(rest$2).tail__O())
       };
-      var $$x12 = h$3
+      var $$x11 = h$2
     };
-    var this$65 = $n($$x12);
-    return (("{" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$65, "", ", ", "")) + "}")
+    var this$73 = $n($$x11);
+    return (("{" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$73, "", ", ", "")) + "}")
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_StringOQLExpression)) {
     var x$1$19 = $as_Lcom_vinctus_oql_StringOQLExpression(expr);
-    var this$67 = $n(x$1$19);
-    var x55 = this$67.Lcom_vinctus_oql_StringOQLExpression__f_s;
-    return $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds).string__T__T(x55)
+    var this$75 = $n(x$1$19);
+    var x61 = this$75.Lcom_vinctus_oql_StringOQLExpression__f_s;
+    return $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds).string__T__T(x61)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ReferenceOQLExpression)) {
     var x$1$20 = $as_Lcom_vinctus_oql_ReferenceOQLExpression(expr);
-    var this$69 = $n(x$1$20);
-    var this$70 = $n(x$1$20);
-    var x52 = this$70.Lcom_vinctus_oql_ReferenceOQLExpression__f_dmrefs;
-    return $p_Lcom_vinctus_oql_SQLQueryBuilder__attribute$1__T__sci_List__T(this, table, x52)
+    var this$77 = $n(x$1$20);
+    var this$78 = $n(x$1$20);
+    var x58 = this$78.Lcom_vinctus_oql_ReferenceOQLExpression__f_dmrefs;
+    return $p_Lcom_vinctus_oql_SQLQueryBuilder__attribute$1__T__sci_List__T(this, table, x58)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_AttributeOQLExpression)) {
     var x$1$21 = $as_Lcom_vinctus_oql_AttributeOQLExpression(expr);
-    var this$72 = $n(x$1$21);
-    var x45 = this$72.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
-    var this$73 = $n(x$1$21);
-    var x46 = this$73.Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs;
-    if ((x45 !== null)) {
+    var this$80 = $n(x$1$21);
+    var x51 = this$80.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
+    var this$81 = $n(x$1$21);
+    var x52 = this$81.Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs;
+    if ((x51 !== null)) {
       $n($m_s_package$().s_package$__f_List);
-      if (($n(x45).lengthCompare__I__I(1) === 0)) {
-        var this$77 = $n(x45);
-        var x48 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$77, 0));
-        if ((x46 === null)) {
-          return $n(x48).Lcom_vinctus_oql_Ident__f_s
+      if (($n(x51).lengthCompare__I__I(1) === 0)) {
+        var this$85 = $n(x51);
+        var x54 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$85, 0));
+        if ((x52 === null)) {
+          return $n(x54).Lcom_vinctus_oql_Ident__f_s
         }
       }
     };
-    return $p_Lcom_vinctus_oql_SQLQueryBuilder__attribute$1__T__sci_List__T(this, table, x46)
+    return $p_Lcom_vinctus_oql_SQLQueryBuilder__attribute$1__T__sci_List__T(this, table, x52)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_BooleanOQLExpression)) {
     var x$1$22 = $as_Lcom_vinctus_oql_BooleanOQLExpression(expr);
-    var this$79 = $n(x$1$22);
-    var x38 = this$79.Lcom_vinctus_oql_BooleanOQLExpression__f_b;
-    return x38
+    var this$87 = $n(x$1$22);
+    var x44 = this$87.Lcom_vinctus_oql_BooleanOQLExpression__f_b;
+    return x44
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_CaseOQLExpression)) {
     var x$1$23 = $as_Lcom_vinctus_oql_CaseOQLExpression(expr);
-    var this$81 = $n(x$1$23);
-    var x34 = this$81.Lcom_vinctus_oql_CaseOQLExpression__f_whens;
-    var this$82 = $n(x$1$23);
-    var x35 = this$82.Lcom_vinctus_oql_CaseOQLExpression__f_els;
-    var this$86 = $n(x34);
-    var f$4 = ((x$1$2$1) => {
+    var this$89 = $n(x$1$23);
+    var x40 = this$89.Lcom_vinctus_oql_CaseOQLExpression__f_whens;
+    var this$90 = $n(x$1$23);
+    var x41 = this$90.Lcom_vinctus_oql_CaseOQLExpression__f_els;
+    var this$94 = $n(x40);
+    var f$3 = ((x$1$2$1) => {
       var x$1$24 = $as_Lcom_vinctus_oql_OQLWhen(x$1$2$1);
       if ((x$1$24 !== null)) {
-        var this$84 = $n(x$1$24);
-        var x29 = this$84.Lcom_vinctus_oql_OQLWhen__f_cond;
-        var this$85 = $n(x$1$24);
-        var x30 = this$85.Lcom_vinctus_oql_OQLWhen__f_expr;
-        return ((("WHEN " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x29, table)) + " THEN ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x30, table))
+        var this$92 = $n(x$1$24);
+        var x35 = this$92.Lcom_vinctus_oql_OQLWhen__f_cond;
+        var this$93 = $n(x$1$24);
+        var x36 = this$93.Lcom_vinctus_oql_OQLWhen__f_expr;
+        return ((("WHEN " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x35, table)) + " THEN ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x36, table))
       };
       throw new $c_s_MatchError(x$1$24)
     });
-    if ((this$86 === $m_sci_Nil$())) {
-      var $$x13 = $m_sci_Nil$()
+    if ((this$94 === $m_sci_Nil$())) {
+      var $$x12 = $m_sci_Nil$()
     } else {
-      var arg1$8 = this$86.head__O();
-      var h$4 = new $c_sci_$colon$colon(f$4(arg1$8), $m_sci_Nil$());
-      var t$4 = h$4;
-      var rest$4 = $as_sci_List(this$86.tail__O());
-      while ((rest$4 !== $m_sci_Nil$())) {
-        var arg1$9 = $n(rest$4).head__O();
-        var nx$4 = new $c_sci_$colon$colon(f$4(arg1$9), $m_sci_Nil$());
-        $n(t$4).sci_$colon$colon__f_next = nx$4;
-        t$4 = nx$4;
-        rest$4 = $as_sci_List($n(rest$4).tail__O())
+      var arg1$7 = this$94.head__O();
+      var h$3 = new $c_sci_$colon$colon(f$3(arg1$7), $m_sci_Nil$());
+      var t$3 = h$3;
+      var rest$3 = $as_sci_List(this$94.tail__O());
+      while ((rest$3 !== $m_sci_Nil$())) {
+        var arg1$8 = $n(rest$3).head__O();
+        var nx$3 = new $c_sci_$colon$colon(f$3(arg1$8), $m_sci_Nil$());
+        $n(t$3).sci_$colon$colon__f_next = nx$3;
+        t$3 = nx$3;
+        rest$3 = $as_sci_List($n(rest$3).tail__O())
       };
-      var $$x13 = h$4
+      var $$x12 = h$3
     };
-    var this$87 = $n($$x13);
-    var $$x14 = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$87, "", " ", "");
-    var this$88 = $n(x35);
-    return ((("CASE " + $$x14) + ((!this$88.isEmpty__Z()) ? (" ELSE " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T($as_Lcom_vinctus_oql_OQLExpression($n(x35).get__O()), table)) : "")) + " END")
+    var this$95 = $n($$x12);
+    var $$x13 = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$95, "", " ", "");
+    var this$96 = $n(x41);
+    return ((("CASE " + $$x13) + ((!this$96.isEmpty__Z()) ? (" ELSE " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T($as_Lcom_vinctus_oql_OQLExpression($n(x41).get__O()), table)) : "")) + " END")
   };
   throw new $c_s_MatchError(expr)
 });
@@ -6375,18 +6484,18 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.leftJoin__T__T__T__T__T__Lcom_vinc
   while (((!res) && $n(it).hasNext__Z())) {
     var arg1 = $n(it).next__O();
     var x$1 = $as_Lcom_vinctus_oql_SQLQueryBuilder$Join(arg1);
-    matchResult12: {
+    matchResult13: {
       if ((x$1 !== null)) {
         $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_Join$lzy1);
         var this$3 = $n(x$1);
         var this$4 = $n(x$1);
         var this$5 = $n(x$1);
-        var x133 = this$5.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t2;
+        var x139 = this$5.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t2;
         var this$6 = $n(x$1);
-        var x134 = this$6.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_alias;
+        var x140 = this$6.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_alias;
         var this$7 = $n(x$1);
-        res = ((x133 === t2) && (x134 === alias));
-        break matchResult12
+        res = ((x139 === t2) && (x140 === alias));
+        break matchResult13
       };
       throw new $c_s_MatchError(x$1)
     }
@@ -6418,30 +6527,30 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
     return ((x$1$1 !== null) && ($as_Lcom_vinctus_oql_SQLQueryBuilder$Project($n(x$1$1).T2__f__1), $uI($n(x$1$1).T2__f__2), true))
   })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
-    matchResult17: {
+    matchResult18: {
       if ((x$1$3 !== null)) {
         var p$1 = $as_Lcom_vinctus_oql_SQLQueryBuilder$Project($n(x$1$3).T2__f__1);
         var i$1 = $uI($n(x$1$3).T2__f__2);
         var this$5 = $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_projects);
         $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (("" + p$1) + ((i$1 < (((-1) + this$5.scm_ArrayBuffer__f_size0) | 0)) ? "," : $p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this, $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds).rowSequenceFunctionEnd__T(), ""))));
-        break matchResult17
+        break matchResult18
       };
       throw new $c_s_MatchError(x$1$3)
     }
   })));
   $ps_Lcom_vinctus_oql_SQLQueryBuilder__out$1__sr_IntRef__V(indent);
-  matchResult18: {
+  matchResult19: {
     var \u03b41$___1;
     var \u03b41$___2;
-    var x146 = this.Lcom_vinctus_oql_SQLQueryBuilder__f_from;
-    if ((x146 !== null)) {
-      var table = $as_T($n(x146).T2__f__1);
-      var alias = $as_s_Option($n(x146).T2__f__2);
+    var x152 = this.Lcom_vinctus_oql_SQLQueryBuilder__f_from;
+    if ((x152 !== null)) {
+      var table = $as_T($n(x152).T2__f__1);
+      var alias = $as_s_Option($n(x152).T2__f__2);
       var \u03b41$___1 = table;
       var \u03b41$___2 = alias;
-      break matchResult18
+      break matchResult19
     };
-    throw new $c_s_MatchError(x146)
+    throw new $c_s_MatchError(x152)
   };
   var table$2 = $as_T(\u03b41$___1);
   var alias$2 = $as_s_Option(\u03b41$___2);
@@ -6454,13 +6563,13 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
   } else {
     var arg1 = this$8.get__O();
     var x$1$4 = $as_T2(arg1);
-    matchResult19: {
+    matchResult20: {
       var $$x1;
       if ((x$1$4 !== null)) {
         var table$1 = $as_T($n(x$1$4).T2__f__1);
         var expr = $as_Lcom_vinctus_oql_OQLExpression($n(x$1$4).T2__f__2);
         var $$x1 = ("WHERE " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(expr, table$1));
-        break matchResult19
+        break matchResult20
       };
       throw new $c_s_MatchError(x$1$4)
     };
@@ -6472,7 +6581,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
   } else {
     var arg1$1 = this$9.get__O();
     var x$1$5 = $as_T2(arg1$1);
-    matchResult20: {
+    matchResult21: {
       var $$x2;
       if ((x$1$5 !== null)) {
         var table$3 = $as_T($n(x$1$5).T2__f__1);
@@ -6500,7 +6609,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
         };
         var this$12 = $n($$x3);
         var $$x2 = ("GROUP BY " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$12, "", ", ", ""));
-        break matchResult20
+        break matchResult21
       };
       throw new $c_s_MatchError(x$1$5)
     };
@@ -6512,7 +6621,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
   } else {
     var arg1$4 = this$13.get__O();
     var x$1$6 = $as_T2(arg1$4);
-    matchResult22: {
+    matchResult23: {
       var $$x4;
       if ((x$1$6 !== null)) {
         var table$4 = $as_T($n(x$1$6).T2__f__1);
@@ -6522,10 +6631,10 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
           var x$1$7 = $as_Lcom_vinctus_oql_OQLOrdering(x$1$2$1);
           if ((x$1$7 !== null)) {
             var this$16 = $n(x$1$7);
-            var x157 = this$16.Lcom_vinctus_oql_OQLOrdering__f_expr;
+            var x163 = this$16.Lcom_vinctus_oql_OQLOrdering__f_expr;
             var this$17 = $n(x$1$7);
-            var x158 = this$17.Lcom_vinctus_oql_OQLOrdering__f_ordering;
-            return ((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x157, table$4) + " ") + x158)
+            var x164 = this$17.Lcom_vinctus_oql_OQLOrdering__f_ordering;
+            return ((this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x163, table$4) + " ") + x164)
           };
           throw new $c_s_MatchError(x$1$7)
         });
@@ -6547,7 +6656,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
         };
         var this$19 = $n($$x5);
         var $$x4 = ("ORDER BY " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$19, "", ", ", ""));
-        break matchResult22
+        break matchResult23
       };
       throw new $c_s_MatchError(x$1$6)
     };
@@ -6571,21 +6680,21 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
   var this$33 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$26, p$2);
   var f$2 = new $c_sjsr_AnonFunction1(((x$1$7$1) => {
     var x$1$9 = $as_Lcom_vinctus_oql_SQLQueryBuilder$Join(x$1$7$1);
-    matchResult24: {
+    matchResult25: {
       if ((x$1$9 !== null)) {
         $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_Join$lzy1);
         var this$28 = $n(x$1$9);
-        var x171 = this$28.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t1;
+        var x177 = this$28.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t1;
         var this$29 = $n(x$1$9);
-        var x172 = this$29.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c1;
+        var x178 = this$29.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c1;
         var this$30 = $n(x$1$9);
-        var x173 = this$30.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t2;
+        var x179 = this$30.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t2;
         var this$31 = $n(x$1$9);
-        var x174 = this$31.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_alias;
+        var x180 = this$31.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_alias;
         var this$32 = $n(x$1$9);
-        var x175 = this$32.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c2;
-        $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (((((((((((("JOIN \"" + x173) + "\" AS \"") + x174) + "\" ON \"") + x171) + "\".\"") + x172) + "\" = \"") + x174) + "\".\"") + x175) + "\""));
-        break matchResult24
+        var x181 = this$32.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c2;
+        $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (((((((((((("JOIN \"" + x179) + "\" AS \"") + x180) + "\" ON \"") + x177) + "\".\"") + x178) + "\" = \"") + x180) + "\".\"") + x181) + "\""));
+        break matchResult25
       };
       throw new $c_s_MatchError(x$1$9)
     }
@@ -6609,21 +6718,21 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
   var this$47 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$40, p$3);
   var f$3 = new $c_sjsr_AnonFunction1(((x$1$9$1) => {
     var x$1$11 = $as_Lcom_vinctus_oql_SQLQueryBuilder$Join(x$1$9$1);
-    matchResult26: {
+    matchResult27: {
       if ((x$1$11 !== null)) {
         $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_Join$lzy1);
         var this$42 = $n(x$1$11);
-        var x185 = this$42.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t1;
+        var x191 = this$42.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t1;
         var this$43 = $n(x$1$11);
-        var x186 = this$43.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c1;
+        var x192 = this$43.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c1;
         var this$44 = $n(x$1$11);
-        var x187 = this$44.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t2;
+        var x193 = this$44.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_t2;
         var this$45 = $n(x$1$11);
-        var x188 = this$45.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_alias;
+        var x194 = this$45.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_alias;
         var this$46 = $n(x$1$11);
-        var x189 = this$46.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c2;
-        $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (((((((((((("LEFT JOIN \"" + x187) + "\" AS \"") + x188) + "\" ON \"") + x185) + "\".\"") + x186) + "\" = \"") + x188) + "\".\"") + x189) + "\""));
-        break matchResult26
+        var x195 = this$46.Lcom_vinctus_oql_SQLQueryBuilder$Join__f_c2;
+        $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (((((((((((("LEFT JOIN \"" + x193) + "\" AS \"") + x194) + "\" ON \"") + x191) + "\".\"") + x192) + "\" = \"") + x194) + "\".\"") + x195) + "\""));
+        break matchResult27
       };
       throw new $c_s_MatchError(x$1$11)
     }
@@ -24777,6 +24886,40 @@ var $d_sc_Iterator$ConcatIteratorCell = new $TypeData().initClass({
 });
 $c_sc_Iterator$ConcatIteratorCell.prototype.$classData = $d_sc_Iterator$ConcatIteratorCell;
 /** @constructor */
+function $c_sc_SeqFactory$UnapplySeqWrapper$() {
+  /*<skip>*/
+}
+$c_sc_SeqFactory$UnapplySeqWrapper$.prototype = new $h_O();
+$c_sc_SeqFactory$UnapplySeqWrapper$.prototype.constructor = $c_sc_SeqFactory$UnapplySeqWrapper$;
+/** @constructor */
+function $h_sc_SeqFactory$UnapplySeqWrapper$() {
+  /*<skip>*/
+}
+$h_sc_SeqFactory$UnapplySeqWrapper$.prototype = $c_sc_SeqFactory$UnapplySeqWrapper$.prototype;
+$c_sc_SeqFactory$UnapplySeqWrapper$.prototype.drop$extension__sc_SeqOps__I__sci_Seq = (function(this$, n) {
+  if ($is_sci_Seq(this$)) {
+    var x2 = $as_sci_Seq(this$);
+    return $as_sci_Seq($n(x2).drop__I__O(n))
+  } else {
+    var this$1 = $n($n($n(this$).view__sc_SeqView()).drop__I__sc_SeqView(n));
+    return $m_sci_Seq$().from__sc_IterableOnce__sci_Seq(this$1)
+  }
+});
+var $d_sc_SeqFactory$UnapplySeqWrapper$ = new $TypeData().initClass({
+  sc_SeqFactory$UnapplySeqWrapper$: 0
+}, false, "scala.collection.SeqFactory$UnapplySeqWrapper$", {
+  sc_SeqFactory$UnapplySeqWrapper$: 1,
+  O: 1
+});
+$c_sc_SeqFactory$UnapplySeqWrapper$.prototype.$classData = $d_sc_SeqFactory$UnapplySeqWrapper$;
+var $n_sc_SeqFactory$UnapplySeqWrapper$;
+function $m_sc_SeqFactory$UnapplySeqWrapper$() {
+  if ((!$n_sc_SeqFactory$UnapplySeqWrapper$)) {
+    $n_sc_SeqFactory$UnapplySeqWrapper$ = new $c_sc_SeqFactory$UnapplySeqWrapper$()
+  };
+  return $n_sc_SeqFactory$UnapplySeqWrapper$
+}
+/** @constructor */
 function $c_sc_StringOps$() {
   this.sc_StringOps$__f_fallback = null;
   $n_sc_StringOps$ = this;
@@ -30238,6 +30381,7 @@ function $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS(dm, host, port, database, u
   this.Lcom_vinctus_oql_AbstractOQL__f_ec = null;
   this.Lcom_vinctus_oql_AbstractOQL__f__transpileOnly = false;
   this.Lcom_vinctus_oql_AbstractOQL__f__showQuery = false;
+  this.Lcom_vinctus_oql_AbstractOQL__f_macros = null;
   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());
@@ -30256,6 +30400,9 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.execute__F1__s_concurrent_
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG = (function(name) {
   return new $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG(this, $as_Lcom_vinctus_oql_Entity($n($n(this.Lcom_vinctus_oql_AbstractOQL__f_model).Lcom_vinctus_oql_DataModel__f_entities).apply__O__O(name)))
 });
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.jsDefine__T__T__sjs_js_Array__V = (function(name, definition, parameters) {
+  this.define__T__T__sci_Seq__V(name, definition, $m_sci_IndexedSeq$().from__sc_IterableOnce__sci_IndexedSeq($ct_sjs_js_WrappedArray__sjs_js_Array__(new $c_sjs_js_WrappedArray(), parameters)))
+});
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.jsCount__T__O__O__sjs_js_Any__sjs_js_Promise = (function(oql, parameters, fixed, at) {
   var $$x1 = this.substitute__T__O__T(oql, parameters);
   var this$2 = $m_s_$less$colon$less$();
@@ -30411,23 +30558,28 @@ $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.raw = (function(arg, arg$2) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.define = (function(arg, arg$2, arg$3) {
   var prep0 = $as_T(arg);
-  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
-});
-$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)
+  var prep1 = $as_T(arg$2);
+  this.jsDefine__T__T__sjs_js_Array__V(prep0, prep1, arg$3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (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.jsQueryOne__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.showQuery = (function() {
-  this.showQuery__V()
+$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)
+});
+$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.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.count = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30436,15 +30588,15 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.count = (function(arg, ...
   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)
 });
-$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()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (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)
+  return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
 var $d_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS: 0
@@ -30461,6 +30613,7 @@ function $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS(dm) {
   this.Lcom_vinctus_oql_AbstractOQL__f_ec = null;
   this.Lcom_vinctus_oql_AbstractOQL__f__transpileOnly = false;
   this.Lcom_vinctus_oql_AbstractOQL__f__showQuery = false;
+  this.Lcom_vinctus_oql_AbstractOQL__f_macros = null;
   this.Lcom_vinctus_oql_AbstractOQL__f_model = null;
   this.Lcom_vinctus_oql_OQL\uff3fRDB\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_RDBDataSource($m_s_concurrent_ExecutionContext$().global__s_concurrent_ExecutionContextExecutor()), $m_Lcom_vinctus_oql_JSConversions$(), $m_s_concurrent_ExecutionContext$().global__s_concurrent_ExecutionContextExecutor());
@@ -30483,6 +30636,9 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.jsCreate__sjs_js_Promise = (f
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB = (function(name) {
   return new $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB(this, $as_Lcom_vinctus_oql_Entity($n($n(this.Lcom_vinctus_oql_AbstractOQL__f_model).Lcom_vinctus_oql_DataModel__f_entities).apply__O__O(name)))
 });
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.jsDefine__T__T__sjs_js_Array__V = (function(name, definition, parameters) {
+  this.define__T__T__sci_Seq__V(name, definition, $m_sci_IndexedSeq$().from__sc_IterableOnce__sci_IndexedSeq($ct_sjs_js_WrappedArray__sjs_js_Array__(new $c_sjs_js_WrappedArray(), parameters)))
+});
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.jsCount__T__O__O__sjs_js_Any__sjs_js_Promise = (function(oql, parameters, fixed, at) {
   var $$x1 = this.substitute__T__O__T(oql, parameters);
   var this$2 = $m_s_$less$colon$less$();
@@ -30651,23 +30807,35 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.render__O__s_Option__T = (fun
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.render$default$2__s_Option = (function() {
   return $m_s_None$()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.create = (function() {
+  return this.jsCreate__sjs_js_Promise()
+});
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.define = (function(arg, arg$2, arg$3) {
   var prep0 = $as_T(arg);
-  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+  var prep1 = $as_T(arg$2);
+  this.jsDefine__T__T__sjs_js_Array__V(prep0, prep1, arg$3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.entity = (function(arg) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.rawMulti = (function(arg) {
   var prep0 = $as_T(arg);
-  return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB(prep0)
+  return this.rawMulti__T__sjs_js_Promise(prep0)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\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.jsQueryOne__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\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+});
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg, arg$2)
+});
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.entity = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB(prep0)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30676,22 +30844,15 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...res
   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)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.rawMulti = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.rawMulti__T__sjs_js_Promise(prep0)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.create = (function() {
-  return this.jsCreate__sjs_js_Promise()
-});
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (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)
+  return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
 var $d_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS: 0
@@ -40718,6 +40879,13 @@ $c_s_util_matching_Regex.prototype.unapplySeq__jl_CharSequence__s_Option = (func
     return $m_s_None$()
   }
 });
+$c_s_util_matching_Regex.prototype.findAllIn__jl_CharSequence__s_util_matching_Regex$MatchIterator = (function(source) {
+  return new $c_s_util_matching_Regex$MatchIterator(source, this, this.s_util_matching_Regex__f_scala$util$matching$Regex$$groupNames)
+});
+$c_s_util_matching_Regex.prototype.findAllMatchIn__jl_CharSequence__sc_Iterator = (function(source) {
+  var matchIterator = this.findAllIn__jl_CharSequence__s_util_matching_Regex$MatchIterator(source);
+  return new $c_s_util_matching_Regex$$anon$1(this, matchIterator)
+});
 $c_s_util_matching_Regex.prototype.findPrefixMatchOf__jl_CharSequence__s_Option = (function(source) {
   var this$1 = $n(this.s_util_matching_Regex__f_pattern);
   var m = new $c_ju_regex_Matcher(this$1, $dp_toString__T($n(source)));
@@ -42238,25 +42406,25 @@ function $f_Lcom_vinctus_oql_PGDataSource__$init$__V($thiz) {
   var $$x4 = $m_sr_ScalaRunTime$();
   var self = new $c_T2("count", 1);
   var y = new $c_sjsr_AnonFunction1(((_$1) => {
-    $as_sci_List(_$1);
+    $as_sci_Seq(_$1);
     return $m_Lcom_vinctus_oql_IntegerType$()
   }));
   var $$x3 = new $c_T2(self, y);
   var self$1 = new $c_T2("min", 1);
   var y$1 = new $c_sjsr_AnonFunction1(((_$2) => {
-    var _$2$1 = $as_sci_List(_$2);
+    var _$2$1 = $as_sci_Seq(_$2);
     return $as_Lcom_vinctus_oql_Datatype($n(_$2$1).head__O())
   }));
   var $$x2 = new $c_T2(self$1, y$1);
   var self$2 = new $c_T2("max", 1);
   var y$2 = new $c_sjsr_AnonFunction1(((_$3) => {
-    var _$3$1 = $as_sci_List(_$3);
+    var _$3$1 = $as_sci_Seq(_$3);
     return $as_Lcom_vinctus_oql_Datatype($n(_$3$1).head__O())
   }));
   var $$x1 = new $c_T2(self$2, y$2);
   var self$3 = new $c_T2("avg", 1);
   var y$3 = new $c_sjsr_AnonFunction1(((_$4) => {
-    $as_sci_List(_$4);
+    $as_sci_Seq(_$4);
     return $m_Lcom_vinctus_oql_FloatType$()
   }));
   var elems = $n($$x4).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([$$x3, $$x2, $$x1, new $c_T2(self$3, y$3)]));
@@ -42400,27 +42568,27 @@ function $c_Lcom_vinctus_oql_RDBDataSource(ec) {
   this.Lcom_vinctus_oql_RDBDataSource__f_caseSensitive = true;
   var this$14 = $n($m_s_Predef$().s_Predef$__f_Map);
   var $$x4 = $m_sr_ScalaRunTime$();
-  var self = new $c_T2("COUNT", 1);
+  var self = new $c_T2("count", 1);
   var y = new $c_sjsr_AnonFunction1(((_$1) => {
-    $as_sci_List(_$1);
+    $as_sci_Seq(_$1);
     return $m_Lcom_vinctus_oql_IntegerType$()
   }));
   var $$x3 = new $c_T2(self, y);
-  var self$1 = new $c_T2("MIN", 1);
+  var self$1 = new $c_T2("min", 1);
   var y$1 = new $c_sjsr_AnonFunction1(((_$2) => {
-    var _$2$1 = $as_sci_List(_$2);
+    var _$2$1 = $as_sci_Seq(_$2);
     return $as_Lcom_vinctus_oql_Datatype($n(_$2$1).head__O())
   }));
   var $$x2 = new $c_T2(self$1, y$1);
-  var self$2 = new $c_T2("MAX", 1);
+  var self$2 = new $c_T2("max", 1);
   var y$2 = new $c_sjsr_AnonFunction1(((_$3) => {
-    var _$3$1 = $as_sci_List(_$3);
+    var _$3$1 = $as_sci_Seq(_$3);
     return $as_Lcom_vinctus_oql_Datatype($n(_$3$1).head__O())
   }));
   var $$x1 = new $c_T2(self$2, y$2);
-  var self$3 = new $c_T2("AVG", 1);
+  var self$3 = new $c_T2("avg", 1);
   var y$3 = new $c_sjsr_AnonFunction1(((_$4) => {
-    $as_sci_List(_$4);
+    $as_sci_Seq(_$4);
     return $m_Lcom_vinctus_oql_FloatType$()
   }));
   var elems = $n($$x4).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([$$x3, $$x2, $$x1, new $c_T2(self$3, y$3)]));
@@ -51065,6 +51233,95 @@ var $d_Lcom_vinctus_oql_Ident = new $TypeData().initClass({
 });
 $c_Lcom_vinctus_oql_Ident.prototype.$classData = $d_Lcom_vinctus_oql_Ident;
 /** @constructor */
+function $c_Lcom_vinctus_oql_Macro(definition, parameters) {
+  this.Lcom_vinctus_oql_Macro__f_definition = null;
+  this.Lcom_vinctus_oql_Macro__f_parameters = null;
+  this.Lcom_vinctus_oql_Macro__f_definition = definition;
+  this.Lcom_vinctus_oql_Macro__f_parameters = parameters
+}
+$c_Lcom_vinctus_oql_Macro.prototype = new $h_O();
+$c_Lcom_vinctus_oql_Macro.prototype.constructor = $c_Lcom_vinctus_oql_Macro;
+/** @constructor */
+function $h_Lcom_vinctus_oql_Macro() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_Macro.prototype = $c_Lcom_vinctus_oql_Macro.prototype;
+$c_Lcom_vinctus_oql_Macro.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_s_Product$$anon$1(this)
+});
+$c_Lcom_vinctus_oql_Macro.prototype.hashCode__I = (function() {
+  var this$2 = $m_s_util_hashing_MurmurHash3$();
+  return this$2.productHash__s_Product__I__Z__I(this, (-889275714), false)
+});
+$c_Lcom_vinctus_oql_Macro.prototype.equals__O__Z = (function(x$0) {
+  if ((this === x$0)) {
+    return true
+  } else if ((x$0 instanceof $c_Lcom_vinctus_oql_Macro)) {
+    var x$0$2 = $as_Lcom_vinctus_oql_Macro(x$0);
+    if ((this.Lcom_vinctus_oql_Macro__f_definition === $n(x$0$2).Lcom_vinctus_oql_Macro__f_definition)) {
+      var x = this.Lcom_vinctus_oql_Macro__f_parameters;
+      var x$2 = $n(x$0$2).Lcom_vinctus_oql_Macro__f_parameters;
+      var $$x1 = ((x === null) ? (x$2 === null) : $n(x).equals__O__Z(x$2))
+    } else {
+      var $$x1 = false
+    };
+    if ($$x1) {
+      $n(x$0$2);
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return false
+  }
+});
+$c_Lcom_vinctus_oql_Macro.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$()._toString__s_Product__T(this)
+});
+$c_Lcom_vinctus_oql_Macro.prototype.productArity__I = (function() {
+  return 2
+});
+$c_Lcom_vinctus_oql_Macro.prototype.productPrefix__T = (function() {
+  return "Macro"
+});
+$c_Lcom_vinctus_oql_Macro.prototype.productElement__I__O = (function(n) {
+  if ((n === 0)) {
+    return this.Lcom_vinctus_oql_Macro__f_definition
+  };
+  if ((n === 1)) {
+    return this.Lcom_vinctus_oql_Macro__f_parameters
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+$c_Lcom_vinctus_oql_Macro.prototype.productElementName__I__T = (function(n) {
+  if ((n === 0)) {
+    return "definition"
+  };
+  if ((n === 1)) {
+    return "parameters"
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+function $as_Lcom_vinctus_oql_Macro(obj) {
+  return (((obj instanceof $c_Lcom_vinctus_oql_Macro) || (obj === null)) ? obj : $throwClassCastException(obj, "com.vinctus.oql.Macro"))
+}
+function $isArrayOf_Lcom_vinctus_oql_Macro(obj, depth) {
+  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lcom_vinctus_oql_Macro)))
+}
+function $asArrayOf_Lcom_vinctus_oql_Macro(obj, depth) {
+  return (($isArrayOf_Lcom_vinctus_oql_Macro(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lcom.vinctus.oql.Macro;", depth))
+}
+var $d_Lcom_vinctus_oql_Macro = new $TypeData().initClass({
+  Lcom_vinctus_oql_Macro: 0
+}, false, "com.vinctus.oql.Macro", {
+  Lcom_vinctus_oql_Macro: 1,
+  O: 1,
+  s_Equals: 1,
+  s_Product: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lcom_vinctus_oql_Macro.prototype.$classData = $d_Lcom_vinctus_oql_Macro;
+/** @constructor */
 function $c_Lcom_vinctus_oql_NodePGDataSource(host, port, database, user, password, ssl, idleTimeoutMillis, max, ec) {
   this.Lcom_vinctus_oql_NodePGDataSource__f_resultArrayFunctionStart = null;
   this.Lcom_vinctus_oql_NodePGDataSource__f_resultArrayFunctionEnd = null;
@@ -51790,7 +52047,12 @@ $c_Lcom_vinctus_oql_OQLParser$.prototype.applyExpression__s_util_parsing_combina
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
         var f = $as_Lcom_vinctus_oql_Ident($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
         var as = $as_sci_List($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
-        return new $c_Lcom_vinctus_oql_ApplyOQLExpression(f, as)
+        var this$5 = $n(as);
+        var factory = $m_sci_ArraySeq$();
+        var evidence$14 = new $c_s_reflect_ClassTag$GenericClassTag($d_Lcom_vinctus_oql_OQLExpression.getClassOf());
+        var factory$1 = new $c_sc_EvidenceIterableFactory$ToFactory(factory, evidence$14);
+        var args = $as_sci_Seq(factory$1.fromSpecific__sc_IterableOnce__O(this$5));
+        return new $c_Lcom_vinctus_oql_ApplyOQLExpression(f, args)
       };
       throw new $c_s_MatchError(x$1$1)
     })))));
@@ -63022,6 +63284,72 @@ $c_s_util_parsing_combinator_syntactical_StandardTokenParsers.prototype.keyword_
   }
 });
 /** @constructor */
+function $c_Lcom_vinctus_oql_AbstractOQL$$anon$1() {
+  /*<skip>*/
+}
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype = new $h_sr_AbstractPartialFunction();
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype.constructor = $c_Lcom_vinctus_oql_AbstractOQL$$anon$1;
+/** @constructor */
+function $h_Lcom_vinctus_oql_AbstractOQL$$anon$1() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype = $c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype;
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype.isDefinedAt__T2__Z = (function(x) {
+  if ((x !== null)) {
+    var x3 = $as_sci_Seq($n(x).T2__f__2);
+    $as_T($n(x).T2__f__1);
+    if ((x3 instanceof $c_sci_List)) {
+      $n($m_s_package$().s_package$__f_List);
+      var x$1 = $as_sci_List(x3);
+      if (($n(x$1).lengthCompare__I__I(2) >= 0)) {
+        var this$4 = $n(x$1);
+        $f_sc_LinearSeqOps__apply__I__O(this$4, 0);
+        var this$6 = $n(x$1);
+        $f_sc_LinearSeqOps__apply__I__O(this$6, 1);
+        $m_sc_SeqFactory$UnapplySeqWrapper$().drop$extension__sc_SeqOps__I__sci_Seq(x$1, 2);
+        return true
+      }
+    }
+  };
+  return false
+});
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype.applyOrElse__T2__F1__O = (function(x, default$1) {
+  if ((x !== null)) {
+    var x11 = $as_sci_Seq($n(x).T2__f__2);
+    var x$2 = $as_T($n(x).T2__f__1);
+    if ((x11 instanceof $c_sci_List)) {
+      $n($m_s_package$().s_package$__f_List);
+      var x$1 = $as_sci_List(x11);
+      if (($n(x$1).lengthCompare__I__I(2) >= 0)) {
+        var this$4 = $n(x$1);
+        $f_sc_LinearSeqOps__apply__I__O(this$4, 0);
+        var this$6 = $n(x$1);
+        $f_sc_LinearSeqOps__apply__I__O(this$6, 1);
+        $m_sc_SeqFactory$UnapplySeqWrapper$().drop$extension__sc_SeqOps__I__sci_Seq(x$1, 2);
+        return x$2
+      }
+    }
+  };
+  return $n(default$1).apply__O__O(x)
+});
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype.isDefinedAt__O__Z = (function(x) {
+  return this.isDefinedAt__T2__Z($as_T2(x))
+});
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype.applyOrElse__O__F1__O = (function(x, default$1) {
+  return this.applyOrElse__T2__F1__O($as_T2(x), default$1)
+});
+var $d_Lcom_vinctus_oql_AbstractOQL$$anon$1 = new $TypeData().initClass({
+  Lcom_vinctus_oql_AbstractOQL$$anon$1: 0
+}, false, "com.vinctus.oql.AbstractOQL$$anon$1", {
+  Lcom_vinctus_oql_AbstractOQL$$anon$1: 1,
+  sr_AbstractPartialFunction: 1,
+  O: 1,
+  F1: 1,
+  s_PartialFunction: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lcom_vinctus_oql_AbstractOQL$$anon$1.prototype.$classData = $d_Lcom_vinctus_oql_AbstractOQL$$anon$1;
+/** @constructor */
 function $c_Lcom_vinctus_oql_AbstractOQL$ManyToManyNode(query, element) {
   this.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_query = null;
   this.Lcom_vinctus_oql_AbstractOQL$ManyToManyNode__f_element = null;
@@ -79073,6 +79401,39 @@ var $d_s_util_Success = new $TypeData().initClass({
   Ljava_io_Serializable: 1
 });
 $c_s_util_Success.prototype.$classData = $d_s_util_Success;
+/** @constructor */
+function $c_s_util_matching_Regex$$anon$1(outer, matchIterator$1) {
+  this.s_util_matching_Regex$$anon$1__f_matchIterator$1 = null;
+  this.s_util_matching_Regex$$anon$1__f_matchIterator$1 = matchIterator$1
+}
+$c_s_util_matching_Regex$$anon$1.prototype = new $h_sc_AbstractIterator();
+$c_s_util_matching_Regex$$anon$1.prototype.constructor = $c_s_util_matching_Regex$$anon$1;
+/** @constructor */
+function $h_s_util_matching_Regex$$anon$1() {
+  /*<skip>*/
+}
+$h_s_util_matching_Regex$$anon$1.prototype = $c_s_util_matching_Regex$$anon$1.prototype;
+$c_s_util_matching_Regex$$anon$1.prototype.hasNext__Z = (function() {
+  return $n(this.s_util_matching_Regex$$anon$1__f_matchIterator$1).hasNext__Z()
+});
+$c_s_util_matching_Regex$$anon$1.prototype.next__s_util_matching_Regex$Match = (function() {
+  $n(this.s_util_matching_Regex$$anon$1__f_matchIterator$1).next__T();
+  return new $c_s_util_matching_Regex$Match($n(this.s_util_matching_Regex$$anon$1__f_matchIterator$1).s_util_matching_Regex$MatchIterator__f_source, $n(this.s_util_matching_Regex$$anon$1__f_matchIterator$1).s_util_matching_Regex$MatchIterator__f_matcher, $n(this.s_util_matching_Regex$$anon$1__f_matchIterator$1).s_util_matching_Regex$MatchIterator__f__groupNames).force__s_util_matching_Regex$Match()
+});
+$c_s_util_matching_Regex$$anon$1.prototype.next__O = (function() {
+  return this.next__s_util_matching_Regex$Match()
+});
+var $d_s_util_matching_Regex$$anon$1 = new $TypeData().initClass({
+  s_util_matching_Regex$$anon$1: 0
+}, false, "scala.util.matching.Regex$$anon$1", {
+  s_util_matching_Regex$$anon$1: 1,
+  sc_AbstractIterator: 1,
+  O: 1,
+  sc_Iterator: 1,
+  sc_IterableOnce: 1,
+  sc_IterableOnceOps: 1
+});
+$c_s_util_matching_Regex$$anon$1.prototype.$classData = $d_s_util_matching_Regex$$anon$1;
 function $ct_s_util_parsing_combinator_Parsers$Success__s_util_parsing_combinator_Parsers__O__s_util_parsing_input_Reader__($thiz, outer, result, next) {
   $thiz.s_util_parsing_combinator_Parsers$Success__f_result = result;
   $thiz.s_util_parsing_combinator_Parsers$Success__f_next = next;
@@ -85890,6 +86251,10 @@ function $f_T__indexOf__I__I($thiz, ch) {
   var str = $m_jl_Character$().toString__I__T(ch);
   return $uI($thiz.indexOf(str))
 }
+function $f_T__indexOf__I__I__I($thiz, ch, fromIndex) {
+  var str = $m_jl_Character$().toString__I__T(ch);
+  return $uI($thiz.indexOf(str, fromIndex))
+}
 function $f_T__repeat__I__T($thiz, count) {
   if ((count < 0)) {
     throw $ct_jl_IllegalArgumentException__(new $c_jl_IllegalArgumentException())
@@ -105273,6 +105638,12 @@ function $h_sc_SeqView$Sorted() {
   /*<skip>*/
 }
 $h_sc_SeqView$Sorted.prototype = $c_sc_SeqView$Sorted.prototype;
+$c_sc_SeqView$Sorted.prototype.view__sc_SeqView = (function() {
+  return this
+});
+$c_sc_SeqView$Sorted.prototype.drop__I__sc_SeqView = (function(n) {
+  return $ct_sc_SeqView$Drop__sc_SeqOps__I__(new $c_sc_SeqView$Drop(), this, n)
+});
 $c_sc_SeqView$Sorted.prototype.iterableFactory__sc_IterableFactory = (function() {
   return $m_sc_View$()
 });
@@ -105448,6 +105819,12 @@ function $h_sc_SeqView$Sorted$ReverseSorted() {
   /*<skip>*/
 }
 $h_sc_SeqView$Sorted$ReverseSorted.prototype = $c_sc_SeqView$Sorted$ReverseSorted.prototype;
+$c_sc_SeqView$Sorted$ReverseSorted.prototype.view__sc_SeqView = (function() {
+  return this
+});
+$c_sc_SeqView$Sorted$ReverseSorted.prototype.drop__I__sc_SeqView = (function(n) {
+  return $ct_sc_SeqView$Drop__sc_SeqOps__I__(new $c_sc_SeqView$Drop(), this, n)
+});
 $c_sc_SeqView$Sorted$ReverseSorted.prototype.iterableFactory__sc_IterableFactory = (function() {
   return $m_sc_View$()
 });
@@ -107241,6 +107618,9 @@ $c_sc_AbstractSeq.prototype.hashCode__I = (function() {
 $c_sc_AbstractSeq.prototype.toString__T = (function() {
   return $f_sc_Iterable__toString__T(this)
 });
+$c_sc_AbstractSeq.prototype.view__sc_SeqView = (function() {
+  return $ct_sc_SeqView$Id__sc_SeqOps__(new $c_sc_SeqView$Id(), this)
+});
 $c_sc_AbstractSeq.prototype.size__I = (function() {
   return this.length__I()
 });
@@ -107254,6 +107634,9 @@ $c_sc_AbstractSeq.prototype.indexWhere__F1__I__I = (function(p, from) {
   var this$1 = $n(this.iterator__sc_Iterator());
   return $f_sc_Iterator__indexWhere__F1__I__I(this$1, p, from)
 });
+$c_sc_AbstractSeq.prototype.indexOf__O__I__I = (function(elem, from) {
+  return $f_sc_SeqOps__indexOf__O__I__I(this, elem, from)
+});
 $c_sc_AbstractSeq.prototype.contains__O__Z = (function(elem) {
   return $f_sc_SeqOps__contains__O__Z(this, elem)
 });
@@ -107289,6 +107672,9 @@ function $h_sc_AbstractSeqView() {
   /*<skip>*/
 }
 $h_sc_AbstractSeqView.prototype = $c_sc_AbstractSeqView.prototype;
+$c_sc_AbstractSeqView.prototype.view__sc_SeqView = (function() {
+  return this
+});
 $c_sc_AbstractSeqView.prototype.map__F1__sc_SeqView = (function(f) {
   return $ct_sc_SeqView$Map__sc_SeqOps__F1__(new $c_sc_SeqView$Map(), this, f)
 });
@@ -110237,6 +110623,9 @@ function $h_sc_SeqView$Drop() {
   /*<skip>*/
 }
 $h_sc_SeqView$Drop.prototype = $c_sc_SeqView$Drop.prototype;
+$c_sc_SeqView$Drop.prototype.view__sc_SeqView = (function() {
+  return this
+});
 $c_sc_SeqView$Drop.prototype.map__F1__sc_SeqView = (function(f) {
   return $ct_sc_SeqView$Map__sc_SeqOps__F1__(new $c_sc_SeqView$Map(), this, f)
 });
@@ -110330,6 +110719,9 @@ function $h_sc_SeqView$DropRight() {
   /*<skip>*/
 }
 $h_sc_SeqView$DropRight.prototype = $c_sc_SeqView$DropRight.prototype;
+$c_sc_SeqView$DropRight.prototype.view__sc_SeqView = (function() {
+  return this
+});
 $c_sc_SeqView$DropRight.prototype.map__F1__sc_SeqView = (function(f) {
   return $ct_sc_SeqView$Map__sc_SeqOps__F1__(new $c_sc_SeqView$Map(), this, f)
 });
@@ -110467,6 +110859,9 @@ function $h_sc_SeqView$Map() {
   /*<skip>*/
 }
 $h_sc_SeqView$Map.prototype = $c_sc_SeqView$Map.prototype;
+$c_sc_SeqView$Map.prototype.view__sc_SeqView = (function() {
+  return this
+});
 $c_sc_SeqView$Map.prototype.map__F1__sc_SeqView = (function(f) {
   return $ct_sc_SeqView$Map__sc_SeqOps__F1__(new $c_sc_SeqView$Map(), this, f)
 });
@@ -111678,6 +112073,9 @@ $c_sc_AbstractIndexedSeqView.prototype.drop__I__sc_SeqView = (function(n) {
 $c_sc_AbstractIndexedSeqView.prototype.drop__I__O = (function(n) {
   return this.drop__I__sc_IndexedSeqView(n)
 });
+$c_sc_AbstractIndexedSeqView.prototype.view__sc_SeqView = (function() {
+  return this
+});
 function $ct_sc_MapOps$KeySet__sc_MapOps__($thiz, outer) {
   if ((outer === null)) {
     $n(null)
@@ -112041,6 +112439,9 @@ $c_sc_IndexedSeqView$Drop.prototype.drop__I__sc_SeqView = (function(n) {
 $c_sc_IndexedSeqView$Drop.prototype.drop__I__O = (function(n) {
   return this.drop__I__sc_IndexedSeqView(n)
 });
+$c_sc_IndexedSeqView$Drop.prototype.view__sc_SeqView = (function() {
+  return this
+});
 var $d_sc_IndexedSeqView$Drop = new $TypeData().initClass({
   sc_IndexedSeqView$Drop: 0
 }, false, "scala.collection.IndexedSeqView$Drop", {
@@ -112134,6 +112535,9 @@ $c_sc_IndexedSeqView$DropRight.prototype.drop__I__sc_SeqView = (function(n) {
 $c_sc_IndexedSeqView$DropRight.prototype.drop__I__O = (function(n) {
   return this.drop__I__sc_IndexedSeqView(n)
 });
+$c_sc_IndexedSeqView$DropRight.prototype.view__sc_SeqView = (function() {
+  return this
+});
 var $d_sc_IndexedSeqView$DropRight = new $TypeData().initClass({
   sc_IndexedSeqView$DropRight: 0
 }, false, "scala.collection.IndexedSeqView$DropRight", {
@@ -112211,6 +112615,9 @@ $c_sc_IndexedSeqView$Id.prototype.drop__I__sc_SeqView = (function(n) {
 $c_sc_IndexedSeqView$Id.prototype.drop__I__O = (function(n) {
   return $ct_sc_IndexedSeqView$Drop__sc_IndexedSeqOps__I__(new $c_sc_IndexedSeqView$Drop(), this, n)
 });
+$c_sc_IndexedSeqView$Id.prototype.view__sc_SeqView = (function() {
+  return this
+});
 var $d_sc_IndexedSeqView$Id = new $TypeData().initClass({
   sc_IndexedSeqView$Id: 0
 }, false, "scala.collection.IndexedSeqView$Id", {
@@ -112303,6 +112710,9 @@ $c_sc_IndexedSeqView$Map.prototype.drop__I__sc_SeqView = (function(n) {
 $c_sc_IndexedSeqView$Map.prototype.drop__I__O = (function(n) {
   return this.drop__I__sc_IndexedSeqView(n)
 });
+$c_sc_IndexedSeqView$Map.prototype.view__sc_SeqView = (function() {
+  return this
+});
 var $d_sc_IndexedSeqView$Map = new $TypeData().initClass({
   sc_IndexedSeqView$Map: 0
 }, false, "scala.collection.IndexedSeqView$Map", {
@@ -112380,9 +112790,15 @@ $c_sc_IndexedSeqView$Prepended.prototype.map__F1__O = (function(f) {
 $c_sc_IndexedSeqView$Prepended.prototype.dropRight__I__O = (function(n) {
   return this.dropRight__I__sc_IndexedSeqView(n)
 });
+$c_sc_IndexedSeqView$Prepended.prototype.drop__I__sc_SeqView = (function(n) {
+  return this.drop__I__sc_IndexedSeqView(n)
+});
 $c_sc_IndexedSeqView$Prepended.prototype.drop__I__O = (function(n) {
   return this.drop__I__sc_IndexedSeqView(n)
 });
+$c_sc_IndexedSeqView$Prepended.prototype.view__sc_SeqView = (function() {
+  return this
+});
 var $d_sc_IndexedSeqView$Prepended = new $TypeData().initClass({
   sc_IndexedSeqView$Prepended: 0
 }, false, "scala.collection.IndexedSeqView$Prepended", {
@@ -112460,6 +112876,9 @@ $c_sc_IndexedSeqView$Reverse.prototype.drop__I__sc_SeqView = (function(n) {
 $c_sc_IndexedSeqView$Reverse.prototype.drop__I__O = (function(n) {
   return $ct_sc_IndexedSeqView$Drop__sc_IndexedSeqOps__I__(new $c_sc_IndexedSeqView$Drop(), this, n)
 });
+$c_sc_IndexedSeqView$Reverse.prototype.view__sc_SeqView = (function() {
+  return this
+});
 var $d_sc_IndexedSeqView$Reverse = new $TypeData().initClass({
   sc_IndexedSeqView$Reverse: 0
 }, false, "scala.collection.IndexedSeqView$Reverse", {
@@ -115589,6 +116008,14 @@ $c_sci_WrappedString.prototype.length__I = (function() {
 $c_sci_WrappedString.prototype.toString__T = (function() {
   return this.sci_WrappedString__f_scala$collection$immutable$WrappedString$$self
 });
+$c_sci_WrappedString.prototype.indexOf__O__I__I = (function(elem, from) {
+  if ((elem instanceof $Char)) {
+    var x2 = $uC(elem);
+    return $f_T__indexOf__I__I__I($n(this.sci_WrappedString__f_scala$collection$immutable$WrappedString$$self), x2, from)
+  } else {
+    return $f_sc_SeqOps__indexOf__O__I__I(this, elem, from)
+  }
+});
 $c_sci_WrappedString.prototype.copyToArray__O__I__I__I = (function(xs, start, len) {
   if ((xs instanceof $ac_C)) {
     var x2 = $asArrayOf_C(xs, 1);
@@ -115643,6 +116070,9 @@ $c_sci_WrappedString.prototype.iterableFactory__sc_IterableFactory = (function()
 $c_sci_WrappedString.prototype.appendedAll__sc_IterableOnce__O = (function(suffix) {
   return this.appendedAll__sc_IterableOnce__sci_IndexedSeq(suffix)
 });
+$c_sci_WrappedString.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_StringView(this.sci_WrappedString__f_scala$collection$immutable$WrappedString$$self)
+});
 $c_sci_WrappedString.prototype.empty__sc_IterableOps = (function() {
   return $m_sci_WrappedString$().sci_WrappedString$__f_empty
 });
@@ -115806,6 +116236,9 @@ $c_sjsr_WrappedVarArgs.prototype.indexWhere__F1__I__I = (function(p, from) {
   var this$2 = $ct_sc_IndexedSeqView$IndexedSeqViewIterator__sc_IndexedSeqView__(new $c_sc_IndexedSeqView$IndexedSeqViewIterator(), this$1);
   return $f_sc_Iterator__indexWhere__F1__I__I(this$2, p, from)
 });
+$c_sjsr_WrappedVarArgs.prototype.indexOf__O__I__I = (function(elem, from) {
+  return $f_sc_SeqOps__indexOf__O__I__I(this, elem, from)
+});
 $c_sjsr_WrappedVarArgs.prototype.contains__O__Z = (function(elem) {
   return $f_sc_SeqOps__contains__O__Z(this, elem)
 });
@@ -115876,6 +116309,9 @@ $c_sjsr_WrappedVarArgs.prototype.isDefinedAt__O__Z = (function(x) {
   var idx = $uI(x);
   return $f_sc_SeqOps__isDefinedAt__I__Z(this, idx)
 });
+$c_sjsr_WrappedVarArgs.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_sjsr_WrappedVarArgs.prototype.apply__O__O = (function(v1) {
   return this.apply__I__O($uI(v1))
 });
@@ -117838,6 +118274,9 @@ $c_sci_ArraySeq.prototype.sorted__s_math_Ordering__sci_ArraySeq = (function(ord)
     return new $c_sci_ArraySeq$ofRef(a)
   }
 });
+$c_sci_ArraySeq.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_sci_ArraySeq.prototype.fromSpecific__sc_IterableOnce__O = (function(coll) {
   var this$1 = $m_sci_ArraySeq$();
   var evidence$5 = this.elemTag__s_reflect_ClassTag();
@@ -118349,6 +118788,9 @@ $c_sci_Vector.prototype.foreach__F1__V = (function(f) {
     i = ((1 + i) | 0)
   }
 });
+$c_sci_Vector.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_sci_Vector.prototype.dropRight__I__O = (function(n) {
   var until = ((this.length__I() - ((n > 0) ? n : 0)) | 0);
   return this.slice__I__I__sci_Vector(0, until)
@@ -118482,6 +118924,9 @@ $c_scm_ArraySeq.prototype.sorted__s_math_Ordering__scm_ArraySeq = (function(ord)
   var xs = this.array__O();
   return $n($$x2).make__O__scm_ArraySeq($n($$x1).sorted$extension__O__s_math_Ordering__O(xs, ord))
 });
+$c_scm_ArraySeq.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_scm_ArraySeq.prototype.sorted__s_math_Ordering__O = (function(ord) {
   return this.sorted__s_math_Ordering__scm_ArraySeq(ord)
 });
@@ -124984,6 +125429,9 @@ $c_scm_StringBuilder.prototype.subSequence__I__I__jl_CharSequence = (function(st
 $c_scm_StringBuilder.prototype.isEmpty__Z = (function() {
   return ($n(this.scm_StringBuilder__f_underlying).length__I() === 0)
 });
+$c_scm_StringBuilder.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_scm_StringBuilder.prototype.iterableFactory__sc_IterableFactory = (function() {
   return $m_scm_IndexedSeq$()
 });
@@ -125625,6 +126073,9 @@ $c_scm_ArrayBuffer.prototype.addOne__O__scm_Growable = (function(elem) {
 $c_scm_ArrayBuffer.prototype.iterableFactory__sc_IterableFactory = (function() {
   return $m_scm_ArrayBuffer$()
 });
+$c_scm_ArrayBuffer.prototype.view__sc_SeqView = (function() {
+  return this.view__scm_ArrayBufferView()
+});
 $c_scm_ArrayBuffer.prototype.apply__O__O = (function(v1) {
   return this.apply__I__O($uI(v1))
 });
@@ -125755,6 +126206,9 @@ $c_sjs_js_WrappedArray.prototype.knownSize__I = (function() {
 $c_sjs_js_WrappedArray.prototype.className__T = (function() {
   return "WrappedArray"
 });
+$c_sjs_js_WrappedArray.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_sjs_js_WrappedArray.prototype.result__O = (function() {
   return this
 });
@@ -126014,6 +126468,9 @@ $c_scm_ArrayDeque.prototype.scala$collection$mutable$ArrayDeque$$resize__I__V =
 $c_scm_ArrayDeque.prototype.stringPrefix__T = (function() {
   return "ArrayDeque"
 });
+$c_scm_ArrayDeque.prototype.view__sc_SeqView = (function() {
+  return new $c_sc_IndexedSeqView$Id(this)
+});
 $c_scm_ArrayDeque.prototype.iterableFactory__sc_IterableFactory = (function() {
   return this.iterableFactory__sc_SeqFactory()
 });