@vinctus/oql 1.1.21 → 1.1.23

package/main.js

@@ -1232,28 +1232,38 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
       var _2 = $n(v).value__O();
       if (((typeof _2) === "string")) {
         var x71 = $as_T(_2);
-        var x = $m_Lcom_vinctus_oql_IntegerType$();
-        if ((x === typ)) {
+        matchAlts1: {
+          matchAlts2: {
+            var x = $m_Lcom_vinctus_oql_SmallintType$();
+            if ((x === typ)) {
+              break matchAlts2
+            };
+            var x$3 = $m_Lcom_vinctus_oql_IntegerType$();
+            if ((x$3 === typ)) {
+              break matchAlts2
+            };
+            break matchAlts1
+          };
           $m_sc_StringOps$();
           var this$22 = $m_jl_Integer$();
           return this$22.parseInt__T__I__I(x71, 10)
         };
-        var x$3 = $m_Lcom_vinctus_oql_FloatType$();
-        if ((x$3 === typ)) {
+        var x$5 = $m_Lcom_vinctus_oql_FloatType$();
+        if ((x$5 === typ)) {
           $m_sc_StringOps$();
           return $m_jl_Double$().parseDouble__T__D(x71)
         };
-        var x$5 = $m_Lcom_vinctus_oql_BigintType$();
-        if ((x$5 === typ)) {
+        var x$7 = $m_Lcom_vinctus_oql_BigintType$();
+        if ((x$7 === typ)) {
           return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).bigint__T__O(x71)
         };
-        var x$7 = $m_Lcom_vinctus_oql_UUIDType$();
-        if ((x$7 === typ)) {
+        var x$9 = $m_Lcom_vinctus_oql_UUIDType$();
+        if ((x$9 === typ)) {
           $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv);
           return x71
         };
-        var x$9 = $m_Lcom_vinctus_oql_TimestampType$();
-        if ((x$9 === typ)) {
+        var x$11 = $m_Lcom_vinctus_oql_TimestampType$();
+        if ((x$11 === typ)) {
           return $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv).timestamp__T__O(x71)
         };
         if ((typ instanceof $c_Lcom_vinctus_oql_DecimalType)) {
@@ -1269,8 +1279,8 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
         var x$1$2 = $as_Lcom_vinctus_oql_NodePGResultSetValue(v);
         var this$30 = $n(x$1$2);
         var x43 = this$30.Lcom_vinctus_oql_NodePGResultSetValue__f_value;
-        var x$11 = $m_Lcom_vinctus_oql_JSONType$();
-        if ((x$11 === typ)) {
+        var x$13 = $m_Lcom_vinctus_oql_JSONType$();
+        if ((x$13 === typ)) {
           $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv);
           return x43
         }
@@ -1279,8 +1289,8 @@ function $p_Lcom_vinctus_oql_AbstractOQL__buildResult$1__T__F0__Lcom_vinctus_oql
         var x$1$3 = $as_Lcom_vinctus_oql_SequenceResultSetValue(v);
         var this$33 = $n(x$1$3);
         var x37 = this$33.Lcom_vinctus_oql_SequenceResultSetValue__f_value;
-        var x$13 = $m_Lcom_vinctus_oql_JSONType$();
-        if ((x$13 === typ)) {
+        var x$15 = $m_Lcom_vinctus_oql_JSONType$();
+        if ((x$15 === typ)) {
           $n($thiz.Lcom_vinctus_oql_AbstractOQL__f_conv);
           return $m_Lcom_vinctus_sjs\uff3futils_package$().toJS__O__sjs_js_Any(x37)
         }
@@ -1994,16 +2004,16 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
     $n(x140).Lcom_vinctus_oql_OQLExpression__f_typ = x143;
     return (void 0)
   };
-  matchAlts1: {
-    matchAlts2: {
+  matchAlts3: {
+    matchAlts4: {
       var x$5 = $m_Lcom_vinctus_oql_StarOQLExpression$();
       if ((x$5 === expr)) {
-        break matchAlts2
+        break matchAlts4
       };
       if ((expr instanceof $c_Lcom_vinctus_oql_RawOQLExpression)) {
-        break matchAlts2
+        break matchAlts4
       };
-      break matchAlts1
+      break matchAlts3
     };
     return (void 0)
   };
@@ -3030,10 +3040,10 @@ function $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__
         var this$11 = $n(x$1$3);
         var this$12 = $n(x$1$3);
         var this$13 = $n(x$1$3);
-        var x264 = this$13.Lcom_vinctus_oql_Attribute__f_pk;
+        var x271 = this$13.Lcom_vinctus_oql_Attribute__f_pk;
         var this$14 = $n(x$1$3);
         var this$15 = $n(x$1$3);
-        return (!x264)
+        return (!x271)
       };
       throw new $c_s_MatchError(x$1$3)
     })))).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$3$1) => {
@@ -3041,28 +3051,28 @@ function $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__
       matchResult31: {
         if ((x$1$4 !== null)) {
           var this$18 = $n(x$1$4);
-          var x273 = this$18.Lcom_vinctus_oql_Attribute__f_name;
+          var x280 = this$18.Lcom_vinctus_oql_Attribute__f_name;
           var this$19 = $n(x$1$4);
           var this$20 = $n(x$1$4);
           var this$21 = $n(x$1$4);
-          var x276 = this$21.Lcom_vinctus_oql_Attribute__f_required;
+          var x283 = this$21.Lcom_vinctus_oql_Attribute__f_required;
           var this$22 = $n(x$1$4);
-          var x277 = this$22.Lcom_vinctus_oql_Attribute__f_typ;
-          if ((x277 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-            var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x277);
+          var x284 = this$22.Lcom_vinctus_oql_Attribute__f_typ;
+          if ((x284 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+            var x$1$5 = $as_Lcom_vinctus_oql_ManyToOneType(x284);
             var this$24 = $n(x$1$5);
-            var x270 = this$24.Lcom_vinctus_oql_ManyToOneType__f_entity;
+            var x277 = this$24.Lcom_vinctus_oql_ManyToOneType__f_entity;
             var this$25 = $n(ents);
             var newents = new $c_sci_$colon$colon(entity, this$25);
-            if ((!newents.contains__O__Z(x270))) {
-              if ((!x276)) {
+            if ((!newents.contains__O__Z(x277))) {
+              if ((!x283)) {
                 var this$27 = $n(nullablesbuf$1);
                 var this$26 = $n(attrs);
-                var elem$2 = new $c_sci_$colon$colon(x273, this$26).reverse__sci_List();
+                var elem$2 = new $c_sci_$colon$colon(x280, this$26).reverse__sci_List();
                 this$27.addOne__O__scm_ListBuffer(elem$2)
               };
               var this$28 = $n(attrs);
-              $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__sci_List__sci_List__Lcom_vinctus_oql_Entity__V($thiz, idsbuf$1, nullablesbuf$1, new $c_sci_$colon$colon(x273, this$28), newents, x270)
+              $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__sci_List__sci_List__Lcom_vinctus_oql_Entity__V($thiz, idsbuf$1, nullablesbuf$1, new $c_sci_$colon$colon(x280, this$28), newents, x277)
             }
           };
           break matchResult31
@@ -3077,30 +3087,30 @@ function $ps_Lcom_vinctus_oql_DataModel__lookup$1__Lcom_vinctus_oql_OQLExpressio
   var ids$tailLocal1 = ids;
   while (true) {
     matchResult34: {
-      var x295 = ids$tailLocal1;
-      if ((x295 !== null)) {
+      var x302 = ids$tailLocal1;
+      if ((x302 !== null)) {
         $n($m_s_package$().s_package$__f_List);
-        if (($n(x295).lengthCompare__I__I(1) === 0)) {
-          var this$4 = $n(x295);
-          var x300 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$4, 0));
+        if (($n(x302).lengthCompare__I__I(1) === 0)) {
+          var this$4 = $n(x302);
+          var x307 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$4, 0));
           matchResult32: {
-            var x278 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(x300).Lcom_vinctus_oql_Ident__f_s);
-            if ((x278 instanceof $c_s_Some)) {
-              var attr = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x278)).s_Some__f_value);
+            var x285 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(x307).Lcom_vinctus_oql_Ident__f_s);
+            if ((x285 instanceof $c_s_Some)) {
+              var attr = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x285)).s_Some__f_value);
               var this$7 = $n(dmrefs$1);
               var self = entity$tailLocal1;
               var elem = new $c_T2(self, attr);
               this$7.addOne__O__scm_ListBuffer(elem);
               if (ref$1) {
                 if ((!($n(attr).Lcom_vinctus_oql_Attribute__f_typ instanceof $c_Lcom_vinctus_oql_ManyToOneType))) {
-                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x300).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x300).Lcom_vinctus_oql_Ident__f_s) + "' is not many-to-one"), input$1)
+                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x307).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x307).Lcom_vinctus_oql_Ident__f_s) + "' is not many-to-one"), input$1)
                 };
                 var $$x1 = $n(expr$1);
                 var this$8 = $n($n($as_Lcom_vinctus_oql_Attribute($n($n($n($as_Lcom_vinctus_oql_ManyToOneType($n(attr).Lcom_vinctus_oql_Attribute__f_typ)).Lcom_vinctus_oql_ManyToOneType__f_entity).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ);
                 $$x1.Lcom_vinctus_oql_OQLExpression__f_typ = $as_Lcom_vinctus_oql_Datatype(this$8)
               } else {
                 if ((!$n($n(attr).Lcom_vinctus_oql_Attribute__f_typ).isDataType__Z())) {
-                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x300).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x300).Lcom_vinctus_oql_Ident__f_s) + "' is not a DBMS data type"), input$1)
+                  $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x307).Lcom_vinctus_oql_Ident__f_pos, (("attribute '" + $n(x307).Lcom_vinctus_oql_Ident__f_s) + "' is not a DBMS data type"), input$1)
                 };
                 var $$x2 = $n(expr$1);
                 var this$9 = $n($n(attr).Lcom_vinctus_oql_Attribute__f_typ);
@@ -3109,50 +3119,50 @@ function $ps_Lcom_vinctus_oql_DataModel__lookup$1__Lcom_vinctus_oql_OQLExpressio
               break matchResult32
             };
             var x = $m_s_None$();
-            if ((x === x278)) {
-              $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x300).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(x300).Lcom_vinctus_oql_Ident__f_s) + "'"), input$1)
+            if ((x === x285)) {
+              $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(x307).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(x307).Lcom_vinctus_oql_Ident__f_s) + "'"), input$1)
             };
-            throw new $c_s_MatchError(x278)
+            throw new $c_s_MatchError(x285)
           };
           break matchResult34
         }
       };
-      if ((x295 instanceof $c_sci_$colon$colon)) {
-        var x296 = $as_sci_$colon$colon(x295);
-        var x298 = $n(x296).sci_$colon$colon__f_next;
-        var head = $as_Lcom_vinctus_oql_Ident($n(x296).sci_$colon$colon__f_head);
-        var x281 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(head).Lcom_vinctus_oql_Ident__f_s);
-        if ((x281 instanceof $c_s_Some)) {
-          var x285 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x281)).s_Some__f_value);
-          if ((x285 !== null)) {
-            var this$11 = $n(x285);
-            var this$12 = $n(x285);
-            var this$13 = $n(x285);
-            var this$14 = $n(x285);
-            var this$15 = $n(x285);
-            var x291 = this$15.Lcom_vinctus_oql_Attribute__f_typ;
-            if ((x291 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-              var x$1 = $as_Lcom_vinctus_oql_ManyToOneType(x291);
+      if ((x302 instanceof $c_sci_$colon$colon)) {
+        var x303 = $as_sci_$colon$colon(x302);
+        var x305 = $n(x303).sci_$colon$colon__f_next;
+        var head = $as_Lcom_vinctus_oql_Ident($n(x303).sci_$colon$colon__f_head);
+        var x288 = $n($n(entity$tailLocal1).attributes__sci_Map()).get__O__s_Option($n(head).Lcom_vinctus_oql_Ident__f_s);
+        if ((x288 instanceof $c_s_Some)) {
+          var x292 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x288)).s_Some__f_value);
+          if ((x292 !== null)) {
+            var this$11 = $n(x292);
+            var this$12 = $n(x292);
+            var this$13 = $n(x292);
+            var this$14 = $n(x292);
+            var this$15 = $n(x292);
+            var x298 = this$15.Lcom_vinctus_oql_Attribute__f_typ;
+            if ((x298 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+              var x$1 = $as_Lcom_vinctus_oql_ManyToOneType(x298);
               var this$17 = $n(x$1);
-              var x294 = this$17.Lcom_vinctus_oql_ManyToOneType__f_entity;
+              var x301 = this$17.Lcom_vinctus_oql_ManyToOneType__f_entity;
               var this$20 = $n(dmrefs$1);
-              var elem$1 = new $c_T2(x294, x285);
+              var elem$1 = new $c_T2(x301, x292);
               this$20.addOne__O__scm_ListBuffer(elem$1);
-              ids$tailLocal1 = x298;
-              entity$tailLocal1 = x294;
+              ids$tailLocal1 = x305;
+              entity$tailLocal1 = x301;
               continue
             }
           };
           $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(head).Lcom_vinctus_oql_Ident__f_pos, (((("attribute '" + $n(head).Lcom_vinctus_oql_Ident__f_s) + "' of entity '") + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have an entity type"), input$1)
         };
         var x$3 = $m_s_None$();
-        if ((x$3 === x281)) {
+        if ((x$3 === x288)) {
           $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(head).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n(entity$tailLocal1).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(head).Lcom_vinctus_oql_Ident__f_s) + "'"), input$1)
         };
-        throw new $c_s_MatchError(x281);
+        throw new $c_s_MatchError(x288);
         break matchResult34
       };
-      throw new $c_s_MatchError(x295)
+      throw new $c_s_MatchError(x302)
     };
     return (void 0)
   }
