@vinctus/oql 1.1.0-alpha.2 → 1.1.0-alpha.5

package/index.d.ts

@@ -61,3 +61,23 @@ export class OQL {
   raw<T = any>(sql: string, values?: any[]): Promise<T[]>
 
 }
+
+export class OQL_RDB {
+
+  constructor(dm: string)
+
+  showQuery(): void
+
+  entity(name: string): Mutation
+
+  queryBuilder<T = any>(fixed?: string, at?: any): QueryBuilder<T>
+
+  queryOne<T = any>(oql: string, parameters?: any, fixed?: string, at?: any): Promise<T | undefined>
+
+  queryMany<T = any>(oql: string, parameters?: any, fixed?: string, at?: any): Promise<T[]>
+
+  count(oql: string, parameters?: any, fixed?: string, at?: any): Promise<number>
+
+  raw<T = any>(sql: string, values?: any[]): Promise<T[]>
+
+}

package/index.js

@@ -1135,39 +1135,33 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
       var x64 = $as_Lcom_vinctus_oql_AbstractOQL$ValueNode(x60);
       var x66 = x64.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_value;
       var v = resultSet$tailLocal1.get__I__Lcom_vinctus_oql_OQLResultSetValue(x64.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx);
-      if (x64.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed) {
-        var this$8 = $thiz.Lcom_vinctus_oql_AbstractOQL__f_ds;
-        var typ = resultSet$tailLocal1.getString__I__T(((1 + x64.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx) | 0));
-        var typ$1 = $f_Lcom_vinctus_oql_PGDataSource__reverseMapType__T__Lcom_vinctus_oql_Datatype(this$8, typ)
-      } else {
-        var typ$1 = x66.Lcom_vinctus_oql_OQLExpression__f_typ
-      };
+      var typ = (x64.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_typed ? $thiz.Lcom_vinctus_oql_AbstractOQL__f_ds.reverseMapType__T__Lcom_vinctus_oql_Datatype(resultSet$tailLocal1.getString__I__T(((1 + x64.Lcom_vinctus_oql_AbstractOQL$ValueNode__f_idx) | 0))) : x66.Lcom_vinctus_oql_OQLExpression__f_typ);
       var _2 = v.v__O();
       if (((typeof _2) === "string")) {
         var x53 = $as_T(_2);
         var x = $m_Lcom_vinctus_oql_IntegerType$();
-        if ((x === typ$1)) {
-          var this$12 = $m_jl_Integer$();
-          return this$12.parseInt__T__I__I(x53, 10)
+        if ((x === typ)) {
+          var this$11 = $m_jl_Integer$();
+          return this$11.parseInt__T__I__I(x53, 10)
         };
         var x$3 = $m_Lcom_vinctus_oql_FloatType$();
-        if ((x$3 === typ$1)) {
+        if ((x$3 === typ)) {
           return $m_jl_Double$().parseDouble__T__D(x53)
         };
         var x$5 = $m_Lcom_vinctus_oql_BigintType$();
-        if ((x$5 === typ$1)) {
+        if ((x$5 === typ)) {
           return $thiz.Lcom_vinctus_oql_AbstractOQL__f_conv.bigint__T__O(x53)
         };
         var x$7 = $m_Lcom_vinctus_oql_UUIDType$();
-        if ((x$7 === typ$1)) {
+        if ((x$7 === typ)) {
           return x53
         };
         var x$9 = $m_Lcom_vinctus_oql_TimestampType$();
-        if ((x$9 === typ$1)) {
+        if ((x$9 === typ)) {
           return $thiz.Lcom_vinctus_oql_AbstractOQL__f_conv.timestamp__T__O(x53)
         };
-        if ((typ$1 instanceof $c_Lcom_vinctus_oql_DecimalType)) {
-          var x$1$1 = $as_Lcom_vinctus_oql_DecimalType(typ$1);
+        if ((typ instanceof $c_Lcom_vinctus_oql_DecimalType)) {
+          var x$1$1 = $as_Lcom_vinctus_oql_DecimalType(typ);
           var x31 = x$1$1.Lcom_vinctus_oql_DecimalType__f_precision;
           var x32 = x$1$1.Lcom_vinctus_oql_DecimalType__f_scale;
           return $thiz.Lcom_vinctus_oql_AbstractOQL__f_conv.decimal__T__I__I__O(x53, x31, x32)
@@ -1177,7 +1171,7 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
         var x$1$2 = $as_Lcom_vinctus_oql_NodePGResultSetValue(v);
         var x25 = x$1$2.Lcom_vinctus_oql_NodePGResultSetValue__f_v;
         var x$11 = $m_Lcom_vinctus_oql_JSONType$();
-        if ((x$11 === typ$1)) {
+        if ((x$11 === typ)) {
           return x25
         }
       };
@@ -1185,7 +1179,7 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
         var x$1$3 = $as_Lcom_vinctus_oql_SequenceResultSetValue(v);
         var x19 = x$1$3.Lcom_vinctus_oql_SequenceResultSetValue__f_v;
         var x$13 = $m_Lcom_vinctus_oql_JSONType$();
-        if ((x$13 === typ$1)) {
+        if ((x$13 === typ)) {
           return $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(x19)
         }
       };
@@ -1198,12 +1192,12 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
       x63.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(x$1$6._1__O()), $as_Lcom_vinctus_oql_AbstractOQL$Node(x$1$6._2__O()), true))
-      }))).foreach__F1__V(new $c_sjsr_AnonFunction1(((this$22, oql$10$2, newResultBuilder$2$2, result$5, resultSet$tailLocal1$2) => ((x$1$2$1) => {
+      }))).foreach__F1__V(new $c_sjsr_AnonFunction1(((this$21, oql$10$2, newResultBuilder$2$2, result$5, resultSet$tailLocal1$2) => ((x$1$2$1) => {
         var x$1$7 = $as_T2(x$1$2$1);
         if ((x$1$7 !== null)) {
           var label$1 = $as_T(x$1$7._1__O());
           var node$2 = $as_Lcom_vinctus_oql_AbstractOQL$Node(x$1$7._2__O());
-          return result$5.update__T__O__Lcom_vinctus_oql_ResultBuilder(label$1, $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O(this$22, oql$10$2, newResultBuilder$2$2, node$2, resultSet$tailLocal1$2))
+          return result$5.update__T__O__Lcom_vinctus_oql_ResultBuilder(label$1, $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql_AbstractOQL$Node__Lcom_vinctus_oql_OQLResultSet__O(this$21, oql$10$2, newResultBuilder$2$2, node$2, resultSet$tailLocal1$2))
         };
         throw new $c_s_MatchError(x$1$7)
       }))($thiz, oql$10, newResultBuilder$2, result$4, resultSet$tailLocal1)));
@@ -1534,14 +1528,14 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
       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(these$2.tail__O())
     };
-    if (ds.Lcom_vinctus_oql_NodePG__f_caseSensitive) {
+    if (ds.caseSensitive__Z()) {
       var fname = x183.Lcom_vinctus_oql_Ident__f_s
     } else {
       var this$13 = x183.Lcom_vinctus_oql_Ident__f_s;
       var fname = $as_T(this$13.toLowerCase())
     };
     matchResult12: {
-      var $$x1 = ds.Lcom_vinctus_oql_NodePG__f_functionReturnType;
+      var $$x1 = ds.functionReturnType__sci_Map();
       var _2 = x184.length__I();
       var x109 = $$x1.get__O__s_Option(new $c_T2(fname, _2));
       var x = $m_s_None$();
@@ -1677,16 +1671,16 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
       $m_s_package$();
       if ((x142.lengthCompare__I__I(1) === 0)) {
         var x145 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(x142, 0));
-        var $$x4 = ds.Lcom_vinctus_oql_NodePG__f_builtinVariables;
-        if (ds.Lcom_vinctus_oql_NodePG__f_caseSensitive) {
+        var $$x4 = ds.builtinVariables__sci_Map();
+        if (ds.caseSensitive__Z()) {
           var $$x3 = x145.Lcom_vinctus_oql_Ident__f_s
         } else {
           var this$28 = x145.Lcom_vinctus_oql_Ident__f_s;
           var $$x3 = $as_T(this$28.toLowerCase())
         };
         if ($$x4.contains__O__Z($$x3)) {
-          var $$x6 = ds.Lcom_vinctus_oql_NodePG__f_builtinVariables;
-          if (ds.Lcom_vinctus_oql_NodePG__f_caseSensitive) {
+          var $$x6 = ds.builtinVariables__sci_Map();
+          if (ds.caseSensitive__Z()) {
             var $$x5 = x145.Lcom_vinctus_oql_Ident__f_s
           } else {
             var this$29 = x145.Lcom_vinctus_oql_Ident__f_s;
@@ -1884,8 +1878,8 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
           };
           var x$2 = $m_s_None$();
           if ((x$2 === x208)) {
-            var $$x3 = ds.Lcom_vinctus_oql_NodePG__f_builtinVariables;
-            if (ds.Lcom_vinctus_oql_NodePG__f_caseSensitive) {
+            var $$x3 = ds.builtinVariables__sci_Map();
+            if (ds.caseSensitive__Z()) {
               var $$x2 = x292.Lcom_vinctus_oql_OQLQuery__f_source.Lcom_vinctus_oql_Ident__f_s
             } else {
               var this$12 = x292.Lcom_vinctus_oql_OQLQuery__f_source.Lcom_vinctus_oql_Ident__f_s;
@@ -2029,8 +2023,8 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.preprocessQuery__s_Option__Lcom_vinct
                 };
                 var x$5 = $m_s_None$();
                 if ((x$5 === x227)) {
-                  var $$x11 = ds.Lcom_vinctus_oql_NodePG__f_builtinVariables;
-                  if (ds.Lcom_vinctus_oql_NodePG__f_caseSensitive) {
+                  var $$x11 = ds.builtinVariables__sci_Map();
+                  if (ds.caseSensitive__Z()) {
                     var $$x10 = x280.Lcom_vinctus_oql_Ident__f_s
                   } else {
                     var this$47 = x280.Lcom_vinctus_oql_Ident__f_s;
@@ -3934,8 +3928,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
   };
   this.Lcom_vinctus_oql_Mutation__f_oql.show__T__V(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content);
   var this$22 = this.Lcom_vinctus_oql_Mutation__f_oql;
-  var this$23 = this$22.Lcom_vinctus_oql_AbstractOQL__f_ds;
-  return this$23.Lcom_vinctus_oql_NodePG__f_connect.command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((this$2$1, obj$4) => ((rs) => {
+  return this$22.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection().command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((this$2$1, obj$4) => ((rs) => {
     var rs$1 = $as_Lcom_vinctus_oql_OQLResultSet(rs);
     if ((!rs$1.next__Z())) {
       $m_s_sys_package$().error__T__E("insert: empty result set")
@@ -3954,10 +3947,10 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
         var pk$2 = $as_Lcom_vinctus_oql_Attribute($as_s_Some(x44).s_Some__f_value);
         var factory$2 = $m_sci_VectorMap$();
         var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
-        var this$28 = $as_sci_MapOps(factory$3.fromSpecific__sc_IterableOnce__O(obj$4));
+        var this$27 = $as_sci_MapOps(factory$3.fromSpecific__sc_IterableOnce__O(obj$4));
         var self = pk$2.Lcom_vinctus_oql_Attribute__f_name;
         var y$2 = rs$1.get__I__Lcom_vinctus_oql_OQLResultSetValue(0);
-        var $$x9 = $as_sci_VectorMap(this$28.updated__O__O__sci_MapOps(self, y$2));
+        var $$x9 = $as_sci_VectorMap(this$27.updated__O__O__sci_MapOps(self, y$2));
         break matchResult5
       };
       throw new $c_s_MatchError(x44)
@@ -3971,8 +3964,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.delete__O__s_concurrent_Future = (functio
   command.append__T__scm_StringBuilder((((("  WHERE " + $as_Lcom_vinctus_oql_Attribute(this.Lcom_vinctus_oql_Mutation__f_entity.pk__s_Option().get__O()).Lcom_vinctus_oql_Attribute__f_column) + " = ") + this.Lcom_vinctus_oql_Mutation__f_oql.render__O__s_Option__T(id, this.Lcom_vinctus_oql_Mutation__f_oql.render$default$2__s_Option())) + "\n"));
   this.Lcom_vinctus_oql_Mutation__f_oql.show__T__V(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content);
   var this$1 = this.Lcom_vinctus_oql_Mutation__f_oql;
-  var this$2 = this$1.Lcom_vinctus_oql_AbstractOQL__f_ds;
-  return this$2.Lcom_vinctus_oql_NodePG__f_connect.command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$2) => {
+  return this$1.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection().command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$2) => {
     $as_Lcom_vinctus_oql_OQLResultSet(_$2)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
@@ -4023,8 +4015,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.unlink__O__T__O__s_concurrent_Future = (f
         command.append__T__scm_StringBuilder((((((((("  WHERE " + x79.Lcom_vinctus_oql_Attribute__f_column) + " = ") + this.Lcom_vinctus_oql_Mutation__f_oql.render__O__s_Option__T(id1, this.Lcom_vinctus_oql_Mutation__f_oql.render$default$2__s_Option())) + " AND ") + x80.Lcom_vinctus_oql_Attribute__f_column) + " = ") + this.Lcom_vinctus_oql_Mutation__f_oql.render__O__s_Option__T(id2, this.Lcom_vinctus_oql_Mutation__f_oql.render$default$2__s_Option())) + "\n"));
         this.Lcom_vinctus_oql_Mutation__f_oql.show__T__V(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content);
         var this$3 = this.Lcom_vinctus_oql_Mutation__f_oql;
-        var this$4 = this$3.Lcom_vinctus_oql_AbstractOQL__f_ds;
-        return this$4.Lcom_vinctus_oql_NodePG__f_connect.command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$4) => {
+        return this$3.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection().command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$4) => {
           $as_Lcom_vinctus_oql_OQLResultSet(_$4)
         })), this.Lcom_vinctus_oql_Mutation__f_ec)
       }
@@ -4138,8 +4129,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
   command.append__T__scm_StringBuilder((((("  WHERE " + $as_Lcom_vinctus_oql_Attribute(this.Lcom_vinctus_oql_Mutation__f_entity.pk__s_Option().get__O()).Lcom_vinctus_oql_Attribute__f_column) + " = ") + this.Lcom_vinctus_oql_Mutation__f_oql.render__O__s_Option__T(id, this.Lcom_vinctus_oql_Mutation__f_oql.render$default$2__s_Option())) + "\n"));
   this.Lcom_vinctus_oql_Mutation__f_oql.show__T__V(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content);
   var this$14 = this.Lcom_vinctus_oql_Mutation__f_oql;
-  var this$15 = this$14.Lcom_vinctus_oql_AbstractOQL__f_ds;
-  return this$15.Lcom_vinctus_oql_NodePG__f_connect.command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$6) => {
+  return this$14.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection().command__T__s_concurrent_Future(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$6) => {
     $as_Lcom_vinctus_oql_OQLResultSet(_$6)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
@@ -4303,8 +4293,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
   command.append__T__scm_StringBuilder((((((("  WHERE " + this.Lcom_vinctus_oql_Mutation__f_entity.Lcom_vinctus_oql_Entity__f_table) + ".") + $as_Lcom_vinctus_oql_Attribute(this.Lcom_vinctus_oql_Mutation__f_entity.pk__s_Option().get__O()).Lcom_vinctus_oql_Attribute__f_column) + " = __data__.") + $as_Lcom_vinctus_oql_Attribute(this.Lcom_vinctus_oql_Mutation__f_entity.pk__s_Option().get__O()).Lcom_vinctus_oql_Attribute__f_column) + "\n"));
   this.Lcom_vinctus_oql_Mutation__f_oql.show__T__V(command.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content);
   var this$18 = this.Lcom_vinctus_oql_Mutation__f_oql;
-  var this$19 = this$18.Lcom_vinctus_oql_AbstractOQL__f_ds;
-  return this$19.Lcom_vinctus_oql_NodePG__f_connect.command__T__s_concurrent_Future(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) => {
+  return this$18.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection().command__T__s_concurrent_Future(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)
 });
@@ -4583,21 +4572,33 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.$js$exported$meth
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.$js$exported$meth$getCount__O = (function() {
   return this.getCount__sjs_js_Promise()
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
-  var prep0 = arg;
-  return this.$js$exported$meth$cond__O__O(prep0)
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
+  "get": (function() {
+    return this.$js$exported$prop$select$default$2__O()
+  }),
+  "configurable": true
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getMany = (function() {
+  return this.$js$exported$meth$getMany__O()
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.select = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$select$default$2__O() : rest[0]);
   return this.$js$exported$meth$select__T__O__O(prep0, prep1)
 });
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
+  var prep0 = arg;
+  return this.$js$exported$meth$cond__O__O(prep0)
+});
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "query$default$2", {
   "get": (function() {
-    return this.$js$exported$prop$select$default$2__O()
+    return this.$js$exported$prop$query$default$2__O()
   }),
   "configurable": true
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount = (function() {
+  return this.$js$exported$meth$getCount__O()
+});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.query = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$query$default$2__O() : rest[0]);
@@ -4607,30 +4608,18 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.limit = (function
   var prep0 = $uI(arg);
   return this.$js$exported$meth$limit__I__O(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getOne = (function() {
-  return this.$js$exported$meth$getOne__O()
-});
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "query$default$2", {
-  "get": (function() {
-    return this.$js$exported$prop$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.$js$exported$meth$order__T__T__O(prep0, prep1)
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getOne = (function() {
+  return this.$js$exported$meth$getOne__O()
+});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.offset = (function(arg) {
   var prep0 = $uI(arg);
   return this.$js$exported$meth$offset__I__O(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount = (function() {
-  return this.$js$exported$meth$getCount__O()
-});
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getMany = (function() {
-  return this.$js$exported$meth$getMany__O()
-});
 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", {
@@ -4823,27 +4812,33 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.$js$exported$meth$ge
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.$js$exported$meth$getCount__O = (function() {
   return this.getCount__sjs_js_Promise()
 });
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "select$default$2", {
   "get": (function() {
-    return this.$js$exported$prop$query$default$2__O()
+    return this.$js$exported$prop$select$default$2__O()
   }),
   "configurable": true
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
-  var prep0 = arg;
-  return this.$js$exported$meth$cond__O__O(prep0)
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getMany = (function() {
+  return this.$js$exported$meth$getMany__O()
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.select = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$select$default$2__O() : rest[0]);
   return this.$js$exported$meth$select__T__O__O(prep0, prep1)
 });
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "select$default$2", {
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
+  var prep0 = arg;
+  return this.$js$exported$meth$cond__O__O(prep0)
+});
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
   "get": (function() {
-    return this.$js$exported$prop$select$default$2__O()
+    return this.$js$exported$prop$query$default$2__O()
   }),
   "configurable": true
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount = (function() {
+  return this.$js$exported$meth$getCount__O()
+});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.query = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$query$default$2__O() : rest[0]);
@@ -4853,24 +4848,18 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.limit = (function(ar
   var prep0 = $uI(arg);
   return this.$js$exported$meth$limit__I__O(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getOne = (function() {
-  return this.$js$exported$meth$getOne__O()
-});
 $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.$js$exported$meth$order__T__T__O(prep0, prep1)
 });
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getOne = (function() {
+  return this.$js$exported$meth$getOne__O()
+});
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.offset = (function(arg) {
   var prep0 = $uI(arg);
   return this.$js$exported$meth$offset__I__O(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount = (function() {
-  return this.$js$exported$meth$getCount__O()
-});
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getMany = (function() {
-  return this.$js$exported$meth$getMany__O()
-});
 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", {
@@ -5046,7 +5035,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.offset__I__V = (function(n) {
 $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.projectValue__Lcom_vinctus_oql_OQLExpression__T__T2 = (function(expr, table) {
   var cur = this.Lcom_vinctus_oql_SQLQueryBuilder__f_idx;
   if (this.Lcom_vinctus_oql_SQLQueryBuilder__f_projectQuery) {
-    var this$1 = this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_typeFunction;
+    var this$1 = this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.typeFunction__s_Option();
     var $$x1 = (!this$1.isEmpty__Z())
   } else {
     var $$x1 = false
@@ -5297,8 +5286,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
   if ((expr instanceof $c_Lcom_vinctus_oql_StringOQLExpression)) {
     var x$1$19 = $as_Lcom_vinctus_oql_StringOQLExpression(expr);
     var x55 = x$1$19.Lcom_vinctus_oql_StringOQLExpression__f_s;
-    var this$33 = this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds;
-    return $f_Lcom_vinctus_oql_SQLDataSource__string__T__T(this$33, x55)
+    return this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.string__T__T(x55)
   };
   if ((expr instanceof $c_Lcom_vinctus_oql_ReferenceOQLExpression)) {
     var x$1$20 = $as_Lcom_vinctus_oql_ReferenceOQLExpression(expr);
@@ -5339,7 +5327,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
       throw new $c_s_MatchError(x$1$24)
     }))(this, table);
     if ((x34 === $m_sci_Nil$())) {
-      var this$42 = $m_sci_Nil$()
+      var this$41 = $m_sci_Nil$()
     } else {
       var arg1$8 = x34.head__O();
       var h$4 = new $c_sci_$colon$colon(f$4(arg1$8), $m_sci_Nil$());
@@ -5352,9 +5340,9 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
         t$4 = nx$4;
         rest$4 = $as_sci_List(rest$4.tail__O())
       };
-      var this$42 = h$4
+      var this$41 = h$4
     };
-    return ((("CASE " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$42, "", " ", "")) + ((!x35.isEmpty__Z()) ? (" ELSE " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T($as_Lcom_vinctus_oql_OQLExpression(x35.get__O()), table)) : "")) + " END")
+    return ((("CASE " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$41, "", " ", "")) + ((!x35.isEmpty__Z()) ? (" ELSE " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T($as_Lcom_vinctus_oql_OQLExpression(x35.get__O()), table)) : "")) + " END")
   };
   throw new $c_s_MatchError(expr)
 });
@@ -5393,7 +5381,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
   var elem = this.Lcom_vinctus_oql_SQLQueryBuilder__f_margin;
   var indent = new $c_sr_IntRef(elem);
   var first = new $c_sr_BooleanRef(true);
-  $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (($p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this, ("(" + this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_resultArrayFunctionStart), "") + "SELECT ") + $p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_rowSequenceFunctionStart, "")));
+  $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (($p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this, ("(" + this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.resultArrayFunctionStart__T()), "") + "SELECT ") + $p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this, this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.rowSequenceFunctionStart__T(), "")));
   $ps_Lcom_vinctus_oql_SQLQueryBuilder__in$1__sr_IntRef__V(indent);
   $ps_Lcom_vinctus_oql_SQLQueryBuilder__in$1__sr_IntRef__V(indent);
   var this$3 = this.Lcom_vinctus_oql_SQLQueryBuilder__f_projects;
@@ -5407,7 +5395,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
         var p$1 = $as_Lcom_vinctus_oql_SQLQueryBuilder$Project(x$1$3._1__O());
         var i$1 = $uI(x$1$3._2__O());
         var this$5 = this$4.Lcom_vinctus_oql_SQLQueryBuilder__f_projects;
-        $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this$4, buf$2, indent$2, first$2, (("" + p$1) + ((i$1 < (((-1) + this$5.scm_ArrayBuffer__f_size0) | 0)) ? "," : $p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this$4, this$4.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_rowSequenceFunctionEnd, ""))));
+        $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this$4, buf$2, indent$2, first$2, (("" + p$1) + ((i$1 < (((-1) + this$5.scm_ArrayBuffer__f_size0) | 0)) ? "," : $p_Lcom_vinctus_oql_SQLQueryBuilder__pq$1__T__T__T(this$4, this$4.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.rowSequenceFunctionEnd__T(), ""))));
         break matchResult17
       };
       throw new $c_s_MatchError(x$1$3)
@@ -5603,7 +5591,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.toString__T = (function() {
     $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, ("OFFSET " + n$1))
   };
   if (this.Lcom_vinctus_oql_SQLQueryBuilder__f_projectQuery) {
-    $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_resultArrayFunctionEnd + ")"))
+    $p_Lcom_vinctus_oql_SQLQueryBuilder__line$1__scm_StringBuilder__sr_IntRef__sr_BooleanRef__T__V(this, buf, indent, first, (this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.resultArrayFunctionEnd__T() + ")"))
   };
   $ps_Lcom_vinctus_oql_SQLQueryBuilder__out$1__sr_IntRef__V(indent);
   return buf.scm_StringBuilder__f_underlying.jl_StringBuilder__f_java$lang$StringBuilder$$content
@@ -25695,14 +25683,24 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.$js$exported$meth$upd
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.$js$exported$meth$bulkUpdate__sjs_js_Array__O = (function(updates) {
   return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(updates)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.bulkUpdate = (function(arg) {
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.link = (function(arg, arg$2, arg$3) {
   var prep0 = arg;
-  return this.$js$exported$meth$bulkUpdate__sjs_js_Array__O(prep0)
+  var prep1 = $as_T(arg$2);
+  var prep2 = arg$3;
+  return this.$js$exported$meth$link__sjs_js_Any__T__sjs_js_Any__O(prep0, prep1, prep2)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.delete = (function(arg) {
   var prep0 = arg;
   return this.$js$exported$meth$delete__sjs_js_Any__O(prep0)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.insert = (function(arg) {
+  var prep0 = arg;
+  return this.$js$exported$meth$insert__sjs_js_Dictionary__O(prep0)
+});
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.bulkUpdate = (function(arg) {
+  var prep0 = arg;
+  return this.$js$exported$meth$bulkUpdate__sjs_js_Array__O(prep0)
+});
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.unlink = (function(arg, arg$2, arg$3) {
   var prep0 = arg;
   var prep1 = $as_T(arg$2);
@@ -25714,16 +25712,6 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.update = (function(ar
   var prep1 = arg$2;
   return this.$js$exported$meth$update__sjs_js_Any__sjs_js_Any__O(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.insert = (function(arg) {
-  var prep0 = arg;
-  return this.$js$exported$meth$insert__sjs_js_Dictionary__O(prep0)
-});
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.link = (function(arg, arg$2, arg$3) {
-  var prep0 = arg;
-  var prep1 = $as_T(arg$2);
-  var prep2 = arg$3;
-  return this.$js$exported$meth$link__sjs_js_Any__T__sjs_js_Any__O(prep0, prep1, prep2)
-});
 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", {
@@ -25881,14 +25869,24 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.$js$exported$meth$update
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.$js$exported$meth$bulkUpdate__sjs_js_Array__O = (function(updates) {
   return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(updates)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.bulkUpdate = (function(arg) {
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.link = (function(arg, arg$2, arg$3) {
   var prep0 = arg;
-  return this.$js$exported$meth$bulkUpdate__sjs_js_Array__O(prep0)
+  var prep1 = $as_T(arg$2);
+  var prep2 = arg$3;
+  return this.$js$exported$meth$link__sjs_js_Any__T__sjs_js_Any__O(prep0, prep1, prep2)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.delete = (function(arg) {
   var prep0 = arg;
   return this.$js$exported$meth$delete__sjs_js_Any__O(prep0)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.insert = (function(arg) {
+  var prep0 = arg;
+  return this.$js$exported$meth$insert__sjs_js_Dictionary__O(prep0)
+});
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.bulkUpdate = (function(arg) {
+  var prep0 = arg;
+  return this.$js$exported$meth$bulkUpdate__sjs_js_Array__O(prep0)
+});
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.unlink = (function(arg, arg$2, arg$3) {
   var prep0 = arg;
   var prep1 = $as_T(arg$2);
@@ -25900,16 +25898,6 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.update = (function(arg,
   var prep1 = arg$2;
   return this.$js$exported$meth$update__sjs_js_Any__sjs_js_Any__O(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.insert = (function(arg) {
-  var prep0 = arg;
-  return this.$js$exported$meth$insert__sjs_js_Dictionary__O(prep0)
-});
-$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.link = (function(arg, arg$2, arg$3) {
-  var prep0 = arg;
-  var prep1 = $as_T(arg$2);
-  var prep2 = arg$3;
-  return this.$js$exported$meth$link__sjs_js_Any__T__sjs_js_Any__O(prep0, prep1, prep2)
-});
 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", {
@@ -26034,8 +26022,7 @@ function $h_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS() {
 }
 $h_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype = $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype;
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.execute__F1__s_concurrent_Future = (function(action) {
-  var this$1 = this.Lcom_vinctus_oql_AbstractOQL__f_ds;
-  return $as_s_concurrent_Future(action.apply__O__O(this$1.Lcom_vinctus_oql_NodePG__f_connect))
+  return $as_s_concurrent_Future(action.apply__O__O(this.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection()))
 });
 $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(this.Lcom_vinctus_oql_AbstractOQL__f_model.Lcom_vinctus_oql_DataModel__f_entities.apply__O__O(name)))
@@ -26149,8 +26136,7 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.render__O__s_Option__T = (
     return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$1, a, typ$1)
   } else if (((typeof a) === "string")) {
     var s = $as_T(a);
-    var this$2 = this.Lcom_vinctus_oql_AbstractOQL__f_ds;
-    return $f_Lcom_vinctus_oql_SQLDataSource__string__T__T(this$2, s)
+    return this.Lcom_vinctus_oql_AbstractOQL__f_ds.string__T__T(s)
   } else if ($uZ((a instanceof Date))) {
     return (("'" + $as_T(a.toISOString())) + "'")
   } else if ($uZ((a instanceof Array))) {
@@ -26163,8 +26149,8 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.render__O__s_Option__T = (
       res[$$x1] = this.render__O__s_Option__T(arg1, typ);
       i = ((1 + i) | 0)
     };
-    var this$6 = $ct_sjs_js_WrappedArray__sjs_js_Array__(new $c_sjs_js_WrappedArray(), res);
-    return (("(" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$6, "", ",", "")) + ")")
+    var this$5 = $ct_sjs_js_WrappedArray__sjs_js_Array__(new $c_sjs_js_WrappedArray(), res);
+    return (("(" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$5, "", ",", "")) + ")")
   } else {
     return ("" + a)
   }
@@ -26220,15 +26206,28 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.$js$exported$meth$queryBui
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.$js$exported$meth$raw__T__O__O = (function(sql, values) {
   return this.raw__T__O__sjs_js_Promise(sql, values)
 });
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$queryOne$default$2__O() : rest[0]);
+  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$queryOne$default$3__O() : rest[1]);
+  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$queryOne$default$4__sjs_js_Any() : rest[2]);
+  return this.$js$exported$meth$queryOne__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
+});
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.count = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$count$default$2__O() : rest[0]);
+  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$count$default$3__O() : rest[1]);
+  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$count$default$4__sjs_js_Any() : rest[2]);
+  return this.$js$exported$meth$count__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
+});
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
   var prep0 = arg;
   var prep1 = arg$2;
   return this.$js$exported$meth$queryBuilder__O__sjs_js_Any__O(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
   var prep0 = $as_T(arg);
-  var prep1 = arg$2;
-  return this.$js$exported$meth$raw__T__O__O(prep0, prep1)
+  return this.$js$exported$meth$entity__T__O(prep0)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -26240,23 +26239,10 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg,
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
   return this.$js$exported$meth$showQuery__O()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.$js$exported$meth$entity__T__O(prep0)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
-  var prep0 = $as_T(arg);
-  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$queryOne$default$2__O() : rest[0]);
-  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$queryOne$default$3__O() : rest[1]);
-  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$queryOne$default$4__sjs_js_Any() : rest[2]);
-  return this.$js$exported$meth$queryOne__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.count = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
-  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$count$default$2__O() : rest[0]);
-  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$count$default$3__O() : rest[1]);
-  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$count$default$4__sjs_js_Any() : rest[2]);
-  return this.$js$exported$meth$count__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
+  var prep1 = arg$2;
+  return this.$js$exported$meth$raw__T__O__O(prep0, prep1)
 });
 var $d_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS: 0
@@ -26275,7 +26261,7 @@ function $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS(dm, host, port, database, user
   this.Lcom_vinctus_oql_AbstractOQL__f__showQuery = false;
   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_NodePG(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());
+  $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());
   this.Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS__f_varRegex = $ct_s_util_matching_Regex__T__sci_Seq__(new $c_s_util_matching_Regex(), ":([a-zA-Z_][a-zA-Z0-9_]*)", $m_sci_Nil$())
 }
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype = new $h_Lcom_vinctus_oql_AbstractOQL();
@@ -26286,8 +26272,7 @@ function $h_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS() {
 }
 $h_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype = $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype;
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.execute__F1__s_concurrent_Future = (function(action) {
-  var this$1 = this.Lcom_vinctus_oql_AbstractOQL__f_ds;
-  return $as_s_concurrent_Future(action.apply__O__O(this$1.Lcom_vinctus_oql_NodePG__f_connect))
+  return $as_s_concurrent_Future(action.apply__O__O(this.Lcom_vinctus_oql_AbstractOQL__f_ds.connect__Lcom_vinctus_oql_OQLConnection()))
 });
 $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(this.Lcom_vinctus_oql_AbstractOQL__f_model.Lcom_vinctus_oql_DataModel__f_entities.apply__O__O(name)))
@@ -26401,8 +26386,7 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.render__O__s_Option__T = (fun
     return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$1, a, typ$1)
   } else if (((typeof a) === "string")) {
     var s = $as_T(a);
-    var this$2 = this.Lcom_vinctus_oql_AbstractOQL__f_ds;
-    return $f_Lcom_vinctus_oql_SQLDataSource__string__T__T(this$2, s)
+    return this.Lcom_vinctus_oql_AbstractOQL__f_ds.string__T__T(s)
   } else if ($uZ((a instanceof Date))) {
     return (("'" + $as_T(a.toISOString())) + "'")
   } else if ($uZ((a instanceof Array))) {
@@ -26415,8 +26399,8 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.render__O__s_Option__T = (fun
       res[$$x1] = this.render__O__s_Option__T(arg1, typ);
       i = ((1 + i) | 0)
     };
-    var this$6 = $ct_sjs_js_WrappedArray__sjs_js_Array__(new $c_sjs_js_WrappedArray(), res);
-    return (("(" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$6, "", ",", "")) + ")")
+    var this$5 = $ct_sjs_js_WrappedArray__sjs_js_Array__(new $c_sjs_js_WrappedArray(), res);
+    return (("(" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$5, "", ",", "")) + ")")
   } else {
     return ("" + a)
   }
@@ -26472,15 +26456,28 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.$js$exported$meth$queryBuilde
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.$js$exported$meth$raw__T__O__O = (function(sql, values) {
   return this.raw__T__O__sjs_js_Promise(sql, values)
 });
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$queryOne$default$2__O() : rest[0]);
+  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$queryOne$default$3__O() : rest[1]);
+  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$queryOne$default$4__sjs_js_Any() : rest[2]);
+  return this.$js$exported$meth$queryOne__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
+});
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$count$default$2__O() : rest[0]);
+  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$count$default$3__O() : rest[1]);
+  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$count$default$4__sjs_js_Any() : rest[2]);
+  return this.$js$exported$meth$count__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
+});
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
   var prep0 = arg;
   var prep1 = arg$2;
   return this.$js$exported$meth$queryBuilder__O__sjs_js_Any__O(prep0, prep1)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.entity = (function(arg) {
   var prep0 = $as_T(arg);
-  var prep1 = arg$2;
-  return this.$js$exported$meth$raw__T__O__O(prep0, prep1)
+  return this.$js$exported$meth$entity__T__O(prep0)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -26492,23 +26489,10 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ..
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
   return this.$js$exported$meth$showQuery__O()
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.entity = (function(arg) {
-  var prep0 = $as_T(arg);
-  return this.$js$exported$meth$entity__T__O(prep0)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...rest) {
-  var prep0 = $as_T(arg);
-  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$queryOne$default$2__O() : rest[0]);
-  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$queryOne$default$3__O() : rest[1]);
-  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$queryOne$default$4__sjs_js_Any() : rest[2]);
-  return this.$js$exported$meth$queryOne__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
-});
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.count = (function(arg, ...rest) {
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
-  var prep1 = ((rest[0] === (void 0)) ? this.$js$exported$meth$count$default$2__O() : rest[0]);
-  var prep2 = ((rest[1] === (void 0)) ? this.$js$exported$meth$count$default$3__O() : rest[1]);
-  var prep3 = ((rest[2] === (void 0)) ? this.$js$exported$meth$count$default$4__sjs_js_Any() : rest[2]);
-  return this.$js$exported$meth$count__T__O__O__sjs_js_Any__O(prep0, prep1, prep2, prep3)
+  var prep1 = arg$2;
+  return this.$js$exported$meth$raw__T__O__O(prep0, prep1)
 });
 var $d_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS: 0
