@vinctus/oql 1.1.4 → 1.1.6

package/main.js

@@ -4644,25 +4644,17 @@ function $h_Lcom_vinctus_oql_Mutation() {
 }
 $h_Lcom_vinctus_oql_Mutation.prototype = $c_Lcom_vinctus_oql_Mutation.prototype;
 $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (function(obj) {
-  var this$1 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
-  if ((!this$1.isEmpty__Z())) {
-    var arg1 = this$1.get__O();
-    var pk = $as_Lcom_vinctus_oql_Attribute(arg1);
-    if ($n(obj).contains__O__Z($n(pk).Lcom_vinctus_oql_Attribute__f_name)) {
-      $m_s_sys_package$().error__T__E(((("insert(): object has a primary key property: " + pk) + " = ") + $n(obj).apply__O__O($n(pk).Lcom_vinctus_oql_Attribute__f_name)))
-    }
-  };
   var attrs = $as_sci_Map($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).filter__F1__O(new $c_sjsr_AnonFunction1(((x$1) => {
     var x$1$1 = $as_T2(x$1);
     if ((x$1$1 !== null)) {
       var x3 = $as_Lcom_vinctus_oql_Attribute($n(x$1$1).T2__f__2);
       if ((x3 !== null)) {
+        var this$2 = $n(x3);
         var this$3 = $n(x3);
         var this$4 = $n(x3);
         var this$5 = $n(x3);
         var this$6 = $n(x3);
-        var this$7 = $n(x3);
-        var x9 = this$7.Lcom_vinctus_oql_Attribute__f_typ;
+        var x9 = this$6.Lcom_vinctus_oql_Attribute__f_typ;
         if ($n(x9).isColumnType__Z()) {
           return true
         }
@@ -4670,28 +4662,28 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
     };
     return false
   }))));
-  var this$8 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
-  if (this$8.isEmpty__Z()) {
+  var this$7 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
+  if (this$7.isEmpty__Z()) {
     var attrsNoPK = attrs
   } else {
-    var arg1$1 = this$8.get__O();
-    var _$1 = $as_Lcom_vinctus_oql_Attribute(arg1$1);
-    var this$9 = $n(attrs);
+    var arg1 = this$7.get__O();
+    var _$1 = $as_Lcom_vinctus_oql_Attribute(arg1);
+    var this$8 = $n(attrs);
     var key = $n(_$1).Lcom_vinctus_oql_Attribute__f_name;
-    var attrsNoPK = $as_sci_Map(this$9.removed__O__sci_MapOps(key))
+    var attrsNoPK = $as_sci_Map(this$8.removed__O__sci_MapOps(key))
   };
   var attrsRequired = $n($as_sci_MapOps($n(attrsNoPK).filter__F1__O(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
     if ((x$1$3 !== null)) {
       var x12 = $as_Lcom_vinctus_oql_Attribute($n(x$1$3).T2__f__2);
       if ((x12 !== null)) {
+        var this$10 = $n(x12);
         var this$11 = $n(x12);
         var this$12 = $n(x12);
         var this$13 = $n(x12);
+        var x17 = this$13.Lcom_vinctus_oql_Attribute__f_required;
         var this$14 = $n(x12);
-        var x17 = this$14.Lcom_vinctus_oql_Attribute__f_required;
-        var this$15 = $n(x12);
-        var x18 = this$15.Lcom_vinctus_oql_Attribute__f_typ;
+        var x18 = this$14.Lcom_vinctus_oql_Attribute__f_typ;
         if ((x17 === true)) {
           if ($n(x18).isColumnType__Z()) {
             return true
@@ -4703,38 +4695,38 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
   }))))).keySet__sci_Set();
   var keyset = $n(obj).keySet__sc_Set();
   var allKeys = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).keySet__sci_Set();
-  var this$16 = $n($n(keyset).diff__sc_Set__sc_SetOps(allKeys));
-  if ((!this$16.isEmpty__Z())) {
+  var this$15 = $n($n(keyset).diff__sc_Set__sc_SetOps(allKeys));
+  if ((!this$15.isEmpty__Z())) {
     var $$x2 = $m_s_sys_package$();
     var $$x1 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name;
-    var this$17 = $n($as_sc_IterableOnceOps($n($n(keyset).diff__sc_Set__sc_SetOps(allKeys)).map__F1__O(new $c_sjsr_AnonFunction1(((p) => {
+    var this$16 = $n($as_sc_IterableOnceOps($n($n(keyset).diff__sc_Set__sc_SetOps(allKeys)).map__F1__O(new $c_sjsr_AnonFunction1(((p) => {
       var p$1 = $as_T(p);
       return (("'" + p$1) + "'")
     })))));
-    $n($$x2).error__T__E(((("insert(): found properties not defined for entity '" + $$x1) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$17, "", ", ", "")))
+    $n($$x2).error__T__E(((("insert(): found properties not defined for entity '" + $$x1) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$16, "", ", ", "")))
   };
   if ((!$n(attrsRequired).subsetOf__sc_Set__Z(keyset))) {
     var $$x4 = $m_s_sys_package$();
     var $$x3 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name;
-    var this$18 = $n($as_sc_IterableOnceOps($n($n(attrsRequired).diff__sc_Set__sci_SetOps(keyset)).map__F1__O(new $c_sjsr_AnonFunction1(((p$2) => {
+    var this$17 = $n($as_sc_IterableOnceOps($n($n(attrsRequired).diff__sc_Set__sci_SetOps(keyset)).map__F1__O(new $c_sjsr_AnonFunction1(((p$2) => {
       var p$3 = $as_T(p$2);
       return (("'" + p$3) + "'")
     })))));
-    $n($$x4).error__T__E(((("insert(): missing required properties for entity '" + $$x3) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$18, "", ", ", "")))
+    $n($$x4).error__T__E(((("insert(): missing required properties for entity '" + $$x3) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$17, "", ", ", "")))
   };
   var command = $ct_scm_StringBuilder__(new $c_scm_StringBuilder());
-  var pairs = $as_sci_Map($n(attrsNoPK).flatMap__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
+  var pairs = $as_sci_Map($n(attrs).flatMap__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
     var x$1$4 = $as_T2(x$1$3$1);
     if ((x$1$4 !== null)) {
       var x33 = $as_T($n(x$1$4).T2__f__1);
       var x34 = $as_Lcom_vinctus_oql_Attribute($n(x$1$4).T2__f__2);
       if ((x34 !== null)) {
+        var this$20 = $n(x34);
         var this$21 = $n(x34);
         var this$22 = $n(x34);
         var this$23 = $n(x34);
         var this$24 = $n(x34);
-        var this$25 = $n(x34);
-        var x40 = this$25.Lcom_vinctus_oql_Attribute__f_typ;
+        var x40 = this$24.Lcom_vinctus_oql_Attribute__f_typ;
         if (($n(x40).isDataType__Z() && $n(obj).contains__O__Z(x33))) {
           $n($m_s_package$().s_package$__f_List);
           var $$x8 = $m_sr_ScalaRunTime$();
@@ -4743,8 +4735,8 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
           var x$2 = $m_Lcom_vinctus_oql_JSONType$();
           var cond = ((x40 !== null) && $n(x40).equals__O__Z(x$2));
           if (cond) {
-            var this$28 = $n(x40);
-            var $$x5 = new $c_s_Some($as_Lcom_vinctus_oql_Datatype(this$28))
+            var this$27 = $n(x40);
+            var $$x5 = new $c_s_Some($as_Lcom_vinctus_oql_Datatype(this$27))
           } else {
             var $$x5 = $m_s_None$()
           };
@@ -4754,8 +4746,8 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
         };
         if ((x40 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
           var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x40);
-          var this$32 = $n(x$1$5);
-          var x32 = this$32.Lcom_vinctus_oql_ManyToOneType__f_entity;
+          var this$31 = $n(x$1$5);
+          var x32 = this$31.Lcom_vinctus_oql_ManyToOneType__f_entity;
           if ($n(obj).contains__O__Z(x33)) {
             var v = $n(obj).apply__O__O(x33);
             $n($m_s_package$().s_package$__f_List);
@@ -4766,8 +4758,8 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
           }
         }
       };
-      var this$36 = $n(attrsRequired);
-      if (this$36.contains__O__Z(x33)) {
+      var this$35 = $n(attrsRequired);
+      if (this$35.contains__O__Z(x33)) {
         $m_s_sys_package$().error__T__E((("attribute '" + x33) + "' is required"))
       } else {
         return $m_s_package$().s_package$__f_Nil
@@ -4782,8 +4774,8 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
     var \u03b41$___1;
     var \u03b41$___2;
     var $$x10 = $n(pairs);
-    var this$38 = $m_s_$less$colon$less$();
-    var x41 = $n($$x10).unzip__F1__T2(this$38.s_$less$colon$less$__f_singleton);
+    var this$37 = $m_s_$less$colon$less$();
+    var x41 = $n($$x10).unzip__F1__T2(this$37.s_$less$colon$less$__f_singleton);
     if ((x41 !== null)) {
       var keys = $as_sci_Iterable($n(x41).T2__f__1);
       var values = $as_sci_Iterable($n(x41).T2__f__2);
@@ -4800,48 +4792,45 @@ $c_Lcom_vinctus_oql_Mutation.prototype.insert__sc_Map__s_concurrent_Future = (fu
     return $n($as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k$1))).Lcom_vinctus_oql_Attribute__f_column
   }))));
   var $$x11 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_table;
-  var this$40 = $n(columns);
-  command.append__T__scm_StringBuilder((((("INSERT INTO " + $$x11) + " (") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$40, "", ", ", "")) + ") VALUES\n"));
-  var this$41 = $n(values$2);
-  command.append__T__scm_StringBuilder((("  (" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$41, "", ", ", "")) + ")\n"));
-  var this$42 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
-  if ((!this$42.isEmpty__Z())) {
-    var arg1$2 = this$42.get__O();
-    var pk$1 = $as_Lcom_vinctus_oql_Attribute(arg1$2);
-    command.append__T__scm_StringBuilder((("  RETURNING " + $n(pk$1).Lcom_vinctus_oql_Attribute__f_column) + "\n"))
+  var this$39 = $n(columns);
+  command.append__T__scm_StringBuilder((((("INSERT INTO " + $$x11) + " (") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$39, "", ", ", "")) + ") VALUES\n"));
+  var this$40 = $n(values$2);
+  command.append__T__scm_StringBuilder((("  (" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$40, "", ", ", "")) + ")\n"));
+  var this$41 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
+  if ((!this$41.isEmpty__Z())) {
+    var arg1$1 = this$41.get__O();
+    var pk = $as_Lcom_vinctus_oql_Attribute(arg1$1);
+    command.append__T__scm_StringBuilder((("  RETURNING " + $n(pk).Lcom_vinctus_oql_Attribute__f_column) + "\n"))
   };
   $n(this.Lcom_vinctus_oql_Mutation__f_oql).show__T__V($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content);
-  var this$43 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
-  return $n($n($n(this$43.Lcom_vinctus_oql_AbstractOQL__f_ds).connect__Lcom_vinctus_oql_OQLConnection()).command__T__s_concurrent_Future($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((rs) => {
+  var this$42 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
+  return $n($n($n(this$42.Lcom_vinctus_oql_AbstractOQL__f_ds).connect__Lcom_vinctus_oql_OQLConnection()).command__T__s_concurrent_Future($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((rs) => {
     var rs$1 = $as_Lcom_vinctus_oql_OQLResultSet(rs);
     if ((!$n(rs$1).next__Z())) {
       $m_s_sys_package$().error__T__E("insert: empty result set")
     };
-    matchResult5: {
-      var $$x12;
-      var x44 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
-      var x = $m_s_None$();
-      if ((x === x44)) {
-        var this$45 = $n(obj);
-        var factory = $m_sci_VectorMap$();
-        var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
-        var $$x12 = $as_sci_VectorMap(factory$1.fromSpecific__sc_IterableOnce__O(this$45));
-        break matchResult5
-      };
-      if ((x44 instanceof $c_s_Some)) {
-        var pk$2 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x44)).s_Some__f_value);
-        var this$47 = $n(obj);
-        var factory$2 = $m_sci_VectorMap$();
-        var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
-        var this$50 = $n($as_sci_MapOps(factory$3.fromSpecific__sc_IterableOnce__O(this$47)));
-        var self = $n(pk$2).Lcom_vinctus_oql_Attribute__f_name;
-        var y$2 = $n($n(rs$1).get__I__Lcom_vinctus_oql_OQLResultSetValue(0)).value__O();
-        var $$x12 = $as_sci_VectorMap(this$50.updated__O__O__sci_MapOps(self, y$2));
-        break matchResult5
-      };
-      throw new $c_s_MatchError(x44)
+    var x44 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
+    var x = $m_s_None$();
+    if ((x === x44)) {
+      var this$44 = $n(obj);
+      var factory = $m_sci_VectorMap$();
+      var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
+      return $as_sci_VectorMap(factory$1.fromSpecific__sc_IterableOnce__O(this$44))
+    };
+    if ((x44 instanceof $c_s_Some)) {
+      var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x44)).s_Some__f_value);
+      var this$47 = $m_sci_VectorMap$();
+      var $$x12 = $m_sr_ScalaRunTime$();
+      var self = $n(pk$1).Lcom_vinctus_oql_Attribute__f_name;
+      var y$2 = $n($n(rs$1).get__I__Lcom_vinctus_oql_OQLResultSetValue(0)).value__O();
+      var elems$2 = $n($$x12).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self, y$2)]));
+      var this$48 = $n(this$47.from__sc_IterableOnce__sci_VectorMap(elems$2));
+      var this$50 = $n($f_sci_StrictOptimizedMapOps__concat__sc_IterableOnce__sci_MapOps(this$48, obj));
+      var factory$2 = $m_sci_VectorMap$();
+      var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
+      return $as_sci_VectorMap(factory$3.fromSpecific__sc_IterableOnce__O(this$50))
     };
-    return new $c_Lcom_vinctus_sjs\uff3futils_DynamicMap($$x12)
+    throw new $c_s_MatchError(x44)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
 $c_Lcom_vinctus_oql_Mutation.prototype.delete__O__s_concurrent_Future = (function(id) {
@@ -4882,7 +4871,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.link__O__T__O__s_concurrent_Future = (fun
         var self$1 = $n(x63).Lcom_vinctus_oql_Attribute__f_name;
         var elems = $n($$x2).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([$$x1, new $c_T2(self$1, id2)]));
         return $n($n($$x3).insert__sc_Map__s_concurrent_Future(this$16.from__sc_IterableOnce__sci_Map(elems))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$3) => {
-          $as_Lcom_vinctus_sjs\uff3futils_DynamicMap(_$3)
+          $as_sci_VectorMap(_$3)
         })), this.Lcom_vinctus_oql_Mutation__f_ec)
       }
     };
@@ -4933,9 +4922,6 @@ $c_Lcom_vinctus_oql_Mutation.prototype.unlink__O__T__O__s_concurrent_Future = (f
   throw new $c_s_MatchError(x64)
 });
 $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future = (function(id, updates) {
-  if ($n(updates).isEmpty__Z()) {
-    $m_s_sys_package$().error__T__E(("update: empty update: " + id))
-  };
   var this$1 = $n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option());
   if ((!this$1.isEmpty__Z())) {
     var arg1 = this$1.get__O();
@@ -4984,36 +4970,48 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
     })))));
     $n($$x2).error__T__E(((("extrinsic properties not found in entity '" + $$x1) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$11, "", ", ", "")))
   };
-  var pairs = $as_sc_Map($n(updates).map__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$2) => {
+  var updatesWithoutUndefined = $as_sc_Map($n(updates).filterNot__F1__O(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
     if ((x$1$3 !== null)) {
-      var k = $as_T($n(x$1$3).T2__f__1);
+      $as_T($n(x$1$3).T2__f__1);
       var v = $n(x$1$3).T2__f__2;
-      if ($is_sci_Map(v)) {
-        matchResult9: {
+      return $m_sr_BoxesRunTime$().equals__O__O__Z(v, (void 0))
+    };
+    throw new $c_s_MatchError(x$1$3)
+  }))));
+  if ($n(updatesWithoutUndefined).isEmpty__Z()) {
+    $m_s_sys_package$().error__T__E(("update: empty update: " + id))
+  };
+  var pairs = $as_sc_Map($n(updatesWithoutUndefined).map__F1__sc_IterableOps(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
+    var x$1$4 = $as_T2(x$1$3$1);
+    if ((x$1$4 !== null)) {
+      var k$1 = $as_T($n(x$1$4).T2__f__1);
+      var v$1 = $n(x$1$4).T2__f__2;
+      if ($is_sci_Map(v$1)) {
+        matchResult10: {
           var v1;
-          var x90 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
-          if ((x90 !== null)) {
-            var this$14 = $n(x90);
-            var this$15 = $n(x90);
-            var this$16 = $n(x90);
-            var this$17 = $n(x90);
-            var this$18 = $n(x90);
-            var x96 = this$18.Lcom_vinctus_oql_Attribute__f_typ;
-            if ((x96 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-              var x$1$4 = $as_Lcom_vinctus_oql_ManyToOneType(x96);
-              var this$20 = $n(x$1$4);
-              var x99 = this$20.Lcom_vinctus_oql_ManyToOneType__f_entity;
-              var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x99).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
-              break matchResult9
+          var x93 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k$1));
+          if ((x93 !== null)) {
+            var this$14 = $n(x93);
+            var this$15 = $n(x93);
+            var this$16 = $n(x93);
+            var this$17 = $n(x93);
+            var this$18 = $n(x93);
+            var x99 = this$18.Lcom_vinctus_oql_Attribute__f_typ;
+            if ((x99 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+              var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x99);
+              var this$20 = $n(x$1$5);
+              var x102 = this$20.Lcom_vinctus_oql_ManyToOneType__f_entity;
+              var v1 = $n($as_sci_Map(v$1)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x102).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
+              break matchResult10
             }
           };
-          $m_s_sys_package$().error__T__E((((("attribute '" + k) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
+          $m_s_sys_package$().error__T__E((((("attribute '" + k$1) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
         }
       } else {
-        var v1 = v
+        var v1 = v$1
       };
-      var attr = $as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k));
+      var attr = $as_Lcom_vinctus_oql_Attribute($n(attrs).apply__O__O(k$1));
       var self = $n(attr).Lcom_vinctus_oql_Attribute__f_column;
       var $$x4 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
       var x = $n(attr).Lcom_vinctus_oql_Attribute__f_typ;
@@ -5028,18 +5026,18 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
       var y = $n($$x4).render__O__s_Option__T(v1, $$x3);
       return new $c_T2(self, y)
     };
-    throw new $c_s_MatchError(x$1$3)
+    throw new $c_s_MatchError(x$1$4)
   }))));
   var command = $ct_scm_StringBuilder__(new $c_scm_StringBuilder());
   command.append__T__scm_StringBuilder((("UPDATE " + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_table) + "\n"));
-  var this$25 = $n($as_sc_IterableOnceOps($n(pairs).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
-    var x$1$5 = $as_T2(x$1$3$1);
-    if ((x$1$5 !== null)) {
-      var k$1 = $as_T($n(x$1$5).T2__f__1);
-      var v$1 = $as_T($n(x$1$5).T2__f__2);
-      return ((k$1 + " = ") + v$1)
+  var this$25 = $n($as_sc_IterableOnceOps($n(pairs).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$4$1) => {
+    var x$1$6 = $as_T2(x$1$4$1);
+    if ((x$1$6 !== null)) {
+      var k$2 = $as_T($n(x$1$6).T2__f__1);
+      var v$2 = $as_T($n(x$1$6).T2__f__2);
+      return ((k$2 + " = ") + v$2)
     };
-    throw new $c_s_MatchError(x$1$5)
+    throw new $c_s_MatchError(x$1$6)
   })))));
   command.append__T__scm_StringBuilder((("  SET " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$25, "", ", ", "")) + "\n"));
   command.append__T__scm_StringBuilder((((("  WHERE " + $n($as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_column) + " = ") + $n(this.Lcom_vinctus_oql_Mutation__f_oql).render__O__s_Option__T(id, $n(this.Lcom_vinctus_oql_Mutation__f_oql).render$default$2__s_Option())) + "\n"));
@@ -5047,27 +5045,27 @@ $c_Lcom_vinctus_oql_Mutation.prototype.update__O__sc_Map__s_concurrent_Future =
   var this$26 = $n(this.Lcom_vinctus_oql_Mutation__f_oql);
   return $n($n($n(this$26.Lcom_vinctus_oql_AbstractOQL__f_ds).connect__Lcom_vinctus_oql_OQLConnection()).command__T__s_concurrent_Future($n(command.scm_StringBuilder__f_underlying).jl_StringBuilder__f_java$lang$StringBuilder$$content)).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((_$6) => {
     $as_Lcom_vinctus_oql_OQLResultSet(_$6);
-    var x106 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
+    var x109 = $n(this.Lcom_vinctus_oql_Mutation__f_entity).pk__s_Option();
     var x$3 = $m_s_None$();
-    if ((x$3 === x106)) {
-      var this$28 = $n(updates);
+    if ((x$3 === x109)) {
+      var this$28 = $n(updatesWithoutUndefined);
       var factory = $m_sci_VectorMap$();
       var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
       return $as_sci_VectorMap(factory$1.fromSpecific__sc_IterableOnce__O(this$28))
     };
-    if ((x106 instanceof $c_s_Some)) {
-      var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x106)).s_Some__f_value);
+    if ((x109 instanceof $c_s_Some)) {
+      var pk$1 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x109)).s_Some__f_value);
       var this$31 = $m_sci_VectorMap$();
       var $$x5 = $m_sr_ScalaRunTime$();
       var self$1 = $n(pk$1).Lcom_vinctus_oql_Attribute__f_name;
       var elems = $n($$x5).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self$1, id)]));
       var this$32 = $n(this$31.from__sc_IterableOnce__sci_VectorMap(elems));