@@ -3259,35 +3269,56 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
         return false
       }
     }));
-    var this$72 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$13, p);
+    var this$79 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$13, p);
     var f$1 = new $c_sjsr_AnonFunction1(((x$1$2) => {
       var x$1$3 = $as_Lcom_vinctus_oql_DataModel$EntityInfo(x$1$2);
       matchResult15: {
         if ((x$1$3 !== null)) {
           $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
           var this$15 = $n(x$1$3);
-          var x114 = this$15.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+          var x121 = this$15.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
           var this$16 = $n(x$1$3);
-          var x115 = this$16.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
+          var x122 = this$16.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
           var this$17 = $n(x$1$3);
-          var x116 = this$17.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
+          var x123 = this$17.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
           var elem = $m_s_None$();
           var pk = new $c_sr_ObjectRef(elem);
-          $n(x115).foreach__F1__V(new $c_sjsr_AnonFunction1(((a$4) => {
+          $n(x122).foreach__F1__V(new $c_sjsr_AnonFunction1(((a$4) => {
             var a$5 = $as_Lcom_vinctus_oql_DMLAttribute(a$4);
             matchResult14: {
               var $$x2;
               var x59 = $n(a$5).Lcom_vinctus_oql_DMLAttribute__f_typ;
-              if ((x59 instanceof $c_Lcom_vinctus_oql_DMLSimpleDataType)) {
-                var x$1$4 = $as_Lcom_vinctus_oql_DMLSimpleDataType(x59);
+              if ((x59 instanceof $c_Lcom_vinctus_oql_DMLParametricDataType)) {
+                var x$1$4 = $as_Lcom_vinctus_oql_DMLParametricDataType(x59);
                 var this$20 = $n(x$1$4);
-                var x111 = this$20.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
-                switch (x111) {
+                var x117 = this$20.Lcom_vinctus_oql_DMLParametricDataType__f_typ;
+                var this$21 = $n(x$1$4);
+                var x118 = this$21.Lcom_vinctus_oql_DMLParametricDataType__f_parameters;
+                if ((x117 === "char")) {
+                  $m_sc_StringOps$();
+                  var x = $as_T($n(x118).head__O());
+                  var this$24 = $m_jl_Integer$();
+                  var n = this$24.parseInt__T__I__I(x, 10);
+                  var $$x2 = new $c_Lcom_vinctus_oql_CharacterType(n);
+                  break matchResult14
+                }
+              };
+              if ((x59 instanceof $c_Lcom_vinctus_oql_DMLSimpleDataType)) {
+                var x$1$5 = $as_Lcom_vinctus_oql_DMLSimpleDataType(x59);
+                var this$27 = $n(x$1$5);
+                var x114 = this$27.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
+                switch (x114) {
                   case "text": {
                     var $$x2 = $m_Lcom_vinctus_oql_TextType$();
                     break matchResult14;
                     break
                   }
+                  case "smallint":
+                  case "int2": {
+                    var $$x2 = $m_Lcom_vinctus_oql_SmallintType$();
+                    break matchResult14;
+                    break
+                  }
                   case "integer":
                   case "int":
                   case "int4": {
@@ -3304,10 +3335,10 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                   default: {
                     matchAlts3: {
                       matchAlts4: {
-                        if ((x111 === "bigint")) {
+                        if ((x114 === "bigint")) {
                           break matchAlts4
                         };
-                        if ((x111 === "int8")) {
+                        if ((x114 === "int8")) {
                           break matchAlts4
                         };
                         break matchAlts3
@@ -3319,28 +3350,28 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                 }
               };
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLParametricDataType)) {
-                var x$1$5 = $as_Lcom_vinctus_oql_DMLParametricDataType(x59);
-                var this$22 = $n(x$1$5);
-                var x98 = this$22.Lcom_vinctus_oql_DMLParametricDataType__f_typ;
-                var this$23 = $n(x$1$5);
-                var x99 = this$23.Lcom_vinctus_oql_DMLParametricDataType__f_parameters;
+                var x$1$6 = $as_Lcom_vinctus_oql_DMLParametricDataType(x59);
+                var this$29 = $n(x$1$6);
+                var x98 = this$29.Lcom_vinctus_oql_DMLParametricDataType__f_typ;
+                var this$30 = $n(x$1$6);
+                var x99 = this$30.Lcom_vinctus_oql_DMLParametricDataType__f_parameters;
                 if ((x98 === "decimal")) {
                   $m_sc_StringOps$();
-                  var x = $as_T($n(x99).head__O());
-                  var this$26 = $m_jl_Integer$();
-                  var precision = this$26.parseInt__T__I__I(x, 10);
+                  var x$2 = $as_T($n(x99).head__O());
+                  var this$33 = $m_jl_Integer$();
+                  var precision = this$33.parseInt__T__I__I(x$2, 10);
                   $m_sc_StringOps$();
-                  var x$2 = $as_T($n($as_sc_IterableOps($n(x99).tail__O())).head__O());
-                  var this$29 = $m_jl_Integer$();
-                  var scale = this$29.parseInt__T__I__I(x$2, 10);
+                  var x$3 = $as_T($n($as_sc_IterableOps($n(x99).tail__O())).head__O());
+                  var this$36 = $m_jl_Integer$();
+                  var scale = this$36.parseInt__T__I__I(x$3, 10);
                   var $$x2 = new $c_Lcom_vinctus_oql_DecimalType(precision, scale);
                   break matchResult14
                 }
               };
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLSimpleDataType)) {
-                var x$1$6 = $as_Lcom_vinctus_oql_DMLSimpleDataType(x59);
-                var this$32 = $n(x$1$6);
-                var x95 = this$32.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
+                var x$1$7 = $as_Lcom_vinctus_oql_DMLSimpleDataType(x59);
+                var this$39 = $n(x$1$7);
+                var x95 = this$39.Lcom_vinctus_oql_DMLSimpleDataType__f_typ;
                 switch (x95) {
                   case "date": {
                     var $$x2 = $m_Lcom_vinctus_oql_DateType$();
@@ -3382,24 +3413,24 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                 }
               };
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLNameType)) {
-                var x$1$7 = $as_Lcom_vinctus_oql_DMLNameType(x59);
-                var this$34 = $n(x$1$7);
-                var x74 = this$34.Lcom_vinctus_oql_DMLNameType__f_entity;
+                var x$1$8 = $as_Lcom_vinctus_oql_DMLNameType(x59);
+                var this$41 = $n(x$1$8);
+                var x74 = this$41.Lcom_vinctus_oql_DMLNameType__f_entity;
                 var x21 = entities.get__O__s_Option($n(x74).Lcom_vinctus_oql_Ident__f_s);
                 if ((x21 instanceof $c_s_Some)) {
                   var x23 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($n($as_s_Some(x21)).s_Some__f_value);
                   if ((x23 !== null)) {
                     $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-                    var this$36 = $n(x23);
-                    var x25 = this$36.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                    var this$37 = $n(x23);
-                    var this$38 = $n(x23);
+                    var this$43 = $n(x23);
+                    var x25 = this$43.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+                    var this$44 = $n(x23);
+                    var this$45 = $n(x23);
                     var $$x2 = new $c_Lcom_vinctus_oql_ManyToOneType(x25);
                     break matchResult14
                   }
                 };
-                var x$3 = $m_s_None$();
-                if ((x$3 === x21)) {
+                var x$4 = $m_s_None$();
+                if ((x$4 === x21)) {
                   var x18 = enums.get__O__s_Option($n(x74).Lcom_vinctus_oql_Ident__f_s);
                   if ((x18 instanceof $c_s_Some)) {
                     var e$4 = $as_Lcom_vinctus_oql_EnumType($n($as_s_Some(x18)).s_Some__f_value);
@@ -3416,19 +3447,19 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                 throw new $c_s_MatchError(x21)
               };
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLOneToOneType)) {
-                var x$1$8 = $as_Lcom_vinctus_oql_DMLOneToOneType(x59);
-                var this$41 = $n(x$1$8);
-                var x70 = this$41.Lcom_vinctus_oql_DMLOneToOneType__f_entity;
-                var this$42 = $n(x$1$8);
+                var x$1$9 = $as_Lcom_vinctus_oql_DMLOneToOneType(x59);
+                var this$48 = $n(x$1$9);
+                var x70 = this$48.Lcom_vinctus_oql_DMLOneToOneType__f_entity;
+                var this$49 = $n(x$1$9);
                 var x28 = entities.get__O__s_Option($n(x70).Lcom_vinctus_oql_Ident__f_s);
                 if ((x28 instanceof $c_s_Some)) {
                   var x30 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($n($as_s_Some(x28)).s_Some__f_value);
                   if ((x30 !== null)) {
                     $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-                    var this$44 = $n(x30);
-                    var x32 = this$44.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                    var this$45 = $n(x30);
-                    var this$46 = $n(x30);
+                    var this$51 = $n(x30);
+                    var x32 = this$51.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+                    var this$52 = $n(x30);
+                    var this$53 = $n(x30);
                     var $$x2 = new $c_Lcom_vinctus_oql_OneToOneType(x32, null);
                     break matchResult14
                   }
@@ -3441,19 +3472,19 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                 throw new $c_s_MatchError(x28)
               };
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLOneToManyType)) {
-                var x$1$9 = $as_Lcom_vinctus_oql_DMLOneToManyType(x59);
-                var this$49 = $n(x$1$9);
-                var x66 = this$49.Lcom_vinctus_oql_DMLOneToManyType__f_entity;
-                var this$50 = $n(x$1$9);
+                var x$1$10 = $as_Lcom_vinctus_oql_DMLOneToManyType(x59);
+                var this$56 = $n(x$1$10);
+                var x66 = this$56.Lcom_vinctus_oql_DMLOneToManyType__f_entity;
+                var this$57 = $n(x$1$10);
                 var x35 = entities.get__O__s_Option($n(x66).Lcom_vinctus_oql_Ident__f_s);
                 if ((x35 instanceof $c_s_Some)) {
                   var x37 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($n($as_s_Some(x35)).s_Some__f_value);
                   if ((x37 !== null)) {
                     $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-                    var this$52 = $n(x37);
-                    var x39 = this$52.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                    var this$53 = $n(x37);
-                    var this$54 = $n(x37);
+                    var this$59 = $n(x37);
+                    var x39 = this$59.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+                    var this$60 = $n(x37);
+                    var this$61 = $n(x37);
                     var $$x2 = new $c_Lcom_vinctus_oql_OneToManyType(x39, null);
                     break matchResult14
                   }
@@ -3466,29 +3497,29 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                 throw new $c_s_MatchError(x35)
               };
               if ((x59 instanceof $c_Lcom_vinctus_oql_DMLManyToManyType)) {
-                var x$1$10 = $as_Lcom_vinctus_oql_DMLManyToManyType(x59);
-                var this$57 = $n(x$1$10);
-                var x62 = this$57.Lcom_vinctus_oql_DMLManyToManyType__f_entity;
-                var this$58 = $n(x$1$10);
-                var x63 = this$58.Lcom_vinctus_oql_DMLManyToManyType__f_link;
+                var x$1$11 = $as_Lcom_vinctus_oql_DMLManyToManyType(x59);
+                var this$64 = $n(x$1$11);
+                var x62 = this$64.Lcom_vinctus_oql_DMLManyToManyType__f_entity;
+                var this$65 = $n(x$1$11);
+                var x63 = this$65.Lcom_vinctus_oql_DMLManyToManyType__f_link;
                 var _1 = entities.get__O__s_Option($n(x62).Lcom_vinctus_oql_Ident__f_s);
                 var _2 = entities.get__O__s_Option($n(x63).Lcom_vinctus_oql_Ident__f_s);
                 if ((_1 instanceof $c_s_Some)) {
                   var x54 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($n($as_s_Some(_1)).s_Some__f_value);
                   if ((x54 !== null)) {
                     $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-                    var this$61 = $n(x54);
-                    var x56 = this$61.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                    var this$62 = $n(x54);
-                    var this$63 = $n(x54);
+                    var this$68 = $n(x54);
+                    var x56 = this$68.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+                    var this$69 = $n(x54);
+                    var this$70 = $n(x54);
                     if ((_2 instanceof $c_s_Some)) {
                       var x48 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($n($as_s_Some(_2)).s_Some__f_value);
                       if ((x48 !== null)) {
                         $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-                        var this$65 = $n(x48);
-                        var x50 = this$65.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                        var this$66 = $n(x48);
-                        var this$67 = $n(x48);
+                        var this$72 = $n(x48);
+                        var x50 = this$72.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+                        var this$73 = $n(x48);
+                        var this$74 = $n(x48);
                         var $$x2 = new $c_Lcom_vinctus_oql_ManyToManyType(x56, x50, null, null);
                         break matchResult14
                       }
@@ -3508,8 +3539,8 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
             };
             var typ$4 = $as_Lcom_vinctus_oql_TypeSpecifier($$x2);
             var name$2 = $n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-            var this$69 = $n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_actualName);
-            var column = $n($as_Lcom_vinctus_oql_Ident((this$69.isEmpty__Z() ? $n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name : this$69.get__O()))).Lcom_vinctus_oql_Ident__f_s;
+            var this$76 = $n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_actualName);
+            var column = $n($as_Lcom_vinctus_oql_Ident((this$76.isEmpty__Z() ? $n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name : this$76.get__O()))).Lcom_vinctus_oql_Ident__f_s;
             var pk$1 = $n(a$5).Lcom_vinctus_oql_DMLAttribute__f_pk;
             var required = $n(a$5).Lcom_vinctus_oql_DMLAttribute__f_required;
             var attr$3 = new $c_Lcom_vinctus_oql_Attribute(name$2, column, pk$1, required, typ$4);
@@ -3524,183 +3555,183 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
               pk.sr_ObjectRef__f_elem = ev$4;
               ev$4 = null
             };
-            $n(x116).update__O__O__V($n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s, attr$3)
+            $n(x123).update__O__O__V($n($n(a$5).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s, attr$3)
           })));
-          $n(x114).Lcom_vinctus_oql_Entity__f__pk = $as_s_Option(pk.sr_ObjectRef__f_elem);
+          $n(x121).Lcom_vinctus_oql_Entity__f__pk = $as_s_Option(pk.sr_ObjectRef__f_elem);
           break matchResult15
         };
         throw new $c_s_MatchError(x$1$3)
       }
     }));
-    $n(this$72.filtered__sc_Iterable()).foreach__F1__V(f$1);
-    var this$77 = new $c_sc_MapOps$$anon$1(entities);
+    $n(this$79.filtered__sc_Iterable()).foreach__F1__V(f$1);
+    var this$84 = new $c_sc_MapOps$$anon$1(entities);
     var p$1 = new $c_sjsr_AnonFunction1(((x$1$3$1) => {
-      var x$1$11 = $as_Lcom_vinctus_oql_DataModel$EntityInfo(x$1$3$1);
-      if ((x$1$11 !== null)) {
+      var x$1$12 = $as_Lcom_vinctus_oql_DataModel$EntityInfo(x$1$3$1);
+      if ((x$1$12 !== null)) {
         $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-        var this$74 = $n(x$1$11);
-        var this$75 = $n(x$1$11);
-        var this$76 = $n(x$1$11);
+        var this$81 = $n(x$1$12);
+        var this$82 = $n(x$1$12);
+        var this$83 = $n(x$1$12);
         return true
       } else {
         return false
       }
     }));
-    var this$180 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$77, p$1);
+    var this$187 = $ct_sc_IterableOps$WithFilter__sc_IterableOps__F1__(new $c_sc_IterableOps$WithFilter(), this$84, p$1);
     var f$2 = new $c_sjsr_AnonFunction1(((x$1$4$1) => {
-      var x$1$12 = $as_Lcom_vinctus_oql_DataModel$EntityInfo(x$1$4$1);
+      var x$1$13 = $as_Lcom_vinctus_oql_DataModel$EntityInfo(x$1$4$1);
       matchResult26: {
-        if ((x$1$12 !== null)) {
+        if ((x$1$13 !== null)) {
           $n(this.Lcom_vinctus_oql_DataModel__f_EntityInfo$lzy1);
-          var this$79 = $n(x$1$12);
-          var x245 = this$79.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-          var this$80 = $n(x$1$12);
-          var x246 = this$80.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
-          var this$81 = $n(x$1$12);
-          var x247 = this$81.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
-          $n(x246).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
-            var x$1$13 = $as_Lcom_vinctus_oql_DMLAttribute(x$1$2$1);
+          var this$86 = $n(x$1$13);
+          var x252 = this$86.Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
+          var this$87 = $n(x$1$13);
+          var x253 = this$87.Lcom_vinctus_oql_DataModel$EntityInfo__f_dmlattrs;
+          var this$88 = $n(x$1$13);
+          var x254 = this$88.Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs;
+          $n(x253).foreach__F1__V(new $c_sjsr_AnonFunction1(((x$1$2$1) => {
+            var x$1$14 = $as_Lcom_vinctus_oql_DMLAttribute(x$1$2$1);
             matchResult25: {
-              if ((x$1$13 !== null)) {
-                var this$83 = $n(x$1$13);
-                var this$84 = $n(x$1$13);
-                var this$85 = $n(x$1$13);
-                var x236 = this$85.Lcom_vinctus_oql_DMLAttribute__f_typ;
-                var this$86 = $n(x$1$13);
-                var this$87 = $n(x$1$13);
-                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLManyToManyType)) {
-                  var x$1$14 = $as_Lcom_vinctus_oql_DMLManyToManyType(x236);
-                  var this$89 = $n(x$1$14);
-                  var x241 = this$89.Lcom_vinctus_oql_DMLManyToManyType__f_entity;
-                  var this$90 = $n(x$1$14);
-                  var x242 = this$90.Lcom_vinctus_oql_DMLManyToManyType__f_link;
-                  var key$1 = $n(x242).Lcom_vinctus_oql_Ident__f_s;
+              if ((x$1$14 !== null)) {
+                var this$90 = $n(x$1$14);
+                var this$91 = $n(x$1$14);
+                var this$92 = $n(x$1$14);
+                var x243 = this$92.Lcom_vinctus_oql_DMLAttribute__f_typ;
+                var this$93 = $n(x$1$14);
+                var this$94 = $n(x$1$14);
+                if ((x243 instanceof $c_Lcom_vinctus_oql_DMLManyToManyType)) {
+                  var x$1$15 = $as_Lcom_vinctus_oql_DMLManyToManyType(x243);
+                  var this$96 = $n(x$1$15);
+                  var x248 = this$96.Lcom_vinctus_oql_DMLManyToManyType__f_entity;
+                  var this$97 = $n(x$1$15);
+                  var x249 = this$97.Lcom_vinctus_oql_DMLManyToManyType__f_link;
+                  var key$1 = $n(x249).Lcom_vinctus_oql_Ident__f_s;
                   var linkinfo = $as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$1));
-                  var this$91 = $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
-                  var this$100 = new $c_sc_MapOps$$anon$1(this$91);
+                  var this$98 = $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
+                  var this$107 = new $c_sc_MapOps$$anon$1(this$98);
                   var pred = new $c_sjsr_AnonFunction1(((x$1$2$2) => {
-                    var x$1$15 = $as_Lcom_vinctus_oql_Attribute(x$1$2$2);
-                    if ((x$1$15 !== null)) {
-                      var this$93 = $n(x$1$15);
-                      var this$94 = $n(x$1$15);
-                      var this$95 = $n(x$1$15);
-                      var this$96 = $n(x$1$15);
-                      var this$97 = $n(x$1$15);
-                      var x128 = this$97.Lcom_vinctus_oql_Attribute__f_typ;
-                      if ((x128 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                        var x$1$16 = $as_Lcom_vinctus_oql_ManyToOneType(x128);
-                        var this$99 = $n(x$1$16);
-                        var x131 = this$99.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                        if (((x245 === null) ? (x131 === null) : $n(x245).equals__O__Z(x131))) {
+                    var x$1$16 = $as_Lcom_vinctus_oql_Attribute(x$1$2$2);
+                    if ((x$1$16 !== null)) {
+                      var this$100 = $n(x$1$16);
+                      var this$101 = $n(x$1$16);
+                      var this$102 = $n(x$1$16);
+                      var this$103 = $n(x$1$16);
+                      var this$104 = $n(x$1$16);
+                      var x135 = this$104.Lcom_vinctus_oql_Attribute__f_typ;
+                      if ((x135 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                        var x$1$17 = $as_Lcom_vinctus_oql_ManyToOneType(x135);
+                        var this$106 = $n(x$1$17);
+                        var x138 = this$106.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                        if (((x252 === null) ? (x138 === null) : $n(x252).equals__O__Z(x138))) {
                           return true
                         }
                       }
                     };
                     return false
                   }));
-                  var self = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$100, pred));
+                  var self = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$107, pred));
                   if (($n(self).size__I() > 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x249).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x252).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                   };
                   if (($n(self).size__I() < 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x249).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x252).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                   };
-                  var key$2 = $n(x241).Lcom_vinctus_oql_Ident__f_s;
+                  var key$2 = $n(x248).Lcom_vinctus_oql_Ident__f_s;
                   var targetentity = $n($as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$2))).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                  var this$101 = $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
-                  var this$110 = new $c_sc_MapOps$$anon$1(this$101);
+                  var this$108 = $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
+                  var this$117 = new $c_sc_MapOps$$anon$1(this$108);
                   var pred$1 = new $c_sjsr_AnonFunction1(((x$1$3$2) => {
-                    var x$1$17 = $as_Lcom_vinctus_oql_Attribute(x$1$3$2);
-                    if ((x$1$17 !== null)) {
-                      var this$103 = $n(x$1$17);
-                      var this$104 = $n(x$1$17);
-                      var this$105 = $n(x$1$17);
-                      var this$106 = $n(x$1$17);
-                      var this$107 = $n(x$1$17);
-                      var x138 = this$107.Lcom_vinctus_oql_Attribute__f_typ;
-                      if ((x138 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                        var x$1$18 = $as_Lcom_vinctus_oql_ManyToOneType(x138);
-                        var this$109 = $n(x$1$18);
-                        var x141 = this$109.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                        if (((targetentity === null) ? (x141 === null) : $n(targetentity).equals__O__Z(x141))) {
+                    var x$1$18 = $as_Lcom_vinctus_oql_Attribute(x$1$3$2);
+                    if ((x$1$18 !== null)) {
+                      var this$110 = $n(x$1$18);
+                      var this$111 = $n(x$1$18);
+                      var this$112 = $n(x$1$18);
+                      var this$113 = $n(x$1$18);
+                      var this$114 = $n(x$1$18);
+                      var x145 = this$114.Lcom_vinctus_oql_Attribute__f_typ;
+                      if ((x145 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                        var x$1$19 = $as_Lcom_vinctus_oql_ManyToOneType(x145);
+                        var this$116 = $n(x$1$19);
+                        var x148 = this$116.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                        if (((targetentity === null) ? (x148 === null) : $n(targetentity).equals__O__Z(x148))) {
                           return true
                         }
                       }
                     };
                     return false
                   }));
-                  var target = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$110, pred$1));
+                  var target = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$117, pred$1));
                   if (($n(target).size__I() > 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x241).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x249).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x248).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
                   };
                   if (($n(target).size__I() < 1)) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x242).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x241).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x249).Lcom_vinctus_oql_Ident__f_pos, (((("junction entity '" + $n($n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x248).Lcom_vinctus_oql_Ident__f_s) + "'"), dml)
                   };
-                  var $$x4 = $n(x247);
-                  var $$x3 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var this$111 = $n(x247);
-                  var key$3 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var \u03b42$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$111, key$3));
+                  var $$x4 = $n(x254);
+                  var $$x3 = $n($n(x$1$14).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
+                  var this$118 = $n(x254);
+                  var key$3 = $n($n(x$1$14).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
+                  var \u03b42$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$118, key$3));
                   var link = $n(linkinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                   var self$1 = $as_Lcom_vinctus_oql_Attribute($n(self).head__O());
                   var target$1 = $as_Lcom_vinctus_oql_Attribute($n(target).head__O());
                   var typ$1 = new $c_Lcom_vinctus_oql_ManyToManyType(targetentity, link, self$1, target$1);
-                  var this$113 = $n(\u03b42$);
-                  var name$1$1 = this$113.Lcom_vinctus_oql_Attribute__f_name;
-                  var this$114 = $n(\u03b42$);
-                  var column$1 = this$114.Lcom_vinctus_oql_Attribute__f_column;
-                  var this$115 = $n(\u03b42$);
-                  var pk$1$1 = this$115.Lcom_vinctus_oql_Attribute__f_pk;
-                  var this$116 = $n(\u03b42$);
-                  var required$1 = this$116.Lcom_vinctus_oql_Attribute__f_required;
+                  var this$120 = $n(\u03b42$);
+                  var name$1$1 = this$120.Lcom_vinctus_oql_Attribute__f_name;
+                  var this$121 = $n(\u03b42$);
+                  var column$1 = this$121.Lcom_vinctus_oql_Attribute__f_column;
+                  var this$122 = $n(\u03b42$);
+                  var pk$1$1 = this$122.Lcom_vinctus_oql_Attribute__f_pk;
+                  var this$123 = $n(\u03b42$);
+                  var required$1 = this$123.Lcom_vinctus_oql_Attribute__f_required;
                   $n(\u03b42$);
                   $n($$x4).update__O__O__V($$x3, new $c_Lcom_vinctus_oql_Attribute(name$1$1, column$1, pk$1$1, required$1, typ$1));
                   break matchResult25
                 };
-                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLNameType)) {
-                  var x$1$19 = $as_Lcom_vinctus_oql_DMLNameType(x236);
-                  var this$119 = $n(x$1$19);
-                  var x232 = this$119.Lcom_vinctus_oql_DMLNameType__f_entity;
-                  if (entities.contains__O__Z($n(x232).Lcom_vinctus_oql_Ident__f_s)) {
-                    var key$4 = $n(x232).Lcom_vinctus_oql_Ident__f_s;
+                if ((x243 instanceof $c_Lcom_vinctus_oql_DMLNameType)) {
+                  var x$1$20 = $as_Lcom_vinctus_oql_DMLNameType(x243);
+                  var this$126 = $n(x$1$20);
+                  var x239 = this$126.Lcom_vinctus_oql_DMLNameType__f_entity;
+                  if (entities.contains__O__Z($n(x239).Lcom_vinctus_oql_Ident__f_s)) {
+                    var key$4 = $n(x239).Lcom_vinctus_oql_Ident__f_s;
                     var $$x5 = $n($n($n($as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$4))).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).pk__s_Option()).isEmpty__Z()
                   } else {
                     var $$x5 = false
                   };
                   if ($$x5) {
-                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x232).Lcom_vinctus_oql_Ident__f_pos, (("target entity '" + $n(x232).Lcom_vinctus_oql_Ident__f_s) + "' has no declared primary key"), dml)
+                    $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x239).Lcom_vinctus_oql_Ident__f_pos, (("target entity '" + $n(x239).Lcom_vinctus_oql_Ident__f_s) + "' has no declared primary key"), dml)
                   };
                   break matchResult25
                 };
-                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLOneToOneType)) {
-                  var x$1$20 = $as_Lcom_vinctus_oql_DMLOneToOneType(x236);
-                  var this$121 = $n(x$1$20);
-                  var x222 = this$121.Lcom_vinctus_oql_DMLOneToOneType__f_entity;
-                  var this$122 = $n(x$1$20);
-                  var x223 = this$122.Lcom_vinctus_oql_DMLOneToOneType__f_attr;
-                  var key$5 = $n(x222).Lcom_vinctus_oql_Ident__f_s;
+                if ((x243 instanceof $c_Lcom_vinctus_oql_DMLOneToOneType)) {
+                  var x$1$21 = $as_Lcom_vinctus_oql_DMLOneToOneType(x243);
+                  var this$128 = $n(x$1$21);
+                  var x229 = this$128.Lcom_vinctus_oql_DMLOneToOneType__f_entity;
+                  var this$129 = $n(x$1$21);
+                  var x230 = this$129.Lcom_vinctus_oql_DMLOneToOneType__f_attr;
+                  var key$5 = $n(x229).Lcom_vinctus_oql_Ident__f_s;
                   var entityinfo = $as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$5));
                   matchResult21: {
                     var newtyp;
-                    if ((x223 instanceof $c_s_Some)) {
-                      var id = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x223)).s_Some__f_value);
-                      var x142 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id).Lcom_vinctus_oql_Ident__f_s);
-                      if ((x142 instanceof $c_s_Some)) {
-                        var x146 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x142)).s_Some__f_value);
-                        if ((x146 !== null)) {
-                          var this$124 = $n(x146);
-                          var this$125 = $n(x146);
-                          var this$126 = $n(x146);
-                          var this$127 = $n(x146);
-                          var this$128 = $n(x146);
-                          var x152 = this$128.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x152 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$21 = $as_Lcom_vinctus_oql_ManyToOneType(x152);
-                            var this$130 = $n(x$1$21);
-                            var x155 = this$130.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x245 === null) ? (x155 === null) : $n(x245).equals__O__Z(x155))) {
+                    if ((x230 instanceof $c_s_Some)) {
+                      var id = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x230)).s_Some__f_value);
+                      var x149 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id).Lcom_vinctus_oql_Ident__f_s);
+                      if ((x149 instanceof $c_s_Some)) {
+                        var x153 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x149)).s_Some__f_value);
+                        if ((x153 !== null)) {
+                          var this$131 = $n(x153);
+                          var this$132 = $n(x153);
+                          var this$133 = $n(x153);
+                          var this$134 = $n(x153);
+                          var this$135 = $n(x153);
+                          var x159 = this$135.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x159 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$22 = $as_Lcom_vinctus_oql_ManyToOneType(x159);
+                            var this$137 = $n(x$1$22);
+                            var x162 = this$137.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x252 === null) ? (x162 === null) : $n(x252).equals__O__Z(x162))) {
                               var entity$2 = $n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                              var newtyp = new $c_Lcom_vinctus_oql_OneToOneType(entity$2, x146);
+                              var newtyp = new $c_Lcom_vinctus_oql_OneToOneType(entity$2, x153);
                               break matchResult21
                             }
                           }