@@ -26638,6 +26622,157 @@ var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB$DoNothingQueryBuilder = ne
   O: 1
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB$DoNothingQueryBuilder.prototype.$classData = $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB$DoNothingQueryBuilder;
+/** @constructor */
+function $c_Lcom_vinctus_oql_RDBConnection(dataSource, ec) {
+  this.Lcom_vinctus_oql_RDBConnection__f_dataSource = null;
+  this.Lcom_vinctus_oql_RDBConnection__f_ec = null;
+  this.Lcom_vinctus_oql_RDBConnection__f_db = null;
+  this.Lcom_vinctus_oql_RDBConnection__f_dataSource = dataSource;
+  this.Lcom_vinctus_oql_RDBConnection__f_ec = ec;
+  this.Lcom_vinctus_oql_RDBConnection__f_db = new $c_Lio_github_edadma_rdb_MemoryDB("mem")
+}
+$c_Lcom_vinctus_oql_RDBConnection.prototype = new $h_Lcom_vinctus_oql_OQLConnection();
+$c_Lcom_vinctus_oql_RDBConnection.prototype.constructor = $c_Lcom_vinctus_oql_RDBConnection;
+/** @constructor */
+function $h_Lcom_vinctus_oql_RDBConnection() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_RDBConnection.prototype = $c_Lcom_vinctus_oql_RDBConnection.prototype;
+$c_Lcom_vinctus_oql_RDBConnection.prototype.command__T__s_concurrent_Future = (function(sql) {
+  return $m_s_concurrent_Future$().apply__F0__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction0(((this$1, sql$2) => (() => {
+    matchResult1: {
+      var $$x1;
+      var x1 = $as_Lio_github_edadma_rdb_Result($m_Lio_github_edadma_rdb_executeSQL$package$().executeSQL__T__Lio_github_edadma_rdb_DB__sci_Seq(sql$2, this$1.Lcom_vinctus_oql_RDBConnection__f_db).head__O());
+      if ((x1 instanceof $c_Lio_github_edadma_rdb_QueryResult)) {
+        var x$1 = $as_Lio_github_edadma_rdb_QueryResult(x1);
+        var x8 = x$1.Lio_github_edadma_rdb_QueryResult__f_table;
+        var $$x1 = x8.Lio_github_edadma_rdb_TableValue__f_data.iterator__sc_Iterator();
+        break matchResult1
+      };
+      if ((x1 instanceof $c_Lio_github_edadma_rdb_InsertResult)) {
+        var x$1$1 = $as_Lio_github_edadma_rdb_InsertResult(x1);
+        var x5 = x$1$1.Lio_github_edadma_rdb_InsertResult__f_table;
+        var $$x1 = x5.Lio_github_edadma_rdb_TableValue__f_data.iterator__sc_Iterator();
+        break matchResult1
+      };
+      throw new $c_s_MatchError(x1)
+    };
+    return new $c_Lcom_vinctus_oql_RDBResultSet($$x1)
+  }))(this, sql)), this.Lcom_vinctus_oql_RDBConnection__f_ec)
+});
+var $d_Lcom_vinctus_oql_RDBConnection = new $TypeData().initClass({
+  Lcom_vinctus_oql_RDBConnection: 0
+}, false, "com.vinctus.oql.RDBConnection", {
+  Lcom_vinctus_oql_RDBConnection: 1,
+  Lcom_vinctus_oql_OQLConnection: 1,
+  O: 1
+});
+$c_Lcom_vinctus_oql_RDBConnection.prototype.$classData = $d_Lcom_vinctus_oql_RDBConnection;
+function $p_Lcom_vinctus_oql_RDBResultSet__unpack__Lio_github_edadma_rdb_Value__O($thiz, v) {
+  if ((v instanceof $c_Lio_github_edadma_rdb_NumberValue)) {
+    var x$1 = $as_Lio_github_edadma_rdb_NumberValue(v);
+    var x35 = x$1.Lio_github_edadma_rdb_NumberValue__f_typ;
+    var x36 = x$1.Lio_github_edadma_rdb_NumberValue__f_value;
+    var x = $m_Lio_github_edadma_dal_IntType$();
+    if ((x === x35)) {
+      return $dp_intValue__I(x36)
+    };
+    var x$3 = $m_Lio_github_edadma_dal_DoubleType$();
+    if ((x$3 === x35)) {
+      return $dp_doubleValue__D(x36)
+    };
+    var x$5 = $m_Lio_github_edadma_dal_LongType$();
+    if ((x$5 === x35)) {
+      return $dp_doubleValue__D(x36)
+    };
+    var x$7 = $m_Lio_github_edadma_dal_BigDecType$();
+    if ((x$7 === x35)) {
+      return $dp_toString__T(x36)
+    }
+  };
+  if ((v instanceof $c_Lio_github_edadma_rdb_TextValue)) {
+    var x$1$1 = $as_Lio_github_edadma_rdb_TextValue(v);
+    var x20 = x$1$1.Lio_github_edadma_rdb_TextValue__f_s;
+    return x20
+  };
+  if ((v instanceof $c_Lio_github_edadma_rdb_UUIDValue)) {
+    var x$1$2 = $as_Lio_github_edadma_rdb_UUIDValue(v);
+    var x17 = x$1$2.Lio_github_edadma_rdb_UUIDValue__f_id;
+    return x17
+  };
+  if ((v instanceof $c_Lio_github_edadma_rdb_TimestampValue)) {
+    var x$1$3 = $as_Lio_github_edadma_rdb_TimestampValue(v);
+    var x14 = x$1$3.Lio_github_edadma_rdb_TimestampValue__f_t;
+    return new Date($m_Lio_github_edadma_datetime_DatetimeFormatter$().Lio_github_edadma_datetime_DatetimeFormatter$__f_ISO.format__Lio_github_edadma_datetime_Datetime__T(x14))
+  };
+  if ((v instanceof $c_Lio_github_edadma_rdb_ArrayValue)) {
+    var x$1$4 = $as_Lio_github_edadma_rdb_ArrayValue(v);
+    var x11 = x$1$4.Lio_github_edadma_rdb_ArrayValue__f_data;
+    return x11.map__F1__O(new $c_sjsr_AnonFunction1(((this$6) => ((v$2) => {
+      var v$1 = $as_Lio_github_edadma_rdb_Value(v$2);
+      return $p_Lcom_vinctus_oql_RDBResultSet__unpack__Lio_github_edadma_rdb_Value__O(this$6, v$1)
+    }))($thiz)))
+  };
+  if ((v instanceof $c_Lio_github_edadma_rdb_ObjectValue)) {
+    var x$1$5 = $as_Lio_github_edadma_rdb_ObjectValue(v);
+    var x8 = x$1$5.Lio_github_edadma_rdb_ObjectValue__f_properties;
+    var $$x1 = $as_sc_IterableOnceOps(x8.map__F1__O(new $c_sjsr_AnonFunction1(((this$2$1) => ((x$1$6) => {
+      var x$1$7 = $as_T2(x$1$6);
+      if ((x$1$7 !== null)) {
+        var k = $as_T(x$1$7._1__O());
+        var v$3 = $as_Lio_github_edadma_rdb_Value(x$1$7._2__O());
+        var y = $p_Lcom_vinctus_oql_RDBResultSet__unpack__Lio_github_edadma_rdb_Value__O(this$2$1, v$3);
+        return new $c_T2(k, y)
+      };
+      throw new $c_s_MatchError(x$1$7)
+    }))($thiz))));
+    var this$10 = $m_s_$less$colon$less$();
+    return $$x1.toMap__s_$less$colon$less__sci_Map(this$10.s_$less$colon$less$__f_singleton)
+  };
+  if (((v instanceof $c_Lio_github_edadma_rdb_NullValue) && ($as_Lio_github_edadma_rdb_NullValue(v), true))) {
+    return null
+  };
+  throw new $c_s_MatchError(v)
+}
+/** @constructor */
+function $c_Lcom_vinctus_oql_RDBResultSet(rs) {
+  this.Lcom_vinctus_oql_RDBResultSet__f_rs = null;
+  this.Lcom_vinctus_oql_RDBResultSet__f_row = null;
+  this.Lcom_vinctus_oql_RDBResultSet__f_rs = rs
+}
+$c_Lcom_vinctus_oql_RDBResultSet.prototype = new $h_Lcom_vinctus_oql_OQLResultSet();
+$c_Lcom_vinctus_oql_RDBResultSet.prototype.constructor = $c_Lcom_vinctus_oql_RDBResultSet;
+/** @constructor */
+function $h_Lcom_vinctus_oql_RDBResultSet() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_RDBResultSet.prototype = $c_Lcom_vinctus_oql_RDBResultSet.prototype;
+$c_Lcom_vinctus_oql_RDBResultSet.prototype.next__Z = (function() {
+  if (this.Lcom_vinctus_oql_RDBResultSet__f_rs.hasNext__Z()) {
+    this.Lcom_vinctus_oql_RDBResultSet__f_row = $as_Lio_github_edadma_rdb_Row(this.Lcom_vinctus_oql_RDBResultSet__f_rs.next__O());
+    return true
+  } else {
+    return false
+  }
+});
+$c_Lcom_vinctus_oql_RDBResultSet.prototype.get__I__Lcom_vinctus_oql_OQLResultSetValue = (function(idx) {
+  var v = $p_Lcom_vinctus_oql_RDBResultSet__unpack__Lio_github_edadma_rdb_Value__O(this, $as_Lio_github_edadma_rdb_Value(this.Lcom_vinctus_oql_RDBResultSet__f_row.Lio_github_edadma_rdb_Row__f_data.apply__I__O(idx)));
+  return new $c_Lcom_vinctus_oql_RDBResultSetValue(v)
+});
+$c_Lcom_vinctus_oql_RDBResultSet.prototype.getString__I__T = (function(idx) {
+  return $as_Lio_github_edadma_rdb_Value(this.Lcom_vinctus_oql_RDBResultSet__f_row.Lio_github_edadma_rdb_Row__f_data.apply__I__O(idx)).string__T()
+});
+$c_Lcom_vinctus_oql_RDBResultSet.prototype.getResultSet__I__Lcom_vinctus_oql_OQLResultSet = (function(idx) {
+  return new $c_Lcom_vinctus_oql_RDBResultSet($as_Lio_github_edadma_rdb_TableValue(this.Lcom_vinctus_oql_RDBResultSet__f_row.Lio_github_edadma_rdb_Row__f_data.apply__I__O(idx)).Lio_github_edadma_rdb_TableValue__f_data.iterator__sc_Iterator())
+});
+var $d_Lcom_vinctus_oql_RDBResultSet = new $TypeData().initClass({
+  Lcom_vinctus_oql_RDBResultSet: 0
+}, false, "com.vinctus.oql.RDBResultSet", {
+  Lcom_vinctus_oql_RDBResultSet: 1,
+  Lcom_vinctus_oql_OQLResultSet: 1,
+  O: 1
+});
+$c_Lcom_vinctus_oql_RDBResultSet.prototype.$classData = $d_Lcom_vinctus_oql_RDBResultSet;
 function $f_Lcom_vinctus_oql_RelationalType__$init$__V($thiz) {
   $thiz.com$vinctus$oql$RelationalType$_setter_$isDataType_$eq__Z__V(false);
   $thiz.com$vinctus$oql$RelationalType$_setter_$isColumnType_$eq__Z__V(false);
@@ -26666,7 +26801,7 @@ function $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype_
     var x9 = $as_T(a);
     var x = $m_Lcom_vinctus_oql_TextType$();
     if ((x === typ)) {
-      return $f_Lcom_vinctus_oql_SQLDataSource__string__T__T($thiz, x9)
+      return $thiz.string__T__T(x9)
     };
     var x$3 = $m_Lcom_vinctus_oql_UUIDType$();
     if ((x$3 === typ)) {
@@ -35221,6 +35356,150 @@ function $f_Lcom_vinctus_oql_PGDataSource__reverseMapType__T__Lcom_vinctus_oql_D
   return $as_Lcom_vinctus_oql_Datatype($$x1)
 }
 /** @constructor */
+function $c_Lcom_vinctus_oql_RDBDataSource(ec) {
+  this.Lcom_vinctus_oql_RDBDataSource__f_name = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_connect = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_platformSpecific = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_resultArrayFunctionStart = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_resultArrayFunctionEnd = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_rowSequenceFunctionStart = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_rowSequenceFunctionEnd = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_typeFunction = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_convertFunction = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_caseSensitive = false;
+  this.Lcom_vinctus_oql_RDBDataSource__f_functionReturnType = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_builtinVariables = null;
+  this.Lcom_vinctus_oql_RDBDataSource__f_name = "RDB";
+  this.Lcom_vinctus_oql_RDBDataSource__f_connect = new $c_Lcom_vinctus_oql_RDBConnection(this, ec);
+  this.Lcom_vinctus_oql_RDBDataSource__f_platformSpecific = new $c_Lcom_vinctus_oql_RDBDataSource$$anon$1();
+  this.Lcom_vinctus_oql_RDBDataSource__f_resultArrayFunctionStart = "TABLE(";
+  this.Lcom_vinctus_oql_RDBDataSource__f_resultArrayFunctionEnd = ")";
+  this.Lcom_vinctus_oql_RDBDataSource__f_rowSequenceFunctionStart = "";
+  this.Lcom_vinctus_oql_RDBDataSource__f_rowSequenceFunctionEnd = "";
+  this.Lcom_vinctus_oql_RDBDataSource__f_typeFunction = new $c_s_Some("TYPE(?)");
+  this.Lcom_vinctus_oql_RDBDataSource__f_convertFunction = $m_s_None$();
+  this.Lcom_vinctus_oql_RDBDataSource__f_caseSensitive = true;
+  var this$14 = $m_s_Predef$().s_Predef$__f_Map;
+  var $$x4 = $m_sr_ScalaRunTime$();
+  var self = new $c_T2("COUNT", 1);
+  var y = new $c_sjsr_AnonFunction1(((_$1) => {
+    $as_sci_List(_$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);
+    return $as_Lcom_vinctus_oql_Datatype(_$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);
+    return $as_Lcom_vinctus_oql_Datatype(_$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);
+    return $m_Lcom_vinctus_oql_FloatType$()
+  }));
+  var elems = $$x4.wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([$$x3, $$x2, $$x1, new $c_T2(self$3, y$3)]));
+  this.Lcom_vinctus_oql_RDBDataSource__f_functionReturnType = this$14.from__sc_IterableOnce__sci_Map(elems);
+  var this$21 = $m_s_Predef$().s_Predef$__f_Map;
+  var $$x7 = $m_sr_ScalaRunTime$();
+  var y$4 = $m_Lcom_vinctus_oql_DateType$();
+  var $$x6 = new $c_T2("CURRENT_DATE", y$4);
+  var y$5 = $m_Lcom_vinctus_oql_TimestampType$();
+  var $$x5 = new $c_T2("CURRENT_TIMESTAMP", y$5);
+  var y$6 = $m_Lcom_vinctus_oql_TimeType$();
+  var elems$1 = $$x7.wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([$$x6, $$x5, new $c_T2("CURRENT_TIME", y$6)]));
+  this.Lcom_vinctus_oql_RDBDataSource__f_builtinVariables = this$21.from__sc_IterableOnce__sci_Map(elems$1)
+}
+$c_Lcom_vinctus_oql_RDBDataSource.prototype = new $h_O();
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.constructor = $c_Lcom_vinctus_oql_RDBDataSource;
+/** @constructor */
+function $h_Lcom_vinctus_oql_RDBDataSource() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_RDBDataSource.prototype = $c_Lcom_vinctus_oql_RDBDataSource.prototype;
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.connect__Lcom_vinctus_oql_OQLConnection = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_connect
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.reverseMapType__T__Lcom_vinctus_oql_Datatype = (function(typ) {
+  var $$x1;
+  switch (typ) {
+    case "TIMESTAMP": {
+      var $$x1 = $m_Lcom_vinctus_oql_TimestampType$();
+      break
+    }
+    case "UUID": {
+      var $$x1 = $m_Lcom_vinctus_oql_UUIDType$();
+      break
+    }
+    case "INT": {
+      var $$x1 = $m_Lcom_vinctus_oql_IntegerType$();
+      break
+    }
+    case "BIGINT": {
+      var $$x1 = $m_Lcom_vinctus_oql_BigintType$();
+      break
+    }
+    case "DOUBLE": {
+      var $$x1 = $m_Lcom_vinctus_oql_FloatType$();
+      break
+    }
+    case "number": {
+      var $$x1 = $m_Lcom_vinctus_oql_FloatType$();
+      break
+    }
+    default: {
+      throw new $c_s_MatchError(typ)
+    }
+  };
+  return $as_Lcom_vinctus_oql_Datatype($$x1)
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.resultArrayFunctionStart__T = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_resultArrayFunctionStart
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.resultArrayFunctionEnd__T = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_resultArrayFunctionEnd
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.rowSequenceFunctionStart__T = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_rowSequenceFunctionStart
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.rowSequenceFunctionEnd__T = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_rowSequenceFunctionEnd
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.typeFunction__s_Option = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_typeFunction
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.convertFunction__s_Option = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_convertFunction
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.caseSensitive__Z = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_caseSensitive
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.functionReturnType__sci_Map = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_functionReturnType
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.builtinVariables__sci_Map = (function() {
+  return this.Lcom_vinctus_oql_RDBDataSource__f_builtinVariables
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.string__T__T = (function(s) {
+  var this$1 = $f_Lcom_vinctus_oql_SQLDataSource__string__T__T(this, s);
+  return $as_T(this$1.substring(1))
+});
+var $d_Lcom_vinctus_oql_RDBDataSource = new $TypeData().initClass({
+  Lcom_vinctus_oql_RDBDataSource: 0
+}, false, "com.vinctus.oql.RDBDataSource", {
+  Lcom_vinctus_oql_RDBDataSource: 1,
+  O: 1,
+  Lcom_vinctus_oql_OQLDataSource: 1,
+  Lcom_vinctus_oql_SQLDataSource: 1
+});
+$c_Lcom_vinctus_oql_RDBDataSource.prototype.$classData = $d_Lcom_vinctus_oql_RDBDataSource;
+/** @constructor */
 function $c_Lcom_vinctus_oql_SQLQueryBuilder$Join$(outer) {
   this.Lcom_vinctus_oql_SQLQueryBuilder$Join$__f_$outer = null;
   if ((outer === null)) {
@@ -42893,6 +43172,42 @@ function $h_Lcom_vinctus_oql_NodePG() {
   /*<skip>*/
 }
 $h_Lcom_vinctus_oql_NodePG.prototype = $c_Lcom_vinctus_oql_NodePG.prototype;
+$c_Lcom_vinctus_oql_NodePG.prototype.string__T__T = (function(s) {
+  return $f_Lcom_vinctus_oql_SQLDataSource__string__T__T(this, s)
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.resultArrayFunctionStart__T = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_resultArrayFunctionStart
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.resultArrayFunctionEnd__T = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_resultArrayFunctionEnd
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.rowSequenceFunctionStart__T = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_rowSequenceFunctionStart
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.rowSequenceFunctionEnd__T = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_rowSequenceFunctionEnd
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.typeFunction__s_Option = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_typeFunction
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.convertFunction__s_Option = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_convertFunction
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.caseSensitive__Z = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_caseSensitive
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.functionReturnType__sci_Map = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_functionReturnType
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.builtinVariables__sci_Map = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_builtinVariables
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.reverseMapType__T__Lcom_vinctus_oql_Datatype = (function(typ) {
+  return $f_Lcom_vinctus_oql_PGDataSource__reverseMapType__T__Lcom_vinctus_oql_Datatype(this, typ)
+});
+$c_Lcom_vinctus_oql_NodePG.prototype.connect__Lcom_vinctus_oql_OQLConnection = (function() {
+  return this.Lcom_vinctus_oql_NodePG__f_connect
+});
 function $as_Lcom_vinctus_oql_NodePG(obj) {
   return (((obj instanceof $c_Lcom_vinctus_oql_NodePG) || (obj === null)) ? obj : $throwClassCastException(obj, "com.vinctus.oql.NodePG"))
 }
@@ -55761,6 +56076,103 @@ var $d_Lcom_vinctus_oql_QueryOQLProject = new $TypeData().initClass({
 });
 $c_Lcom_vinctus_oql_QueryOQLProject.prototype.$classData = $d_Lcom_vinctus_oql_QueryOQLProject;
 /** @constructor */
+function $c_Lcom_vinctus_oql_RDBDataSource$$anon$1() {
+  /*<skip>*/
+}
+$c_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype = new $h_sr_AbstractPartialFunction();
+$c_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype.constructor = $c_Lcom_vinctus_oql_RDBDataSource$$anon$1;
+/** @constructor */
+function $h_Lcom_vinctus_oql_RDBDataSource$$anon$1() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype = $c_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype;
+$c_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype.isDefinedAt__O__Z = (function(x) {
+  return $uZ((x instanceof Date))
+});
+$c_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype.applyOrElse__O__F1__O = (function(x, default$1) {
+  return ($uZ((x instanceof Date)) ? (("\"" + $as_T(x.toISOString())) + "\"") : default$1.apply__O__O(x))
+});
+var $d_Lcom_vinctus_oql_RDBDataSource$$anon$1 = new $TypeData().initClass({
+  Lcom_vinctus_oql_RDBDataSource$$anon$1: 0
+}, false, "com.vinctus.oql.RDBDataSource$$anon$1", {
+  Lcom_vinctus_oql_RDBDataSource$$anon$1: 1,
+  sr_AbstractPartialFunction: 1,
+  O: 1,
+  F1: 1,
+  s_PartialFunction: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lcom_vinctus_oql_RDBDataSource$$anon$1.prototype.$classData = $d_Lcom_vinctus_oql_RDBDataSource$$anon$1;
+/** @constructor */
+function $c_Lcom_vinctus_oql_RDBResultSetValue(v) {
+  this.Lcom_vinctus_oql_RDBResultSetValue__f_v = null;
+  this.Lcom_vinctus_oql_RDBResultSetValue__f_v = v
+}
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype = new $h_Lcom_vinctus_oql_OQLResultSetValue();
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.constructor = $c_Lcom_vinctus_oql_RDBResultSetValue;
+/** @constructor */
+function $h_Lcom_vinctus_oql_RDBResultSetValue() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_RDBResultSetValue.prototype = $c_Lcom_vinctus_oql_RDBResultSetValue.prototype;
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_s_Product$$anon$1(this)
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.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_RDBResultSetValue.prototype.equals__O__Z = (function(x$0) {
+  if ((this === x$0)) {
+    return true
+  } else if ((x$0 instanceof $c_Lcom_vinctus_oql_RDBResultSetValue)) {
+    var x$0$2 = $as_Lcom_vinctus_oql_RDBResultSetValue(x$0);
+    var x = this.Lcom_vinctus_oql_RDBResultSetValue__f_v;
+    var y = x$0$2.Lcom_vinctus_oql_RDBResultSetValue__f_v;
+    return $m_sr_BoxesRunTime$().equals__O__O__Z(x, y)
+  } else {
+    return false
+  }
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$()._toString__s_Product__T(this)
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.productArity__I = (function() {
+  return 1
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.productPrefix__T = (function() {
+  return "RDBResultSetValue"
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.productElement__I__O = (function(n) {
+  if ((n === 0)) {
+    return this.Lcom_vinctus_oql_RDBResultSetValue__f_v
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.v__O = (function() {
+  return this.Lcom_vinctus_oql_RDBResultSetValue__f_v
+});
+function $as_Lcom_vinctus_oql_RDBResultSetValue(obj) {
+  return (((obj instanceof $c_Lcom_vinctus_oql_RDBResultSetValue) || (obj === null)) ? obj : $throwClassCastException(obj, "com.vinctus.oql.RDBResultSetValue"))
+}
+function $isArrayOf_Lcom_vinctus_oql_RDBResultSetValue(obj, depth) {
+  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lcom_vinctus_oql_RDBResultSetValue)))
+}
+function $asArrayOf_Lcom_vinctus_oql_RDBResultSetValue(obj, depth) {
+  return (($isArrayOf_Lcom_vinctus_oql_RDBResultSetValue(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lcom.vinctus.oql.RDBResultSetValue;", depth))
+}
+var $d_Lcom_vinctus_oql_RDBResultSetValue = new $TypeData().initClass({
+  Lcom_vinctus_oql_RDBResultSetValue: 0
+}, false, "com.vinctus.oql.RDBResultSetValue", {
+  Lcom_vinctus_oql_RDBResultSetValue: 1,
+  Lcom_vinctus_oql_OQLResultSetValue: 1,
+  O: 1,
+  s_Equals: 1,
+  s_Product: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lcom_vinctus_oql_RDBResultSetValue.prototype.$classData = $d_Lcom_vinctus_oql_RDBResultSetValue;
+/** @constructor */
 function $c_Lcom_vinctus_oql_RawOQLExpression(s) {
   this.Lcom_vinctus_oql_OQLExpression__f_typ = null;
   this.Lcom_vinctus_oql_RawOQLExpression__f_s = null;
@@ -56065,7 +56477,7 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder$ValueProject.prototype.productElement__I__O
 });
 $c_Lcom_vinctus_oql_SQLQueryBuilder$ValueProject.prototype.toString__T = (function() {
   if (this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_projectQuery) {
-    var this$1 = this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_convertFunction;
+    var this$1 = this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.convertFunction__s_Option();
     var $$x2 = (!this$1.isEmpty__Z())
   } else {
     var $$x2 = false
@@ -56084,14 +56496,14 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder$ValueProject.prototype.toString__T = (functi
     var $$x1 = false
   };
   if ($$x1) {
-    var f = $as_T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_convertFunction.get__O());
+    var f = $as_T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.convertFunction__s_Option().get__O());
     var args = this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.expression__Lcom_vinctus_oql_OQLExpression__T__T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_expr, this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_table);
     var exp = $as_T(f.split("?").join(args))
   } else {
     var exp = this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.expression__Lcom_vinctus_oql_OQLExpression__T__T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_expr, this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_table)
   };
   if (this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_typed) {
-    var f$1 = $as_T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.Lcom_vinctus_oql_NodePG__f_typeFunction.get__O());
+    var f$1 = $as_T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds.typeFunction__s_Option().get__O());
     var args$1 = this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_$outer.expression__Lcom_vinctus_oql_OQLExpression__T__T(this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_expr, this.Lcom_vinctus_oql_SQLQueryBuilder$ValueProject__f_table);
     var typing = (", " + $as_T(f$1.split("?").join(args$1)))
   } else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vinctus/oql",
-  "version": "1.1.0-alpha.2",
+  "version": "1.1.0-alpha.5",
   "description": "Object Query Language",
   "main": "index.js",
   "scripts": {