-      var this$34 = $n($f_sci_StrictOptimizedMapOps__concat__sc_IterableOnce__sci_MapOps(this$32, updates));
+      var this$34 = $n($f_sci_StrictOptimizedMapOps__concat__sc_IterableOnce__sci_MapOps(this$32, updatesWithoutUndefined));
       var factory$2 = $m_sci_VectorMap$();
       var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
       return $as_sci_VectorMap(factory$3.fromSpecific__sc_IterableOnce__O(this$34))
     };
-    throw new $c_s_MatchError(x106)
+    throw new $c_s_MatchError(x109)
   })), this.Lcom_vinctus_oql_Mutation__f_ec)
 });
 $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future = (function(updates) {
@@ -5081,7 +5079,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
     return ((x$1$1 !== null) && ($as_sc_Map($n(x$1$1).T2__f__2), true))
   })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
-    matchResult14: {
+    matchResult15: {
       if ((x$1$3 !== null)) {
         var u$1 = $as_sc_Map($n(x$1$3).T2__f__2);
         var x = $n(u$1).keySet__sc_Set();
@@ -5090,7 +5088,7 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
           var this$2 = $n(u$1);
           $n($$x1).error__T__E(("update: key set mismatch: " + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$2, "{", ", ", "}")))
         };
-        break matchResult14
+        break matchResult15
       };
       throw new $c_s_MatchError(x$1$3)
     }