@@ -3709,96 +3740,96 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                         break matchResult21
                       };
                       var x$3$2 = $m_s_None$();
-                      if ((x$3$2 === x142)) {
+                      if ((x$3$2 === x149)) {
                         var newtyp = $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(id).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(id).Lcom_vinctus_oql_Ident__f_s) + "'"), dml);
                         break matchResult21
                       };
-                      throw new $c_s_MatchError(x142)
+                      throw new $c_s_MatchError(x149)
                     };
                     var x$5$1 = $m_s_None$();
-                    if ((x$5$1 === x223)) {
-                      var this$132 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
-                      var this$141 = new $c_sc_MapOps$$anon$1(this$132);
+                    if ((x$5$1 === x230)) {
+                      var this$139 = $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
+                      var this$148 = new $c_sc_MapOps$$anon$1(this$139);
                       var pred$2 = new $c_sjsr_AnonFunction1(((x$1$4$2) => {
-                        var x$1$22 = $as_Lcom_vinctus_oql_Attribute(x$1$4$2);
-                        if ((x$1$22 !== null)) {
-                          var this$134 = $n(x$1$22);
-                          var this$135 = $n(x$1$22);
-                          var this$136 = $n(x$1$22);
-                          var this$137 = $n(x$1$22);
-                          var this$138 = $n(x$1$22);
-                          var x162 = this$138.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x162 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$23 = $as_Lcom_vinctus_oql_ManyToOneType(x162);
-                            var this$140 = $n(x$1$23);
-                            var x165 = this$140.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x245 === null) ? (x165 === null) : $n(x245).equals__O__Z(x165))) {
+                        var x$1$23 = $as_Lcom_vinctus_oql_Attribute(x$1$4$2);
+                        if ((x$1$23 !== null)) {
+                          var this$141 = $n(x$1$23);
+                          var this$142 = $n(x$1$23);
+                          var this$143 = $n(x$1$23);
+                          var this$144 = $n(x$1$23);
+                          var this$145 = $n(x$1$23);
+                          var x169 = this$145.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x169 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$24 = $as_Lcom_vinctus_oql_ManyToOneType(x169);
+                            var this$147 = $n(x$1$24);
+                            var x172 = this$147.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x252 === null) ? (x172 === null) : $n(x252).equals__O__Z(x172))) {
                               return true
                             }
                           }
                         };
                         return false
                       }));
