@vinctus/oql 1.1.14 → 1.1.16

package/README.md

@@ -68,7 +68,7 @@ Add the following lines to your `build.sbt`:
 ```sbt
 externalResolvers += "OQL" at "https://maven.pkg.github.com/vinctustech/oql"
 
-libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.14"
+libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.16"
 
 Compile / npmDependencies ++= Seq(
   "pg" -> "8.10.0",

package/main.js

@@ -4979,7 +4979,6 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
   var updatesWithoutUndefined = $as_sc_Map($n(updates).filterNot__F1__O(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
     if ((x$1$3 !== null)) {
-      $as_T($n(x$1$3).T2__f__1);
       var v = $n(x$1$3).T2__f__2;
       return $m_sr_BoxesRunTime$().equals__O__O__Z(v, (void 0))
     };
@@ -4991,12 +4990,12 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
   var pairs = $as_sc_Map($n(updatesWithoutUndefined).map__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
     var x$1$4 = $as_T2(x$1$3$1);
     if ((x$1$4 !== null)) {
-      var k$1 = $as_T($n(x$1$4).T2__f__1);
+      var k = $as_T($n(x$1$4).T2__f__1);
       var v$1 = $n(x$1$4).T2__f__2;
       if ($is_sci_Map(v$1)) {
         matchResult10: {
           var v1;
-          var x93 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k$1));
+          var x93 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
           if ((x93 !== null)) {
             var this$14 = $n(x93);
             var this$15 = $n(x93);
@@ -5012,12 +5011,12 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
               break matchResult10
             }
           };
-          $m_s_sys_package$().error__T__E((((("attribute '" + k$1) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
+          $m_s_sys_package$().error__T__E((((("attribute '" + k) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
         }
       } else {
         var v1 = v$1
       };
-      var attr = $as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k$1));
+      var attr = $as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k));
       var self = $n(attr).Lcom_vinctus_oql_Attribute__f_column;
       var $$x4 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
       var x = $n(attr).Lcom_vinctus_oql_Attribute__f_typ;
@@ -5039,9 +5038,9 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
   var this$25 = $n($as_sc_IterableOnceOps($n(pairs).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$4$1) => {
     var x$1$6 = $as_T2(x$1$4$1);
     if ((x$1$6 !== null)) {
-      var k$2 = $as_T($n(x$1$6).T2__f__1);
+      var k$1 = $as_T($n(x$1$6).T2__f__1);
       var v$2 = $as_T($n(x$1$6).T2__f__2);
-      return ((k$2 + " = ") + v$2)
+      return ((k$1 + " = ") + v$2)
     };
     throw new $c_s_MatchError(x$1$6)
   })))));
@@ -5149,114 +5148,59 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
     })))));
     $n($$x3).error__T__E(((("extrinsic properties not found in entity '" + $$x2) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$13, "", ", ", "")))
   };
-  var this$25 = $n(updates);
+  var command = $ct_scm_StringBuilder__(new $c_scm_StringBuilder());
+  var columns = $as_sc_Iterable($n($n($as_sc_MapOps($n($as_T2($n(updates).head__O())).T2__f__2)).keys__sc_Iterable()).map__F1__O(new $c_sjsr_AnonFunction1(((k) => {
+    var k$1 = $as_T(k);
+    return $n($as_Lcom_vinctus_oql_Attribute($n(attrsNoPK).apply__O__O(k$1))).Lcom_vinctus_oql_Attribute__f_column
+  }))));
+  command.append__T__scm_StringBuilder((("UPDATE  " + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_table) + "\n"));
+  var this$14 = $n($as_sc_IterableOnceOps($n(columns).map__F1__O(new $c_sjsr_AnonFunction1(((k$2) => {
+    var k$3 = $as_T(k$2);
+    return ((k$3 + " = __data__.") + k$3)
+  })))));
+  command.append__T__scm_StringBuilder((("  SET   " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$14, "", ", ", "")) + "\n"));
+  var this$20 = $n(updates);
   var f = ((x$1$4$1) => {
     var x$1$5 = $as_T2(x$1$4$1);
     if ((x$1$5 !== null)) {
-      var u$2 = $as_sc_Map($n(x$1$5).T2__f__2);
-      return $as_sc_Map($n(u$2).map__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
-        var x$1$6 = $as_T2(x$1$2$1);
-        if ((x$1$6 !== null)) {
-          var k = $as_T($n(x$1$6).T2__f__1);
-          var v = $n(x$1$6).T2__f__2;
-          if ($is_sci_Map(v)) {
-            matchResult17: {
-              var v1;
-              var x127 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
-              if ((x127 !== null)) {
-                var this$16 = $n(x127);
-                var this$17 = $n(x127);
-                var this$18 = $n(x127);
-                var this$19 = $n(x127);
-                var this$20 = $n(x127);
-                var x133 = this$20.Lcom_vinctus_oql_Attribute__f_typ;
-                if ((x133 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                  var x$1$7 = $as_Lcom_vinctus_oql_ManyToOneType(x133);
-                  var this$22 = $n(x$1$7);
-                  var x136 = this$22.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                  var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x136).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
-                  break matchResult17
-                }
-              };
-              $m_s_sys_package$().error__T__E((((("attribute '" + k) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
-            }
-          } else {
-            var v1 = v
-          };
-          var self = $n($as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k))).Lcom_vinctus_oql_Attribute__f_column;
-          var y = $n(this.Lcom_vinctus_oql_Mutation__f_oql).render__O__s_Option__T(v1, $n(this.Lcom_vinctus_oql_Mutation__f_oql).render$default$2__s_Option());
-          return new $c_T2(self, y)
-        };
-        throw new $c_s_MatchError(x$1$6)
-      }))))
+      var id = $n(x$1$5).T2__f__1;
+      var update = $as_sc_Map($n(x$1$5).T2__f__2);
+      var $$x6 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
+      var this$16 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
+      var value = $as_Lcom_vinctus_oql_Datatype(this$16);
+      var $$x5 = $n($$x6).render__O__s_Option__T(id, new $c_s_Some(value));
+      var this$18 = $n(update);
+      var k$4 = new $c_sjsr_AnonFunction1(((x$2) => $n(this.Lcom_vinctus_oql_Mutation__f_oql).render__O__s_Option__T(x$2, $n(this.Lcom_vinctus_oql_Mutation__f_oql).render$default$2__s_Option())));
+      var this$19 = $n($as_sc_IterableOnceOps($n(columns).map__F1__O($f_s_PartialFunction__andThen__F1__s_PartialFunction(this$18, k$4))));
+      return (((("(" + $$x5) + ", ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$19, "", ", ", "")) + ")")
     };
     throw new $c_s_MatchError(x$1$5)
   });
-  if ((this$25 === $m_sci_Nil$())) {
-    $m_sci_Nil$()
+  if ((this$20 === $m_sci_Nil$())) {
+    var $$x7 = $m_sci_Nil$()
   } else {
-    var arg1$2 = this$25.head__O();
+    var arg1$2 = this$20.head__O();
     var h = new $c_sci_$colon$colon(f(arg1$2), $m_sci_Nil$());
     var t = h;
-    var rest = $as_sci_List(this$25.tail__O());
+    var rest = $as_sci_List(this$20.tail__O());
     while ((rest !== $m_sci_Nil$())) {
       var arg1$3 = $n(rest).head__O();
       var nx = new $c_sci_$colon$colon(f(arg1$3), $m_sci_Nil$());
       $n(t).sci_$colon$colon__f_next = nx;
       t = nx;
       rest = $as_sci_List($n(rest).tail__O())
-    }
-  };
-  var command = $ct_scm_StringBuilder__(new $c_scm_StringBuilder());
-  var keys = $n($as_sc_MapOps($n($as_T2($n(updates).head__O())).T2__f__2)).keys__sc_Iterable();
-  command.append__T__scm_StringBuilder((("UPDATE  " + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_table) + "\n"));
-  var this$26 = $n($as_sc_IterableOnceOps($n(keys).map__F1__O(new $c_sjsr_AnonFunction1(((k$1) => {
-    var k$2 = $as_T(k$1);
-    return ((k$2 + " = __data__.") + k$2)
-  })))));
-  command.append__T__scm_StringBuilder((("  SET   " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$26, "", ", ", "")) + "\n"));
-  var this$31 = $n(updates);
-  var f$1 = ((x$1$5$1) => {
-    var x$1$8 = $as_T2(x$1$5$1);
-    if ((x$1$8 !== null)) {
-      var id = $n(x$1$8).T2__f__1;
-      var update = $as_sc_Map($n(x$1$8).T2__f__2);
-      var $$x6 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
-      var this$27 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
-      var value = $as_Lcom_vinctus_oql_Datatype(this$27);
-      var $$x5 = $n($$x6).render__O__s_Option__T(id, new $c_s_Some(value));
-      var this$29 = $n(update);
-      var k$3 = new $c_sjsr_AnonFunction1(((x$2) => $n(this.Lcom_vinctus_oql_Mutation__f_oql).render__O__s_Option__T(x$2, $n(this.Lcom_vinctus_oql_Mutation__f_oql).render$default$2__s_Option())));
-      var this$30 = $n($as_sc_IterableOnceOps($n(keys).map__F1__O($f_s_PartialFunction__andThen__F1__s_PartialFunction(this$29, k$3))));
-      return (((("(" + $$x5) + ", ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$30, "", ", ", "")) + ")")
-    };
-    throw new $c_s_MatchError(x$1$8)
-  });
-  if ((this$31 === $m_sci_Nil$())) {
-    var $$x7 = $m_sci_Nil$()
-  } else {
-    var arg1$4 = this$31.head__O();
-    var h$1 = new $c_sci_$colon$colon(f$1(arg1$4), $m_sci_Nil$());
-    var t$1 = h$1;
-    var rest$1 = $as_sci_List(this$31.tail__O());
-    while ((rest$1 !== $m_sci_Nil$())) {
-      var arg1$5 = $n(rest$1).head__O();
-      var nx$1 = new $c_sci_$colon$colon(f$1(arg1$5), $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 $$x7 = h$1
+    var $$x7 = h
   };
-  var this$32 = $n($$x7);
-  var $$x8 = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$32, "", ", ", "");
+  var this$21 = $n($$x7);
+  var $$x8 = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$21, "", ", ", "");
   var $$x4 = $n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column;
-  var this$33 = $n(keys);
-  command.append__T__scm_StringBuilder((((((("  FROM  (VALUES " + $$x8) + ") AS __data__ (") + $$x4) + ", ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$33, "", ", ", "")) + ")\n"));
+  var this$22 = $n(columns);
+  command.append__T__scm_StringBuilder((((((("  FROM  (VALUES " + $$x8) + ") AS __data__ (") + $$x4) + ", ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$22, "", ", ", "")) + ")\n"));
   command.append__T__scm_StringBuilder((((((("  WHERE " + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_table) + ".") + $n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + " = __data__.") + $n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + "\n"));
   $n(this.Lcom_vinctus_oql_Mutation__f_oql).show__T__V($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content);
-  var this$34 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
-  return $n($n($n(this$34.Lcom_vinctus_oql_AbstractOQL__f_ds).connect__Lcom_vinctus_oql_OQLConnection()).command__T__s_concurrent_Future($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$8) => {
+  var this$23 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
+  return $n($n($n(this$23.Lcom_vinctus_oql_AbstractOQL__f_ds).connect__Lcom_vinctus_oql_OQLConnection()).command__T__s_concurrent_Future($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$8) => {
     $as_Lcom_vinctus_oql_OQLResultSet(_$8)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
@@ -5500,52 +5444,52 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount__sjs_js_
   var f = $n($n($p_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__check__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(this)).Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_oql).count__Lcom_vinctus_oql_OQLQuery__T__Lcom_vinctus_oql_Fixed__s_concurrent_Future(this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_q, null, this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_com$vinctus$oql$QueryBuilder_JS_NodePG$$fixed);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getOne = (function() {
-  return this.getOne__sjs_js_Promise()
-});
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "query$default$2", {
   "get": (function() {
-    return this.select$default$2__O()
+    return this.query$default$2__O()
   }),
   "configurable": true
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.limit = (function(arg) {
-  var prep0 = $uI(arg);
-  return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
+  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.query = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.query$default$2__O() : rest[0]);
   return this.query__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
-  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.offset = (function(arg) {
+  var prep0 = $uI(arg);
+  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount = (function() {
   return this.getCount__sjs_js_Promise()
 });
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "query$default$2", {
-  "get": (function() {
-    return this.query$default$2__O()
-  }),
-  "configurable": true
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.order = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  var prep1 = $as_T(arg$2);
+  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getMany = (function() {
   return this.getMany__sjs_js_Promise()
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getOne = (function() {
+  return this.getOne__sjs_js_Promise()
+});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.select = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
   return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.order = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  var prep1 = $as_T(arg$2);
-  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
-});
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.offset = (function(arg) {
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
-  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
+  return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
+});
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
+  "get": (function() {
+    return this.select$default$2__O()
+  }),
+  "configurable": true
 });
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG: 0
@@ -5704,52 +5648,52 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount__sjs_js_Pro
   var f = $n($n($p_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__check__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(this)).Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_oql).count__Lcom_vinctus_oql_OQLQuery__T__Lcom_vinctus_oql_Fixed__s_concurrent_Future(this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_q, null, this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_com$vinctus$oql$QueryBuilder_JS_RDB$$fixed);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getOne = (function() {
-  return this.getOne__sjs_js_Promise()
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
+  "get": (function() {
+    return this.query$default$2__O()
+  }),
+  "configurable": true
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.limit = (function(arg) {
-  var prep0 = $uI(arg);
-  return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
+  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.query = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.query$default$2__O() : rest[0]);
   return this.query__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
-  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.offset = (function(arg) {
+  var prep0 = $uI(arg);
+  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount = (function() {
   return this.getCount__sjs_js_Promise()
 });
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
-  "get": (function() {
-    return this.query$default$2__O()
-  }),
-  "configurable": true
-});
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "select$default$2", {
-  "get": (function() {
-    return this.select$default$2__O()
-  }),
-  "configurable": true
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.order = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  var prep1 = $as_T(arg$2);
+  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getMany = (function() {
   return this.getMany__sjs_js_Promise()
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getOne = (function() {
+  return this.getOne__sjs_js_Promise()
+});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.select = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
   return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.order = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  var prep1 = $as_T(arg$2);
-  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
-});
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.offset = (function(arg) {
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
-  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
+  return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
+});
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "select$default$2", {
+  "get": (function() {
+    return this.select$default$2__O()
+  }),
+  "configurable": true
 });
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB: 0
@@ -30002,10 +29946,19 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsBulkUpdate__sjs_js_
   var f$1 = this.bulkUpdate__sci_List__s_concurrent_Future($$x1);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f$1, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.delete = (function(arg) {
+  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
+});
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.link = (function(arg, arg$2, arg$3) {
   var prep1 = $as_T(arg$2);
   return this.jsLink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.update = (function(arg, arg$2) {
+  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
+});
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.insert = (function(arg) {
+  return this.jsInsert__sjs_js_Dictionary__sjs_js_Promise(arg)
+});
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.unlink = (function(arg, arg$2, arg$3) {
   var prep1 = $as_T(arg$2);
   return this.jsUnlink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
@@ -30013,15 +29966,6 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.unlink = (function(ar
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.bulkUpdate = (function(arg) {
   return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.insert = (function(arg) {
-  return this.jsInsert__sjs_js_Dictionary__sjs_js_Promise(arg)
-});
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.update = (function(arg, arg$2) {
-  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
-});
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.delete = (function(arg) {
-  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
-});
 var $d_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG = new $TypeData().initClass({
   Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG: 0
 }, false, "com.vinctus.oql.Mutation_JS_NodePG", {
@@ -30161,10 +30105,19 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsBulkUpdate__sjs_js_Arr
   var f$1 = this.bulkUpdate__sci_List__s_concurrent_Future($$x1);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f$1, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.delete = (function(arg) {
+  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
+});
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.link = (function(arg, arg$2, arg$3) {
   var prep1 = $as_T(arg$2);
   return this.jsLink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.update = (function(arg, arg$2) {
+  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
+});
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.insert = (function(arg) {
+  return this.jsInsert__sjs_js_Dictionary__sjs_js_Promise(arg)
+});
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.unlink = (function(arg, arg$2, arg$3) {
   var prep1 = $as_T(arg$2);
   return this.jsUnlink__sjs_js_Any__T__sjs_js_Any__sjs_js_Promise(arg, prep1, arg$3)
@@ -30172,15 +30125,6 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.unlink = (function(arg,
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.bulkUpdate = (function(arg) {
   return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.insert = (function(arg) {
-  return this.jsInsert__sjs_js_Dictionary__sjs_js_Promise(arg)
-});
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.update = (function(arg, arg$2) {
-  return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
-});
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.delete = (function(arg) {
-  return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
-});
 var $d_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB: 0
 }, false, "com.vinctus.oql.Mutation_JS_RDB", {
@@ -30438,8 +30382,9 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.render__O__s_Option__T = (
       return (("'" + $m_Lcom_vinctus_oql_JSON$().apply__O__s_PartialFunction__I__Z__T(a, $n(this.Lcom_vinctus_oql_AbstractOQL__f_ds).platformSpecific__s_PartialFunction(), ($m_Lcom_vinctus_oql_JSON$(), 2), ($m_Lcom_vinctus_oql_JSON$(), false))) + "'")
     } else {
       var this$2 = $n(this.Lcom_vinctus_oql_AbstractOQL__f_ds);
+      var a$1 = this.render__O__s_Option__T(a, $m_s_None$());
       var typ$1 = $as_Lcom_vinctus_oql_Datatype($n(typ).get__O());
-      return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$2, a, typ$1)
+      return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$2, a$1, typ$1)
     }
   } else if (((typeof a) === "string")) {
     var s = $as_T(a);
@@ -30465,40 +30410,40 @@ $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.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
+});
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
   return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.count = (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.jsCount__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)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
+});
+$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);
   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.jsCount__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
+$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)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG(prep0)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
+  return this.jsQueryMany__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
@@ -30705,33 +30650,33 @@ $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.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.showQuery = (function() {
-  this.showQuery__V()
+$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.rawMulti = (function(arg) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
-  return this.rawMulti__T__sjs_js_Promise(prep0)
+  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
 });
-$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)
 });
-$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.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.create = (function() {
   return this.jsCreate__sjs_js_Promise()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.rawMulti = (function(arg) {
   var prep0 = $as_T(arg);
-  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+  return this.rawMulti__T__sjs_js_Promise(prep0)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30740,12 +30685,12 @@ $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.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)
 });
 var $d_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS: 0
@@ -31203,23 +31148,23 @@ function $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype_
     };
     var x$3 = $m_Lcom_vinctus_oql_UUIDType$();
     if ((x$3 === typ)) {
-      return (("'" + x25) + "'::UUID")
+      return (x25 + "::UUID")
     };
     var x$5 = $m_Lcom_vinctus_oql_TimestampType$();
     if ((x$5 === typ)) {
-      return (("'" + x25) + "'::TIMESTAMP")
+      return (x25 + "::TIMESTAMP")
     };
     var x$7 = $m_Lcom_vinctus_oql_DateType$();
     if ((x$7 === typ)) {
-      return (("'" + x25) + "'::DATE")
+      return (x25 + "::DATE")
     };
     var x$9 = $m_Lcom_vinctus_oql_JSONType$();
     if ((x$9 === typ)) {
-      return (("'" + x25) + "'::JSON")
+      return (x25 + "::JSON")
     };
     var x$11 = $m_Lcom_vinctus_oql_IntervalType$();
     if ((x$11 === typ)) {
-      return (("'" + x25) + "'::INTERVAL")
+      return (x25 + "::INTERVAL")
     }
   };
   matchAlts1: {