@@ -5109,15 +5107,15 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
   var attrs = $as_sci_Map($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).filter__F1__O(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
     var x$1$4 = $as_T2(x$1$3$1);
     if ((x$1$4 !== null)) {
-      var x117 = $as_Lcom_vinctus_oql_Attribute($n(x$1$4).T2__f__2);
-      if ((x117 !== null)) {
-        var this$5 = $n(x117);
-        var this$6 = $n(x117);
-        var this$7 = $n(x117);
-        var this$8 = $n(x117);
-        var this$9 = $n(x117);
-        var x123 = this$9.Lcom_vinctus_oql_Attribute__f_typ;
-        if ($n(x123).isColumnType__Z()) {
+      var x120 = $as_Lcom_vinctus_oql_Attribute($n(x$1$4).T2__f__2);
+      if ((x120 !== null)) {
+        var this$5 = $n(x120);
+        var this$6 = $n(x120);
+        var this$7 = $n(x120);
+        var this$8 = $n(x120);
+        var this$9 = $n(x120);
+        var x126 = this$9.Lcom_vinctus_oql_Attribute__f_typ;
+        if ($n(x126).isColumnType__Z()) {
           return true
         }
       }
@@ -5156,22 +5154,22 @@ $c_Lcom_vinctus_oql_Mutation.prototype.bulkUpdate__sci_List__s_concurrent_Future
           var k = $as_T($n(x$1$6).T2__f__1);
           var v = $n(x$1$6).T2__f__2;
           if ($is_sci_Map(v)) {
-            matchResult16: {
+            matchResult17: {
               var v1;
-              var x124 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
-              if ((x124 !== null)) {
-                var this$16 = $n(x124);
-                var this$17 = $n(x124);
-                var this$18 = $n(x124);
-                var this$19 = $n(x124);
-                var this$20 = $n(x124);
-                var x130 = this$20.Lcom_vinctus_oql_Attribute__f_typ;
-                if ((x130 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                  var x$1$7 = $as_Lcom_vinctus_oql_ManyToOneType(x130);
+              var x127 = $as_Lcom_vinctus_oql_Attribute($n($n(this.Lcom_vinctus_oql_Mutation__f_entity).attributes__sci_Map()).apply__O__O(k));
+              if ((x127 !== null)) {
+                var this$16 = $n(x127);
+                var this$17 = $n(x127);
+                var this$18 = $n(x127);
+                var this$19 = $n(x127);
+                var this$20 = $n(x127);
+                var x133 = this$20.Lcom_vinctus_oql_Attribute__f_typ;
+                if ((x133 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                  var x$1$7 = $as_Lcom_vinctus_oql_ManyToOneType(x133);
                   var this$22 = $n(x$1$7);
-                  var x133 = this$22.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                  var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x133).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
-                  break matchResult16
+                  var x136 = this$22.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                  var v1 = $n($as_sci_Map(v)).apply__O__O($n($as_Lcom_vinctus_oql_Attribute($n($n(x136).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_name);
+                  break matchResult17
                 }
               };
               $m_s_sys_package$().error__T__E((((("attribute '" + k) + "' of entity '") + $n(this.Lcom_vinctus_oql_Mutation__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' is not an entity attribute"))
@@ -5496,53 +5494,53 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.getCount__sjs_js_
   var f = $n($n($p_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__check__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(this)).Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_oql).count__Lcom_vinctus_oql_OQLQuery__T__Lcom_vinctus_oql_Fixed__s_concurrent_Future(this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_q, null, this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG__f_com$vinctus$oql$QueryBuilder_JS_NodePG$$fixed);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.cond = (function(arg) {
-  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg)
+$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)
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
+  "get": (function() {
+    return this.select$default$2__O()
+  }),
+  "configurable": true
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
   return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.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.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)
-});
-Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype, "select$default$2", {
-  "get": (function() {
-    return this.select$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.getCount = (function() {
   return this.getCount__sjs_js_Promise()
 });
-$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()
-});
 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.getMany = (function() {
+  return this.getMany__sjs_js_Promise()
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.select = (function(arg, ...rest) {
+  var prep0 = $as_T(arg);
+  var prep1 = ((rest[0] === (void 0)) ? this.select$default$2__O() : rest[0]);
+  return this.select__T__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.order = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  var prep1 = $as_T(arg$2);
+  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0, prep1)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG.prototype.offset = (function(arg) {
+  var prep0 = $uI(arg);
+  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(prep0)
+});
 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", {
@@ -5700,31 +5698,29 @@ $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount__sjs_js_Pro
   var f = $n($n($p_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__check__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(this)).Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_oql).count__Lcom_vinctus_oql_OQLQuery__T__Lcom_vinctus_oql_Fixed__s_concurrent_Future(this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_q, null, this.Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB__f_com$vinctus$oql$QueryBuilder_JS_RDB$$fixed);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.cond = (function(arg) {
-  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg)
-});
-$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.getOne = (function() {
+  return this.getOne__sjs_js_Promise()
 });
 $c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.limit = (function(arg) {
   var prep0 = $uI(arg);
   return this.limit__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
 });
-$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.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.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.cond = (function(arg) {
+  return this.cond__O__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.getCount = (function() {
+  return this.getCount__sjs_js_Promise()
+});
+Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "query$default$2", {
+  "get": (function() {
+    return this.query$default$2__O()
+  }),
+  "configurable": true
 });
 Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype, "select$default$2", {
   "get": (function() {
@@ -5732,20 +5728,22 @@ Object.defineProperty($c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototyp
   }),
   "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.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)
 });
-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.order = (function(arg, arg$2) {
+  var prep0 = $as_T(arg);
+  var prep1 = $as_T(arg$2);
+  return this.order__T__T__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0, prep1)
+});
+$c_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB.prototype.offset = (function(arg) {
+  var prep0 = $uI(arg);
+  return this.offset__I__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(prep0)
 });
 var $d_Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB: 0
@@ -6960,8 +6958,8 @@ $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.jsArray__O__Z = (function(v) {
 $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.jsObject__O__Z = (function(v) {
   return ((((($as_T((typeof v)) === "object") && (v !== null)) && (!(v instanceof $c_RTLong))) && (!$uZ((v instanceof Date)))) && (!$m_Lcom_vinctus_sjs\uff3futils_package$().jsArray__O__Z(v)))
 });
-$c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__O = (function(a) {
-  if ((a === (void 0))) {
+$c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__Z__O = (function(a, undefinedToNull) {
+  if ((undefinedToNull && (a === (void 0)))) {
     return null
   } else if ($m_Lcom_vinctus_sjs\uff3futils_package$().jsObject__O__Z(a)) {
     var this$8 = new $c_sjs_js_WrappedDictionary$DictionaryIterator(a);
@@ -6970,7 +6968,7 @@ $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__O = (function(a) {
       if ((x$1$1 !== null)) {
         var k = $as_T($n(x$1$1).T2__f__1);
         var v = $n(x$1$1).T2__f__2;
-        var _2 = $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(v);
+        var _2 = $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(v, undefinedToNull);
         return new $c_T2(k, _2)
       };
       throw new $c_s_MatchError(x$1$1)
@@ -6981,7 +6979,7 @@ $c_Lcom_vinctus_sjs\uff3futils_package$.prototype.fromJS__O__O = (function(a) {
     return factory$1.fromSpecific__sc_IterableOnce__O(this$10)
   } else if ($m_Lcom_vinctus_sjs\uff3futils_package$().jsArray__O__Z(a)) {
     var this$13 = new $c_sjs_js_ArrayOps$ArrayIterator(a);
-    var f$1 = new $c_sjsr_AnonFunction1(((_$1) => $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(_$1)));
+    var f$1 = new $c_sjsr_AnonFunction1(((_$1) => $m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(_$1, undefinedToNull)));
     var this$14 = new $c_sc_Iterator$$anon$9(this$13, f$1);
     $m_sci_List$();
     return $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(this$14)
@@ -9494,7 +9492,7 @@ function $p_Lio_github_edadma_rdb_ConnectSQL__toJS__Lio_github_edadma_rdb_Value_
 /** @constructor */
 function $c_Lio_github_edadma_rdb_ConnectSQL() {
   this.Lio_github_edadma_rdb_ConnectSQL__f_db = null;
-  this.Lio_github_edadma_rdb_ConnectSQL__f_db = new $c_Lio_github_edadma_rdb_MemoryDB("mem")
+  this.Lio_github_edadma_rdb_ConnectSQL__f_db = new $c_Lio_github_edadma_rdb_MemoryDB()
 }
 $c_Lio_github_edadma_rdb_ConnectSQL.prototype = new $h_O();
 $c_Lio_github_edadma_rdb_ConnectSQL.prototype.constructor = $c_Lio_github_edadma_rdb_ConnectSQL;
@@ -9572,9 +9570,15 @@ var $d_Lio_github_edadma_rdb_ConnectSQL = new $TypeData().initClass({
   O: 1
 });
 $c_Lio_github_edadma_rdb_ConnectSQL.prototype.$classData = $d_Lio_github_edadma_rdb_ConnectSQL;
+function $ct_Lio_github_edadma_rdb_DB__($thiz) {
+  $thiz.Lio_github_edadma_rdb_DB__f_tables = $ct_scm_HashMap__(new $c_scm_HashMap());
+  $thiz.Lio_github_edadma_rdb_DB__f_types = $ct_scm_HashMap__(new $c_scm_HashMap());
+  return $thiz
+}
 /** @constructor */
 function $c_Lio_github_edadma_rdb_DB() {
-  /*<skip>*/
+  this.Lio_github_edadma_rdb_DB__f_tables = null;
+  this.Lio_github_edadma_rdb_DB__f_types = null
 }
 $c_Lio_github_edadma_rdb_DB.prototype = new $h_O();
 $c_Lio_github_edadma_rdb_DB.prototype.constructor = $c_Lio_github_edadma_rdb_DB;
@@ -9583,6 +9587,42 @@ function $h_Lio_github_edadma_rdb_DB() {
   /*<skip>*/
 }
 $h_Lio_github_edadma_rdb_DB.prototype = $c_Lio_github_edadma_rdb_DB.prototype;
+$c_Lio_github_edadma_rdb_DB.prototype.createTable__T__sci_Seq__Lio_github_edadma_rdb_Table = (function(name, specs) {
+  var requirement = (!$n(this.Lio_github_edadma_rdb_DB__f_tables).contains__O__Z(name));
+  if ((!requirement)) {
+    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + ("table '" + name)) + "' already exists"))
+  };
+  var table = new $c_Lio_github_edadma_rdb_MemoryTable(name, specs);
+  var this$2 = $n(this.Lio_github_edadma_rdb_DB__f_tables);
+  $p_scm_HashMap__put0__O__O__Z__s_Some(this$2, name, table, false);
+  return table
+});
+$c_Lio_github_edadma_rdb_DB.prototype.createEnum__T__sci_Seq__V = (function(name, labels) {
+  var requirement = (!$n(this.Lio_github_edadma_rdb_DB__f_types).contains__O__Z(name));
+  if ((!requirement)) {
+    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + ("type " + name)) + " already exists"))
+  };
+  var this$3 = $n(this.Lio_github_edadma_rdb_DB__f_types);
+  var labels$1 = $n(labels).toIndexedSeq__sci_IndexedSeq();
+  var value = new $c_Lio_github_edadma_rdb_EnumType(name, labels$1);
+  $p_scm_HashMap__put0__O__O__Z__s_Some(this$3, name, value, false)
+});
+$c_Lio_github_edadma_rdb_DB.prototype.toString__T = (function() {
+  var $$x1 = this.Lio_github_edadma_rdb_MemoryDB__f_name;
+  var this$1 = $n(this.Lio_github_edadma_rdb_DB__f_tables);
+  var b = $m_scm_Iterable$().newBuilder__scm_Builder();
+  var it = this$1.iterator__sc_Iterator();
+  while ($n(it).hasNext__Z()) {
+    var this$2 = $n(b);
+    var arg1 = $n(it).next__O();
+    var x$1 = $as_T2(arg1);
+    $as_T($n(x$1).T2__f__1);
+    var t = $as_Lio_github_edadma_rdb_Table($n(x$1).T2__f__2);
+    this$2.addOne__O__scm_Growable(t)
+  };
+  var this$3 = $n($as_sc_IterableOnceOps($n(b).result__O()));
+  return (((("[Database '" + $$x1) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$3, "", ", ", "")) + "]")
+});
 /** @constructor */
 function $c_Lio_github_edadma_rdb_Nulls$() {
   this.Lio_github_edadma_rdb_Nulls$__f_first = null;
@@ -10024,8 +10064,10 @@ function $p_Lio_github_edadma_rdb_eval$package$__like$1__T__T__Z__Z($thiz, s, pa
           };
           var nsp$2 = $uI(\u03b41$___1);
           var npp$2 = $uI(\u03b41$___2);
-          elem = nsp$2;
-          elem$1 = npp$2;
+          var ev$4 = nsp$2;
+          elem = ev$4;
+          var ev$5 = npp$2;
+          elem$1 = ev$5;
           var $$x3 = true
         } else {
           var $$x3 = false
@@ -10131,8 +10173,10 @@ function $p_Lio_github_edadma_rdb_eval$package$__like$1__T__T__Z__Z($thiz, s, pa
               };
               var nsp$2$1 = $uI(\u03b41$$1___1);
               var npp$2$1 = $uI(\u03b41$$1___2);
-              elem = nsp$2$1;
-              elem$1 = npp$2$1;
+              var ev$4$1 = nsp$2$1;
+              elem = ev$4$1;
+              var ev$5$1 = npp$2$1;
+              elem$1 = ev$5$1;
               var $$x10 = true
             } else {
               var $$x10 = false
@@ -10828,12 +10872,13 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
         if ((x108 !== null)) {
           var this$9 = $n(x108);
           var x113 = this$9.Lio_github_edadma_rdb_Ident__f_name;
-          var this$10 = $n($n(db).getTable__T__s_Option(x113));
-          if (this$10.isEmpty__Z()) {
+          var this$10 = $n(db);
+          var this$11 = $n($n(this$10.Lio_github_edadma_rdb_DB__f_tables).get__O__s_Option(x113));
+          if (this$11.isEmpty__Z()) {
             var msg = ("unknown table: " + x113);
             $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x108).Lio_github_edadma_rdb_Ident__f_pos, msg)
           };
-          var t = $as_Lio_github_edadma_rdb_Table(this$10.get__O());
+          var t = $as_Lio_github_edadma_rdb_Table(this$11.get__O());
           var cols = $n(x109).length__I();
           var x30 = $n(x110).find__F1__s_Option(new $c_sjsr_AnonFunction1(((_$1) => {
             var _$1$1 = $as_sci_Seq(_$1);
@@ -10857,7 +10902,7 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
             $n($n(x109).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
               var x$1$3 = $as_Lio_github_edadma_rdb_Ident(x$1$2$1);
               if ((x$1$3 !== null)) {
-                var this$14 = $n(x$1$3);
+                var this$15 = $n(x$1$3);
                 return true
               } else {
                 return false
@@ -10866,9 +10911,10 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
               var x$1$4 = $as_Lio_github_edadma_rdb_Ident(x$1$3$1);
               matchResult2: {
                 if ((x$1$4 !== null)) {
-                  var this$16 = $n(x$1$4);
-                  var x6 = this$16.Lio_github_edadma_rdb_Ident__f_name;
-                  if ((!$n(t).hasColumn__T__Z(x6))) {
+                  var this$17 = $n(x$1$4);
+                  var x6 = this$17.Lio_github_edadma_rdb_Ident__f_name;
+                  var this$18 = $n(t);
+                  if ((!$n(this$18.Lio_github_edadma_rdb_Table__f_columnMap).contains__O__Z(x6))) {
                     var msg$2 = ("unknown column: " + x6);
                     $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x$1$4).Lio_github_edadma_rdb_Ident__f_pos, msg$2)
                   };
@@ -10877,10 +10923,10 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
                 throw new $c_s_MatchError(x$1$4)
               }
             })));
-            var result = $n(t).bulkInsert__sci_Seq__sci_Seq__sci_Map($as_sci_Seq($n(x109).map__F1__O(new $c_sjsr_AnonFunction1(((_$2) => {
+            var result = $n(t).bulkInsert__sci_Seq__sci_Seq__s_Option__sci_Map($as_sci_Seq($n(x109).map__F1__O(new $c_sjsr_AnonFunction1(((_$2) => {
               var _$2$1 = $as_Lio_github_edadma_rdb_Ident(_$2);
               return $n(_$2$1).Lio_github_edadma_rdb_Ident__f_name
-            })))), data);
+            })))), data, x111);
             matchResult8: {
               var x27___1;
               var x27___2;
@@ -10901,8 +10947,8 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
                     };
                     throw new $c_s_MatchError(x$1$5)
                   }))));
-                  var this$22 = $m_s_$less$colon$less$();
-                  var x10 = $n($$x2).unzip__F1__T2(this$22.s_$less$colon$less$__f_singleton);
+                  var this$24 = $m_s_$less$colon$less$();
+                  var x10 = $n($$x2).unzip__F1__T2(this$24.s_$less$colon$less$__f_singleton);
                   if ((x10 !== null)) {
                     var cols$3 = $as_sci_Iterable($n(x10).T2__f__1);
                     var seq = $as_sci_Iterable($n(x10).T2__f__2);
@@ -10928,8 +10974,8 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
               if ((x111 instanceof $c_s_Some)) {
                 var x24 = $as_Lio_github_edadma_rdb_Ident($n($as_s_Some(x111)).s_Some__f_value);
                 if ((x24 !== null)) {
-                  var this$29 = $n(x24);
-                  var x26 = this$29.Lio_github_edadma_rdb_Ident__f_name;
+                  var this$31 = $n(x24);
+                  var x26 = this$31.Lio_github_edadma_rdb_Ident__f_name;
                   if ((!$n(result).contains__O__Z(x26))) {
                     var msg$3 = (("'" + x26) + "' not found in result from insert");
                     $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x24).Lio_github_edadma_rdb_Ident__f_pos, msg$3)
@@ -10956,8 +11002,8 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
                       };
                       throw new $c_s_MatchError(x$1$7)
                     }))));
-                    var this$34 = $m_s_$less$colon$less$();
-                    var x19 = $n($$x3).unzip__F1__T2(this$34.s_$less$colon$less$__f_singleton);
+                    var this$36 = $m_s_$less$colon$less$();
+                    var x19 = $n($$x3).unzip__F1__T2(this$36.s_$less$colon$less$__f_singleton);
                     if ((x19 !== null)) {
                       var cols$5 = $as_sci_Iterable($n(x19).T2__f__1);
                       var seq$3 = $as_sci_Iterable($n(x19).T2__f__2);
@@ -10989,9 +11035,9 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
             var \u03b41$___2 = metadata$3;
             var row$3 = $as_Lio_github_edadma_rdb_Row(\u03b41$___1);
             var metadata$4 = $as_Lio_github_edadma_rdb_Metadata(\u03b41$___2);
-            var this$42 = $n($m_s_package$().s_package$__f_Vector);
+            var this$44 = $n($m_s_package$().s_package$__f_Vector);
             var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_Lio_github_edadma_rdb_Row.getArrayOf().constr)([row$3]));
-            var data$3 = this$42.from__sc_IterableOnce__sci_Vector(elems);
+            var data$3 = this$44.from__sc_IterableOnce__sci_Vector(elems);
             var table$2 = new $c_Lio_github_edadma_rdb_TableValue(data$3, metadata$4);
             var $$x1 = new $c_Lio_github_edadma_rdb_InsertResult(result, table$2);
             break matchResult20
@@ -11001,22 +11047,23 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
       };
       if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_QueryCommand)) {
         var x$1$8 = $as_Lio_github_edadma_rdb_QueryCommand(x$1$1);
-        var this$46 = $n(x$1$8);
-        var x105 = this$46.Lio_github_edadma_rdb_QueryCommand__f_query;
+        var this$48 = $n(x$1$8);
+        var x105 = this$48.Lio_github_edadma_rdb_QueryCommand__f_query;
         var table$3 = $as_Lio_github_edadma_rdb_TableValue($m_Lio_github_edadma_rdb_eval$package$().eval__Lio_github_edadma_rdb_Expr__sci_Seq__Lio_github_edadma_rdb_AggregateMode__Lio_github_edadma_rdb_Value($m_Lio_github_edadma_rdb_rewrite$package$().rewrite__Lio_github_edadma_rdb_Expr__Lio_github_edadma_rdb_DB__Lio_github_edadma_rdb_Expr(x105, db), $m_s_package$().s_package$__f_Nil, $s_Lio_github_edadma_rdb_AggregateMode$__Return__Lio_github_edadma_rdb_AggregateMode()));
         var $$x1 = new $c_Lio_github_edadma_rdb_QueryResult(table$3);
         break matchResult20
       };
       if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_CreateTableCommand)) {
         var x$1$9 = $as_Lio_github_edadma_rdb_CreateTableCommand(x$1$1);
-        var this$49 = $n(x$1$9);
-        var x99 = this$49.Lio_github_edadma_rdb_CreateTableCommand__f_table;
-        var this$50 = $n(x$1$9);
-        var x100 = this$50.Lio_github_edadma_rdb_CreateTableCommand__f_columns;
+        var this$51 = $n(x$1$9);
+        var x99 = this$51.Lio_github_edadma_rdb_CreateTableCommand__f_table;
+        var this$52 = $n(x$1$9);
+        var x100 = this$52.Lio_github_edadma_rdb_CreateTableCommand__f_columns;
         if ((x99 !== null)) {
-          var this$52 = $n(x99);
-          var x102 = this$52.Lio_github_edadma_rdb_Ident__f_name;
-          if ($n(db).hasTable__T__Z(x102)) {
+          var this$54 = $n(x99);
+          var x102 = this$54.Lio_github_edadma_rdb_Ident__f_name;
+          var this$55 = $n(db);
+          if ($n(this$55.Lio_github_edadma_rdb_DB__f_tables).contains__O__Z(x102)) {
             var msg$4 = ("duplicate table: " + x102);
             $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x99).Lio_github_edadma_rdb_Ident__f_pos, msg$4)
           };
@@ -11024,19 +11071,19 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
           var specs = $as_sci_Seq($n(x100).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$7$1) => {
             var x$1$10 = $as_Lio_github_edadma_rdb_ColumnDesc(x$1$7$1);
             if ((x$1$10 !== null)) {
-              var this$55 = $n(x$1$10);
-              var x45 = this$55.Lio_github_edadma_rdb_ColumnDesc__f_name;
-              var this$56 = $n(x$1$10);
-              var x46 = this$56.Lio_github_edadma_rdb_ColumnDesc__f_typ;
-              var this$57 = $n(x$1$10);
-              var x47 = this$57.Lio_github_edadma_rdb_ColumnDesc__f_auto;
               var this$58 = $n(x$1$10);
-              var x48 = this$58.Lio_github_edadma_rdb_ColumnDesc__f_required;
+              var x45 = this$58.Lio_github_edadma_rdb_ColumnDesc__f_name;
               var this$59 = $n(x$1$10);
-              var x49 = this$59.Lio_github_edadma_rdb_ColumnDesc__f_pk;
+              var x46 = this$59.Lio_github_edadma_rdb_ColumnDesc__f_typ;
+              var this$60 = $n(x$1$10);
+              var x47 = this$60.Lio_github_edadma_rdb_ColumnDesc__f_auto;
+              var this$61 = $n(x$1$10);
+              var x48 = this$61.Lio_github_edadma_rdb_ColumnDesc__f_required;
+              var this$62 = $n(x$1$10);
+              var x49 = this$62.Lio_github_edadma_rdb_ColumnDesc__f_pk;
               if ((x45 !== null)) {
-                var this$61 = $n(x45);
-                var x51 = this$61.Lio_github_edadma_rdb_Ident__f_name;
+                var this$64 = $n(x45);
+                var x51 = this$64.Lio_github_edadma_rdb_Ident__f_name;
                 if (names.contains__O__Z(x51)) {
                   var msg$5 = ("duplicate column name: " + x51);
                   $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x45).Lio_github_edadma_rdb_Ident__f_pos, msg$5)
@@ -11052,9 +11099,10 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
                   if ((x46 instanceof $c_s_util_Right)) {
                     var x38 = $as_Lio_github_edadma_rdb_Ident($n($as_s_util_Right(x46)).s_util_Right__f_value);
                     if ((x38 !== null)) {
-                      var this$64 = $n(x38);
-                      var x40 = this$64.Lio_github_edadma_rdb_Ident__f_name;
-                      var x33 = $n(db).getType__T__s_Option(x40);
+                      var this$67 = $n(x38);
+                      var x40 = this$67.Lio_github_edadma_rdb_Ident__f_name;
+                      var this$68 = $n(db);
+                      var x33 = $n(this$68.Lio_github_edadma_rdb_DB__f_types).get__O__s_Option(x40);
                       var x$2 = $m_s_None$();
                       if ((x$2 === x33)) {
                         var msg$6 = (("type '" + x40) + "' is undefined");
@@ -11084,14 +11132,15 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
       };
       if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_CreateEnumCommand)) {
         var x$1$11 = $as_Lio_github_edadma_rdb_CreateEnumCommand(x$1$1);
-        var this$71 = $n(x$1$11);
-        var x93 = this$71.Lio_github_edadma_rdb_CreateEnumCommand__f_name;
-        var this$72 = $n(x$1$11);
-        var x94 = this$72.Lio_github_edadma_rdb_CreateEnumCommand__f_labels;
+        var this$75 = $n(x$1$11);
+        var x93 = this$75.Lio_github_edadma_rdb_CreateEnumCommand__f_name;
+        var this$76 = $n(x$1$11);
+        var x94 = this$76.Lio_github_edadma_rdb_CreateEnumCommand__f_labels;
         if ((x93 !== null)) {
-          var this$74 = $n(x93);
-          var x96 = this$74.Lio_github_edadma_rdb_Ident__f_name;
-          if ($n(db).hasType__T__Z(x96)) {
+          var this$78 = $n(x93);
+          var x96 = this$78.Lio_github_edadma_rdb_Ident__f_name;
+          var this$79 = $n(db);
+          if ($n(this$79.Lio_github_edadma_rdb_DB__f_types).contains__O__Z(x96)) {
             var msg$7 = (("duplicate type '" + x96) + "'");
             $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x93).Lio_github_edadma_rdb_Ident__f_pos, msg$7)
           };
@@ -11102,35 +11151,37 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
       };
       if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_UpdateCommand)) {
         var x$1$12 = $as_Lio_github_edadma_rdb_UpdateCommand(x$1$1);
-        var this$78 = $n(x$1$12);
-        var x86 = this$78.Lio_github_edadma_rdb_UpdateCommand__f_table;
-        var this$79 = $n(x$1$12);
-        var x87 = this$79.Lio_github_edadma_rdb_UpdateCommand__f_sets;
-        var this$80 = $n(x$1$12);
-        var x88 = this$80.Lio_github_edadma_rdb_UpdateCommand__f_cond;
+        var this$83 = $n(x$1$12);
+        var x86 = this$83.Lio_github_edadma_rdb_UpdateCommand__f_table;
+        var this$84 = $n(x$1$12);
+        var x87 = this$84.Lio_github_edadma_rdb_UpdateCommand__f_sets;
+        var this$85 = $n(x$1$12);
+        var x88 = this$85.Lio_github_edadma_rdb_UpdateCommand__f_cond;
         if ((x86 !== null)) {
-          var this$82 = $n(x86);
-          var x90 = this$82.Lio_github_edadma_rdb_Ident__f_name;
-          var this$83 = $n($n(db).getTable__T__s_Option(x90));
-          if (this$83.isEmpty__Z()) {
+          var this$87 = $n(x86);
+          var x90 = this$87.Lio_github_edadma_rdb_Ident__f_name;
+          var this$88 = $n(db);
+          var this$89 = $n($n(this$88.Lio_github_edadma_rdb_DB__f_tables).get__O__s_Option(x90));
+          if (this$89.isEmpty__Z()) {
             var msg$8 = ("unknown table: " + x90);
             $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x86).Lio_github_edadma_rdb_Ident__f_pos, msg$8)
           };
-          var t$3 = $as_Lio_github_edadma_rdb_Table(this$83.get__O());
+          var t$3 = $as_Lio_github_edadma_rdb_Table(this$89.get__O());
           matchResult15: {
             var \u03b44$___1;
             var \u03b44$___2;
             var $$x4 = $n($as_sc_IterableOps($n(x87).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$8$1) => {
               var x$1$13 = $as_Lio_github_edadma_rdb_UpdateSet(x$1$8$1);
               if ((x$1$13 !== null)) {
-                var this$86 = $n(x$1$13);
-                var x54 = this$86.Lio_github_edadma_rdb_UpdateSet__f_col;
-                var this$87 = $n(x$1$13);
-                var x55 = this$87.Lio_github_edadma_rdb_UpdateSet__f_value;
+                var this$92 = $n(x$1$13);
+                var x54 = this$92.Lio_github_edadma_rdb_UpdateSet__f_col;
+                var this$93 = $n(x$1$13);
+                var x55 = this$93.Lio_github_edadma_rdb_UpdateSet__f_value;
                 if ((x54 !== null)) {
-                  var this$89 = $n(x54);
-                  var x57 = this$89.Lio_github_edadma_rdb_Ident__f_name;
-                  if ((!$n(t$3).hasColumn__T__Z(x57))) {
+                  var this$95 = $n(x54);
+                  var x57 = this$95.Lio_github_edadma_rdb_Ident__f_name;
+                  var this$96 = $n(t$3);
+                  if ((!$n(this$96.Lio_github_edadma_rdb_Table__f_columnMap).contains__O__Z(x57))) {
                     var msg$9 = (((("table " + x90) + " doesn't has column '") + x57) + "'");
                     $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x54).Lio_github_edadma_rdb_Ident__f_pos, msg$9)
                   };
@@ -11140,8 +11191,8 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
               };
               throw new $c_s_MatchError(x$1$13)
             })))));
-            var this$94 = $m_s_$less$colon$less$();
-            var x58 = $n($$x4).unzip__F1__T2(this$94.s_$less$colon$less$__f_singleton);
+            var this$101 = $m_s_$less$colon$less$();
+            var x58 = $n($$x4).unzip__F1__T2(this$101.s_$less$colon$less$__f_singleton);
             if ((x58 !== null)) {
               var cols$7 = $as_sci_Seq($n(x58).T2__f__1);
               var exprs = $as_sci_Seq($n(x58).T2__f__2);
@@ -11170,9 +11221,9 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
           };
           var elem = 0;
           elem = 0;
-          var this$98 = $n($n(rows$2).iterator__sci_Seq__sc_Iterator($m_s_package$().s_package$__f_Nil));
-          while (this$98.hasNext__Z()) {
-            var arg1 = this$98.next__O();
+          var this$105 = $n($n(rows$2).iterator__sci_Seq__sc_Iterator($m_s_package$().s_package$__f_Nil));
+          while (this$105.hasNext__Z()) {
+            var arg1 = this$105.next__O();
             var r$2 = $as_Lio_github_edadma_rdb_Row(arg1);
             matchResult17: {
               var x64 = $n(r$2).Lio_github_edadma_rdb_Row__f_updater;
@@ -11198,19 +11249,22 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
           break matchResult20
         }
       };
-      if (false) {
+      if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_DeleteCommand)) {
         var x$1$14 = $as_Lio_github_edadma_rdb_DeleteCommand(x$1$1);
-        var x80 = $n(x$1$14)._1__Lio_github_edadma_rdb_Ident();
-        var x81 = $n(x$1$14)._2__s_Option();
+        var this$109 = $n(x$1$14);
+        var x80 = this$109.Lio_github_edadma_rdb_DeleteCommand__f_table;
+        var this$110 = $n(x$1$14);
+        var x81 = this$110.Lio_github_edadma_rdb_DeleteCommand__f_cond;
         if ((x80 !== null)) {
-          var this$103 = $n(x80);
-          var x83 = this$103.Lio_github_edadma_rdb_Ident__f_name;
-          var this$104 = $n($n(db).getTable__T__s_Option(x83));
-          if (this$104.isEmpty__Z()) {
+          var this$112 = $n(x80);
+          var x83 = this$112.Lio_github_edadma_rdb_Ident__f_name;
+          var this$113 = $n(db);
+          var this$114 = $n($n(this$113.Lio_github_edadma_rdb_DB__f_tables).get__O__s_Option(x83));
+          if (this$114.isEmpty__Z()) {
             var msg$10 = ("unknown table: " + x83);
             $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(x80).Lio_github_edadma_rdb_Ident__f_pos, msg$10)
           };
-          var t$5 = $as_Lio_github_edadma_rdb_Table(this$104.get__O());
+          var t$5 = $as_Lio_github_edadma_rdb_Table(this$114.get__O());
           matchResult18: {
             var rows$3;
             if ((x81 instanceof $c_s_Some)) {
@@ -11228,9 +11282,9 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
           };
           var elem$1 = 0;
           elem$1 = 0;
-          var this$108 = $n($n(rows$3).iterator__sci_Seq__sc_Iterator($m_s_package$().s_package$__f_Nil));
-          while (this$108.hasNext__Z()) {
-            var arg1$1 = this$108.next__O();
+          var this$118 = $n($n(rows$3).iterator__sci_Seq__sc_Iterator($m_s_package$().s_package$__f_Nil));
+          while (this$118.hasNext__Z()) {
+            var arg1$1 = this$118.next__O();
             var r$3 = $as_Lio_github_edadma_rdb_Row(arg1$1);
             matchResult19: {
               var x70 = $n(r$3).Lio_github_edadma_rdb_Row__f_deleter;
@@ -11255,8 +11309,8 @@ $c_Lio_github_edadma_rdb_executeSQL$package$.prototype.executeSQL__T__Lio_github
       };
       if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_AlterTableCommand)) {
         var x$1$15 = $as_Lio_github_edadma_rdb_AlterTableCommand(x$1$1);
-        var this$112 = $n(x$1$15);
-        var this$113 = $n(x$1$15);
+        var this$122 = $n(x$1$15);
+        var this$123 = $n(x$1$15);
         var $$x1 = new $c_Lio_github_edadma_rdb_AlterTableResult();
         break matchResult20
       };
@@ -11847,7 +11901,8 @@ $c_Lio_github_edadma_rdb_rewrite$package$.prototype.rewrite__Lio_github_edadma_r
       if ((x70 !== null)) {
         var this$151 = $n(x70);
         var x72 = this$151.Lio_github_edadma_rdb_Ident__f_name;
-        var x52 = $n(db).getTable__T__s_Option(x72);
+        var this$152 = $n(db);
+        var x52 = $n(this$152.Lio_github_edadma_rdb_DB__f_tables).get__O__s_Option(x72);
         if ((x52 instanceof $c_s_Some)) {
           var t = $as_Lio_github_edadma_rdb_Table($n($as_s_Some(x52)).s_Some__f_value);
           return new $c_Lio_github_edadma_rdb_ProcessOperator(t)
@@ -11862,34 +11917,34 @@ $c_Lio_github_edadma_rdb_rewrite$package$.prototype.rewrite__Lio_github_edadma_r
     };
     if ((x55 instanceof $c_Lio_github_edadma_rdb_ProjectOperator)) {
       var x$1$23 = $as_Lio_github_edadma_rdb_ProjectOperator(x55);
-      var this$155 = $n(x$1$23);
-      var x66 = this$155.Lio_github_edadma_rdb_ProjectOperator__f_rel;
       var this$156 = $n(x$1$23);
-      var x67 = this$156.Lio_github_edadma_rdb_ProjectOperator__f_exprs;
-      var this$157 = $n(x67);
-      var a$2 = new $ac_O(this$157.length__I());
+      var x66 = this$156.Lio_github_edadma_rdb_ProjectOperator__f_rel;
+      var this$157 = $n(x$1$23);
+      var x67 = this$157.Lio_github_edadma_rdb_ProjectOperator__f_exprs;
+      var this$158 = $n(x67);
+      var a$2 = new $ac_O(this$158.length__I());
       var i$2 = 0;
       while ((i$2 < $n(a$2).u.length)) {
         var $$x7 = $n(a$2);
         var $$x6 = i$2;
-        var arg1$3 = this$157.apply__I__O(i$2);
+        var arg1$3 = this$158.apply__I__O(i$2);
         var expr$12 = $as_Lio_github_edadma_rdb_Expr(arg1$3);
         $$x7.set($$x6, $m_Lio_github_edadma_rdb_rewrite$package$().rewrite__Lio_github_edadma_rdb_Expr__Lio_github_edadma_rdb_DB__Lio_github_edadma_rdb_Expr(expr$12, db));
         i$2 = ((1 + i$2) | 0)
       };
       var rewritten_projs$2 = $m_sci_ArraySeq$().unsafeWrapArray__O__sci_ArraySeq(a$2);
-      var this$158 = $n(rewritten_projs$2);
+      var this$159 = $n(rewritten_projs$2);
       var res = false;
-      var it = this$158.iterator__sc_Iterator();
+      var it = this$159.iterator__sc_Iterator();
       while (((!res) && $n(it).hasNext__Z())) {
         var arg1$4 = $n(it).next__O();
         var expr$13 = $as_Lio_github_edadma_rdb_Expr(arg1$4);
         res = $m_Lio_github_edadma_rdb_rewrite$package$().aggregate__Lio_github_edadma_rdb_Expr__Z(expr$13)
       };
       var aggregates = res;
-      var this$159 = $n(rewritten_projs$2);
+      var this$160 = $n(rewritten_projs$2);
       var res$1 = false;
-      var it$1 = this$159.iterator__sc_Iterator();
+      var it$1 = this$160.iterator__sc_Iterator();
       while (((!res$1) && $n(it$1).hasNext__Z())) {
         var arg1$5 = $n(it$1).next__O();
         var expr$14 = $as_Lio_github_edadma_rdb_Expr(arg1$5);
@@ -11903,10 +11958,10 @@ $c_Lio_github_edadma_rdb_rewrite$package$.prototype.rewrite__Lio_github_edadma_r
     };
     if ((x55 instanceof $c_Lio_github_edadma_rdb_CrossOperator)) {
       var x$1$24 = $as_Lio_github_edadma_rdb_CrossOperator(x55);
-      var this$164 = $n(x$1$24);
-      var x62 = this$164.Lio_github_edadma_rdb_CrossOperator__f_rel1;
       var this$165 = $n(x$1$24);
-      var x63 = this$165.Lio_github_edadma_rdb_CrossOperator__f_rel2;
+      var x62 = this$165.Lio_github_edadma_rdb_CrossOperator__f_rel1;
+      var this$166 = $n(x$1$24);
+      var x63 = this$166.Lio_github_edadma_rdb_CrossOperator__f_rel2;
       var input1$2 = $m_Lio_github_edadma_rdb_rewrite$package$().procRewrite__Lio_github_edadma_rdb_Expr__Lio_github_edadma_rdb_DB__Lio_github_edadma_rdb_Process(x62, db);
       var input2$2 = $m_Lio_github_edadma_rdb_rewrite$package$().procRewrite__Lio_github_edadma_rdb_Expr__Lio_github_edadma_rdb_DB__Lio_github_edadma_rdb_Process(x63, db);
       var proc$9 = new $c_Lio_github_edadma_rdb_CrossProcess(input1$2, input2$2);
@@ -11914,10 +11969,10 @@ $c_Lio_github_edadma_rdb_rewrite$package$.prototype.rewrite__Lio_github_edadma_r
     };
     if ((x55 instanceof $c_Lio_github_edadma_rdb_SelectOperator)) {
       var x$1$25 = $as_Lio_github_edadma_rdb_SelectOperator(x55);
-      var this$169 = $n(x$1$25);
-      var x58 = this$169.Lio_github_edadma_rdb_SelectOperator__f_rel;
       var this$170 = $n(x$1$25);
-      var x59 = this$170.Lio_github_edadma_rdb_SelectOperator__f_cond;
+      var x58 = this$170.Lio_github_edadma_rdb_SelectOperator__f_rel;
+      var this$171 = $n(x$1$25);
+      var x59 = this$171.Lio_github_edadma_rdb_SelectOperator__f_cond;
       var input$7 = $m_Lio_github_edadma_rdb_rewrite$package$().procRewrite__Lio_github_edadma_rdb_Expr__Lio_github_edadma_rdb_DB__Lio_github_edadma_rdb_Process(x58, db);
       var cond$4 = $m_Lio_github_edadma_rdb_rewrite$package$().rewrite__Lio_github_edadma_rdb_Expr__Lio_github_edadma_rdb_DB__Lio_github_edadma_rdb_Expr(x59, db);
       var proc$10 = new $c_Lio_github_edadma_rdb_FilterProcess(input$7, cond$4);
@@ -29632,7 +29687,7 @@ function $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG() {
 }
 $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype = $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype;
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsInsert__sjs_js_Dictionary__sjs_js_Promise = (function(obj) {
-  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(obj)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(obj, true)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsDelete__sjs_js_Any__sjs_js_Promise = (function(e) {
@@ -29704,7 +29759,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsUpdate__sjs_js_Any_
   } else {
     var $$x1 = e
   };
-  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(updates)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(updates, false)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsBulkUpdate__sjs_js_Array__sjs_js_Promise = (function(updates) {
@@ -29724,7 +29779,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.jsBulkUpdate__sjs_js_
     };
     var array = $m_sjs_js_ArrayOps$().tail$extension__sjs_js_Array__sjs_js_Array(u);
     var a = $m_sjs_js_ArrayOps$().head$extension__sjs_js_Array__O(array);
-    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(a));
+    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(a, true));
     return new $c_T2(self, y)
   });
   if ((this$15 === $m_sci_Nil$())) {
@@ -29746,13 +29801,6 @@ $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.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.update = (function(arg, arg$2) {
   return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
 });
@@ -29760,12 +29808,19 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.link = (function(arg,
   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.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.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.delete = (function(arg) {
   return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG.prototype.bulkUpdate = (function(arg) {
+  return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
+});
 var $d_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG = new $TypeData().initClass({
   Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG: 0
 }, false, "com.vinctus.oql.Mutation_JS_NodePG", {
@@ -29791,7 +29846,7 @@ function $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB() {
 }
 $h_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype = $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype;
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsInsert__sjs_js_Dictionary__sjs_js_Promise = (function(obj) {
-  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(obj)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.insert__sc_Map__s_concurrent_Future($as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(obj, true)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsDelete__sjs_js_Any__sjs_js_Promise = (function(e) {
@@ -29863,7 +29918,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsUpdate__sjs_js_Any__sj
   } else {
     var $$x1 = e
   };
-  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(updates)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
+  var f = $n(this.update__O__sc_Map__s_concurrent_Future($$x1, $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(updates, true)))).map__F1__s_concurrent_ExecutionContext__s_concurrent_Future(new $c_sjsr_AnonFunction1(((a) => $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(a))), $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue);
   return $m_sjs_js_JSConverters$JSRichFuture$().toJSPromise$extension__s_concurrent_Future__s_concurrent_ExecutionContext__sjs_js_Promise(f, $m_sjs_concurrent_JSExecutionContext$Implicits$().sjs_concurrent_JSExecutionContext$Implicits$__f_queue)
 });
 $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsBulkUpdate__sjs_js_Array__sjs_js_Promise = (function(updates) {
@@ -29883,7 +29938,7 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.jsBulkUpdate__sjs_js_Arr
     };
     var array = $m_sjs_js_ArrayOps$().tail$extension__sjs_js_Array__sjs_js_Array(u);
     var a = $m_sjs_js_ArrayOps$().head$extension__sjs_js_Array__O(array);
-    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__O(a));
+    var y = $as_sci_VectorMap($m_Lcom_vinctus_sjs\uff3futils_package$().fromJS__O__Z__O(a, true));
     return new $c_T2(self, y)
   });
   if ((this$15 === $m_sci_Nil$())) {
@@ -29905,13 +29960,6 @@ $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.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.update = (function(arg, arg$2) {
   return this.jsUpdate__sjs_js_Any__sjs_js_Any__sjs_js_Promise(arg, arg$2)
 });
@@ -29919,12 +29967,19 @@ $c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.link = (function(arg, ar
   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.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.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.delete = (function(arg) {
   return this.jsDelete__sjs_js_Any__sjs_js_Promise(arg)
 });
+$c_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB.prototype.bulkUpdate = (function(arg) {
+  return this.jsBulkUpdate__sjs_js_Array__sjs_js_Promise(arg)
+});
 var $d_Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB = new $TypeData().initClass({
   Lcom_vinctus_oql_Mutation\uff3fJS\uff3fRDB: 0
 }, false, "com.vinctus.oql.Mutation_JS_RDB", {
@@ -30213,8 +30268,8 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.entity = (function(arg) {
   var prep0 = $as_T(arg);
   return this.entity__T__Lcom_vinctus_oql_Mutation\uff3fJS\uff3fNodePG(prep0)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
 });
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30223,6 +30278,9 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryMany = (function(arg,
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryMany__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
+$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fNodePG(arg, arg$2)
+});
 $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.raw = (function(arg, arg$2) {
   var prep0 = $as_T(arg);
   return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
@@ -30241,9 +30299,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.queryOne = (function(arg,
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
-});
 var $d_Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fNodePG\uff3fJS: 0
 }, false, "com.vinctus.oql.OQL_NodePG_JS", {
@@ -30453,8 +30508,12 @@ $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.queryBuilder = (function(arg, arg$2) {
-  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
+  this.showQuery__V()
+});
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.rawMulti = (function(arg) {
+  var prep0 = $as_T(arg);
+  return this.rawMulti__T__sjs_js_Promise(prep0)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
@@ -30463,13 +30522,16 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryMany = (function(arg, ..
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryMany__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.raw = (function(arg, arg$2) {
-  var prep0 = $as_T(arg);
-  return this.raw__T__O__sjs_js_Promise(prep0, arg$2)
+$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryBuilder = (function(arg, arg$2) {
+  return this.jsQueryBuilder__O__sjs_js_Any__Lcom_vinctus_oql_QueryBuilder\uff3fJS\uff3fRDB(arg, arg$2)
 });
 $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.create = (function() {
   return this.jsCreate__sjs_js_Promise()
 });
+$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.count = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30477,10 +30539,6 @@ $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.queryOne = (function(arg, ...rest) {
   var prep0 = $as_T(arg);
   var prep1 = ((rest[0] === (void 0)) ? (void 0) : rest[0]);
@@ -30488,9 +30546,6 @@ $c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.queryOne = (function(arg, ...
   var prep3 = ((rest[2] === (void 0)) ? null : rest[2]);
   return this.jsQueryOne__T__O__O__sjs_js_Any__sjs_js_Promise(prep0, prep1, prep2, prep3)
 });
-$c_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS.prototype.showQuery = (function() {
-  this.showQuery__V()
-});
 var $d_Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS = new $TypeData().initClass({
   Lcom_vinctus_oql_OQL\uff3fRDB\uff3fJS: 0
 }, false, "com.vinctus.oql.OQL_RDB_JS", {
@@ -30627,7 +30682,7 @@ function $c_Lcom_vinctus_oql_RDBConnection(dataSource, ec) {
   this.Lcom_vinctus_oql_RDBConnection__f_varRegex = 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");
+  this.Lcom_vinctus_oql_RDBConnection__f_db = new $c_Lio_github_edadma_rdb_MemoryDB();
   this.Lcom_vinctus_oql_RDBConnection__f_varRegex = ($m_sc_StringOps$(), $ct_s_util_matching_Regex__T__sci_Seq__(new $c_s_util_matching_Regex(), "$([0-9_]+)", $m_sci_Nil$()))
 }
 $c_Lcom_vinctus_oql_RDBConnection.prototype = new $h_Lcom_vinctus_oql_OQLConnection();
@@ -32326,13 +32381,12 @@ var $d_Lio_github_edadma_rdb_Expr = new $TypeData().initClass({
   s_util_parsing_input_Positional: 1
 });
 /** @constructor */
-function $c_Lio_github_edadma_rdb_MemoryDB(name) {
+function $c_Lio_github_edadma_rdb_MemoryDB() {
+  this.Lio_github_edadma_rdb_DB__f_tables = null;
+  this.Lio_github_edadma_rdb_DB__f_types = null;
   this.Lio_github_edadma_rdb_MemoryDB__f_name = null;
-  this.Lio_github_edadma_rdb_MemoryDB__f_tables = null;
-  this.Lio_github_edadma_rdb_MemoryDB__f_types = null;
-  this.Lio_github_edadma_rdb_MemoryDB__f_name = name;
-  this.Lio_github_edadma_rdb_MemoryDB__f_tables = $ct_scm_HashMap__(new $c_scm_HashMap());
-  this.Lio_github_edadma_rdb_MemoryDB__f_types = $ct_scm_HashMap__(new $c_scm_HashMap())
+  $ct_Lio_github_edadma_rdb_DB__(this);
+  this.Lio_github_edadma_rdb_MemoryDB__f_name = "in-memory DB"
 }
 $c_Lio_github_edadma_rdb_MemoryDB.prototype = new $h_Lio_github_edadma_rdb_DB();
 $c_Lio_github_edadma_rdb_MemoryDB.prototype.constructor = $c_Lio_github_edadma_rdb_MemoryDB;
@@ -32341,53 +32395,6 @@ function $h_Lio_github_edadma_rdb_MemoryDB() {
   /*<skip>*/
 }
 $h_Lio_github_edadma_rdb_MemoryDB.prototype = $c_Lio_github_edadma_rdb_MemoryDB.prototype;
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.hasTable__T__Z = (function(name) {
-  return $n(this.Lio_github_edadma_rdb_MemoryDB__f_tables).contains__O__Z(name)
-});
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.getTable__T__s_Option = (function(name) {
-  return $n(this.Lio_github_edadma_rdb_MemoryDB__f_tables).get__O__s_Option(name)
-});
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.createTable__T__sci_Seq__Lio_github_edadma_rdb_Table = (function(name, specs) {
-  var requirement = (!$n(this.Lio_github_edadma_rdb_MemoryDB__f_tables).contains__O__Z(name));
-  if ((!requirement)) {
-    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + ("table '" + name)) + "' already exists"))
-  };
-  var res = new $c_Lio_github_edadma_rdb_MemoryTable(name, specs);
-  var this$2 = $n(this.Lio_github_edadma_rdb_MemoryDB__f_tables);
-  $p_scm_HashMap__put0__O__O__Z__s_Some(this$2, name, res, false);
-  return res
-});
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.createEnum__T__sci_Seq__V = (function(name, labels) {
-  var requirement = (!$n(this.Lio_github_edadma_rdb_MemoryDB__f_types).contains__O__Z(name));
-  if ((!requirement)) {
-    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + ("type " + name)) + " already exists"))
-  };
-  var this$3 = $n(this.Lio_github_edadma_rdb_MemoryDB__f_types);
-  var labels$1 = $n(labels).toIndexedSeq__sci_IndexedSeq();
-  var value = new $c_Lio_github_edadma_rdb_EnumType(name, labels$1);
-  $p_scm_HashMap__put0__O__O__Z__s_Some(this$3, name, value, false)
-});
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.hasType__T__Z = (function(name) {
-  return $n(this.Lio_github_edadma_rdb_MemoryDB__f_types).contains__O__Z(name)
-});
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.getType__T__s_Option = (function(name) {
-  return $n(this.Lio_github_edadma_rdb_MemoryDB__f_types).get__O__s_Option(name)
-});
-$c_Lio_github_edadma_rdb_MemoryDB.prototype.toString__T = (function() {
-  var $$x1 = this.Lio_github_edadma_rdb_MemoryDB__f_name;
-  var this$1 = $n(this.Lio_github_edadma_rdb_MemoryDB__f_tables);
-  var b = $m_scm_Iterable$().newBuilder__scm_Builder();
-  var it = this$1.iterator__sc_Iterator();
-  while ($n(it).hasNext__Z()) {
-    var this$2 = $n(b);
-    var arg1 = $n(it).next__O();
-    var x$1 = $as_T2(arg1);
-    var elem = $as_Lio_github_edadma_rdb_MemoryTable($n(x$1).T2__f__2);
-    this$2.addOne__O__scm_Growable(elem)
-  };
-  var this$3 = $n($as_sc_IterableOnceOps($n(b).result__O()));
-  return (((("[Database '" + $$x1) + "': ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$3, "", ", ", "")) + "]")
-});
 var $d_Lio_github_edadma_rdb_MemoryDB = new $TypeData().initClass({
   Lio_github_edadma_rdb_MemoryDB: 0
 }, false, "io.github.edadma.rdb.MemoryDB", {
@@ -32451,39 +32458,41 @@ $c_Lio_github_edadma_rdb_MemoryTable$Updater.prototype.apply__sci_Seq__V = (func
     return ((x$1$1 !== null) && ($as_T($n(x$1$1).T2__f__1), $as_Lio_github_edadma_rdb_Value($n(x$1$1).T2__f__2), true))
   })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2) => {
     var x$1$3 = $as_T2(x$1$2);
-    matchResult11: {
+    matchResult2: {
       if ((x$1$3 !== null)) {
         var k$1 = $as_T($n(x$1$3).T2__f__1);
         var v$1 = $as_Lio_github_edadma_rdb_Value($n(x$1$3).T2__f__2);
-        var this$2 = $n($n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_$outer).Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap);
+        var this$3 = $n($n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_$outer).Lio_github_edadma_rdb_Table__f_columnMap);
         var f = (() => {
-          $m_s_sys_package$().error__T__E((((("table '" + $n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_$outer).Lio_github_edadma_rdb_MemoryTable__f_name) + "' has no column '") + k$1) + "'"))
+          var $$x1 = $m_s_sys_package$();
+          var this$2 = $n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_$outer);
+          $n($$x1).error__T__E((((("table '" + this$2.Lio_github_edadma_rdb_Table__f_name) + "' has no column '") + k$1) + "'"))
         });
-        var x = $objectGetClass(this$2);
+        var x = $objectGetClass(this$3);
         if ((!(x === $d_scm_HashMap.getClassOf()))) {
-          var x1 = this$2.get__O__s_Option(k$1);
+          var x1 = this$3.get__O__s_Option(k$1);
           if ((x1 instanceof $c_s_Some)) {
             var x2 = $as_s_Some(x1);
             var v$2 = $n(x2).s_Some__f_value;
-            var $$x1 = v$2
+            var $$x2 = v$2
           } else {
             var x$2 = $m_s_None$();
             if ((!(x$2 === x1))) {
               throw new $c_s_MatchError(x1)
             };
-            var $$x1 = f()
+            var $$x2 = f()
           }
         } else {
           var originalHash = $m_sr_Statics$().anyHash__O__I(k$1);
           var hash = (originalHash ^ ((originalHash >>> 16) | 0));
-          var x1$1 = $n(this$2.scm_HashMap__f_scala$collection$mutable$HashMap$$table).get((hash & (((-1) + $n(this$2.scm_HashMap__f_scala$collection$mutable$HashMap$$table).u.length) | 0)));
+          var x1$1 = $n(this$3.scm_HashMap__f_scala$collection$mutable$HashMap$$table).get((hash & (((-1) + $n(this$3.scm_HashMap__f_scala$collection$mutable$HashMap$$table).u.length) | 0)));
           var nd = ((x1$1 === null) ? null : $n(x1$1).findNode__O__I__scm_HashMap$Node(k$1, hash));
-          var $$x1 = ((nd === null) ? f() : $n(nd).scm_HashMap$Node__f__value)
+          var $$x2 = ((nd === null) ? f() : $n(nd).scm_HashMap$Node__f__value)
         };
-        var col = $uI($$x1);
-        var spec = $as_Lio_github_edadma_rdb_ColumnSpec($n($n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_$outer).Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns).apply__I__O(col));
+        var col = $uI($$x2);
+        var spec = $as_Lio_github_edadma_rdb_ColumnSpec($n($n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_$outer).Lio_github_edadma_rdb_Table__f_columns).apply__I__O(col));
         $n(this.Lio_github_edadma_rdb_MemoryTable$Updater__f_row).set(col, $n($n(spec).Lio_github_edadma_rdb_ColumnSpec__f_typ).convert__Lio_github_edadma_rdb_Value__Lio_github_edadma_rdb_Value(v$1));
-        break matchResult11
+        break matchResult2
       };
       throw new $c_s_MatchError(x$1$3)
     }
@@ -32529,9 +32538,47 @@ var $d_Lio_github_edadma_rdb_SQLParser$$anon$1 = new $TypeData().initClass({
   s_util_parsing_input_Positional: 1
 });
 $c_Lio_github_edadma_rdb_SQLParser$$anon$1.prototype.$classData = $d_Lio_github_edadma_rdb_SQLParser$$anon$1;
+function $ct_Lio_github_edadma_rdb_Table__T__sci_Seq__($thiz, name, specs) {
+  $thiz.Lio_github_edadma_rdb_Table__f_name = name;
+  $thiz.Lio_github_edadma_rdb_Table__f_columns = $ct_scm_ArrayBuffer__(new $c_scm_ArrayBuffer());
+  $thiz.Lio_github_edadma_rdb_Table__f_columnMap = $ct_scm_HashMap__(new $c_scm_HashMap());
+  $thiz.Lio_github_edadma_rdb_Table__f_autoMap = $ct_scm_HashMap__(new $c_scm_HashMap());
+  $n($m_s_package$().s_package$__f_Vector);
+  var columns = $m_sci_Vector0$();
+  $thiz.Lio_github_edadma_rdb_Table__f__meta = new $c_Lio_github_edadma_rdb_Metadata(columns);
+  $n(specs).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1) => {
+    var x$1$1 = $as_Lio_github_edadma_rdb_Spec(x$1);
+    if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_ColumnSpec)) {
+      var s = $as_Lio_github_edadma_rdb_ColumnSpec(x$1$1);
+      $thiz.createColumn__Lio_github_edadma_rdb_ColumnSpec__V(s)
+    }
+  })));
+  var this$4 = $n($thiz.Lio_github_edadma_rdb_Table__f_columns);
+  $m_scm_ArrayBuffer$();
+  var b = new $c_scm_ArrayBuffer$$anon$1();
+  var it = $n(this$4.view__scm_ArrayBufferView()).iterator__sc_Iterator();
+  while ($n(it).hasNext__Z()) {
+    var elem = $n(it).next__O();
+    var _$2 = $as_Lio_github_edadma_rdb_ColumnSpec(elem);
+    if (($n(_$2).Lio_github_edadma_rdb_ColumnSpec__f_auto !== false)) {
+      b.addOne__O__scm_GrowableBuilder(elem)
+    }
+  };
+  var this$6 = $n($as_sc_IterableOnceOps($n($as_sc_StrictOptimizedIterableOps(b.scm_GrowableBuilder__f_elems)).map__F1__O(new $c_sjsr_AnonFunction1(((_$3) => {
+    var _$3$1 = $as_Lio_github_edadma_rdb_ColumnSpec(_$3);
+    return $n(_$3$1).Lio_github_edadma_rdb_ColumnSpec__f_name
+  })))));
+  $thiz.Lio_github_edadma_rdb_Table__f_autoSet = $m_sci_Set$().from__sc_IterableOnce__sci_Set($as_sc_IterableOnce(this$6));
+  return $thiz
+}
 /** @constructor */
 function $c_Lio_github_edadma_rdb_Table() {
-  /*<skip>*/
+  this.Lio_github_edadma_rdb_Table__f_name = null;
+  this.Lio_github_edadma_rdb_Table__f_columns = null;
+  this.Lio_github_edadma_rdb_Table__f_columnMap = null;
+  this.Lio_github_edadma_rdb_Table__f_autoMap = null;
+  this.Lio_github_edadma_rdb_Table__f__meta = null;
+  this.Lio_github_edadma_rdb_Table__f_autoSet = null
 }
 $c_Lio_github_edadma_rdb_Table.prototype = new $h_O();
 $c_Lio_github_edadma_rdb_Table.prototype.constructor = $c_Lio_github_edadma_rdb_Table;
@@ -32540,6 +32587,230 @@ function $h_Lio_github_edadma_rdb_Table() {
   /*<skip>*/
 }
 $h_Lio_github_edadma_rdb_Table.prototype = $c_Lio_github_edadma_rdb_Table.prototype;
+$c_Lio_github_edadma_rdb_Table.prototype.meta__Lio_github_edadma_rdb_Metadata = (function() {
+  return this.Lio_github_edadma_rdb_Table__f__meta
+});
+$c_Lio_github_edadma_rdb_Table.prototype.createColumn__Lio_github_edadma_rdb_ColumnSpec__V = (function(spec) {
+  var requirement = (!$n(this.Lio_github_edadma_rdb_Table__f_columnMap).contains__O__Z($n(spec).Lio_github_edadma_rdb_ColumnSpec__f_name));
+  if ((!requirement)) {
+    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + ("duplicate column '" + $n(spec).Lio_github_edadma_rdb_ColumnSpec__f_name)) + "'"))
+  };
+  var this$3 = $n(this.Lio_github_edadma_rdb_Table__f_columnMap);
+  var key = $n(spec).Lio_github_edadma_rdb_ColumnSpec__f_name;
+  var this$2 = $n(this.Lio_github_edadma_rdb_Table__f_columns);
+  var value = this$2.scm_ArrayBuffer__f_size0;
+  $p_scm_HashMap__put0__O__O__Z__s_Some(this$3, key, value, false);
+  var this$4 = $n(this.Lio_github_edadma_rdb_Table__f_columns);
+  this$4.addOne__O__scm_ArrayBuffer(spec);
+  var this$7 = $n(this.Lio_github_edadma_rdb_Table__f_columns);
+  var factory = $m_sci_ArraySeq$();
+  var evidence$14 = new $c_s_reflect_ClassTag$GenericClassTag($d_Lio_github_edadma_rdb_ColumnSpec.getClassOf());
+  var factory$1 = new $c_sc_EvidenceIterableFactory$ToFactory(factory, evidence$14);
+  var this$8 = $n($as_sci_ArraySeq(factory$1.fromSpecific__sc_IterableOnce__O(this$7)));
+  var a = new $ac_O(this$8.length__I());
+  var i = 0;
+  while ((i < $n(a).u.length)) {
+    var $$x2 = $n(a);
+    var $$x1 = i;
+    var arg1 = this$8.apply__I__O(i);
+    var s = $as_Lio_github_edadma_rdb_ColumnSpec(arg1);
+    var value$1 = this.Lio_github_edadma_rdb_Table__f_name;
+    var table = new $c_s_Some(value$1);
+    var name = $n(s).Lio_github_edadma_rdb_ColumnSpec__f_name;
+    var typ = $n(s).Lio_github_edadma_rdb_ColumnSpec__f_typ;
+    $$x2.set($$x1, new $c_Lio_github_edadma_rdb_ColumnMetadata(table, name, typ));
+    i = ((1 + i) | 0)
+  };
+  var columns = $m_sci_ArraySeq$().unsafeWrapArray__O__sci_ArraySeq(a);
+  this.Lio_github_edadma_rdb_Table__f__meta = new $c_Lio_github_edadma_rdb_Metadata(columns)
+});
+$c_Lio_github_edadma_rdb_Table.prototype.auto__T__Lio_github_edadma_rdb_Value = (function(col) {
+  var x3 = $n(this.Lio_github_edadma_rdb_Table__f_autoMap).get__O__s_Option(col);
+  var x = $m_s_None$();
+  if ((x === x3)) {
+    var first = $n($n($as_Lio_github_edadma_rdb_ColumnSpec($n(this.Lio_github_edadma_rdb_Table__f_columns).apply__I__O($uI($n(this.Lio_github_edadma_rdb_Table__f_columnMap).apply__O__O(col))))).Lio_github_edadma_rdb_ColumnSpec__f_typ).init__Lio_github_edadma_rdb_Value();
+    var this$1 = $n(this.Lio_github_edadma_rdb_Table__f_autoMap);
+    $p_scm_HashMap__put0__O__O__Z__s_Some(this$1, col, first, false);
+    return first
+  };
+  if ((x3 instanceof $c_s_Some)) {
+    var cur = $as_Lio_github_edadma_rdb_Value($n($as_s_Some(x3)).s_Some__f_value);
+    var next = $n(cur).next__Lio_github_edadma_rdb_Value();
+    var this$2 = $n(this.Lio_github_edadma_rdb_Table__f_autoMap);
+    $p_scm_HashMap__put0__O__O__Z__s_Some(this$2, col, next, false);
+    return next
+  };
+  throw new $c_s_MatchError(x3)
+});
+$c_Lio_github_edadma_rdb_Table.prototype.bulkInsert__sci_Seq__sci_Seq__s_Option__sci_Map = (function(header, rows, returning) {
+  var this$1 = $n(header);
+  var headerSet = $m_sci_Set$().from__sc_IterableOnce__sci_Set(this$1);
+  var this$2 = $n(this.Lio_github_edadma_rdb_Table__f_columnMap);
+  var columnSet = $ct_sc_MapOps$KeySet__sc_MapOps__(new $c_sc_MapOps$KeySet(), this$2);
+  var requirement = $n(headerSet).subsetOf__sc_Set__Z(columnSet);
+  if ((!requirement)) {
+    var this$4 = $n($n(headerSet).diff__sc_Set__sci_SetOps(columnSet));
+    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + "unknown columns: ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$4, "", ", ", "")))
+  };
+  var missingSet = columnSet.diff__sc_Set__sc_Set(headerSet);
+  var missing = $as_sc_Set($n($n(missingSet).diff__sc_Set__sc_SetOps(this.Lio_github_edadma_rdb_Table__f_autoSet)).map__F1__O(new $c_sjsr_AnonFunction1(((m) => {
+    var m$1 = $as_T(m);
+    var idx = $uI($n(this.Lio_github_edadma_rdb_Table__f_columnMap).apply__O__O(m$1));
+    var s = $as_Lio_github_edadma_rdb_ColumnSpec($n(this.Lio_github_edadma_rdb_Table__f_columns).apply__I__O(idx));
+    if (($n(s).Lio_github_edadma_rdb_ColumnSpec__f_required && $n($n(s).Lio_github_edadma_rdb_ColumnSpec__f_default).isEmpty__Z())) {
+      $m_s_sys_package$().error__T__E((("bulkInsert: column '" + m$1) + "' is required and has no default"))
+    };
+    if ($n(s).Lio_github_edadma_rdb_ColumnSpec__f_pk) {
+      $m_s_sys_package$().error__T__E((("bulkInsert: column '" + m$1) + "' is a required primary key"))
+    };
+    var this$6 = $n($n(s).Lio_github_edadma_rdb_ColumnSpec__f_default);
+    var _2 = (this$6.isEmpty__Z() ? new $c_Lio_github_edadma_rdb_NullValue() : this$6.get__O());
+    return new $c_T2(idx, _2)
+  }))));
+  var autos = $as_sci_Set($n($n(this.Lio_github_edadma_rdb_Table__f_autoSet).intersect__sc_Set__sc_SetOps(missingSet)).map__F1__O(new $c_sjsr_AnonFunction1(((c) => {
+    var c$1 = $as_T(c);
+    var _2$1 = $n(this.Lio_github_edadma_rdb_Table__f_columnMap).apply__O__O(c$1);
+    return new $c_T2(c$1, _2$1)
+  }))));
+  var mapping = $as_sci_Seq($n(header).map__F1__O(new $c_sjsr_AnonFunction1(((h) => {
+    var h$1 = $as_T(h);
+    return $uI($n($as_T3($n($n(this.Lio_github_edadma_rdb_Table__f__meta).columnMap__sci_Map()).apply__O__O(h$1))).T3__f__1)
+  }))));
+  var specs = $as_sci_Seq($n(header).map__F1__O(new $c_sjsr_AnonFunction1(((h$2) => {
+    var h$3 = $as_T(h$2);
+    return $as_Lio_github_edadma_rdb_ColumnSpec($n(this.Lio_github_edadma_rdb_Table__f_columns).apply__I__O($uI($n(this.Lio_github_edadma_rdb_Table__f_columnMap).apply__O__O(h$3))))
+  }))));
+  $n($m_s_Predef$().s_Predef$__f_Map);
+  var elem = $m_sci_Map$EmptyMap$();
+  var result = new $c_sr_ObjectRef(elem);
+  $n(rows).foreach__F1__V(new $c_sjsr_AnonFunction1(((r) => {
+    var r$1 = $as_sci_Seq(r);
+    var dimensions = new $ac_I(new Int32Array([$n(this.Lio_github_edadma_rdb_Table__f__meta).width__I()]));
+    var arr = $asArrayOf_Lio_github_edadma_rdb_Value($m_jl_reflect_Array$().newInstance__jl_Class__AI__O($d_Lio_github_edadma_rdb_Value.getClassOf(), dimensions), 1);
+    $n($n($as_sc_IterableOps($n($as_sc_IterableOps($n(mapping).zip__sc_IterableOnce__O(r$1))).zip__sc_IterableOnce__O(specs))).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1) => {
+      var x$1$1 = $as_T2(x$1);
+      if ((x$1$1 !== null)) {
+        var x10 = $as_T2($n(x$1$1).T2__f__1);
+        if ((x10 !== null)) {
+          $uI($n(x10).T2__f__1);
+          $as_Lio_github_edadma_rdb_Value($n(x10).T2__f__2);
+          $as_Lio_github_edadma_rdb_ColumnSpec($n(x$1$1).T2__f__2);
+          return true
+        }
+      };
+      return false
+    })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2) => {
+      var x$1$3 = $as_T2(x$1$2);
+      matchResult5: {
+        if ((x$1$3 !== null)) {
+          var x15 = $as_T2($n(x$1$3).T2__f__1);
+          if ((x15 !== null)) {
+            var i$1 = $uI($n(x15).T2__f__1);
+            var v$1 = $as_Lio_github_edadma_rdb_Value($n(x15).T2__f__2);
+            var s$2 = $as_Lio_github_edadma_rdb_ColumnSpec($n(x$1$3).T2__f__2);
+            var this$13 = $n(v$1);
+            if ((this$13 instanceof $c_Lio_github_edadma_rdb_NullValue)) {
+              if ($n(s$2).Lio_github_edadma_rdb_ColumnSpec__f_required) {
+                var msg = (("column '" + $n(s$2).Lio_github_edadma_rdb_ColumnSpec__f_name) + "' is required");
+                $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(v$1).pos__s_util_parsing_input_Position(), msg)
+              } else {
+                $n(arr).set(i$1, v$1)
+              }
+            } else {
+              $n(arr).set(i$1, $n($n(s$2).Lio_github_edadma_rdb_ColumnSpec__f_typ).convert__Lio_github_edadma_rdb_Value__Lio_github_edadma_rdb_Value(v$1))
+            };
+            break matchResult5
+          }
+        };
+        throw new $c_s_MatchError(x$1$3)
+      }
+    })));
+    var this$15 = $n(missing);
+    var p = new $c_sjsr_AnonFunction1(((x$1$3$1) => {
+      var x$1$4 = $as_T2(x$1$3$1);
+      return ((x$1$4 !== null) && ($uI($n(x$1$4).T2__f__1), $as_Lio_github_edadma_rdb_Value($n(x$1$4).T2__f__2), true))
+    }));
+    var this$16 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$15, p);
+    var f = new $c_sjsr_AnonFunction1(((x$1$4$1) => {
+      var x$1$5 = $as_T2(x$1$4$1);
+      matchResult7: {
+        if ((x$1$5 !== null)) {
+          var i$3 = $uI($n(x$1$5).T2__f__1);
+          var v$3 = $as_Lio_github_edadma_rdb_Value($n(x$1$5).T2__f__2);
+          $n(arr).set(i$3, v$3);
+          break matchResult7
+        };
+        throw new $c_s_MatchError(x$1$5)
+      }
+    }));
+    $n(this$16.filtered__sc_Iterable()).foreach__F1__V(f);
+    var this$17 = $n(autos);
+    var p$1 = new $c_sjsr_AnonFunction1(((x$1$5$1) => {
+      var x$1$6 = $as_T2(x$1$5$1);
+      return ((x$1$6 !== null) && ($as_T($n(x$1$6).T2__f__1), $uI($n(x$1$6).T2__f__2), true))
+    }));
+    var newAutos = $as_sci_Set($ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$17, p$1).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$6$1) => {
+      var x$1$7 = $as_T2(x$1$6$1);
+      if ((x$1$7 !== null)) {
+        var c$3 = $as_T($n(x$1$7).T2__f__1);
+        var i$5 = $uI($n(x$1$7).T2__f__2);
+        var v$4 = this.auto__T__Lio_github_edadma_rdb_Value(c$3);
+        $n(arr).set(i$5, v$4);
+        return new $c_T2(c$3, v$4)
+      };
+      throw new $c_s_MatchError(x$1$7)
+    }))));
+    var this$21 = $n(newAutos);
+    var this$20 = $m_s_$less$colon$less$();
+    var ev$3 = $m_sci_Map$().from__sc_IterableOnce__sci_Map(this$21);
+    result.sr_ObjectRef__f_elem = ev$3;
+    ev$3 = null;
+    var this$22 = $n(returning);
+    if ((!this$22.isEmpty__Z())) {
+      var this$24 = $n(this.Lio_github_edadma_rdb_Table__f_columnMap);
+      var key = $n($as_Lio_github_edadma_rdb_Ident($n(returning).get__O())).Lio_github_edadma_rdb_Ident__f_name;
+      var f$1 = (() => {
+        var p$2 = $as_s_util_parsing_input_Positional($n(returning).get__O());
+        var msg$1 = (("column '" + $n($as_Lio_github_edadma_rdb_Ident($n(returning).get__O())).Lio_github_edadma_rdb_Ident__f_name) + "' not found");
+        $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(p$2).pos__s_util_parsing_input_Position(), msg$1)
+      });
+      var x = $objectGetClass(this$24);
+      if ((!(x === $d_scm_HashMap.getClassOf()))) {
+        var x1 = this$24.get__O__s_Option(key);
+        if ((x1 instanceof $c_s_Some)) {
+          var x2 = $as_s_Some(x1);
+          var v$5 = $n(x2).s_Some__f_value;
+          var $$x1 = v$5
+        } else {
+          var x$2 = $m_s_None$();
+          if ((!(x$2 === x1))) {
+            throw new $c_s_MatchError(x1)
+          };
+          var $$x1 = f$1()
+        }
+      } else {
+        var originalHash = $m_sr_Statics$().anyHash__O__I(key);
+        var hash = (originalHash ^ ((originalHash >>> 16) | 0));
+        var x1$1 = $n(this$24.scm_HashMap__f_scala$collection$mutable$HashMap$$table).get((hash & (((-1) + $n(this$24.scm_HashMap__f_scala$collection$mutable$HashMap$$table).u.length) | 0)));
+        var nd = ((x1$1 === null) ? null : $n(x1$1).findNode__O__I__scm_HashMap$Node(key, hash));
+        var $$x1 = ((nd === null) ? f$1() : $n(nd).scm_HashMap$Node__f__value)
+      };
+      var idx$1 = $uI($$x1);
+      var this$27 = $n($as_sci_Map(result.sr_ObjectRef__f_elem));
+      var self = $n($as_Lio_github_edadma_rdb_Ident($n(returning).get__O())).Lio_github_edadma_rdb_Ident__f_name;
+      var y = $n(arr).get(idx$1);
+      var ev$4 = $as_sci_Map(this$27.updated__O__O__sci_MapOps(self, y));
+      result.sr_ObjectRef__f_elem = ev$4;
+      ev$4 = null
+    };
+    var this$30 = $n($m_s_Predef$().wrapRefArray__AO__scm_ArraySeq$ofRef(arr));
+    var factory = $m_sci_ArraySeq$();
+    var evidence$14 = new $c_s_reflect_ClassTag$GenericClassTag($d_Lio_github_edadma_rdb_Value.getClassOf());
+    var factory$1 = new $c_sc_EvidenceIterableFactory$ToFactory(factory, evidence$14);
+    this.addRow__sci_Seq__V($as_sci_Seq(factory$1.fromSpecific__sc_IterableOnce__O(this$30)))
+  })));
+  return $as_sci_Map(result.sr_ObjectRef__f_elem)
+});
 function $as_Lio_github_edadma_rdb_Table(obj) {
   return (((obj instanceof $c_Lio_github_edadma_rdb_Table) || (obj === null)) ? obj : $throwClassCastException(obj, "io.github.edadma.rdb.Table"))
 }
@@ -43047,45 +43318,16 @@ var $d_Lio_github_edadma_rdb_JSONParser$JSONLexer$DecimalLit$ = new $TypeData().
 });
 $c_Lio_github_edadma_rdb_JSONParser$JSONLexer$DecimalLit$.prototype.$classData = $d_Lio_github_edadma_rdb_JSONParser$JSONLexer$DecimalLit$;
 /** @constructor */
-function $c_Lio_github_edadma_rdb_MemoryTable(name, spec) {
-  this.Lio_github_edadma_rdb_MemoryTable__f_name = null;
-  this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns = null;
-  this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap = null;
+function $c_Lio_github_edadma_rdb_MemoryTable(name, specs) {
+  this.Lio_github_edadma_rdb_Table__f_name = null;
+  this.Lio_github_edadma_rdb_Table__f_columns = null;
+  this.Lio_github_edadma_rdb_Table__f_columnMap = null;
+  this.Lio_github_edadma_rdb_Table__f_autoMap = null;
+  this.Lio_github_edadma_rdb_Table__f__meta = null;
+  this.Lio_github_edadma_rdb_Table__f_autoSet = null;
   this.Lio_github_edadma_rdb_MemoryTable__f_data = null;
-  this.Lio_github_edadma_rdb_MemoryTable__f_autoMap = null;
-  this.Lio_github_edadma_rdb_MemoryTable__f__meta = null;
-  this.Lio_github_edadma_rdb_MemoryTable__f_autoSet = null;
-  this.Lio_github_edadma_rdb_MemoryTable__f_name = name;
-  this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns = $ct_scm_ArrayBuffer__(new $c_scm_ArrayBuffer());
-  this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap = $ct_scm_HashMap__(new $c_scm_HashMap());
-  this.Lio_github_edadma_rdb_MemoryTable__f_data = new $c_Lio_github_edadma_dllist_DLList();
-  this.Lio_github_edadma_rdb_MemoryTable__f_autoMap = $ct_scm_HashMap__(new $c_scm_HashMap());
-  $n($m_s_package$().s_package$__f_Vector);
-  var columns = $m_sci_Vector0$();
-  this.Lio_github_edadma_rdb_MemoryTable__f__meta = new $c_Lio_github_edadma_rdb_Metadata(columns);
-  $n(spec).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1) => {
-    var x$1$1 = $as_Lio_github_edadma_rdb_Spec(x$1);
-    if ((x$1$1 instanceof $c_Lio_github_edadma_rdb_ColumnSpec)) {
-      var s = $as_Lio_github_edadma_rdb_ColumnSpec(x$1$1);
-      this.addColumn__Lio_github_edadma_rdb_ColumnSpec__V(s)
-    }
-  })));
-  var this$4 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns);
-  $m_scm_ArrayBuffer$();
-  var b = new $c_scm_ArrayBuffer$$anon$1();
-  var it = $n(this$4.view__scm_ArrayBufferView()).iterator__sc_Iterator();
-  while ($n(it).hasNext__Z()) {
-    var elem = $n(it).next__O();
-    var _$2 = $as_Lio_github_edadma_rdb_ColumnSpec(elem);
-    if (($n(_$2).Lio_github_edadma_rdb_ColumnSpec__f_auto !== false)) {
-      b.addOne__O__scm_GrowableBuilder(elem)
-    }
-  };
-  var this$6 = $n($as_sc_IterableOnceOps($n($as_sc_StrictOptimizedIterableOps(b.scm_GrowableBuilder__f_elems)).map__F1__O(new $c_sjsr_AnonFunction1(((_$3) => {
-    var _$3$1 = $as_Lio_github_edadma_rdb_ColumnSpec(_$3);
-    return $n(_$3$1).Lio_github_edadma_rdb_ColumnSpec__f_name
-  })))));
-  this.Lio_github_edadma_rdb_MemoryTable__f_autoSet = $m_sci_Set$().from__sc_IterableOnce__sci_Set($as_sc_IterableOnce(this$6))
+  $ct_Lio_github_edadma_rdb_Table__T__sci_Seq__(this, name, specs);
+  this.Lio_github_edadma_rdb_MemoryTable__f_data = new $c_Lio_github_edadma_dllist_DLList()
 }
 $c_Lio_github_edadma_rdb_MemoryTable.prototype = new $h_Lio_github_edadma_rdb_Table();
 $c_Lio_github_edadma_rdb_MemoryTable.prototype.constructor = $c_Lio_github_edadma_rdb_MemoryTable;
@@ -43094,9 +43336,6 @@ function $h_Lio_github_edadma_rdb_MemoryTable() {
   /*<skip>*/
 }
 $h_Lio_github_edadma_rdb_MemoryTable.prototype = $c_Lio_github_edadma_rdb_MemoryTable.prototype;
-$c_Lio_github_edadma_rdb_MemoryTable.prototype.meta__Lio_github_edadma_rdb_Metadata = (function() {
-  return this.Lio_github_edadma_rdb_MemoryTable__f__meta
-});
 $c_Lio_github_edadma_rdb_MemoryTable.prototype.iterator__sci_Seq__sc_Iterator = (function(ctx) {
   var this$9 = $n($n(this.Lio_github_edadma_rdb_MemoryTable__f_data).nodeIterator__sc_Iterator());
   var f = new $c_sjsr_AnonFunction1(((n) => {
@@ -43106,7 +43345,7 @@ $c_Lio_github_edadma_rdb_MemoryTable.prototype.iterator__sci_Seq__sc_Iterator =
     var evidence$14 = new $c_s_reflect_ClassTag$GenericClassTag($d_Lio_github_edadma_rdb_Value.getClassOf());
     var factory$1 = new $c_sc_EvidenceIterableFactory$ToFactory(factory, evidence$14);
     var data = $as_sci_IndexedSeq(factory$1.fromSpecific__sc_IterableOnce__O(this$4));
-    var meta = this.Lio_github_edadma_rdb_MemoryTable__f__meta;
+    var meta = this.Lio_github_edadma_rdb_Table__f__meta;
     var row = $asArrayOf_Lio_github_edadma_rdb_Value($n(n$1).element__O(), 1);
     var value = new $c_Lio_github_edadma_rdb_MemoryTable$Updater(this, row);
     var updater = new $c_s_Some(value);
@@ -43117,208 +43356,40 @@ $c_Lio_github_edadma_rdb_MemoryTable.prototype.iterator__sci_Seq__sc_Iterator =
   }));
   return new $c_sc_Iterator$$anon$9(this$9, f)
 });
-$c_Lio_github_edadma_rdb_MemoryTable.prototype.hasColumn__T__Z = (function(name) {
-  return $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap).contains__O__Z(name)
-});
-$c_Lio_github_edadma_rdb_MemoryTable.prototype.addColumn__Lio_github_edadma_rdb_ColumnSpec__V = (function(spec) {
-  var requirement = (!$n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap).contains__O__Z($n(spec).Lio_github_edadma_rdb_ColumnSpec__f_name));
-  if ((!requirement)) {
-    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + ("duplicate column '" + $n(spec).Lio_github_edadma_rdb_ColumnSpec__f_name)) + "'"))
-  };
-  var this$3 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap);
-  var key = $n(spec).Lio_github_edadma_rdb_ColumnSpec__f_name;
-  var this$2 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns);
-  var value = this$2.scm_ArrayBuffer__f_size0;
-  $p_scm_HashMap__put0__O__O__Z__s_Some(this$3, key, value, false);
-  var this$4 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns);
-  this$4.addOne__O__scm_ArrayBuffer(spec);
-  var this$7 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns);
-  var factory = $m_sci_ArraySeq$();
-  var evidence$14 = new $c_s_reflect_ClassTag$GenericClassTag($d_Lio_github_edadma_rdb_ColumnSpec.getClassOf());
-  var factory$1 = new $c_sc_EvidenceIterableFactory$ToFactory(factory, evidence$14);
-  var this$8 = $n($as_sci_ArraySeq(factory$1.fromSpecific__sc_IterableOnce__O(this$7)));
-  var a = new $ac_O(this$8.length__I());
-  var i = 0;
-  while ((i < $n(a).u.length)) {
-    var $$x2 = $n(a);
-    var $$x1 = i;
-    var arg1 = this$8.apply__I__O(i);
-    var s = $as_Lio_github_edadma_rdb_ColumnSpec(arg1);
-    var value$1 = this.Lio_github_edadma_rdb_MemoryTable__f_name;
-    var table = new $c_s_Some(value$1);
-    var name = $n(s).Lio_github_edadma_rdb_ColumnSpec__f_name;
-    var typ = $n(s).Lio_github_edadma_rdb_ColumnSpec__f_typ;
-    $$x2.set($$x1, new $c_Lio_github_edadma_rdb_ColumnMetadata(table, name, typ));
-    i = ((1 + i) | 0)
-  };
-  var columns = $m_sci_ArraySeq$().unsafeWrapArray__O__sci_ArraySeq(a);
-  this.Lio_github_edadma_rdb_MemoryTable__f__meta = new $c_Lio_github_edadma_rdb_Metadata(columns)
-});
-$c_Lio_github_edadma_rdb_MemoryTable.prototype.auto__T__Lio_github_edadma_rdb_Value = (function(col) {
-  var x3 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_autoMap).get__O__s_Option(col);
-  var x = $m_s_None$();
-  if ((x === x3)) {
-    var first = $n($n($as_Lio_github_edadma_rdb_ColumnSpec($n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns).apply__I__O($uI($n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap).apply__O__O(col))))).Lio_github_edadma_rdb_ColumnSpec__f_typ).init__Lio_github_edadma_rdb_Value();
-    var this$1 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_autoMap);
-    $p_scm_HashMap__put0__O__O__Z__s_Some(this$1, col, first, false);
-    return first
-  };
-  if ((x3 instanceof $c_s_Some)) {
-    var cur = $as_Lio_github_edadma_rdb_Value($n($as_s_Some(x3)).s_Some__f_value);
-    var next = $n(cur).next__Lio_github_edadma_rdb_Value();
-    var this$2 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_autoMap);
-    $p_scm_HashMap__put0__O__O__Z__s_Some(this$2, col, next, false);
-    return next
-  };
-  throw new $c_s_MatchError(x3)
-});
-$c_Lio_github_edadma_rdb_MemoryTable.prototype.bulkInsert__sci_Seq__sci_Seq__sci_Map = (function(header, rows) {
-  var this$1 = $n(header);
-  var headerSet = $m_sci_Set$().from__sc_IterableOnce__sci_Set(this$1);
-  var this$2 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap);
-  var columnSet = $ct_sc_MapOps$KeySet__sc_MapOps__(new $c_sc_MapOps$KeySet(), this$2);
-  var requirement = $n(headerSet).subsetOf__sc_Set__Z(columnSet);
-  if ((!requirement)) {
-    var this$4 = $n($n(headerSet).diff__sc_Set__sci_SetOps(columnSet));
-    throw $ct_jl_IllegalArgumentException__T__(new $c_jl_IllegalArgumentException(), (("requirement failed: " + "unknown columns: ") + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$4, "", ", ", "")))
-  };
-  var missingSet = columnSet.diff__sc_Set__sc_Set(headerSet);
-  var missing = $as_sc_Set($n($n(missingSet).diff__sc_Set__sc_SetOps(this.Lio_github_edadma_rdb_MemoryTable__f_autoSet)).map__F1__O(new $c_sjsr_AnonFunction1(((m) => {
-    var m$1 = $as_T(m);
-    var idx = $uI($n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap).apply__O__O(m$1));
-    var s = $as_Lio_github_edadma_rdb_ColumnSpec($n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns).apply__I__O(idx));
-    if (($n(s).Lio_github_edadma_rdb_ColumnSpec__f_required && $n($n(s).Lio_github_edadma_rdb_ColumnSpec__f_default).isEmpty__Z())) {
-      $m_s_sys_package$().error__T__E((("bulkInsert: column '" + m$1) + "' is required and has no default"))
-    };
-    if ($n(s).Lio_github_edadma_rdb_ColumnSpec__f_pk) {
-      $m_s_sys_package$().error__T__E((("bulkInsert: column '" + m$1) + "' is a required primary key"))
+$c_Lio_github_edadma_rdb_MemoryTable.prototype.addRow__sci_Seq__V = (function(row) {
+  var this$5 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_data);
+  var this$2 = $n(row);
+  if ((this$2.knownSize__I() >= 0)) {
+    var len = this$2.knownSize__I();
+    var destination = new ($d_Lio_github_edadma_rdb_Value.getArrayOf().constr)(len);
+    this$2.copyToArray__O__I__I__I(destination, 0, 2147483647);
+    var elem$1 = destination
+  } else {
+    var capacity = 0;
+    var jsElems = null;
+    capacity = 0;
+    jsElems = [];
+    var it = this$2.iterator__sc_Iterator();
+    while ($n(it).hasNext__Z()) {
+      var elem = $n(it).next__O();
+      var unboxedElem = ((elem === null) ? null : elem);
+      jsElems.push(unboxedElem)
     };
-    var this$6 = $n($n(s).Lio_github_edadma_rdb_ColumnSpec__f_default);
-    var _2 = (this$6.isEmpty__Z() ? new $c_Lio_github_edadma_rdb_NullValue() : this$6.get__O());
-    return new $c_T2(idx, _2)
-  }))));
-  var autos = $as_sci_Set($n($n(this.Lio_github_edadma_rdb_MemoryTable__f_autoSet).intersect__sc_Set__sc_SetOps(missingSet)).map__F1__O(new $c_sjsr_AnonFunction1(((c) => {
-    var c$1 = $as_T(c);
-    var _2$1 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap).apply__O__O(c$1);
-    return new $c_T2(c$1, _2$1)
-  }))));
-  var mapping = $as_sci_Seq($n(header).map__F1__O(new $c_sjsr_AnonFunction1(((h) => {
-    var h$1 = $as_T(h);
-    return $uI($n($as_T3($n($n(this.Lio_github_edadma_rdb_MemoryTable__f__meta).columnMap__sci_Map()).apply__O__O(h$1))).T3__f__1)
-  }))));
-  var specs = $as_sci_Seq($n(header).map__F1__O(new $c_sjsr_AnonFunction1(((h$2) => {
-    var h$3 = $as_T(h$2);
-    return $as_Lio_github_edadma_rdb_ColumnSpec($n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columns).apply__I__O($uI($n(this.Lio_github_edadma_rdb_MemoryTable__f_io$github$edadma$rdb$MemoryTable$$columnMap).apply__O__O(h$3))))
-  }))));
-  $n($m_s_Predef$().s_Predef$__f_Map);
-  var elem = $m_sci_Map$EmptyMap$();
-  var result = new $c_sr_ObjectRef(elem);
-  $n(rows).foreach__F1__V(new $c_sjsr_AnonFunction1(((r) => {
-    var r$1 = $as_sci_Seq(r);
-    var dimensions = new $ac_I(new Int32Array([$n(this.Lio_github_edadma_rdb_MemoryTable__f__meta).width__I()]));
-    var arr = $asArrayOf_Lio_github_edadma_rdb_Value($m_jl_reflect_Array$().newInstance__jl_Class__AI__O($d_Lio_github_edadma_rdb_Value.getClassOf(), dimensions), 1);
-    $n($n($as_sc_IterableOps($n($as_sc_IterableOps($n(mapping).zip__sc_IterableOnce__O(r$1))).zip__sc_IterableOnce__O(specs))).withFilter__F1__sc_WithFilter(new $c_sjsr_AnonFunction1(((x$1) => {
-      var x$1$1 = $as_T2(x$1);
-      if ((x$1$1 !== null)) {
-        var x10 = $as_T2($n(x$1$1).T2__f__1);
-        if ((x10 !== null)) {
-          $uI($n(x10).T2__f__1);
-          $as_Lio_github_edadma_rdb_Value($n(x10).T2__f__2);
-          $as_Lio_github_edadma_rdb_ColumnSpec($n(x$1$1).T2__f__2);
-          return true
-        }
-      };
-      return false
-    })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2) => {
-      var x$1$3 = $as_T2(x$1$2);
-      matchResult5: {
-        if ((x$1$3 !== null)) {
-          var x15 = $as_T2($n(x$1$3).T2__f__1);
-          if ((x15 !== null)) {
-            var i$1 = $uI($n(x15).T2__f__1);
-            var v$1 = $as_Lio_github_edadma_rdb_Value($n(x15).T2__f__2);
-            var s$2 = $as_Lio_github_edadma_rdb_ColumnSpec($n(x$1$3).T2__f__2);
-            var this$13 = $n(v$1);
-            if ((this$13 instanceof $c_Lio_github_edadma_rdb_NullValue)) {
-              if ($n(s$2).Lio_github_edadma_rdb_ColumnSpec__f_required) {
-                var msg = (("column '" + $n(s$2).Lio_github_edadma_rdb_ColumnSpec__f_name) + "' is required");
-                $m_Lio_github_edadma_rdb_errors$package$().problem__s_util_parsing_input_Position__T__E($n(v$1).pos__s_util_parsing_input_Position(), msg)
-              } else {
-                $n(arr).set(i$1, v$1)
-              }
-            } else {
-              $n(arr).set(i$1, $n($n(s$2).Lio_github_edadma_rdb_ColumnSpec__f_typ).convert__Lio_github_edadma_rdb_Value__Lio_github_edadma_rdb_Value(v$1))
-            };
-            break matchResult5
-          }
-        };
-        throw new $c_s_MatchError(x$1$3)
-      }
-    })));
-    var this$15 = $n(missing);
-    var p = new $c_sjsr_AnonFunction1(((x$1$3$1) => {
-      var x$1$4 = $as_T2(x$1$3$1);
-      return ((x$1$4 !== null) && ($uI($n(x$1$4).T2__f__1), $as_Lio_github_edadma_rdb_Value($n(x$1$4).T2__f__2), true))
-    }));
-    var this$16 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$15, p);
-    var f = new $c_sjsr_AnonFunction1(((x$1$4$1) => {
-      var x$1$5 = $as_T2(x$1$4$1);
-      matchResult7: {
-        if ((x$1$5 !== null)) {
-          var i$3 = $uI($n(x$1$5).T2__f__1);
-          var v$3 = $as_Lio_github_edadma_rdb_Value($n(x$1$5).T2__f__2);
-          $n(arr).set(i$3, v$3);
-          break matchResult7
-        };
-        throw new $c_s_MatchError(x$1$5)
-      }
-    }));
-    $n(this$16.filtered__sc_Iterable()).foreach__F1__V(f);
-    var this$17 = $n(autos);
-    var p$1 = new $c_sjsr_AnonFunction1(((x$1$5$1) => {
-      var x$1$6 = $as_T2(x$1$5$1);
-      return ((x$1$6 !== null) && ($as_T($n(x$1$6).T2__f__1), $uI($n(x$1$6).T2__f__2), true))
-    }));
-    var newAutos = $as_sci_Set($ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$17, p$1).map__F1__O(new $c_sjsr_AnonFunction1(((x$1$6$1) => {
-      var x$1$7 = $as_T2(x$1$6$1);
-      if ((x$1$7 !== null)) {
-        var c$3 = $as_T($n(x$1$7).T2__f__1);
-        var i$5 = $uI($n(x$1$7).T2__f__2);
-        var v$4 = this.auto__T__Lio_github_edadma_rdb_Value(c$3);
-        $n(arr).set(i$5, v$4);
-        return new $c_T2(c$3, v$4)
-      };
-      throw new $c_s_MatchError(x$1$7)
-    }))));
-    var this$21 = $n(newAutos);
-    var this$20 = $m_s_$less$colon$less$();
-    var ev$3 = $m_sci_Map$().from__sc_IterableOnce__sci_Map(this$21);
-    result.sr_ObjectRef__f_elem = ev$3;
-    var this$22 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_data);
-    return this$22.addOne__O__Lio_github_edadma_dllist_DLList(arr)
-  })));
-  return $as_sci_Map(result.sr_ObjectRef__f_elem)
+    var elem$1 = new ($d_Lio_github_edadma_rdb_Value.getArrayOf().constr)(jsElems)
+  };
+  this$5.addOne__O__Lio_github_edadma_dllist_DLList(elem$1)
 });
 $c_Lio_github_edadma_rdb_MemoryTable.prototype.toString__T = (function() {
-  var $$x2 = this.Lio_github_edadma_rdb_MemoryTable__f_name;
-  var $$x1 = this.Lio_github_edadma_rdb_MemoryTable__f__meta;
+  var $$x2 = this.Lio_github_edadma_rdb_Table__f_name;
+  var $$x1 = this.Lio_github_edadma_rdb_Table__f__meta;
   var this$3 = $n(this.Lio_github_edadma_rdb_MemoryTable__f_data);
-  var f = new $c_sjsr_AnonFunction1(((_$4) => {
-    var _$4$1 = $asArrayOf_Lio_github_edadma_rdb_Value(_$4, 1);
+  var f = new $c_sjsr_AnonFunction1(((_$1) => {
+    var _$1$1 = $asArrayOf_Lio_github_edadma_rdb_Value(_$1, 1);
     $m_sc_ArrayOps$();
-    return $m_sc_ArrayOps$().toIndexedSeq$extension__O__sci_IndexedSeq(_$4$1)
+    return $m_sc_ArrayOps$().toIndexedSeq$extension__O__sci_IndexedSeq(_$1$1)
   }));
   return (((((("[MemoryTable '" + $$x2) + "': ") + $$x1) + "; ") + $f_sc_IterableOps__map__F1__O(this$3, f)) + "]")
 });
-function $as_Lio_github_edadma_rdb_MemoryTable(obj) {
-  return (((obj instanceof $c_Lio_github_edadma_rdb_MemoryTable) || (obj === null)) ? obj : $throwClassCastException(obj, "io.github.edadma.rdb.MemoryTable"))
-}
-function $isArrayOf_Lio_github_edadma_rdb_MemoryTable(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lio_github_edadma_rdb_MemoryTable)))
-}
-function $asArrayOf_Lio_github_edadma_rdb_MemoryTable(obj, depth) {
-  return (($isArrayOf_Lio_github_edadma_rdb_MemoryTable(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.github.edadma.rdb.MemoryTable;", depth))
-}
 var $d_Lio_github_edadma_rdb_MemoryTable = new $TypeData().initClass({
   Lio_github_edadma_rdb_MemoryTable: 0
 }, false, "io.github.edadma.rdb.MemoryTable", {
@@ -53293,12 +53364,13 @@ $c_Lio_github_edadma_rdb_Metadata.prototype.columnMap__sci_Map = (function() {
     while ($n(it$1).hasNext__Z()) {
       var arg1 = $n(it$1).next__O();
       var x$1 = $as_T2(arg1);
-      var self = $as_T($n(x$1).T2__f__1);
-      var y = ($n($as_sci_IndexedSeq($n(x$1).T2__f__2)).length__I() > 1);
+      var k$1 = $as_T($n(x$1).T2__f__1);
+      var v$1 = $as_sci_IndexedSeq($n(x$1).T2__f__2);
+      var y = ($n(v$1).length__I() > 1);
       $p_sci_HashMapBuilder__ensureUnaliased__V(b);
-      var h = $m_sr_Statics$().anyHash__O__I(self);
+      var h = $m_sr_Statics$().anyHash__O__I(k$1);
       var im = $m_sc_Hashing$().improve__I__I(h);
-      b.update__sci_MapNode__O__O__I__I__I__V(b.sci_HashMapBuilder__f_scala$collection$immutable$HashMapBuilder$$rootNode, self, y, h, im, 0)
+      b.update__sci_MapNode__O__O__I__I__I__V(b.sci_HashMapBuilder__f_scala$collection$immutable$HashMapBuilder$$rootNode, k$1, y, h, im, 0)
     };
     var ambiguous = b.result__sci_HashMap();
     var $$x1 = $as_sc_IterableOnceOps($n($as_sc_IterableOps($n(this.Lio_github_edadma_rdb_Metadata__f_columns).zipWithIndex__O())).flatMap__F1__O(new $c_sjsr_AnonFunction1(((x$1$2) => {
@@ -53313,11 +53385,11 @@ $c_Lio_github_edadma_rdb_Metadata.prototype.columnMap__sci_Map = (function() {
           var this$11 = $n(x20);
           var x25 = this$11.Lio_github_edadma_rdb_ColumnMetadata__f_typ;
           var idx = $uI($n(x$1$1).T2__f__2);
-          var v$1 = new $c_T3(idx, x25, x23);
+          var v$2 = new $c_T3(idx, x25, x23);
           var x = $m_s_None$();
           if ((x === x23)) {
             $n($m_s_package$().s_package$__f_List);
-            var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(x24, v$1)]));
+            var elems = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(x24, v$2)]));
             return $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems)
           };
           if ((x23 instanceof $c_s_Some)) {
@@ -53325,14 +53397,14 @@ $c_Lio_github_edadma_rdb_Metadata.prototype.columnMap__sci_Map = (function() {
             if ($uZ($n(ambiguous).apply__O__O(x24))) {
               $n($m_s_package$().s_package$__f_List);
               var $$x2 = $m_sr_ScalaRunTime$();
-              var self$1 = ((x18 + ".") + x24);
-              var elems$1 = $n($$x2).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self$1, v$1)]));
+              var self = ((x18 + ".") + x24);
+              var elems$1 = $n($$x2).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self, v$2)]));
               return $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$1)
             };
             $n($m_s_package$().s_package$__f_List);
             var $$x3 = $m_sr_ScalaRunTime$();
-            var self$2 = ((x18 + ".") + x24);
-            var elems$2 = $n($$x3).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self$2, v$1), new $c_T2(x24, v$1)]));
+            var self$1 = ((x18 + ".") + x24);
+            var elems$2 = $n($$x3).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self$1, v$2), new $c_T2(x24, v$2)]));
             return $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$2)
           };
           throw new $c_s_MatchError(x23)