-                      var attrs = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$141, pred$2));
+                      var attrs = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$148, pred$2));
                       if (($n(attrs).size__I() > 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x222).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x229).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x252).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       if (($n(attrs).size__I() < 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x222).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x229).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x252).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       var entity$3 = $n(entityinfo).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                       var attribute = $as_Lcom_vinctus_oql_Attribute($n(attrs).head__O());
                       var newtyp = new $c_Lcom_vinctus_oql_OneToOneType(entity$3, attribute);
                       break matchResult21
                     };
-                    throw new $c_s_MatchError(x223)
+                    throw new $c_s_MatchError(x230)
                   };
-                  var $$x7 = $n(x247);
-                  var $$x6 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var this$143 = $n(x247);
-                  var key$6 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var \u03b43$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$143, key$6));
+                  var $$x7 = $n(x254);
+                  var $$x6 = $n($n(x$1$14).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
+                  var this$150 = $n(x254);
+                  var key$6 = $n($n(x$1$14).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
+                  var \u03b43$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$150, key$6));
                   $n(\u03b43$);
-                  var this$144 = $n(\u03b43$);
-                  var name$3 = this$144.Lcom_vinctus_oql_Attribute__f_name;
-                  var this$145 = $n(\u03b43$);
-                  var column$2 = this$145.Lcom_vinctus_oql_Attribute__f_column;
-                  var this$146 = $n(\u03b43$);
-                  var pk$2 = this$146.Lcom_vinctus_oql_Attribute__f_pk;
-                  var this$147 = $n(\u03b43$);
-                  var required$2 = this$147.Lcom_vinctus_oql_Attribute__f_required;
+                  var this$151 = $n(\u03b43$);
+                  var name$3 = this$151.Lcom_vinctus_oql_Attribute__f_name;
+                  var this$152 = $n(\u03b43$);
+                  var column$2 = this$152.Lcom_vinctus_oql_Attribute__f_column;
+                  var this$153 = $n(\u03b43$);
+                  var pk$2 = this$153.Lcom_vinctus_oql_Attribute__f_pk;
+                  var this$154 = $n(\u03b43$);
+                  var required$2 = this$154.Lcom_vinctus_oql_Attribute__f_required;
                   $n($$x7).update__O__O__V($$x6, new $c_Lcom_vinctus_oql_Attribute(name$3, column$2, pk$2, required$2, newtyp));
                   break matchResult25
                 };
-                if ((x236 instanceof $c_Lcom_vinctus_oql_DMLOneToManyType)) {
-                  var x$1$24 = $as_Lcom_vinctus_oql_DMLOneToManyType(x236);
-                  var this$150 = $n(x$1$24);
-                  var x212 = this$150.Lcom_vinctus_oql_DMLOneToManyType__f_entity;
-                  var this$151 = $n(x$1$24);
-                  var x213 = this$151.Lcom_vinctus_oql_DMLOneToManyType__f_attr;
-                  var key$7 = $n(x212).Lcom_vinctus_oql_Ident__f_s;
+                if ((x243 instanceof $c_Lcom_vinctus_oql_DMLOneToManyType)) {
+                  var x$1$25 = $as_Lcom_vinctus_oql_DMLOneToManyType(x243);
+                  var this$157 = $n(x$1$25);
+                  var x219 = this$157.Lcom_vinctus_oql_DMLOneToManyType__f_entity;
+                  var this$158 = $n(x$1$25);
+                  var x220 = this$158.Lcom_vinctus_oql_DMLOneToManyType__f_attr;
+                  var key$7 = $n(x219).Lcom_vinctus_oql_Ident__f_s;
                   var entityinfo$2 = $as_Lcom_vinctus_oql_DataModel$EntityInfo($f_sc_MapOps__apply__O__O(entities, key$7));
                   matchResult24: {
                     var newtyp$2;
-                    if ((x213 instanceof $c_s_Some)) {
-                      var id$2 = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x213)).s_Some__f_value);
-                      var x169 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id$2).Lcom_vinctus_oql_Ident__f_s);
-                      if ((x169 instanceof $c_s_Some)) {
-                        var x173 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x169)).s_Some__f_value);
-                        if ((x173 !== null)) {
-                          var this$153 = $n(x173);
-                          var this$154 = $n(x173);
-                          var this$155 = $n(x173);
-                          var this$156 = $n(x173);
-                          var this$157 = $n(x173);
-                          var x179 = this$157.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x179 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$25 = $as_Lcom_vinctus_oql_ManyToOneType(x179);
-                            var this$159 = $n(x$1$25);
-                            var x182 = this$159.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x245 === null) ? (x182 === null) : $n(x245).equals__O__Z(x182))) {
+                    if ((x220 instanceof $c_s_Some)) {
+                      var id$2 = $as_Lcom_vinctus_oql_Ident($n($as_s_Some(x220)).s_Some__f_value);
+                      var x176 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs).get__O__s_Option($n(id$2).Lcom_vinctus_oql_Ident__f_s);
+                      if ((x176 instanceof $c_s_Some)) {
+                        var x180 = $as_Lcom_vinctus_oql_Attribute($n($as_s_Some(x176)).s_Some__f_value);
+                        if ((x180 !== null)) {
+                          var this$160 = $n(x180);
+                          var this$161 = $n(x180);
+                          var this$162 = $n(x180);
+                          var this$163 = $n(x180);
+                          var this$164 = $n(x180);
+                          var x186 = this$164.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x186 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$26 = $as_Lcom_vinctus_oql_ManyToOneType(x186);
+                            var this$166 = $n(x$1$26);
+                            var x189 = this$166.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x252 === null) ? (x189 === null) : $n(x252).equals__O__Z(x189))) {
                               var entity$4 = $n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
-                              var newtyp$2 = new $c_Lcom_vinctus_oql_OneToManyType(entity$4, x173);
+                              var newtyp$2 = new $c_Lcom_vinctus_oql_OneToManyType(entity$4, x180);
                               break matchResult24
                             }
                           }
@@ -3807,110 +3838,110 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                         break matchResult24
                       };
                       var x$9 = $m_s_None$();
-                      if ((x$9 === x169)) {
+                      if ((x$9 === x176)) {
                         var newtyp$2 = $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(id$2).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' does not have attribute '") + $n(id$2).Lcom_vinctus_oql_Ident__f_s) + "'"), dml);
                         break matchResult24
                       };
-                      throw new $c_s_MatchError(x169)
+                      throw new $c_s_MatchError(x176)
                     };
                     var x$11 = $m_s_None$();
