@vinctus/oql 1.1.16 → 1.1.18

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.16"
+libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.18"
 
 Compile / npmDependencies ++= Seq(
   "pg" -> "8.10.0",

package/main.js

@@ -4,7 +4,7 @@ var $linkingInfo = Object.freeze({
   "esVersion": 9,
   "assumingES6": true,
   "productionMode": false,
-  "linkerVersion": "1.13.0",
+  "linkerVersion": "1.13.1",
   "fileLevelThis": this
 });
 var $L0;
@@ -5149,7 +5149,8 @@ $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 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 keys = $n($as_sc_MapOps($n($as_T2($n(updates).head__O())).T2__f__2)).keys__sc_Iterable();
+  var columns = $as_sc_Iterable($n(keys).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
   }))));
@@ -5171,7 +5172,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
       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))));
+      var this$19 = $n($as_sc_IterableOnceOps($n(keys).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)
@@ -5444,42 +5445,31 @@ $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)
 });
-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.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.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.offset = (function(arg) {
-  var prep0 = $uI(arg);
-  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
+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.getCount = (function() {
-  return this.getCount__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.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.getCount = (function() {
+  return this.getCount__sjs_js_Promise()
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
@@ -5491,6 +5481,17 @@ Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.proto
   }),
   "configurable": true
 });
+$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.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.getMany = (function() {
+  return this.getMany__sjs_js_Promise()
+});
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG: 0
 }, false, "com.vinctus.oql.QueryBuilder_JS_NodePG", {
@@ -5648,42 +5649,31 @@ $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)
 });
-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.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.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.offset = (function(arg) {
-  var prep0 = $uI(arg);
-  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
+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.getCount = (function() {
-  return this.getCount__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.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.getCount = (function() {
+  return this.getCount__sjs_js_Promise()
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
@@ -5695,6 +5685,17 @@ Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototyp
   }),
   "configurable": true
 });
+$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.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.getMany = (function() {
+  return this.getMany__sjs_js_Promise()
+});
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB: 0
 }, false, "com.vinctus.oql.QueryBuilder_JS_RDB", {
@@ -29946,25 +29947,25 @@ $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.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.bulkUpdate = (function(arg) {
+  return this.jsBulkUpdate__sjs_js_Array__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)
 });
-$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.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
@@ -30105,25 +30106,25 @@ $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.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.bulkUpdate = (function(arg) {
+  return this.jsBulkUpdate__sjs_js_Array__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)
 });
-$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.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
@@ -30410,13 +30411,14 @@ $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.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.queryOne = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30427,10 +30429,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg,
 $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]);
@@ -30438,6 +30436,9 @@ $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.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30650,13 +30651,14 @@ $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.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.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.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.queryOne = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30667,17 +30669,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...
 $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.rawMulti = (function(arg) {
-  var prep0 = $as_T(arg);
-  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);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30685,6 +30676,16 @@ $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.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -31132,12 +31133,17 @@ function $f_Lcom_vinctus_oql_SQLDataSource__schema__Lcom_vinctus_oql_DataModel__
   $m_sc_StringOps$();
   return (("" + x$2) + xs)
 }
-function $f_Lcom_vinctus_oql_SQLDataSource__string__T__T($thiz, s) {
+function $f_Lcom_vinctus_oql_SQLDataSource__quote__T__T($thiz, s) {
   var this$1 = $n(s);
   var this$2 = $n($as_T(this$1.split("\\").join("\\\\")));
   var this$3 = $n($as_T(this$2.split("'").join("\\'")));
-  var this$4 = $n($as_T(this$3.split("\r").join("\\r")));
-  return (("E'" + $as_T(this$4.split("\n").join("\\n"))) + "'")
+  var this$4 = $n($as_T(this$3.split("\t").join("\\t")));
+  var this$5 = $n($as_T(this$4.split("\r").join("\\r")));
+  return $as_T(this$5.split("\n").join("\\n"))
+}
+function $f_Lcom_vinctus_oql_SQLDataSource__string__T__T($thiz, s) {
+  var quoted = $f_Lcom_vinctus_oql_SQLDataSource__quote__T__T($thiz, s);
+  return ((quoted === s) ? (("'" + s) + "'") : (("E'" + quoted) + "'"))
 }
 function $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T($thiz, a, typ) {
   if (((typeof a) === "string")) {
@@ -42578,11 +42584,7 @@ $c_Lcom_vinctus_oql_RDBDataSource.prototype.builtinVariables__sci_Map = (functio
   return this.Lcom_vinctus_oql_RDBDataSource__f_builtinVariables
 });
 $c_Lcom_vinctus_oql_RDBDataSource.prototype.string__T__T = (function(s) {
-  var this$1 = $n($f_Lcom_vinctus_oql_SQLDataSource__string__T__T(this, s));
-  if ((this$1.length < 1)) {
-    $charAt(this$1, 1)
-  };
-  return $as_T(this$1.substring(1))
+  return (("'" + $f_Lcom_vinctus_oql_SQLDataSource__quote__T__T(this, s)) + "'")
 });
 $c_Lcom_vinctus_oql_RDBDataSource.prototype.connect__Lcom_vinctus_oql_OQLConnection = (function() {
   return this.Lcom_vinctus_oql_RDBDataSource__f_connect