@@ -68521,8 +68593,80 @@ var $d_Lio_github_edadma_rdb_CrossProcess = new $TypeData().initClass({
   Ljava_io_Serializable: 1
 });
 $c_Lio_github_edadma_rdb_CrossProcess.prototype.$classData = $d_Lio_github_edadma_rdb_CrossProcess;
+/** @constructor */
+function $c_Lio_github_edadma_rdb_DeleteCommand(table, cond) {
+  this.Lio_github_edadma_rdb_DeleteCommand__f_table = null;
+  this.Lio_github_edadma_rdb_DeleteCommand__f_cond = null;
+  this.Lio_github_edadma_rdb_DeleteCommand__f_table = table;
+  this.Lio_github_edadma_rdb_DeleteCommand__f_cond = cond
+}
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype = new $h_O();
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.constructor = $c_Lio_github_edadma_rdb_DeleteCommand;
+/** @constructor */
+function $h_Lio_github_edadma_rdb_DeleteCommand() {
+  /*<skip>*/
+}
+$h_Lio_github_edadma_rdb_DeleteCommand.prototype = $c_Lio_github_edadma_rdb_DeleteCommand.prototype;
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_s_Product$$anon$1(this)
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.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_Lio_github_edadma_rdb_DeleteCommand.prototype.equals__O__Z = (function(x$0) {
+  if ((this === x$0)) {
+    return true
+  } else if ((x$0 instanceof $c_Lio_github_edadma_rdb_DeleteCommand)) {
+    var x$0$2 = $as_Lio_github_edadma_rdb_DeleteCommand(x$0);
+    var x = this.Lio_github_edadma_rdb_DeleteCommand__f_table;
+    var x$2 = $n(x$0$2).Lio_github_edadma_rdb_DeleteCommand__f_table;
+    if (((x === null) ? (x$2 === null) : $n(x).equals__O__Z(x$2))) {
+      var x$3 = this.Lio_github_edadma_rdb_DeleteCommand__f_cond;
+      var x$4 = $n(x$0$2).Lio_github_edadma_rdb_DeleteCommand__f_cond;
+      var $$x1 = ((x$3 === null) ? (x$4 === null) : $n(x$3).equals__O__Z(x$4))
+    } else {
+      var $$x1 = false
+    };
+    if ($$x1) {
+      $n(x$0$2);
+      return true
+    } else {
+      return false
+    }
+  } else {
+    return false
+  }
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$()._toString__s_Product__T(this)
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.productArity__I = (function() {
+  return 2
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.productPrefix__T = (function() {
+  return "DeleteCommand"
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.productElement__I__O = (function(n) {
+  if ((n === 0)) {
+    return this.Lio_github_edadma_rdb_DeleteCommand__f_table
+  };
+  if ((n === 1)) {
+    return this.Lio_github_edadma_rdb_DeleteCommand__f_cond
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.productElementName__I__T = (function(n) {
+  if ((n === 0)) {
+    return "table"
+  };
+  if ((n === 1)) {
+    return "cond"
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
 function $as_Lio_github_edadma_rdb_DeleteCommand(obj) {
-  return ((false || (obj === null)) ? obj : $throwClassCastException(obj, "io.github.edadma.rdb.DeleteCommand"))
+  return (((obj instanceof $c_Lio_github_edadma_rdb_DeleteCommand) || (obj === null)) ? obj : $throwClassCastException(obj, "io.github.edadma.rdb.DeleteCommand"))
 }
 function $isArrayOf_Lio_github_edadma_rdb_DeleteCommand(obj, depth) {
   return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lio_github_edadma_rdb_DeleteCommand)))
@@ -68530,6 +68674,17 @@ function $isArrayOf_Lio_github_edadma_rdb_DeleteCommand(obj, depth) {
 function $asArrayOf_Lio_github_edadma_rdb_DeleteCommand(obj, depth) {
   return (($isArrayOf_Lio_github_edadma_rdb_DeleteCommand(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lio.github.edadma.rdb.DeleteCommand;", depth))
 }
+var $d_Lio_github_edadma_rdb_DeleteCommand = new $TypeData().initClass({
+  Lio_github_edadma_rdb_DeleteCommand: 0
+}, false, "io.github.edadma.rdb.DeleteCommand", {
+  Lio_github_edadma_rdb_DeleteCommand: 1,
+  O: 1,
+  Lio_github_edadma_rdb_Command: 1,
+  s_Equals: 1,
+  s_Product: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lio_github_edadma_rdb_DeleteCommand.prototype.$classData = $d_Lio_github_edadma_rdb_DeleteCommand;
 /** @constructor */
 function $c_Lio_github_edadma_rdb_DeleteResult(rows) {
   this.Lio_github_edadma_rdb_DeleteResult__f_rows = 0;
@@ -69730,7 +69885,6 @@ var $d_Lio_github_edadma_rdb_NumericType = new $TypeData().initClass({
 });
 $c_Lio_github_edadma_rdb_NumericType.prototype.$classData = $d_Lio_github_edadma_rdb_NumericType;
 function $p_Lio_github_edadma_rdb_ProjectProcess__lookup__T__sci_Seq__s_Option($thiz, name, ctx) {
-  var this$ = $thiz;
   var ctx$tailLocal1 = ctx;
   while (true) {
     var x21 = ctx$tailLocal1;
@@ -69745,8 +69899,6 @@ function $p_Lio_github_edadma_rdb_ProjectProcess__lookup__T__sci_Seq__s_Option($
       var x15 = $n($n(hd).columnMap__sci_Map()).get__O__s_Option(name);
       var x$3 = $m_s_None$();
       if ((x$3 === x15)) {
-        var \u03b4this$tmp1 = this$;
-        this$ = \u03b4this$tmp1;
         ctx$tailLocal1 = x24;
         continue
       };
@@ -69777,7 +69929,6 @@ function $c_Lio_github_edadma_rdb_ProjectProcess(input, fields) {
     var x$1$1 = $as_T2(x$1);
     if ((x$1$1 !== null)) {
       var x34 = $as_Lio_github_edadma_rdb_Expr($n(x$1$1).T2__f__1);
-      var x35 = $uI($n(x$1$1).T2__f__2);
       if ((x34 instanceof $c_Lio_github_edadma_rdb_ColumnExpr)) {
         var x36 = $as_Lio_github_edadma_rdb_ColumnExpr(x34);
         var this$3 = $n(x36);
@@ -69803,8 +69954,9 @@ function $c_Lio_github_edadma_rdb_ProjectProcess(input, fields) {
         }
       };
       if ((x34 !== null)) {
+        var idx = $uI($n(x$1$1).T2__f__2);
         var table = $m_s_None$();
-        var name = ("col_" + ((1 + x35) | 0));
+        var name = ("col_" + ((1 + idx) | 0));
         var typ$1 = $n(x34).typ__Lio_github_edadma_rdb_Type();
         return new $c_Lio_github_edadma_rdb_ColumnMetadata(table, name, typ$1)
       }
@@ -82784,6 +82936,8 @@ function $c_Lio_github_edadma_rdb_SQLParser$() {
   this.Lio_github_edadma_rdb_SQLParser$__f_createTypebitmap$1 = false;
   this.Lio_github_edadma_rdb_SQLParser$__f_update$lzy1 = null;
   this.Lio_github_edadma_rdb_SQLParser$__f_updatebitmap$1 = false;
+  this.Lio_github_edadma_rdb_SQLParser$__f_delete$lzy1 = null;
+  this.Lio_github_edadma_rdb_SQLParser$__f_deletebitmap$1 = false;
   this.Lio_github_edadma_rdb_SQLParser$__f_typ$lzy1 = null;
   this.Lio_github_edadma_rdb_SQLParser$__f_typbitmap$1 = false;
   this.Lio_github_edadma_rdb_SQLParser$__f_columnDesc$lzy1 = null;
@@ -82841,6 +82995,16 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.decimalLit__s_util_parsing_combina
     return $n($as_Lio_github_edadma_rdb_SQLParser$SQLLexer$DecimalLit(_$5$1)).Lio_github_edadma_rdb_SQLParser$SQLLexer$DecimalLit__f_chars
   })))
 });
+$c_Lio_github_edadma_rdb_SQLParser$.prototype.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser = (function(s) {
+  var p = new $c_sjsr_AnonFunction0((() => {
+    var this$2 = $n(s);
+    return $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser($as_T(this$2.toLowerCase()))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+      var this$3 = $n(s);
+      return this.keyword__T__s_util_parsing_combinator_Parsers$Parser($as_T(this$3.toUpperCase()))
+    })))
+  }));
+  return $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p)
+});
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.pos__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_posbitmap$1)) {
     var p$1 = new $c_sjsr_AnonFunction0((() => {
@@ -82860,7 +83024,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.pos__s_util_parsing_combinator_Pac
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.query__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_querybitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("SELECT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expressions__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.fromClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.whereClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.groupByClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.orderByClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.limitClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.offsetClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("SELECT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expressions__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.fromClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.whereClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.groupByClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.orderByClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.limitClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.offsetClause__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -82911,7 +83075,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.query__s_util_parsing_combinator_P
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.fromClause__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_fromClausebitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("FROM")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("FROM")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.sources__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
@@ -82926,7 +83090,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.fromClause__s_util_parsing_combina
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.whereClause__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_whereClausebitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("WHERE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("WHERE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
     })))));
@@ -82937,7 +83101,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.whereClause__s_util_parsing_combin
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.groupByClause__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_groupByClausebitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("GROUP")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("BY"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("GROUP")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("BY"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
@@ -82952,7 +83116,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.groupByClause__s_util_parsing_comb
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.orderByClause__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_orderByClausebitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ORDER")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("BY"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ORDER")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("BY"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.orderBy__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
@@ -82984,7 +83148,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.count__s_util_parsing_combinator_P
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.offsetClause__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_offsetClausebitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("OFFSET")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.count__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("OFFSET")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.count__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
     })))));
@@ -82995,7 +83159,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.offsetClause__s_util_parsing_combi
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.limitClause__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_limitClausebitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("LIMIT")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.count__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("LIMIT")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.count__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
     })))));