-                    if ((x$11 === x213)) {
-                      var this$161 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
-                      var this$170 = new $c_sc_MapOps$$anon$1(this$161);
+                    if ((x$11 === x220)) {
+                      var this$168 = $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_attrs);
+                      var this$177 = new $c_sc_MapOps$$anon$1(this$168);
                       var pred$3 = new $c_sjsr_AnonFunction1(((x$1$5$1) => {
-                        var x$1$26 = $as_Lcom_vinctus_oql_Attribute(x$1$5$1);
-                        if ((x$1$26 !== null)) {
-                          var this$163 = $n(x$1$26);
-                          var this$164 = $n(x$1$26);
-                          var this$165 = $n(x$1$26);
-                          var this$166 = $n(x$1$26);
-                          var this$167 = $n(x$1$26);
-                          var x189 = this$167.Lcom_vinctus_oql_Attribute__f_typ;
-                          if ((x189 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-                            var x$1$27 = $as_Lcom_vinctus_oql_ManyToOneType(x189);
-                            var this$169 = $n(x$1$27);
-                            var x192 = this$169.Lcom_vinctus_oql_ManyToOneType__f_entity;
-                            if (((x245 === null) ? (x192 === null) : $n(x245).equals__O__Z(x192))) {
+                        var x$1$27 = $as_Lcom_vinctus_oql_Attribute(x$1$5$1);
+                        if ((x$1$27 !== null)) {
+                          var this$170 = $n(x$1$27);
+                          var this$171 = $n(x$1$27);
+                          var this$172 = $n(x$1$27);
+                          var this$173 = $n(x$1$27);
+                          var this$174 = $n(x$1$27);
+                          var x196 = this$174.Lcom_vinctus_oql_Attribute__f_typ;
+                          if ((x196 instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
+                            var x$1$28 = $as_Lcom_vinctus_oql_ManyToOneType(x196);
+                            var this$176 = $n(x$1$28);
+                            var x199 = this$176.Lcom_vinctus_oql_ManyToOneType__f_entity;
+                            if (((x252 === null) ? (x199 === null) : $n(x252).equals__O__Z(x199))) {
                               return true
                             }
                           }
                         };
                         return false
                       }));
-                      var attrs$2 = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$170, pred$3));
+                      var attrs$2 = $as_sc_Iterable($f_sc_IterableOps__filter__F1__O(this$177, pred$3));
                       if (($n(attrs$2).size__I() > 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x212).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x219).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has more than one attribute of type '") + $n(x252).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       if (($n(attrs$2).size__I() < 1)) {
-                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x212).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x245).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
+                        $m_Lcom_vinctus_oql_package$().printError__s_util_parsing_input_Position__T__T__N($n(x219).Lcom_vinctus_oql_Ident__f_pos, (((("entity '" + $n($n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity).Lcom_vinctus_oql_Entity__f_name) + "' has no attributes of type '") + $n(x252).Lcom_vinctus_oql_Entity__f_name) + "'"), dml)
                       };
                       var entity$5 = $n(entityinfo$2).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity;
                       var attribute$1 = $as_Lcom_vinctus_oql_Attribute($n(attrs$2).head__O());
                       var newtyp$2 = new $c_Lcom_vinctus_oql_OneToManyType(entity$5, attribute$1);
                       break matchResult24
                     };
-                    throw new $c_s_MatchError(x213)
+                    throw new $c_s_MatchError(x220)
                   };
-                  var $$x9 = $n(x247);
-                  var $$x8 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var this$172 = $n(x247);
-                  var key$8 = $n($n(x$1$13).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
-                  var \u03b44$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$172, key$8));
+                  var $$x9 = $n(x254);
+                  var $$x8 = $n($n(x$1$14).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
+                  var this$179 = $n(x254);
+                  var key$8 = $n($n(x$1$14).Lcom_vinctus_oql_DMLAttribute__f_name).Lcom_vinctus_oql_Ident__f_s;
+                  var \u03b44$ = $as_Lcom_vinctus_oql_Attribute($f_sc_MapOps__apply__O__O(this$179, key$8));
                   $n(\u03b44$);
-                  var this$173 = $n(\u03b44$);
-                  var name$4 = this$173.Lcom_vinctus_oql_Attribute__f_name;
-                  var this$174 = $n(\u03b44$);
-                  var column$3 = this$174.Lcom_vinctus_oql_Attribute__f_column;
-                  var this$175 = $n(\u03b44$);
-                  var pk$3 = this$175.Lcom_vinctus_oql_Attribute__f_pk;
-                  var this$176 = $n(\u03b44$);
-                  var required$3 = this$176.Lcom_vinctus_oql_Attribute__f_required;
+                  var this$180 = $n(\u03b44$);
+                  var name$4 = this$180.Lcom_vinctus_oql_Attribute__f_name;
+                  var this$181 = $n(\u03b44$);
+                  var column$3 = this$181.Lcom_vinctus_oql_Attribute__f_column;
+                  var this$182 = $n(\u03b44$);
+                  var pk$3 = this$182.Lcom_vinctus_oql_Attribute__f_pk;
+                  var this$183 = $n(\u03b44$);
+                  var required$3 = this$183.Lcom_vinctus_oql_Attribute__f_required;
                   $n($$x9).update__O__O__V($$x8, new $c_Lcom_vinctus_oql_Attribute(name$4, column$3, pk$3, required$3, newtyp$2));
                   break matchResult25
                 };
-                if ($is_Lcom_vinctus_oql_DMLDataType(x236)) {
+                if ($is_Lcom_vinctus_oql_DMLDataType(x243)) {
                   break matchResult25
                 }
               };
-              throw new $c_s_MatchError(x$1$13)
+              throw new $c_s_MatchError(x$1$14)
             }
           })));
-          var $$x10 = $n(x245);
-          var this$179 = $n(x247);
+          var $$x10 = $n(x252);
+          var this$186 = $n(x254);
           var factory = $m_sci_VectorMap$();
           var factory$1 = new $c_sc_MapFactory$ToFactory(factory);
-          $$x10.Lcom_vinctus_oql_Entity__f__attributes = $as_sci_Map(factory$1.fromSpecific__sc_IterableOnce__O(this$179));
+          $$x10.Lcom_vinctus_oql_Entity__f__attributes = $as_sci_Map(factory$1.fromSpecific__sc_IterableOnce__O(this$186));
           break matchResult26
         };
-        throw new $c_s_MatchError(x$1$12)
+        throw new $c_s_MatchError(x$1$13)
       }
     }));
-    $n(this$180.filtered__sc_Iterable()).foreach__F1__V(f$2);
+    $n(this$187.filtered__sc_Iterable()).foreach__F1__V(f$2);
     if ($m_Lcom_vinctus_oql_package$().Lcom_vinctus_oql_package$__f_parsingError) {
       $m_s_sys_package$().error__T__E("errors while creating data model")
     };
-    var this$181 = new $c_sc_MapView$Id(entities);
+    var this$188 = new $c_sc_MapView$Id(entities);
     var f$3 = new $c_sjsr_AnonFunction1(((_$10) => {
       var _$10$1 = $as_Lcom_vinctus_oql_DataModel$EntityInfo(_$10);
       return $n(_$10$1).Lcom_vinctus_oql_DataModel$EntityInfo__f_entity
     }));
-    var this$183 = new $c_sc_MapView$MapValues(this$181, f$3);
+    var this$190 = new $c_sc_MapView$MapValues(this$188, f$3);
     var factory$2 = $m_sci_VectorMap$();
     var factory$3 = new $c_sc_MapFactory$ToFactory(factory$2);
-    var _1$1 = factory$3.fromSpecific__sc_IterableOnce__O(this$183);
-    var this$184 = $m_s_$less$colon$less$();
+    var _1$1 = factory$3.fromSpecific__sc_IterableOnce__O(this$190);
+    var this$191 = $m_s_$less$colon$less$();
     var _2$1 = $m_sci_Map$().from__sc_IterableOnce__sci_Map(enums);
