@vinctus/oql 1.1.11 → 1.1.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/main.js +58 -53
- package/main.js.map +2 -2
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -68,7 +68,7 @@ Add the following lines to your `build.sbt`:
|
|
|
68
68
|
```sbt
|
|
69
69
|
externalResolvers += "OQL" at "https://maven.pkg.github.com/vinctustech/oql"
|
|
70
70
|
|
|
71
|
-
libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.
|
|
71
|
+
libraryDependencies += "com.vinctus" %%% "-vinctus-oql" % "1.1.12"
|
|
72
72
|
|
|
73
73
|
Compile / npmDependencies ++= Seq(
|
|
74
74
|
"pg" -> "8.10.0",
|
package/main.js
CHANGED
|
@@ -1932,8 +1932,10 @@ $c_Lcom_vinctus_oql_AbstractOQL$.prototype.decorate__Lcom_vinctus_oql_Entity__Lc
|
|
|
1932
1932
|
if ((expr instanceof $c_Lcom_vinctus_oql_TypedOQLExpression)) {
|
|
1933
1933
|
var x122 = $as_Lcom_vinctus_oql_TypedOQLExpression(expr);
|
|
1934
1934
|
var this$81 = $n(x122);
|
|
1935
|
+
var x124 = this$81.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
|
|
1935
1936
|
var this$82 = $n(x122);
|
|
1936
1937
|
var x125 = this$82.Lcom_vinctus_oql_TypedOQLExpression__f_t;
|
|
1938
|
+
this.decorate__Lcom_vinctus_oql_Entity__Lcom_vinctus_oql_OQLExpression__Lcom_vinctus_oql_DataModel__Lcom_vinctus_oql_SQLDataSource__T__V(entity, x124, model, ds, oql);
|
|
1937
1939
|
$n(x122).Lcom_vinctus_oql_OQLExpression__f_typ = x125;
|
|
1938
1940
|
return (void 0)
|
|
1939
1941
|
};
|
|
@@ -6260,44 +6262,47 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
|
|
|
6260
6262
|
var x73 = this$47.Lcom_vinctus_oql_TypedOQLExpression__f_expr;
|
|
6261
6263
|
var this$48 = $n(x$1$11);
|
|
6262
6264
|
var x74 = this$48.Lcom_vinctus_oql_TypedOQLExpression__f_t;
|
|
6263
|
-
var this$
|
|
6265
|
+
var this$50 = $m_s_Console$();
|
|
6266
|
+
var this$51 = $n(this$50.out__Ljava_io_PrintStream());
|
|
6267
|
+
this$51.java$lang$JSConsoleBasedPrintStream$$printString__T__V((x73 + "\n"));
|
|
6268
|
+
var this$52 = $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds);
|
|
6264
6269
|
var a = this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x73, table);
|
|
6265
|
-
return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$
|
|
6270
|
+
return $f_Lcom_vinctus_oql_SQLDataSource__typed__O__Lcom_vinctus_oql_Datatype__T(this$52, a, x74)
|
|
6266
6271
|
};
|
|
6267
6272
|
if ((expr instanceof $c_Lcom_vinctus_oql_FloatOQLExpression)) {
|
|
6268
6273
|
var x$1$12 = $as_Lcom_vinctus_oql_FloatOQLExpression(expr);
|
|
6269
|
-
var this$
|
|
6270
|
-
var x70 = this$
|
|
6274
|
+
var this$54 = $n(x$1$12);
|
|
6275
|
+
var x70 = this$54.Lcom_vinctus_oql_FloatOQLExpression__f_n;
|
|
6271
6276
|
return ("" + x70)
|
|
6272
6277
|
};
|
|
6273
6278
|
if ((expr instanceof $c_Lcom_vinctus_oql_IntegerOQLExpression)) {
|
|
6274
6279
|
var x$1$13 = $as_Lcom_vinctus_oql_IntegerOQLExpression(expr);
|
|
6275
|
-
var this$
|
|
6276
|
-
var x67 = this$
|
|
6280
|
+
var this$57 = $n(x$1$13);
|
|
6281
|
+
var x67 = this$57.Lcom_vinctus_oql_IntegerOQLExpression__f_n;
|
|
6277
6282
|
return ("" + x67)
|
|
6278
6283
|
};
|
|
6279
6284
|
if ((expr instanceof $c_Lcom_vinctus_oql_JSONOQLExpression)) {
|
|
6280
6285
|
var x$1$14 = $as_Lcom_vinctus_oql_JSONOQLExpression(expr);
|
|
6281
|
-
var this$
|
|
6282
|
-
var x64 = this$
|
|
6286
|
+
var this$60 = $n(x$1$14);
|
|
6287
|
+
var x64 = this$60.Lcom_vinctus_oql_JSONOQLExpression__f_expr;
|
|
6283
6288
|
return (("'" + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x64, table)) + "'")
|
|
6284
6289
|
};
|
|
6285
6290
|
if ((expr instanceof $c_Lcom_vinctus_oql_ArrayOQLExpression)) {
|
|
6286
6291
|
var x$1$15 = $as_Lcom_vinctus_oql_ArrayOQLExpression(expr);
|
|
6287
|
-
var this$
|
|
6288
|
-
var x61 = this$
|
|
6289
|
-
var this$
|
|
6292
|
+
var this$62 = $n(x$1$15);
|
|
6293
|
+
var x61 = this$62.Lcom_vinctus_oql_ArrayOQLExpression__f_elems;
|
|
6294
|
+
var this$63 = $n(x61);
|
|
6290
6295
|
var f$2 = ((e$2) => {
|
|
6291
6296
|
var e = $as_Lcom_vinctus_oql_OQLExpression(e$2);
|
|
6292
6297
|
return this.expression__Lcom_vinctus_oql_OQLExpression__T__T(e, table)
|
|
6293
6298
|
});
|
|
6294
|
-
if ((this$
|
|
6299
|
+
if ((this$63 === $m_sci_Nil$())) {
|
|
6295
6300
|
var $$x11 = $m_sci_Nil$()
|
|
6296
6301
|
} else {
|
|
6297
|
-
var arg1$4 = this$
|
|
6302
|
+
var arg1$4 = this$63.head__O();
|
|
6298
6303
|
var h$2 = new $c_sci_$colon$colon(f$2(arg1$4), $m_sci_Nil$());
|
|
6299
6304
|
var t$2 = h$2;
|
|
6300
|
-
var rest$2 = $as_sci_List(this$
|
|
6305
|
+
var rest$2 = $as_sci_List(this$63.tail__O());
|
|
6301
6306
|
while ((rest$2 !== $m_sci_Nil$())) {
|
|
6302
6307
|
var arg1$5 = $n(rest$2).head__O();
|
|
6303
6308
|
var nx$2 = new $c_sci_$colon$colon(f$2(arg1$5), $m_sci_Nil$());
|
|
@@ -6307,14 +6312,14 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
|
|
|
6307
6312
|
};
|
|
6308
6313
|
var $$x11 = h$2
|
|
6309
6314
|
};
|
|
6310
|
-
var this$
|
|
6311
|
-
return (("[" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$
|
|
6315
|
+
var this$64 = $n($$x11);
|
|
6316
|
+
return (("[" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$64, "", ", ", "")) + "]")
|
|
6312
6317
|
};
|
|
6313
6318
|
if ((expr instanceof $c_Lcom_vinctus_oql_ObjectOQLExpression)) {
|
|
6314
6319
|
var x$1$16 = $as_Lcom_vinctus_oql_ObjectOQLExpression(expr);
|
|
6315
|
-
var this$
|
|
6316
|
-
var x58 = this$
|
|
6317
|
-
var this$
|
|
6320
|
+
var this$66 = $n(x$1$16);
|
|
6321
|
+
var x58 = this$66.Lcom_vinctus_oql_ObjectOQLExpression__f_pairs;
|
|
6322
|
+
var this$67 = $n(x58);
|
|
6318
6323
|
var f$3 = ((x$1$17) => {
|
|
6319
6324
|
var x$1$18 = $as_T2(x$1$17);
|
|
6320
6325
|
if ((x$1$18 !== null)) {
|
|
@@ -6324,13 +6329,13 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
|
|
|
6324
6329
|
};
|
|
6325
6330
|
throw new $c_s_MatchError(x$1$18)
|
|
6326
6331
|
});
|
|
6327
|
-
if ((this$
|
|
6332
|
+
if ((this$67 === $m_sci_Nil$())) {
|
|
6328
6333
|
var $$x12 = $m_sci_Nil$()
|
|
6329
6334
|
} else {
|
|
6330
|
-
var arg1$6 = this$
|
|
6335
|
+
var arg1$6 = this$67.head__O();
|
|
6331
6336
|
var h$3 = new $c_sci_$colon$colon(f$3(arg1$6), $m_sci_Nil$());
|
|
6332
6337
|
var t$3 = h$3;
|
|
6333
|
-
var rest$3 = $as_sci_List(this$
|
|
6338
|
+
var rest$3 = $as_sci_List(this$67.tail__O());
|
|
6334
6339
|
while ((rest$3 !== $m_sci_Nil$())) {
|
|
6335
6340
|
var arg1$7 = $n(rest$3).head__O();
|
|
6336
6341
|
var nx$3 = new $c_sci_$colon$colon(f$3(arg1$7), $m_sci_Nil$());
|
|
@@ -6340,33 +6345,33 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
|
|
|
6340
6345
|
};
|
|
6341
6346
|
var $$x12 = h$3
|
|
6342
6347
|
};
|
|
6343
|
-
var this$
|
|
6344
|
-
return (("{" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$
|
|
6348
|
+
var this$68 = $n($$x12);
|
|
6349
|
+
return (("{" + $f_sc_IterableOnceOps__mkString__T__T__T__T(this$68, "", ", ", "")) + "}")
|
|
6345
6350
|
};
|
|
6346
6351
|
if ((expr instanceof $c_Lcom_vinctus_oql_StringOQLExpression)) {
|
|
6347
6352
|
var x$1$19 = $as_Lcom_vinctus_oql_StringOQLExpression(expr);
|
|
6348
|
-
var this$
|
|
6349
|
-
var x55 = this$
|
|
6353
|
+
var this$70 = $n(x$1$19);
|
|
6354
|
+
var x55 = this$70.Lcom_vinctus_oql_StringOQLExpression__f_s;
|
|
6350
6355
|
return $n(this.Lcom_vinctus_oql_SQLQueryBuilder__f_com$vinctus$oql$SQLQueryBuilder$$ds).string__T__T(x55)
|
|
6351
6356
|
};
|
|
6352
6357
|
if ((expr instanceof $c_Lcom_vinctus_oql_ReferenceOQLExpression)) {
|
|
6353
6358
|
var x$1$20 = $as_Lcom_vinctus_oql_ReferenceOQLExpression(expr);
|
|
6354
|
-
var this$
|
|
6355
|
-
var this$
|
|
6356
|
-
var x52 = this$
|
|
6359
|
+
var this$72 = $n(x$1$20);
|
|
6360
|
+
var this$73 = $n(x$1$20);
|
|
6361
|
+
var x52 = this$73.Lcom_vinctus_oql_ReferenceOQLExpression__f_dmrefs;
|
|
6357
6362
|
return $p_Lcom_vinctus_oql_SQLQueryBuilder__attribute$1__T__sci_List__T(this, table, x52)
|
|
6358
6363
|
};
|
|
6359
6364
|
if ((expr instanceof $c_Lcom_vinctus_oql_AttributeOQLExpression)) {
|
|
6360
6365
|
var x$1$21 = $as_Lcom_vinctus_oql_AttributeOQLExpression(expr);
|
|
6361
|
-
var this$
|
|
6362
|
-
var x45 = this$
|
|
6363
|
-
var this$
|
|
6364
|
-
var x46 = this$
|
|
6366
|
+
var this$75 = $n(x$1$21);
|
|
6367
|
+
var x45 = this$75.Lcom_vinctus_oql_AttributeOQLExpression__f_ids;
|
|
6368
|
+
var this$76 = $n(x$1$21);
|
|
6369
|
+
var x46 = this$76.Lcom_vinctus_oql_AttributeOQLExpression__f_dmrefs;
|
|
6365
6370
|
if ((x45 !== null)) {
|
|
6366
6371
|
$n($m_s_package$().s_package$__f_List);
|
|
6367
6372
|
if (($n(x45).lengthCompare__I__I(1) === 0)) {
|
|
6368
|
-
var this$
|
|
6369
|
-
var x48 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$
|
|
6373
|
+
var this$80 = $n(x45);
|
|
6374
|
+
var x48 = $as_Lcom_vinctus_oql_Ident($f_sc_LinearSeqOps__apply__I__O(this$80, 0));
|
|
6370
6375
|
if ((x46 === null)) {
|
|
6371
6376
|
return $n(x48).Lcom_vinctus_oql_Ident__f_s
|
|
6372
6377
|
}
|
|
@@ -6376,35 +6381,35 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
|
|
|
6376
6381
|
};
|
|
6377
6382
|
if ((expr instanceof $c_Lcom_vinctus_oql_BooleanOQLExpression)) {
|
|
6378
6383
|
var x$1$22 = $as_Lcom_vinctus_oql_BooleanOQLExpression(expr);
|
|
6379
|
-
var this$
|
|
6380
|
-
var x38 = this$
|
|
6384
|
+
var this$82 = $n(x$1$22);
|
|
6385
|
+
var x38 = this$82.Lcom_vinctus_oql_BooleanOQLExpression__f_b;
|
|
6381
6386
|
return x38
|
|
6382
6387
|
};
|
|
6383
6388
|
if ((expr instanceof $c_Lcom_vinctus_oql_CaseOQLExpression)) {
|
|
6384
6389
|
var x$1$23 = $as_Lcom_vinctus_oql_CaseOQLExpression(expr);
|
|
6385
|
-
var this$
|
|
6386
|
-
var x34 = this$
|
|
6387
|
-
var this$
|
|
6388
|
-
var x35 = this$
|
|
6389
|
-
var this$
|
|
6390
|
+
var this$84 = $n(x$1$23);
|
|
6391
|
+
var x34 = this$84.Lcom_vinctus_oql_CaseOQLExpression__f_whens;
|
|
6392
|
+
var this$85 = $n(x$1$23);
|
|
6393
|
+
var x35 = this$85.Lcom_vinctus_oql_CaseOQLExpression__f_els;
|
|
6394
|
+
var this$89 = $n(x34);
|
|
6390
6395
|
var f$4 = ((x$1$2$1) => {
|
|
6391
6396
|
var x$1$24 = $as_Lcom_vinctus_oql_OQLWhen(x$1$2$1);
|
|
6392
6397
|
if ((x$1$24 !== null)) {
|
|
6393
|
-
var this$
|
|
6394
|
-
var x29 = this$
|
|
6395
|
-
var this$
|
|
6396
|
-
var x30 = this$
|
|
6398
|
+
var this$87 = $n(x$1$24);
|
|
6399
|
+
var x29 = this$87.Lcom_vinctus_oql_OQLWhen__f_cond;
|
|
6400
|
+
var this$88 = $n(x$1$24);
|
|
6401
|
+
var x30 = this$88.Lcom_vinctus_oql_OQLWhen__f_expr;
|
|
6397
6402
|
return ((("WHEN " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x29, table)) + " THEN ") + this.expression__Lcom_vinctus_oql_OQLExpression__T__T(x30, table))
|
|
6398
6403
|
};
|
|
6399
6404
|
throw new $c_s_MatchError(x$1$24)
|
|
6400
6405
|
});
|
|
6401
|
-
if ((this$
|
|
6406
|
+
if ((this$89 === $m_sci_Nil$())) {
|
|
6402
6407
|
var $$x13 = $m_sci_Nil$()
|
|
6403
6408
|
} else {
|
|
6404
|
-
var arg1$8 = this$
|
|
6409
|
+
var arg1$8 = this$89.head__O();
|
|
6405
6410
|
var h$4 = new $c_sci_$colon$colon(f$4(arg1$8), $m_sci_Nil$());
|
|
6406
6411
|
var t$4 = h$4;
|
|
6407
|
-
var rest$4 = $as_sci_List(this$
|
|
6412
|
+
var rest$4 = $as_sci_List(this$89.tail__O());
|
|
6408
6413
|
while ((rest$4 !== $m_sci_Nil$())) {
|
|
6409
6414
|
var arg1$9 = $n(rest$4).head__O();
|
|
6410
6415
|
var nx$4 = new $c_sci_$colon$colon(f$4(arg1$9), $m_sci_Nil$());
|
|
@@ -6414,10 +6419,10 @@ $c_Lcom_vinctus_oql_SQLQueryBuilder.prototype.expression__Lcom_vinctus_oql_OQLEx
|
|
|
6414
6419
|
};
|
|
6415
6420
|
var $$x13 = h$4
|
|
6416
6421
|
};
|
|
6417
|
-
var this$
|
|
6418
|
-
var $$x14 = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$
|
|
6419
|
-
var this$
|
|
6420
|
-
return ((("CASE " + $$x14) + ((!this$
|
|
6422
|
+
var this$90 = $n($$x13);
|
|
6423
|
+
var $$x14 = $f_sc_IterableOnceOps__mkString__T__T__T__T(this$90, "", " ", "");
|
|
6424
|
+
var this$91 = $n(x35);
|
|
6425
|
+
return ((("CASE " + $$x14) + ((!this$91.isEmpty__Z()) ? (" ELSE " + this.expression__Lcom_vinctus_oql_OQLExpression__T__T($as_Lcom_vinctus_oql_OQLExpression($n(x35).get__O()), table)) : "")) + " END")
|
|
6421
6426
|
};
|
|
6422
6427
|
throw new $c_s_MatchError(expr)
|
|
6423
6428
|
});
|