@@ -83006,10 +83170,10 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.limitClause__s_util_parsing_combin
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.orderBy__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_orderBybitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ASC")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("DESC"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ASC")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("DESC"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
-    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULLS")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("FIRST")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("LAST")))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => new $c_s_Some(x$1))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULLS")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("FIRST")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("LAST")))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => new $c_s_Some(x$1))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v$1 = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v$1)
     }))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$1) => {
@@ -83085,13 +83249,13 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.orderBy__s_util_parsing_combinator
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.sources__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_sourcesbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n(this.sources__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("INNER")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("LEFT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("OUTER")).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n(this.sources__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("INNER")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("LEFT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("OUTER")).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
     })))))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => new $c_s_Some(x$1))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v$1 = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v$1)
-    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("JOIN"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.source__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ON"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$1) => {
+    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("JOIN"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.source__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ON"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$1) => {
       var x$1$2 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$1);
       matchResult12: {
         var $$x1;
@@ -83145,7 +83309,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.sources__s_util_parsing_combinator
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.source__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_sourcebitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.table__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("AS")).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.table__s_util_parsing_combinator_PackratParsers$PackratParser()).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("AS")).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
     })))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => new $c_s_Some(x$1))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
@@ -83234,7 +83398,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.booleanExpression__s_util_parsing_
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.orExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_orExpressionbitmap$1)) {
     var p$1 = new $c_sjsr_AnonFunction0((() => {
-      var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.orExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("OR"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.andExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+      var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.orExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("OR"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.andExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
         var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
         if ((x$1$1 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83258,7 +83422,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.orExpression__s_util_parsing_combi
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.andExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_andExpressionbitmap$1)) {
     var p$1 = new $c_sjsr_AnonFunction0((() => {
-      var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.andExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("AND"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.notExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+      var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.andExpression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("AND"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.notExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
         var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
         if ((x$1$1 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83282,7 +83446,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.andExpression__s_util_parsing_comb
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.notExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_notExpressionbitmap$1)) {
     var p$1 = new $c_sjsr_AnonFunction0((() => {
-      var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
+      var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
         var e$1 = $as_Lio_github_edadma_rdb_Expr(e);
         return new $c_Lio_github_edadma_rdb_UnaryExpr("NOT", e$1)
       })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser())))));
@@ -83296,7 +83460,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.notExpression__s_util_parsing_comb
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.booleanPrimary__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_booleanPrimarybitmap$1)) {
     var p$1 = new $c_sjsr_AnonFunction0((() => {
-      var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("EXISTS")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("("))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((subquery) => {
+      var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("EXISTS")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("("))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((subquery) => {
         var subquery$1 = $as_Lio_github_edadma_rdb_Expr(subquery);
         return new $c_Lio_github_edadma_rdb_ExistsExpr(subquery$1)
       })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.comparison__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
@@ -83313,7 +83477,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.booleanPrimary__s_util_parsing_com
           }
         };
         throw new $c_s_MatchError(x$1$1)
-      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("BETWEEN"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT BETWEEN")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("BETWEEN")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("AND"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$2) => {
+      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.expression__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("BETWEEN"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT BETWEEN")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("BETWEEN")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("AND"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$2) => {
         var x$1$3 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$2);
         if ((x$1$3 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83373,7 +83537,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.booleanPrimary__s_util_parsing_com
           }
         };
         throw new $c_s_MatchError(x$1$9)
-      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULL")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_Lio_github_edadma_rdb_NullExpr()))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))));
+      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULL")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_Lio_github_edadma_rdb_NullExpr()))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))));
       return $f_s_util_parsing_combinator_Parsers__positioned__F0__s_util_parsing_combinator_Parsers$Parser(this, p)
     }));
     this.Lio_github_edadma_rdb_SQLParser$__f_booleanPrimary$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p$1);
@@ -83383,7 +83547,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.booleanPrimary__s_util_parsing_com
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.isNull__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_isNullbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("IS")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULL"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "IS NULL")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("IS")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULL"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "IS NOT NULL"))))))));
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("IS")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULL"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "IS NULL")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("IS")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULL"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "IS NOT NULL"))))))));
     this.Lio_github_edadma_rdb_SQLParser$__f_isNull$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
     this.Lio_github_edadma_rdb_SQLParser$__f_isNullbitmap$1 = true
   };