-    var x248 = new $c_T2(_1$1, _2$1);
-    var x249 = $as_sci_VectorMap(x248.T2__f__1);
-    var x250 = $as_sci_Map(x248.T2__f__2);
-    if ((x249 !== null)) {
-      if ((x250 !== null)) {
-        var \u03b41$___1 = x249;
-        var \u03b41$___2 = x250;
+    var x255 = new $c_T2(_1$1, _2$1);
+    var x256 = $as_sci_VectorMap(x255.T2__f__1);
+    var x257 = $as_sci_Map(x255.T2__f__2);
+    if ((x256 !== null)) {
+      if ((x257 !== null)) {
+        var \u03b41$___1 = x256;
+        var \u03b41$___2 = x257;
         break matchResult27
       }
     };
-    throw new $c_s_MatchError(x248)
+    throw new $c_s_MatchError(x255)
   };
   this.Lcom_vinctus_oql_DataModel__f_entities = $as_sci_Map(\u03b41$___1);
   this.Lcom_vinctus_oql_DataModel__f_enums = $as_sci_Map(\u03b41$___2);
@@ -3919,21 +3950,21 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
     var idsbuf = new $c_scm_ListBuffer();
     var nullablesbuf = new $c_scm_ListBuffer();
     $p_Lcom_vinctus_oql_DataModel__scan$1__scm_ListBuffer__scm_ListBuffer__sci_List__sci_List__Lcom_vinctus_oql_Entity__V(this, idsbuf, nullablesbuf, $m_s_package$().s_package$__f_Nil, $m_s_package$().s_package$__f_Nil, e$5);
-    var this$198 = $n(idsbuf.toList__sci_List());
+    var this$205 = $n(idsbuf.toList__sci_List());
     var f$8 = ((ids) => {
       var ids$1 = $as_sci_List(ids);
-      var this$188 = $n(ids$1);
+      var this$195 = $n(ids$1);
       var f$4 = ((id$1) => {
         var id$3 = $as_T(id$1);
         return new $c_Lcom_vinctus_oql_Ident(id$3, null)
       });
-      if ((this$188 === $m_sci_Nil$())) {
+      if ((this$195 === $m_sci_Nil$())) {
         var attridents = $m_sci_Nil$()
       } else {
-        var arg1$2 = this$188.head__O();
+        var arg1$2 = this$195.head__O();
         var h$1 = new $c_sci_$colon$colon(f$4(arg1$2), $m_sci_Nil$());
         var t$1 = h$1;
-        var rest$1 = $as_sci_List(this$188.tail__O());
+        var rest$1 = $as_sci_List(this$195.tail__O());
         while ((rest$1 !== $m_sci_Nil$())) {
           var arg1$3 = $n(rest$1).head__O();
           var nx$1 = new $c_sci_$colon$colon(f$4(arg1$3), $m_sci_Nil$());
@@ -3945,15 +3976,15 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
       };
       var attr = new $c_Lcom_vinctus_oql_AttributeOQLExpression(attridents, null);
       attr.Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs = this.lookup__Lcom_vinctus_oql_OQLExpression__sci_List__Z__Lcom_vinctus_oql_Entity__T__sci_List(attr, attridents, false, e$5, null);
-      var this$192 = $n(nullablesbuf.toList__sci_List());
+      var this$199 = $n(nullablesbuf.toList__sci_List());
       var f$5 = ((_$11) => {
         var _$11$1 = $as_sci_List(_$11);
-        var this$191 = $n(ids$1);
+        var this$198 = $n(ids$1);
         $n(ids$1);
         var offset = 0;
-        return $f_sc_SeqOps__startsWith__sc_IterableOnce__I__Z(this$191, _$11$1, offset)
+        return $f_sc_SeqOps__startsWith__sc_IterableOnce__I__Z(this$198, _$11$1, offset)
       });
-      var l = this$192;
+      var l = this$199;
       block: {
         var result;
         while (true) {
@@ -3974,8 +4005,8 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
                 var result = start;
                 break block
               } else {
-                var x$4 = $n(remaining).head__O();
-                if (($uZ(f$5(x$4)) !== false)) {
+                var x$6 = $n(remaining).head__O();
+                if (($uZ(f$5(x$6)) !== false)) {
                   remaining = $as_sci_List($n(remaining).tail__O());
                   continue
                 };
@@ -4016,21 +4047,21 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
           }
         }
       };
-      var this$196 = $n(result);
+      var this$203 = $n(result);
       var f$7 = ((ids$3) => {
         var ids$2 = $as_sci_List(ids$3);
-        var this$194 = $n(ids$2);
+        var this$201 = $n(ids$2);
         var f$6 = ((id$4) => {
           var id$5 = $as_T(id$4);
           return new $c_Lcom_vinctus_oql_Ident(id$5, null)
         });
-        if ((this$194 === $m_sci_Nil$())) {
+        if ((this$201 === $m_sci_Nil$())) {
           var nullidents = $m_sci_Nil$()
         } else {
-          var arg1$4 = this$194.head__O();
+          var arg1$4 = this$201.head__O();
           var h$3 = new $c_sci_$colon$colon(f$6(arg1$4), $m_sci_Nil$());
           var t$3 = h$3;
-          var rest$2 = $as_sci_List(this$194.tail__O());
+          var rest$2 = $as_sci_List(this$201.tail__O());
           while ((rest$2 !== $m_sci_Nil$())) {
             var arg1$5 = $n(rest$2).head__O();
             var nx$2 = new $c_sci_$colon$colon(f$6(arg1$5), $m_sci_Nil$());
@@ -4044,13 +4075,13 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
         nullable.Lcom_vinctus_oql_ReferenceOQLExpression__f_dmrefs = this.lookup__Lcom_vinctus_oql_OQLExpression__sci_List__Z__Lcom_vinctus_oql_Entity__T__sci_List(nullable, nullidents, true, e$5, null);
         return nullable
       });
-      if ((this$196 === $m_sci_Nil$())) {
+      if ((this$203 === $m_sci_Nil$())) {
         var nullables = $m_sci_Nil$()
       } else {
-        var arg1$6 = this$196.head__O();
+        var arg1$6 = this$203.head__O();
         var h$4 = new $c_sci_$colon$colon(f$7(arg1$6), $m_sci_Nil$());
         var t$4 = h$4;
-        var rest$3 = $as_sci_List(this$196.tail__O());
+        var rest$3 = $as_sci_List(this$203.tail__O());
         while ((rest$3 !== $m_sci_Nil$())) {
           var arg1$7 = $n(rest$3).head__O();
           var nx$3 = new $c_sci_$colon$colon(f$7(arg1$7), $m_sci_Nil$());
@@ -4062,13 +4093,13 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
       };
       return new $c_T2(attr, nullables)
     });
-    if ((this$198 === $m_sci_Nil$())) {
+    if ((this$205 === $m_sci_Nil$())) {
       var attrs$1 = $m_sci_Nil$()
     } else {
-      var arg1$8 = this$198.head__O();
+      var arg1$8 = this$205.head__O();
       var h$5 = new $c_sci_$colon$colon(f$8(arg1$8), $m_sci_Nil$());
       var t$5 = h$5;
-      var rest$4 = $as_sci_List(this$198.tail__O());
+      var rest$4 = $as_sci_List(this$205.tail__O());
       while ((rest$4 !== $m_sci_Nil$())) {
         var arg1$9 = $n(rest$4).head__O();
         var nx$4 = new $c_sci_$colon$colon(f$8(arg1$9), $m_sci_Nil$());
@@ -4079,11 +4110,11 @@ function $c_Lcom_vinctus_oql_DataModel(model, dml) {
       var attrs$1 = h$5
     };
     var $$x12 = $n(e$5);
-    var this$201 = $n($m_s_Predef$().s_Predef$__f_Map);
+    var this$208 = $n($m_s_Predef$().s_Predef$__f_Map);
     var $$x11 = $m_sr_ScalaRunTime$();
     var self$2 = this.Lcom_vinctus_oql_DataModel__f_first;
     var elems = $n($$x11).wrapRefArray__AO__sci_ArraySeq(new ($d_T2.getArrayOf().constr)([new $c_T2(self$2, attrs$1)]));
-    $$x12.Lcom_vinctus_oql_Entity__f__fixing = this$201.from__sc_IterableOnce__sci_Map(elems)
+    $$x12.Lcom_vinctus_oql_Entity__f__fixing = this$208.from__sc_IterableOnce__sci_Map(elems)
   })))
 }
 $c_Lcom_vinctus_oql_DataModel.prototype = new $h_O();
@@ -31308,40 +31339,69 @@ function $f_Lcom_vinctus_oql_SQLDataSource__string__T__T($thiz, s) {
 }
 function $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T($thiz, a, typ) {
   if (((typeof a) === "string")) {
-    var x25 = $as_T(a);
-    var x = $m_Lcom_vinctus_oql_TextType$();
-    if ((x === typ)) {
-      return $thiz.string__T__T(x25)
+    var x35 = $as_T(a);
+    matchAlts3: {
+      matchAlts4: {
+        var x = $m_Lcom_vinctus_oql_TextType$();
+        if ((x === typ)) {
+          break matchAlts4
+        };
+        if ((typ instanceof $c_Lcom_vinctus_oql_CharacterType)) {
+          var x$1 = $as_Lcom_vinctus_oql_CharacterType(typ);
+          var this$3 = $n(x$1);
+          break matchAlts4
+        };
+        break matchAlts3
+      };
+      return $thiz.string__T__T(x35)
     };
     var x$3 = $m_Lcom_vinctus_oql_UUIDType$();
     if ((x$3 === typ)) {
-      return (x25 + "::UUID")
+      return (x35 + "::UUID")
     };
     var x$5 = $m_Lcom_vinctus_oql_TimestampType$();
     if ((x$5 === typ)) {
-      return (x25 + "::TIMESTAMP")
+      return (x35 + "::TIMESTAMP")
     };
     var x$7 = $m_Lcom_vinctus_oql_DateType$();
     if ((x$7 === typ)) {
-      return (x25 + "::DATE")
+      return (x35 + "::DATE")
     };
-    var x$9 = $m_Lcom_vinctus_oql_JSONType$();
+    var x$9 = $m_Lcom_vinctus_oql_TimeType$();
     if ((x$9 === typ)) {
-      return (x25 + "::JSON")
+      return (x35 + "::TIME")
     };
-    var x$11 = $m_Lcom_vinctus_oql_IntervalType$();
+    var x$11 = $m_Lcom_vinctus_oql_JSONType$();
     if ((x$11 === typ)) {
-      return (x25 + "::INTERVAL")
+      return (x35 + "::JSON")
+    };
+    var x$13 = $m_Lcom_vinctus_oql_IntervalType$();
+    if ((x$13 === typ)) {
+      return (x35 + "::INTERVAL")
     }
   };
   matchAlts1: {
     matchAlts2: {
-      var x$13 = $m_Lcom_vinctus_oql_IntegerType$();
-      if ((x$13 === typ)) {
+      var x$15 = $m_Lcom_vinctus_oql_SmallintType$();
+      if ((x$15 === typ)) {
         break matchAlts2
       };
-      var x$15 = $m_Lcom_vinctus_oql_FloatType$();
-      if ((x$15 === typ)) {
+      var x$17 = $m_Lcom_vinctus_oql_IntegerType$();
+      if ((x$17 === typ)) {
+        break matchAlts2
+      };
+      var x$19 = $m_Lcom_vinctus_oql_FloatType$();
+      if ((x$19 === typ)) {
+        break matchAlts2
+      };
+      var x$21 = $m_Lcom_vinctus_oql_BigintType$();
+      if ((x$21 === typ)) {
+        break matchAlts2
+      };
+      if ((typ instanceof $c_Lcom_vinctus_oql_DecimalType)) {
+        var x$1$1 = $as_Lcom_vinctus_oql_DecimalType(typ);
+        var this$5 = $n(x$1$1);
+        var this$6 = $n(x$1$1);
         break matchAlts2
       };
       break matchAlts1
@@ -42096,57 +42156,63 @@ $c_Lcom_vinctus_oql_DMLParser.prototype.attribute__s_util_parsing_combinator_Par
 });
 $c_Lcom_vinctus_oql_DMLParser.prototype.typeSpecifier__s_util_parsing_combinator_Parsers$Parser = (function() {
   var r = this.kw__T__s_util_matching_Regex("text");
-  return $n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+  return $n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r, this).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
     var r$1 = this.kw__T__s_util_matching_Regex("json");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$1, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$2 = this.kw__T__s_util_matching_Regex("integer");
+    var r$2 = this.kw__T__s_util_matching_Regex("int2");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$2, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$3 = this.kw__T__s_util_matching_Regex("int4");
+    var r$3 = this.kw__T__s_util_matching_Regex("smallint");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$3, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$4 = this.kw__T__s_util_matching_Regex("int");
+    var r$4 = this.kw__T__s_util_matching_Regex("integer");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$4, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$5 = this.kw__T__s_util_matching_Regex("boolean");
+    var r$5 = this.kw__T__s_util_matching_Regex("int4");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$5, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$6 = this.kw__T__s_util_matching_Regex("bool");
+    var r$6 = this.kw__T__s_util_matching_Regex("int");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$6, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$7 = this.kw__T__s_util_matching_Regex("bigint");
+    var r$7 = this.kw__T__s_util_matching_Regex("boolean");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$7, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$8 = this.kw__T__s_util_matching_Regex("int8");
+    var r$8 = this.kw__T__s_util_matching_Regex("bool");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$8, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$9 = this.kw__T__s_util_matching_Regex("date");
+    var r$9 = this.kw__T__s_util_matching_Regex("bigint");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$9, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$10 = this.kw__T__s_util_matching_Regex("time");
+    var r$10 = this.kw__T__s_util_matching_Regex("int8");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$10, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$11 = this.kw__T__s_util_matching_Regex("interval");
+    var r$11 = this.kw__T__s_util_matching_Regex("date");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$11, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$12 = this.kw__T__s_util_matching_Regex("float8");
+    var r$12 = this.kw__T__s_util_matching_Regex("time");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$12, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$13 = this.kw__T__s_util_matching_Regex("float");
+    var r$13 = this.kw__T__s_util_matching_Regex("interval");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$13, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$14 = this.kw__T__s_util_matching_Regex("uuid");
+    var r$14 = this.kw__T__s_util_matching_Regex("float8");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$14, this)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$15 = this.kw__T__s_util_matching_Regex("timestamp");
+    var r$15 = this.kw__T__s_util_matching_Regex("float");
     return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$15, this)
+  })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var r$16 = this.kw__T__s_util_matching_Regex("uuid");
+    return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$16, this)
+  })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var r$17 = this.kw__T__s_util_matching_Regex("timestamp");
+    return new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$17, this)
   })))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((typ) => {
     var typ$1 = $as_T(typ);
     return new $c_Lcom_vinctus_oql_DMLSimpleDataType(typ$1)
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
-    var r$16 = this.kw__T__s_util_matching_Regex("decimal");
-    return $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$16, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(",", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1) => {
+    var r$18 = this.kw__T__s_util_matching_Regex("decimal");
+    return $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$18, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(",", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$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$());
@@ -42175,98 +42241,120 @@ $c_Lcom_vinctus_oql_DMLParser.prototype.typeSpecifier__s_util_parsing_combinator
       };
       throw new $c_s_MatchError(x$1$1)
     })))
+  })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
+    var r$19 = this.kw__T__s_util_matching_Regex("char");
+    return $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$2(r$19, this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.integer__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$3) => {
+      var x$1$4 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$3);
+      if ((x$1$4 !== null)) {
+        $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
+        var x68 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$4).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x68 !== null)) {
+          $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
+          if (($n(x68).s_util_parsing_combinator_Parsers$$tilde__f__1 !== null)) {
+            $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
+            $as_s_util_parsing_combinator_Parsers$$tilde($n(x68).s_util_parsing_combinator_Parsers$$tilde__f__1);
+            var n = $as_T($n(x68).s_util_parsing_combinator_Parsers$$tilde__f__2);
+            $n($m_s_package$().s_package$__f_List);
+            var elems$1 = $m_sr_ScalaRunTime$().wrapRefArray__AO__sci_ArraySeq(new ($d_T.getArrayOf().constr)([n]));
+            var parameters$1 = $m_sci_Nil$().prependedAll__sc_IterableOnce__sci_List(elems$1);
+            return new $c_Lcom_vinctus_oql_DMLParametricDataType("char", parameters$1)
+          }
+        }
+      };
+      throw new $c_s_MatchError(x$1$4)
+    })))
   })))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n(this.ident__s_util_parsing_combinator_Parsers$Parser()).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((entity) => {
     var entity$1 = $as_Lcom_vinctus_oql_Ident(entity);
     return new $c_Lcom_vinctus_oql_DMLNameType(entity$1)
-  }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("[", this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("]", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$3) => {
-    var x$1$4 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$3);
-    if ((x$1$4 !== null)) {
+  }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("[", this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("]", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("(", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(")", this))))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$6) => {
+    var x$1$7 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$6);
+    if ((x$1$7 !== null)) {
       $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-      var x68 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$4).s_util_parsing_combinator_Parsers$$tilde__f__1);
-      if ((x68 !== null)) {
+      var x78 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$7).s_util_parsing_combinator_Parsers$$tilde__f__1);
+      if ((x78 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x71 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x68).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x71 !== null)) {
+        var x81 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x78).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x81 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var x74 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x71).s_util_parsing_combinator_Parsers$$tilde__f__1);
-          if ((x74 !== null)) {
+          var x84 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x81).s_util_parsing_combinator_Parsers$$tilde__f__1);
+          if ((x84 !== null)) {
             $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-            var x77 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x74).s_util_parsing_combinator_Parsers$$tilde__f__1);
-            if ((x77 !== null)) {
+            var x87 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x84).s_util_parsing_combinator_Parsers$$tilde__f__1);
+            if ((x87 !== null)) {
               $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-              var n = $as_Lcom_vinctus_oql_Ident($n(x77).s_util_parsing_combinator_Parsers$$tilde__f__2);
-              var l = $as_Lcom_vinctus_oql_Ident($n(x68).s_util_parsing_combinator_Parsers$$tilde__f__2);
-              return new $c_Lcom_vinctus_oql_DMLManyToManyType(n, l)
+              var n$1 = $as_Lcom_vinctus_oql_Ident($n(x87).s_util_parsing_combinator_Parsers$$tilde__f__2);
+              var l = $as_Lcom_vinctus_oql_Ident($n(x78).s_util_parsing_combinator_Parsers$$tilde__f__2);
+              return new $c_Lcom_vinctus_oql_DMLManyToManyType(n$1, l)
             }
           }
         }
       }
     };
-    throw new $c_s_MatchError(x$1$4)
+    throw new $c_s_MatchError(x$1$7)
   }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("[", this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1("]", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
     var p$1 = new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(".", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))));
     return $f_s_util_parsing_combinator_Parsers__opt__F0__s_util_parsing_combinator_Parsers$Parser(this, p$1)
-  })))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$5) => {
-    var x$1$6 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$5);
-    if ((x$1$6 !== null)) {
+  })))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$8) => {
+    var x$1$9 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$8);
+    if ((x$1$9 !== null)) {
       $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-      var x84 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$6).s_util_parsing_combinator_Parsers$$tilde__f__1);