@@ -83391,7 +83555,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.isNull__s_util_parsing_combinator_
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.in__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_inbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("IN"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT IN")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("IN"))))));
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("IN"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT IN")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("IN"))))));
     this.Lio_github_edadma_rdb_SQLParser$__f_in$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
     this.Lio_github_edadma_rdb_SQLParser$__f_inbitmap$1 = true
   };
@@ -83399,7 +83563,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.in__s_util_parsing_combinator_Pack
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.comparison__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_comparisonbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("<=")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(">="))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("<"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(">"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("="))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("!="))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("LIKE"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ILIKE"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("LIKE"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT LIKE")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ILIKE"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT ILIKE")))))))))));
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("<=")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(">="))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("<"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(">"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("="))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("!="))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("LIKE"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ILIKE"))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("LIKE"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT LIKE")))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ILIKE"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => "NOT ILIKE")))))))))));
     this.Lio_github_edadma_rdb_SQLParser$__f_comparison$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
     this.Lio_github_edadma_rdb_SQLParser$__f_comparisonbitmap$1 = true
   };
@@ -83408,7 +83572,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.comparison__s_util_parsing_combina
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_booleanLiteralbitmap$1)) {
     var p$1 = new $c_sjsr_AnonFunction0((() => {
-      var p = new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TRUE")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("FALSE"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((s) => {
+      var p = new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TRUE")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("FALSE"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((s) => {
         var s$1 = $as_T(s);
         var this$2 = $n(s$1);
         _return: {
@@ -83712,10 +83876,10 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.primary__s_util_parsing_combinator
       }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($f_s_util_parsing_combinator_syntactical_StdTokenParsers__stringLit__s_util_parsing_combinator_Parsers$Parser(this)).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((s) => {
         var s$1 = $as_T(s);
         return new $c_Lio_github_edadma_rdb_StringExpr(s$1)
-      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULL")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_Lio_github_edadma_rdb_NullExpr()))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.application__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.column__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.variable__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.jsonLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("-")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.primary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
+      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULL")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_Lio_github_edadma_rdb_NullExpr()))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.application__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.column__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.variable__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.jsonLiteral__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("-")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.primary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
         var e$1 = $as_Lio_github_edadma_rdb_Expr(e);
         return new $c_Lio_github_edadma_rdb_UnaryExpr("-", e$1)
-      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TABLE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("("))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
+      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TABLE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("("))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
         var query$1 = $as_Lio_github_edadma_rdb_Expr(query);
         return new $c_Lio_github_edadma_rdb_TableConstructorExpr(query$1)
       }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.query__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query$2) => {
@@ -83741,7 +83905,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.literal__s_util_parsing_combinator
       }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($f_s_util_parsing_combinator_syntactical_StdTokenParsers__stringLit__s_util_parsing_combinator_Parsers$Parser(this)).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((s) => {
         var s$1 = $as_T(s);
         return new $c_Lio_github_edadma_rdb_StringExpr(s$1)
-      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULL")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_Lio_github_edadma_rdb_NullExpr()))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("-")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.primary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
+      }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULL")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_Lio_github_edadma_rdb_NullExpr()))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("-")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.primary__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((e) => {
         var e$1 = $as_Lio_github_edadma_rdb_Expr(e);
         return new $c_Lio_github_edadma_rdb_UnaryExpr("-", e$1)
       }))))))));
@@ -83754,13 +83918,13 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.literal__s_util_parsing_combinator
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.caseExpression__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_caseExpressionbitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("CASE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("CASE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.when__s_util_parsing_combinator_PackratParsers$PackratParser()));
       return $f_s_util_parsing_combinator_Parsers__rep1__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, p)
-    })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ELSE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ELSE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
-    }))))))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("END"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    }))))))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("END"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83777,7 +83941,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.caseExpression__s_util_parsing_com
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.when__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_whenbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("WHEN")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("THEN"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("WHEN")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("THEN"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.expression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83831,16 +83995,16 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.set__s_util_parsing_combinator_Pac
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.insert__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_insertbitmap$1)) {
-    var p$3 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("INSERT")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("INTO"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$3 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("INSERT")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("INTO"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
-    })))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("VALUES"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    })))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("VALUES"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p$1 = new $c_sjsr_AnonFunction0((() => this.row__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q$1 = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p$1, q$1)
     })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-      var p$2 = new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("RETURNING")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))));
+      var p$2 = new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("RETURNING")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))));
       return $f_s_util_parsing_combinator_Parsers__opt__F0__s_util_parsing_combinator_Parsers$Parser(this, p$2)
     })))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
@@ -83873,7 +84037,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.insert__s_util_parsing_combinator_
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.createTable__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_createTablebitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("CREATE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TABLE"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("CREATE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TABLE"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.columnDesc__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
@@ -83894,7 +84058,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.createTable__s_util_parsing_combin
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.createEnum__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_createEnumbitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ENUM")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ENUM")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => $f_s_util_parsing_combinator_syntactical_StdTokenParsers__stringLit__s_util_parsing_combinator_Parsers$Parser(this)));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
@@ -83906,7 +84070,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.createEnum__s_util_parsing_combina
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.createType__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_createTypebitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("CREATE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TYPE"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("AS")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.createEnum__s_util_parsing_combinator_PackratParsers$PackratParser()))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("CREATE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TYPE"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("AS")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.createEnum__s_util_parsing_combinator_PackratParsers$PackratParser()))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83923,11 +84087,11 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.createType__s_util_parsing_combina
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.update__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_updatebitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("UPDATE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("SET"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("UPDATE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("SET"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var p = new $c_sjsr_AnonFunction0((() => this.set__s_util_parsing_combinator_PackratParsers$PackratParser()));
       var q = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")));
       return $f_s_util_parsing_combinator_Parsers__rep1sep__F0__F0__s_util_parsing_combinator_Parsers$Parser(this, p, q)
-    })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("WHERE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    })))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("WHERE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
     }))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