-      if ((x84 !== null)) {
+      var x94 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$9).s_util_parsing_combinator_Parsers$$tilde__f__1);
+      if ((x94 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x87 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x84).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x87 !== null)) {
+        var x97 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x94).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x97 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var n$1 = $as_Lcom_vinctus_oql_Ident($n(x87).s_util_parsing_combinator_Parsers$$tilde__f__2);
-          var t = $as_s_Option($n(x$1$6).s_util_parsing_combinator_Parsers$$tilde__f__2);
-          return new $c_Lcom_vinctus_oql_DMLOneToManyType(n$1, t)
+          var n$2 = $as_Lcom_vinctus_oql_Ident($n(x97).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var t = $as_s_Option($n(x$1$9).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          return new $c_Lcom_vinctus_oql_DMLOneToManyType(n$2, t)
         }
       }
     };
-    throw new $c_s_MatchError(x$1$6)
+    throw new $c_s_MatchError(x$1$9)
   }))))))).$bar__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => $n($n($n(new $c_s_util_parsing_combinator_RegexParsers$$anon$1("<", this).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(">", this))))).$tilde__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => {
     var p$2 = new $c_sjsr_AnonFunction0((() => new $c_s_util_parsing_combinator_RegexParsers$$anon$1(".", this).$tilde$greater__F0__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction0((() => this.ident__s_util_parsing_combinator_Parsers$Parser())))));
     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$7) => {
-    var x$1$8 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$7);
-    if ((x$1$8 !== null)) {
+  })))).$up$up__F1__s_util_parsing_combinator_Parsers$Parser(new $c_sjsr_AnonFunction1(((x$1$10) => {
+    var x$1$11 = $as_s_util_parsing_combinator_Parsers$$tilde(x$1$10);
+    if ((x$1$11 !== null)) {
       $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-      var x94 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$8).s_util_parsing_combinator_Parsers$$tilde__f__1);
-      if ((x94 !== null)) {
+      var x104 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x$1$11).s_util_parsing_combinator_Parsers$$tilde__f__1);
+      if ((x104 !== null)) {
         $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-        var x97 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x94).s_util_parsing_combinator_Parsers$$tilde__f__1);
-        if ((x97 !== null)) {
+        var x107 = $as_s_util_parsing_combinator_Parsers$$tilde($n(x104).s_util_parsing_combinator_Parsers$$tilde__f__1);
+        if ((x107 !== null)) {
           $n(this.$tilde__s_util_parsing_combinator_Parsers$$tilde$());
-          var n$2 = $as_Lcom_vinctus_oql_Ident($n(x97).s_util_parsing_combinator_Parsers$$tilde__f__2);
-          var t$1 = $as_s_Option($n(x$1$8).s_util_parsing_combinator_Parsers$$tilde__f__2);
-          return new $c_Lcom_vinctus_oql_DMLOneToOneType(n$2, t$1)
+          var n$3 = $as_Lcom_vinctus_oql_Ident($n(x107).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          var t$1 = $as_s_Option($n(x$1$11).s_util_parsing_combinator_Parsers$$tilde__f__2);
+          return new $c_Lcom_vinctus_oql_DMLOneToOneType(n$3, t$1)
         }
       }
     };
-    throw new $c_s_MatchError(x$1$8)
+    throw new $c_s_MatchError(x$1$11)
   }))))))
 });
 $c_Lcom_vinctus_oql_DMLParser.prototype.parseModel__T__Lcom_vinctus_oql_DMLModel = (function(src) {
   var p = this.model__s_util_parsing_combinator_Parsers$Parser();
   var in$1 = $ct_s_util_parsing_input_CharSequenceReader__jl_CharSequence__(new $c_s_util_parsing_input_CharSequenceReader(), src);
-  var x102 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p, in$1);
-  if (((x102 instanceof $c_s_util_parsing_combinator_Parsers$Success) && ($n($as_s_util_parsing_combinator_Parsers$Success(x102)).s_util_parsing_combinator_Parsers$Success__f_$outer === this))) {
+  var x112 = $f_s_util_parsing_combinator_RegexParsers__parseAll__s_util_parsing_combinator_Parsers$Parser__s_util_parsing_input_Reader__s_util_parsing_combinator_Parsers$ParseResult(this, p, in$1);
+  if (((x112 instanceof $c_s_util_parsing_combinator_Parsers$Success) && ($n($as_s_util_parsing_combinator_Parsers$Success(x112)).s_util_parsing_combinator_Parsers$Success__f_$outer === this))) {
     $n(this.Success__s_util_parsing_combinator_Parsers$Success$());
-    var x$1 = $as_s_util_parsing_combinator_Parsers$Success(x102);
+    var x$1 = $as_s_util_parsing_combinator_Parsers$Success(x112);
     var this$2 = $n(x$1);
-    var x109 = $as_Lcom_vinctus_oql_DMLModel(this$2.s_util_parsing_combinator_Parsers$Success__f_result);
+    var x119 = $as_Lcom_vinctus_oql_DMLModel(this$2.s_util_parsing_combinator_Parsers$Success__f_result);
     var this$3 = $n(x$1);
-    return x109
-  };
-  if ((x102 !== null)) {
-    var x103 = $n(this.NoSuccess__s_util_parsing_combinator_Parsers$NoSuccess$()).unapply__s_util_parsing_combinator_Parsers$ParseResult__s_Option(x102);
-    if ((!$n(x103).isEmpty__Z())) {
-      var x104 = $as_T2($n(x103).get__O());
-      var error = $as_T($n(x104).T2__f__1);
-      var rest = $as_s_util_parsing_input_Reader($n(x104).T2__f__2);
+    return x119
+  };
+  if ((x112 !== null)) {
+    var x113 = $n(this.NoSuccess__s_util_parsing_combinator_Parsers$NoSuccess$()).unapply__s_util_parsing_combinator_Parsers$ParseResult__s_Option(x112);
+    if ((!$n(x113).isEmpty__Z())) {
+      var x114 = $as_T2($n(x113).get__O());
+      var error = $as_T($n(x114).T2__f__1);
+      var rest = $as_s_util_parsing_input_Reader($n(x114).T2__f__2);
       $m_Lcom_vinctus_oql_package$().problem__s_util_parsing_input_Position__T__T__E($n(rest).pos__s_util_parsing_input_Position(), error, src)
     }
   };
-  throw new $c_s_MatchError(x102)
+  throw new $c_s_MatchError(x112)
 });
 var $d_Lcom_vinctus_oql_DMLParser = new $TypeData().initClass({
   Lcom_vinctus_oql_DMLParser: 0
@@ -42440,6 +42528,12 @@ function $f_Lcom_vinctus_oql_PGDataSource__$init$__V($thiz) {
   $thiz.Lcom_vinctus_oql_NodePGDataSource__f_builtinVariables = this$21.from__sc_IterableOnce__sci_Map(elems$1)
 }
 function $f_Lcom_vinctus_oql_PGDataSource__mapType__Lcom_vinctus_oql_TypeSpecifier__T($thiz, typ) {
+  if ((typ instanceof $c_Lcom_vinctus_oql_CharacterType)) {
+    var x$1 = $as_Lcom_vinctus_oql_CharacterType(typ);
+    var this$2 = $n(x$1);
+    var x11 = this$2.Lcom_vinctus_oql_CharacterType__f_n;
+    return (("CHAR(" + x11) + ")")
+  };
   var x = $m_Lcom_vinctus_oql_TextType$();
   if ((x === typ)) {
     return "TEXT"
@@ -42448,54 +42542,62 @@ function $f_Lcom_vinctus_oql_PGDataSource__mapType__Lcom_vinctus_oql_TypeSpecifi
   if ((x$3 === typ)) {
     return "INTEGER"
   };
-  var x$5 = $m_Lcom_vinctus_oql_BooleanType$();
+  var x$5 = $m_Lcom_vinctus_oql_SmallintType$();
   if ((x$5 === typ)) {
-    return "BOOLEAN"
+    return "SMALLINT"
   };
-  var x$7 = $m_Lcom_vinctus_oql_BigintType$();
+  var x$7 = $m_Lcom_vinctus_oql_BooleanType$();
   if ((x$7 === typ)) {
+    return "BOOLEAN"
+  };
+  var x$9 = $m_Lcom_vinctus_oql_BigintType$();
+  if ((x$9 === typ)) {
     return "BIGINT"
   };
   if ((typ instanceof $c_Lcom_vinctus_oql_DecimalType)) {
-    var x$1 = $as_Lcom_vinctus_oql_DecimalType(typ);
-    var this$2 = $n(x$1);
-    var x7 = this$2.Lcom_vinctus_oql_DecimalType__f_precision;
-    var this$3 = $n(x$1);
-    var x8 = this$3.Lcom_vinctus_oql_DecimalType__f_scale;
+    var x$1$1 = $as_Lcom_vinctus_oql_DecimalType(typ);
+    var this$4 = $n(x$1$1);
+    var x7 = this$4.Lcom_vinctus_oql_DecimalType__f_precision;
+    var this$5 = $n(x$1$1);
+    var x8 = this$5.Lcom_vinctus_oql_DecimalType__f_scale;
     return (((("NUMERIC(" + x7) + ", ") + x8) + ")")
   };
-  var x$9 = $m_Lcom_vinctus_oql_DateType$();
-  if ((x$9 === typ)) {
+  var x$11 = $m_Lcom_vinctus_oql_DateType$();
+  if ((x$11 === typ)) {
     return "DATE"
   };
-  var x$11 = $m_Lcom_vinctus_oql_FloatType$();
-  if ((x$11 === typ)) {
+  var x$13 = $m_Lcom_vinctus_oql_FloatType$();
+  if ((x$13 === typ)) {
     return "DOUBLE PRECISION"
   };
-  var x$13 = $m_Lcom_vinctus_oql_UUIDType$();
-  if ((x$13 === typ)) {
+  var x$15 = $m_Lcom_vinctus_oql_UUIDType$();
+  if ((x$15 === typ)) {
     return "UUID"
   };
-  var x$15 = $m_Lcom_vinctus_oql_TimestampType$();
-  if ((x$15 === typ)) {
+  var x$17 = $m_Lcom_vinctus_oql_TimestampType$();
+  if ((x$17 === typ)) {
     return "TIMESTAMP WITHOUT TIME ZONE"
   };
   if ((typ instanceof $c_Lcom_vinctus_oql_ManyToOneType)) {
-    var x$1$1 = $as_Lcom_vinctus_oql_ManyToOneType(typ);
-    var this$5 = $n(x$1$1);
-    var x4 = this$5.Lcom_vinctus_oql_ManyToOneType__f_entity;
+    var x$1$2 = $as_Lcom_vinctus_oql_ManyToOneType(typ);
+    var this$7 = $n(x$1$2);
+    var x4 = this$7.Lcom_vinctus_oql_ManyToOneType__f_entity;
     var typ$1 = $n($as_Lcom_vinctus_oql_Attribute($n($n(x4).pk__s_Option()).get__O())).Lcom_vinctus_oql_Attribute__f_typ;
     return $f_Lcom_vinctus_oql_PGDataSource__mapType__Lcom_vinctus_oql_TypeSpecifier__T($thiz, typ$1)
   };
   throw new $c_s_MatchError(typ)
 }
 function $f_Lcom_vinctus_oql_PGDataSource__mapPKType__Lcom_vinctus_oql_TypeSpecifier__T($thiz, typ) {
-  var x = $m_Lcom_vinctus_oql_IntegerType$();
+  var x = $m_Lcom_vinctus_oql_SmallintType$();
   if ((x === typ)) {
-    return "SERIAL"
+    return "SMALLSERIAL"
   };
-  var x$3 = $m_Lcom_vinctus_oql_BigintType$();
+  var x$3 = $m_Lcom_vinctus_oql_IntegerType$();
   if ((x$3 === typ)) {
+    return "SERIAL"
+  };
+  var x$5 = $m_Lcom_vinctus_oql_BigintType$();
+  if ((x$5 === typ)) {
     return "BIGSERIAL"
   };
   if ($is_Lcom_vinctus_oql_Datatype(typ)) {
@@ -42514,6 +42616,10 @@ function $f_Lcom_vinctus_oql_PGDataSource__reverseMapType__T__Lcom_vinctus_oql_D
       var $$x1 = $m_Lcom_vinctus_oql_UUIDType$();
       break
     }
+    case "smallint": {
+      var $$x1 = $m_Lcom_vinctus_oql_SmallintType$();
+      break
+    }
     case "integer": {
       var $$x1 = $m_Lcom_vinctus_oql_IntegerType$();
       break
@@ -42618,16 +42724,20 @@ $c_Lcom_vinctus_oql_RDBDataSource.prototype.mapType__Lcom_vinctus_oql_TypeSpecif
   if ((x === typ)) {
     return "TEXT"
   };
-  var x$3 = $m_Lcom_vinctus_oql_IntegerType$();
+  var x$3 = $m_Lcom_vinctus_oql_SmallintType$();
   if ((x$3 === typ)) {
-    return "INTEGER"
+    return "SMALLINT"
   };
-  var x$5 = $m_Lcom_vinctus_oql_BooleanType$();
+  var x$5 = $m_Lcom_vinctus_oql_IntegerType$();
   if ((x$5 === typ)) {
-    return "BOOLEAN"
+    return "INTEGER"
   };
-  var x$7 = $m_Lcom_vinctus_oql_BigintType$();
+  var x$7 = $m_Lcom_vinctus_oql_BooleanType$();
   if ((x$7 === typ)) {
+    return "BOOLEAN"
+  };
+  var x$9 = $m_Lcom_vinctus_oql_BigintType$();
+  if ((x$9 === typ)) {
     return "BIGINT"
   };
   if ((typ instanceof $c_Lcom_vinctus_oql_DecimalType)) {
@@ -42638,24 +42748,24 @@ $c_Lcom_vinctus_oql_RDBDataSource.prototype.mapType__Lcom_vinctus_oql_TypeSpecif
     var x16 = this$3.Lcom_vinctus_oql_DecimalType__f_scale;
     return (((("DECIMAL(" + x15) + ", ") + x16) + ")")
   };
-  var x$9 = $m_Lcom_vinctus_oql_DateType$();
-  if ((x$9 === typ)) {
+  var x$11 = $m_Lcom_vinctus_oql_DateType$();
+  if ((x$11 === typ)) {
     return "DATE"
   };
-  var x$11 = $m_Lcom_vinctus_oql_FloatType$();
-  if ((x$11 === typ)) {
+  var x$13 = $m_Lcom_vinctus_oql_FloatType$();
+  if ((x$13 === typ)) {
     return "DOUBLE"
   };
-  var x$13 = $m_Lcom_vinctus_oql_UUIDType$();
-  if ((x$13 === typ)) {
+  var x$15 = $m_Lcom_vinctus_oql_UUIDType$();
+  if ((x$15 === typ)) {
     return "UUID"
   };
-  var x$15 = $m_Lcom_vinctus_oql_TimestampType$();
-  if ((x$15 === typ)) {
+  var x$17 = $m_Lcom_vinctus_oql_TimestampType$();
+  if ((x$17 === typ)) {
     return "TIMESTAMP"
   };
-  var x$17 = $m_Lcom_vinctus_oql_JSONType$();
-  if ((x$17 === typ)) {
+  var x$19 = $m_Lcom_vinctus_oql_JSONType$();
+  if ((x$19 === typ)) {
     return "JSON"
   };
   if ((typ instanceof $c_Lcom_vinctus_oql_EnumType)) {
@@ -42674,16 +42784,20 @@ $c_Lcom_vinctus_oql_RDBDataSource.prototype.mapType__Lcom_vinctus_oql_TypeSpecif
   throw new $c_s_MatchError(typ)
 });
 $c_Lcom_vinctus_oql_RDBDataSource.prototype.mapPKType__Lcom_vinctus_oql_TypeSpecifier__T = (function(typ) {
-  var x = $m_Lcom_vinctus_oql_IntegerType$();
+  var x = $m_Lcom_vinctus_oql_SmallintType$();
   if ((x === typ)) {
-    return "INT AUTO"
+    return "SMALLINT AUTO"
   };
-  var x$3 = $m_Lcom_vinctus_oql_BigintType$();
+  var x$3 = $m_Lcom_vinctus_oql_IntegerType$();
   if ((x$3 === typ)) {
-    return "BIGINT AUTO"
+    return "INT AUTO"
   };
-  var x$5 = $m_Lcom_vinctus_oql_UUIDType$();
+  var x$5 = $m_Lcom_vinctus_oql_BigintType$();
   if ((x$5 === typ)) {
+    return "BIGINT AUTO"
+  };
+  var x$7 = $m_Lcom_vinctus_oql_UUIDType$();
+  if ((x$7 === typ)) {
     return "UUID AUTO"
   };
   if ($is_Lcom_vinctus_oql_Datatype(typ)) {
@@ -42702,6 +42816,10 @@ $c_Lcom_vinctus_oql_RDBDataSource.prototype.reverseMapType__T__Lcom_vinctus_oql_
       var $$x1 = $m_Lcom_vinctus_oql_UUIDType$();
       break
     }
+    case "SMALLINT": {
+      var $$x1 = $m_Lcom_vinctus_oql_SmallintType$();
+      break
+    }
     case "INT": {
       var $$x1 = $m_Lcom_vinctus_oql_IntegerType$();
       break
@@ -80177,6 +80295,106 @@ var $d_s_util_parsing_input_OffsetPosition = new $TypeData().initClass({
 });
 $c_s_util_parsing_input_OffsetPosition.prototype.$classData = $d_s_util_parsing_input_OffsetPosition;
 /** @constructor */
+function $c_Lcom_vinctus_oql_CharacterType(n) {
+  this.Lcom_vinctus_oql_CharacterType__f_isDataType = false;
+  this.Lcom_vinctus_oql_CharacterType__f_isColumnType = false;
+  this.Lcom_vinctus_oql_CharacterType__f_isArrayType = false;
+  this.Lcom_vinctus_oql_CharacterType__f_n = 0;
+  this.Lcom_vinctus_oql_CharacterType__f_n = n;
+  $f_Lcom_vinctus_oql_Datatype__$init$__V(this)
+}
+$c_Lcom_vinctus_oql_CharacterType.prototype = new $h_O();
+$c_Lcom_vinctus_oql_CharacterType.prototype.constructor = $c_Lcom_vinctus_oql_CharacterType;
+/** @constructor */
+function $h_Lcom_vinctus_oql_CharacterType() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_CharacterType.prototype = $c_Lcom_vinctus_oql_CharacterType.prototype;
+$c_Lcom_vinctus_oql_CharacterType.prototype.isDataType__Z = (function() {
+  return this.Lcom_vinctus_oql_CharacterType__f_isDataType
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.isColumnType__Z = (function() {
+  return this.Lcom_vinctus_oql_CharacterType__f_isColumnType
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.isArrayType__Z = (function() {
+  return this.Lcom_vinctus_oql_CharacterType__f_isArrayType
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.com$vinctus$oql$Datatype$_setter_$isDataType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_CharacterType__f_isDataType = x$0
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.com$vinctus$oql$Datatype$_setter_$isColumnType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_CharacterType__f_isColumnType = x$0
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.com$vinctus$oql$Datatype$_setter_$isArrayType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_CharacterType__f_isArrayType = x$0
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_s_Product$$anon$1(this)
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.hashCode__I = (function() {
+  var acc = (-889275714);
+  var hash = acc;
+  var data = $f_T__hashCode__I("CharacterType");
+  acc = $m_sr_Statics$().mix__I__I__I(hash, data);
+  var hash$1 = acc;
+  var data$1 = this.Lcom_vinctus_oql_CharacterType__f_n;
+  acc = $m_sr_Statics$().mix__I__I__I(hash$1, data$1);
+  var hash$2 = acc;
+  return $m_sr_Statics$().finalizeHash__I__I__I(hash$2, 1)
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.equals__O__Z = (function(x$0) {
+  if ((this === x$0)) {
+    return true
+  } else if ((x$0 instanceof $c_Lcom_vinctus_oql_CharacterType)) {
+    var x$0$2 = $as_Lcom_vinctus_oql_CharacterType(x$0);
+    return ((this.Lcom_vinctus_oql_CharacterType__f_n === $n(x$0$2).Lcom_vinctus_oql_CharacterType__f_n) && ($n(x$0$2), true))
+  } else {
+    return false
+  }
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.toString__T = (function() {
+  return $m_sr_ScalaRunTime$()._toString__s_Product__T(this)
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.productArity__I = (function() {
+  return 1
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.productPrefix__T = (function() {
+  return "CharacterType"
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.productElement__I__O = (function(n) {
+  if ((n === 0)) {
+    return this.Lcom_vinctus_oql_CharacterType__f_n
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.productElementName__I__T = (function(n) {
+  if ((n === 0)) {
+    return "n"
+  };
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+function $as_Lcom_vinctus_oql_CharacterType(obj) {
+  return (((obj instanceof $c_Lcom_vinctus_oql_CharacterType) || (obj === null)) ? obj : $throwClassCastException(obj, "com.vinctus.oql.CharacterType"))
+}
+function $isArrayOf_Lcom_vinctus_oql_CharacterType(obj, depth) {
+  return (!(!(((obj && obj.$classData) && (obj.$classData.arrayDepth === depth)) && obj.$classData.arrayBase.ancestors.Lcom_vinctus_oql_CharacterType)))
+}
+function $asArrayOf_Lcom_vinctus_oql_CharacterType(obj, depth) {
+  return (($isArrayOf_Lcom_vinctus_oql_CharacterType(obj, depth) || (obj === null)) ? obj : $throwArrayCastException(obj, "Lcom.vinctus.oql.CharacterType;", depth))
+}
+var $d_Lcom_vinctus_oql_CharacterType = new $TypeData().initClass({
+  Lcom_vinctus_oql_CharacterType: 0
+}, false, "com.vinctus.oql.CharacterType", {
+  Lcom_vinctus_oql_CharacterType: 1,
+  O: 1,
+  Lcom_vinctus_oql_TypeSpecifier: 1,
+  Lcom_vinctus_oql_Datatype: 1,
+  s_Equals: 1,
+  s_Product: 1,
+  Ljava_io_Serializable: 1
+});
+$c_Lcom_vinctus_oql_CharacterType.prototype.$classData = $d_Lcom_vinctus_oql_CharacterType;
+/** @constructor */
 function $c_Lcom_vinctus_oql_DMLEntity(name, actualName, attributes) {
   this.Lcom_vinctus_oql_DMLEntity__f_name = null;
   this.Lcom_vinctus_oql_DMLEntity__f_actualName = null;
@@ -103414,6 +103632,82 @@ function $m_Lcom_vinctus_oql_JSONType$() {
   return $n_Lcom_vinctus_oql_JSONType$
 }
 /** @constructor */
+function $c_Lcom_vinctus_oql_SmallintType$() {
+  this.Lcom_vinctus_oql_SmallintType$__f_isDataType = false;
+  this.Lcom_vinctus_oql_SmallintType$__f_isColumnType = false;
+  this.Lcom_vinctus_oql_SmallintType$__f_isArrayType = false;
+  $n_Lcom_vinctus_oql_SmallintType$ = this;
+  $f_Lcom_vinctus_oql_Datatype__$init$__V(this)
+}
+$c_Lcom_vinctus_oql_SmallintType$.prototype = new $h_O();
+$c_Lcom_vinctus_oql_SmallintType$.prototype.constructor = $c_Lcom_vinctus_oql_SmallintType$;
+/** @constructor */
+function $h_Lcom_vinctus_oql_SmallintType$() {
+  /*<skip>*/
+}
+$h_Lcom_vinctus_oql_SmallintType$.prototype = $c_Lcom_vinctus_oql_SmallintType$.prototype;
+$c_Lcom_vinctus_oql_SmallintType$.prototype.isDataType__Z = (function() {
+  return this.Lcom_vinctus_oql_SmallintType$__f_isDataType
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.isColumnType__Z = (function() {
+  return this.Lcom_vinctus_oql_SmallintType$__f_isColumnType
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.isArrayType__Z = (function() {
+  return this.Lcom_vinctus_oql_SmallintType$__f_isArrayType
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.com$vinctus$oql$Datatype$_setter_$isDataType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_SmallintType$__f_isDataType = x$0
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.com$vinctus$oql$Datatype$_setter_$isColumnType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_SmallintType$__f_isColumnType = x$0
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.com$vinctus$oql$Datatype$_setter_$isArrayType_$eq__Z__V = (function(x$0) {
+  this.Lcom_vinctus_oql_SmallintType$__f_isArrayType = x$0
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.productIterator__sc_Iterator = (function() {
+  return new $c_s_Product$$anon$1(this)
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.hashCode__I = (function() {
+  return 1213752578
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.toString__T = (function() {
+  return "SmallintType"
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.productArity__I = (function() {
+  return 0
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.productPrefix__T = (function() {
+  return "SmallintType"
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.productElement__I__O = (function(n) {
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.productElementName__I__T = (function(n) {
+  throw $ct_jl_IndexOutOfBoundsException__T__(new $c_jl_IndexOutOfBoundsException(), ("" + n))
+});
+var $d_Lcom_vinctus_oql_SmallintType$ = new $TypeData().initClass({
+  Lcom_vinctus_oql_SmallintType$: 0
+}, false, "com.vinctus.oql.SmallintType$", {
+  Lcom_vinctus_oql_SmallintType$: 1,
+  O: 1,
+  Lcom_vinctus_oql_TypeSpecifier: 1,
+  Lcom_vinctus_oql_Datatype: 1,
+  s_Equals: 1,
+  s_Product: 1,
+  Ljava_io_Serializable: 1,
+  s_deriving_Mirror: 1,
+  s_deriving_Mirror$Product: 1,
+  s_deriving_Mirror$Singleton: 1
+});
+$c_Lcom_vinctus_oql_SmallintType$.prototype.$classData = $d_Lcom_vinctus_oql_SmallintType$;
+var $n_Lcom_vinctus_oql_SmallintType$;
+function $m_Lcom_vinctus_oql_SmallintType$() {
+  if ((!$n_Lcom_vinctus_oql_SmallintType$)) {
+    $n_Lcom_vinctus_oql_SmallintType$ = new $c_Lcom_vinctus_oql_SmallintType$()
+  };
+  return $n_Lcom_vinctus_oql_SmallintType$
+}
+/** @constructor */
 function $c_Lcom_vinctus_oql_TextType$() {
   this.Lcom_vinctus_oql_TextType$__f_isDataType = false;
   this.Lcom_vinctus_oql_TextType$__f_isColumnType = false;