@@ -83954,28 +84118,48 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.update__s_util_parsing_combinator_
   };
   return this.Lio_github_edadma_rdb_SQLParser$__f_update$lzy1
 });
+$c_Lio_github_edadma_rdb_SQLParser$.prototype.delete__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
+  if ((!this.Lio_github_edadma_rdb_SQLParser$__f_deletebitmap$1)) {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("DELETE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("FROM"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("WHERE")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.booleanExpression__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+      var v = $m_s_None$();
+      return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
+    }))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+      var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
+      if ((x$1$1 !== null)) {
+        $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
+        var t = $as_Lio_github_edadma_rdb_Ident($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        var c = $as_s_Option($n(x$1$1).s_util_parsing_combinator_Parsers$$tilde__f__2);
+        return new $c_Lio_github_edadma_rdb_DeleteCommand(t, c)
+      };
+      throw new $c_s_MatchError(x$1$1)
+    })))));
+    this.Lio_github_edadma_rdb_SQLParser$__f_delete$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
+    this.Lio_github_edadma_rdb_SQLParser$__f_deletebitmap$1 = true
+  };
+  return this.Lio_github_edadma_rdb_SQLParser$__f_delete$lzy1
+});
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.typ__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_typbitmap$1)) {
-    var p$3 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("BOOLEAN")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$3 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("BOOLEAN")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value = $m_Lio_github_edadma_rdb_BooleanType$();
       return new $c_s_util_Left(value)
-    })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("INT")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("INTEGER"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("INT")).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("INTEGER"))))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$1 = $m_Lio_github_edadma_rdb_IntegerType$();
       return new $c_s_util_Left(value$1)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("BIGINT")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("BIGINT")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$2 = $m_Lio_github_edadma_rdb_BigintType$();
       return new $c_s_util_Left(value$2)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("DOUBLE")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-      var p = new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("PRECISION")));
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("DOUBLE")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+      var p = new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("PRECISION")));
       return $f_s_util_parsing_combinator_Parsers__opt__F0__s_util_parsing_combinator_Parsers$Parser(this, p)
     })))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$3 = $m_Lio_github_edadma_rdb_DoubleType$();
       return new $c_s_util_Left(value$3)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NUMERIC")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_PackratParsers$PackratParser()))))))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NUMERIC")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser(",")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_PackratParsers$PackratParser()))))))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -83986,22 +84170,22 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.typ__s_util_parsing_combinator_Pac
         return new $c_s_util_Left(value$4)
       };
       throw new $c_s_MatchError(x$1$1)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("JSON")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("JSON")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$5 = $m_Lio_github_edadma_rdb_JSONType$();
       return new $c_s_util_Left(value$5)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TIMESTAMP")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-      var p$2 = new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("WITHOUT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TIME"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ZONE"))))));
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TIMESTAMP")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+      var p$2 = new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("WITHOUT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TIME"))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ZONE"))))));
       return $f_s_util_parsing_combinator_Parsers__opt__F0__s_util_parsing_combinator_Parsers$Parser(this, p$2)
     })))).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$6 = $m_Lio_github_edadma_rdb_TimestampType$();
       return new $c_s_util_Left(value$6)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TEXT")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TEXT")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$7 = $m_Lio_github_edadma_rdb_TextType$();
       return new $c_s_util_Left(value$7)
-    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("UUID")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("UUID")).$up$up$up__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       $n($m_s_package$().s_package$__f_Left);
       var value$8 = $m_Lio_github_edadma_rdb_UUIDType$();
       return new $c_s_util_Left(value$8)
@@ -84017,13 +84201,13 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.typ__s_util_parsing_combinator_Pac
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.columnDesc__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_columnDescbitmap$1)) {
-    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.typ__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("AUTO")).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var p$1 = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.typ__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("AUTO")).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x) => new $c_s_Some(x))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v)
-    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("NULL"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => new $c_s_Some(x$1))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NOT")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("NULL"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => new $c_s_Some(x$1))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v$1 = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v$1)
-    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("PRIMARY")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("KEY"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$2) => new $c_s_Some(x$2))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    }))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("PRIMARY")).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("KEY"))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$2) => new $c_s_Some(x$2))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
       var v$2 = $m_s_None$();
       return $f_s_util_parsing_combinator_Parsers__success__O__s_util_parsing_combinator_Parsers$Parser(this, v$2)
     }))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$1) => {
@@ -84064,7 +84248,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.columnDesc__s_util_parsing_combina
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.alterTable__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_alterTablebitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ALTER")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("TABLE"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.tableAlteration__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ALTER")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("TABLE"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.tableAlteration__s_util_parsing_combinator_PackratParsers$PackratParser())))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -84081,7 +84265,7 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.alterTable__s_util_parsing_combina
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.tableAlteration__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_tableAlterationbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("ADD")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("FOREIGN"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser("KEY"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("REFERENCES")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("ADD")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("FOREIGN"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("KEY"))))).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n(this.keyword__T__s_util_parsing_combinator_Parsers$Parser("(")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser())))).$less$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.keyword__T__s_util_parsing_combinator_Parsers$Parser(")")))))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.kw__T__s_util_parsing_combinator_PackratParsers$PackratParser("REFERENCES")).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.identifier__s_util_parsing_combinator_PackratParsers$PackratParser()))))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
       var x$1$1 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1);
       if ((x$1$1 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
@@ -84098,10 +84282,10 @@ $c_Lio_github_edadma_rdb_SQLParser$.prototype.tableAlteration__s_util_parsing_co
 });
 $c_Lio_github_edadma_rdb_SQLParser$.prototype.command__s_util_parsing_combinator_PackratParsers$PackratParser = (function() {
   if ((!this.Lio_github_edadma_rdb_SQLParser$__f_commandbitmap$1)) {
-    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n(this.query__s_util_parsing_combinator_PackratParsers$PackratParser()).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
+    var p = new $c_sjsr_AnonFunction0((() => $n($n($n($n($n($n($n(this.query__s_util_parsing_combinator_PackratParsers$PackratParser()).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((query) => {
       var query$1 = $as_Lio_github_edadma_rdb_Expr(query);
       return new $c_Lio_github_edadma_rdb_QueryCommand(query$1)
-    })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.insert__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.createTable__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.createType__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.update__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.alterTable__s_util_parsing_combinator_PackratParsers$PackratParser())))));
+    })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.insert__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.createTable__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.createType__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.update__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.delete__s_util_parsing_combinator_PackratParsers$PackratParser())))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.alterTable__s_util_parsing_combinator_PackratParsers$PackratParser())))));
     this.Lio_github_edadma_rdb_SQLParser$__f_command$lzy1 = $f_s_util_parsing_combinator_PackratParsers__parser2packrat__F0__s_util_parsing_combinator_PackratParsers$PackratParser(this, p);
     this.Lio_github_edadma_rdb_SQLParser$__f_commandbitmap$1 = true
   };
@@ -91058,7 +91242,7 @@ function $c_Lio_github_edadma_rdb_SQLParser$SQLLexer() {
   var xs = $n($m_s_package$().s_package$__f_Seq).apply__sci_Seq__sc_SeqOps($m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T.getArrayOf().constr)(["+", "-", "*", "/", "%", "(", ")", ".", "||", "<=", ">=", "<", ">", "=", "!=", ",", "&", "|", "^", "@", "{", "}", ":", "[", "]", ";"])));
   this$1.addAll__sc_IterableOnce__scm_HashSet(xs);
   var this$2 = $n(this.s_util_parsing_combinator_lexical_StdLexical__f_reserved);
-  var xs$1 = $n($m_s_package$().s_package$__f_Seq).apply__sci_Seq__sc_SeqOps($m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T.getArrayOf().constr)(["ADD", "ALL", "ALTER", "AND", "ANY", "AS", "ASC", "AUTO", "BETWEEN", "BIGINT", "BOOLEAN", "BY", "CASE", "CHECK", "COLUMN", "CONSTRAINT", "CREATE", "CURRENT_TIMESTAMP", "DROP", "DATABASE", "DEFAULT", "DELETE", "DESC", "DISTINCT", "DOUBLE", "ELSE", "END", "ENUM", "EXEC", "EXISTS", "FALSE", "FIRST", "FLOAT", "FOREIGN", "FROM", "GROUP", "HAVING", "ILIKE", "IN", "INDEX", "INNER", "INSERT", "INT", "INTO", "INTEGER", "IS", "JOIN", "JSON", "KEY", "LAST", "LEFT", "LIKE", "LIMIT", "NOT", "NULL", "NULLS", "NUMERIC", "OFFSET", "ON", "OR", "ORDER", "PRECISION", "PRIMARY", "PROCEDURE", "REFERENCES", "RETURNING", "SELECT", "SET", "SOME", "TABLE", "TEXT", "TIME", "TIMESTAMP", "THEN", "TRUE", "TYPE", "UPDATE", "UNION", "UNIQUE", "UUID", "VALUES", "WHEN", "WHERE", "WITHOUT", "ZONE"])));
+  var xs$1 = $n($m_s_package$().s_package$__f_Seq).apply__sci_Seq__sc_SeqOps($m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T.getArrayOf().constr)(["ADD", "add", "ALL", "all", "ALTER", "alter", "AND", "and", "ANY", "any", "AS", "as", "ASC", "asc", "AUTO", "auto", "BETWEEN", "between", "BIGINT", "bigint", "BOOLEAN", "boolean", "BY", "by", "CASE", "case", "CHECK", "check", "COLUMN", "column", "CONSTRAINT", "constraint", "CREATE", "create", "CURRENT_TIMESTAMP", "current_timestamp", "DATABASE", "database", "DEFAULT", "default", "DELETE", "delete", "DESC", "desc", "DISTINCT", "distinct", "DOUBLE", "double", "DROP", "drop", "ELSE", "else", "END", "end", "ENUM", "enum", "EXEC", "exec", "EXISTS", "exists", "FALSE", "false", "FIRST", "first", "FLOAT", "float", "FOREIGN", "foreign", "FROM", "from", "GROUP", "group", "HAVING", "having", "ILIKE", "ilike", "IN", "in", "INDEX", "index", "INNER", "inner", "INSERT", "insert", "INT", "int", "INTEGER", "integer", "INTO", "into", "IS", "is", "JOIN", "join", "JSON", "json", "KEY", "key", "LAST", "last", "LEFT", "left", "LIKE", "like", "LIMIT", "limit", "NOT", "not", "NULL", "null", "NULLS", "nulls", "NUMERIC", "numeric", "OFFSET", "offset", "ON", "on", "OR", "or", "ORDER", "order", "PRECISION", "precision", "PRIMARY", "primary", "PROCEDURE", "procedure", "REFERENCES", "references", "RETURNING", "returning", "SELECT", "select", "SET", "set", "SOME", "some", "TABLE", "table", "TEXT", "text", "THEN", "then", "TIME", "time", "TIMESTAMP", "timestamp", "TRUE", "true", "TYPE", "type", "UNION", "union", "UNIQUE", "unique", "UPDATE", "update", "UUID", "uuid", "VALUES", "values", "WHEN", "when", "WHERE", "where", "WITHOUT", "without", "ZONE", "zone"])));
   this$2.addAll__sc_IterableOnce__scm_HashSet(xs$1)
 }
 $c_Lio_github_edadma_rdb_SQLParser$SQLLexer.prototype = new $h_s_util_parsing_combinator_lexical_StdLexical();
@@ -98308,7 +98492,7 @@ function $c_Lio_github_edadma_rdb_UUIDType$() {
   this.Lio_github_edadma_rdb_UUIDType$__f_UUIDv4 = null;
   $n_Lio_github_edadma_rdb_UUIDType$ = this;
   this.Lio_github_edadma_rdb_UUIDType$__f_name = "uuid";
-  this.Lio_github_edadma_rdb_UUIDType$__f_UUIDv4 = ($m_sc_StringOps$(), $ct_s_util_matching_Regex__T__sci_Seq__(new $c_s_util_matching_Regex(), "(?i)^[0-9A-F]{8}-[0-9A-F]{4}-[4][0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$", $m_sci_Nil$()))
+  this.Lio_github_edadma_rdb_UUIDType$__f_UUIDv4 = ($m_sc_StringOps$(), $ct_s_util_matching_Regex__T__sci_Seq__(new $c_s_util_matching_Regex(), "(?i)^[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[89AB][0-9A-F]{3}-[0-9A-F]{12}$", $m_sci_Nil$()))
 }
 $c_Lio_github_edadma_rdb_UUIDType$.prototype = new $h_O();
 $c_Lio_github_edadma_rdb_UUIDType$.prototype.constructor = $c_Lio_github_edadma_rdb_UUIDType$;
@@ -113299,93 +113483,6 @@ var $d_scm_CheckedIndexedSeqView$Map = new $TypeData().initClass({
   scm_CheckedIndexedSeqView: 1
 });
 $c_scm_CheckedIndexedSeqView$Map.prototype.$classData = $d_scm_CheckedIndexedSeqView$Map;
-function $p_Lcom_vinctus_sjs\uff3futils_DynamicMap__quoted__O__T($thiz, a) {
-  if (((typeof a) === "string")) {
-    var s = $as_T(a);
-    return (("\"" + s) + "\"")
-  } else {
-    return ("" + a)
-  }
-}
-/** @constructor */
-function $c_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj) {
-  this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj = null;
-  this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj = obj
-}
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype = new $h_sci_AbstractMap();
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.constructor = $c_Lcom_vinctus_sjs\uff3futils_DynamicMap;
-/** @constructor */
-function $h_Lcom_vinctus_sjs\uff3futils_DynamicMap() {
-  /*<skip>*/
-}
-$h_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype = $c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype;
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.removed__T__Lcom_vinctus_sjs\uff3futils_DynamicMap = (function(key) {
-  return new $c_Lcom_vinctus_sjs\uff3futils_DynamicMap($as_sci_Map($n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).removed__O__sci_MapOps(key)))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.get__T__s_Option = (function(key) {
-  return $n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).get__O__s_Option(key)
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.iterator__sc_Iterator = (function() {
-  return $n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).iterator__sc_Iterator()
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.updated__T__O__Lcom_vinctus_sjs\uff3futils_DynamicMap = (function(key, value) {
-  return new $c_Lcom_vinctus_sjs\uff3futils_DynamicMap($as_sci_Map($n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).updated__O__O__sci_MapOps(key, value)))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.toString__T = (function() {
-  var this$2 = $n($as_sc_IterableOnceOps($n(this.Lcom_vinctus_sjs\uff3futils_DynamicMap__f_obj).map__F1__O(new $c_sjsr_AnonFunction1(((x$1) => {
-    var x$1$1 = $as_T2(x$1);
-    if ((x$1$1 !== null)) {
-      var k = $as_T($n(x$1$1).T2__f__1);
-      var v = $n(x$1$1).T2__f__2;
-      return ((k + ": ") + $p_Lcom_vinctus_sjs\uff3futils_DynamicMap__quoted__O__T(this, v))
-    };
-    throw new $c_s_MatchError(x$1$1)
-  })))));
-  return $f_sc_IterableOnceOps__mkString__T__T__T__T(this$2, "{", ", ", "}")
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.removed__O__sci_MapOps = (function(key) {
-  return this.removed__T__Lcom_vinctus_sjs\uff3futils_DynamicMap($as_T(key))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.get__O__s_Option = (function(key) {
-  return this.get__T__s_Option($as_T(key))
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.updated__O__O__sci_MapOps = (function(key, value) {
-  return this.updated__T__O__Lcom_vinctus_sjs\uff3futils_DynamicMap($as_T(key), value)
-});
-function $as_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj) {
-  return (((obj instanceof $c_Lcom_vinctus_sjs\uff3futils_DynamicMap) || (obj === null)) ? obj : $throwClassCastException(obj, "com.vinctus.sjs_utils.DynamicMap"))
-}
-function $isArrayOf_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj, depth) {
-  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lcom_vinctus_sjs\uff3futils_DynamicMap)))
-}
-function $asArrayOf_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj, depth) {
-  return (($isArrayOf_Lcom_vinctus_sjs\uff3futils_DynamicMap(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lcom.vinctus.sjs_utils.DynamicMap;", depth))
-}
-var $d_Lcom_vinctus_sjs\uff3futils_DynamicMap = new $TypeData().initClass({
-  Lcom_vinctus_sjs\uff3futils_DynamicMap: 0
-}, false, "com.vinctus.sjs_utils.DynamicMap", {
-  Lcom_vinctus_sjs\uff3futils_DynamicMap: 1,
-  sci_AbstractMap: 1,
-  sc_AbstractMap: 1,
-  sc_AbstractIterable: 1,
-  O: 1,
-  sc_Iterable: 1,
-  sc_IterableOnce: 1,
-  sc_IterableOps: 1,
-  sc_IterableOnceOps: 1,
-  sc_IterableFactoryDefaults: 1,
-  sc_Map: 1,
-  sc_MapOps: 1,
-  s_PartialFunction: 1,
-  F1: 1,
-  sc_MapFactoryDefaults: 1,
-  s_Equals: 1,
-  sci_Map: 1,
-  sci_Iterable: 1,
-  sci_MapOps: 1,
-  s_Dynamic: 1
-});
-$c_Lcom_vinctus_sjs\uff3futils_DynamicMap.prototype.$classData = $d_Lcom_vinctus_sjs\uff3futils_DynamicMap;
 /** @constructor */
 function $c_sci_Map$EmptyMap$() {
   /*<skip>*/
@@ -113646,6 +113743,9 @@ $c_sci_Map$Map1.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map1.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map1.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map1.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -113786,6 +113886,9 @@ $c_sci_Map$Map2.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map2.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map2.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map2.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -113963,6 +114066,9 @@ $c_sci_Map$Map3.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map3.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map3.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map3.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -114170,6 +114276,9 @@ $c_sci_Map$Map4.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_Map$Map4.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_Map(pred, false)
 });
+$c_sci_Map$Map4.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_Map(pred, true)
+});
 $c_sci_Map$Map4.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -115537,6 +115646,9 @@ $c_sci_HashMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_HashMap.prototype.filter__F1__O = (function(pred) {
   return this.filterImpl__F1__Z__sci_HashMap(pred, false)
 });
+$c_sci_HashMap.prototype.filterNot__F1__O = (function(pred) {
+  return this.filterImpl__F1__Z__sci_HashMap(pred, true)
+});
 $c_sci_HashMap.prototype.mapFactory__sc_MapFactory = (function() {
   return $m_sci_HashMap$()
 });
@@ -115793,6 +115905,9 @@ $c_sci_TreeSeqMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_TreeSeqMap.prototype.filter__F1__O = (function(pred) {
   return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, false)
 });
+$c_sci_TreeSeqMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_sci_TreeSeqMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -116149,6 +116264,9 @@ $c_sci_VectorMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_VectorMap.prototype.filter__F1__O = (function(pred) {
   return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, false)
 });
+$c_sci_VectorMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_sci_VectorMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -116912,6 +117030,9 @@ $c_sci_ListMap.prototype.zip__sc_IterableOnce__O = (function(that) {
 $c_sci_ListMap.prototype.filter__F1__O = (function(pred) {
   return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, false)
 });
+$c_sci_ListMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_sci_ListMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -120795,6 +120916,9 @@ $c_scm_HashMap.prototype.collect__s_PartialFunction__O = (function(pf) {
 $c_scm_HashMap.prototype.zip__sc_IterableOnce__O = (function(that) {
   return $f_sc_StrictOptimizedIterableOps__zip__sc_IterableOnce__O(this, that)
 });
+$c_scm_HashMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_scm_HashMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });
@@ -124672,6 +124796,9 @@ $c_scm_LinkedHashMap.prototype.collect__s_PartialFunction__O = (function(pf) {
 $c_scm_LinkedHashMap.prototype.zip__sc_IterableOnce__O = (function(that) {
   return $f_sc_StrictOptimizedIterableOps__zip__sc_IterableOnce__O(this, that)
 });
+$c_scm_LinkedHashMap.prototype.filterNot__F1__O = (function(pred) {
+  return $f_sc_StrictOptimizedIterableOps__filterImpl__F1__Z__O(this, pred, true)
+});
 $c_scm_LinkedHashMap.prototype.dropRight__I__O = (function(n) {
   return $f_sc_StrictOptimizedIterableOps__dropRight__I__O(this, n)
 });