@qrvey/formula-lang 2.0.1-rc.629 → 2.0.1-rc.638
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/dist/cjs/constants/interfaces.d.ts +1 -1
- package/dist/cjs/functions/datedif.js +4 -1
- package/dist/cjs/functions/datedif.js.map +1 -1
- package/dist/cjs/utils/elasticsearch/scripts.js +3 -0
- package/dist/cjs/utils/elasticsearch/scripts.js.map +1 -1
- package/dist/cjs/utils/sql/scripts.js +17 -1
- package/dist/cjs/utils/sql/scripts.js.map +1 -1
- package/dist/module/constants/interfaces.d.ts +1 -1
- package/dist/module/functions/datedif.js +4 -1
- package/dist/module/functions/datedif.js.map +1 -1
- package/dist/module/utils/elasticsearch/scripts.js +3 -0
- package/dist/module/utils/elasticsearch/scripts.js.map +1 -1
- package/dist/module/utils/sql/scripts.js +17 -1
- package/dist/module/utils/sql/scripts.js.map +1 -1
- package/package.json +1 -1
|
@@ -156,7 +156,7 @@ export interface IsValidOrError {
|
|
|
156
156
|
error?: BaseError;
|
|
157
157
|
}
|
|
158
158
|
export type DateUnit = 'Y' | 'M' | 'D';
|
|
159
|
-
export type DateDifUnitParam = DateUnit;
|
|
160
159
|
export type DateTimeUnit = DateUnit | 'H' | 'MI' | 'S';
|
|
160
|
+
export type DateDifUnitParam = DateTimeUnit;
|
|
161
161
|
export type DayOfWeekFormat = 'Day' | 'D';
|
|
162
162
|
export {};
|
|
@@ -30,7 +30,10 @@ exports.DATEDIF = {
|
|
|
30
30
|
identifier: 'UNIT',
|
|
31
31
|
optional: false,
|
|
32
32
|
expectedPrimitive: constants_1.AST_PRIMITIVES.STRING,
|
|
33
|
-
validator: [
|
|
33
|
+
validator: [
|
|
34
|
+
utils_1.isStringParam,
|
|
35
|
+
(0, isAnAllowedValue_1.isAnAllowedValue)(['Y', 'M', 'D', 'H', 'S', 'MI']),
|
|
36
|
+
],
|
|
34
37
|
},
|
|
35
38
|
],
|
|
36
39
|
transpiler: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datedif.js","sourceRoot":"","sources":["../../../src/functions/datedif.ts"],"names":[],"mappings":";;;AACA,4CAA+D;AAC/D,4DAAsE;AACtE,kDAI8B;AAC9B,oCAAoE;AACpE,gEAA6D;AAE7D;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,2BAAe,CAAC,GAAG,CAAC;IACpC,UAAU,EAAE;QACR;YACI,UAAU,EAAE,YAAY;YACxB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"datedif.js","sourceRoot":"","sources":["../../../src/functions/datedif.ts"],"names":[],"mappings":";;;AACA,4CAA+D;AAC/D,4DAAsE;AACtE,kDAI8B;AAC9B,oCAAoE;AACpE,gEAA6D;AAE7D;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,2BAAe,CAAC,GAAG,CAAC;IACpC,UAAU,EAAE;QACR;YACI,UAAU,EAAE,YAAY;YACxB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,mBAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE;gBACP,qBAAa;gBACb,IAAA,mCAAgB,EAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aACpD;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAClB,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAqB,CAAC;IAC9C,OAAO,IAAA,iBAAS,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IAC3D,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAqB,CAAC;IAC9C,OAAO,IAAA,iBAAU,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACjE,OAAO,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IAChE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACrC,OAAO,QAAQ,MAAM,UAAU,CAAC;AACpC,CAAC;AAED,SAAS,UAAU,CACf,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAqB,CAAC;IAC9C,MAAM,MAAM,GAAG,IAAA,yBAAe,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACjD,OAAO,QAAQ,MAAM,UAAU,CAAC;AACpC,CAAC;AAED,SAAS,UAAU,CACf,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,GAAG,IAAA,oBAAY,EAAC,IAAI,CAAqB,CAAC;IAC9C,OAAO,IAAA,2BAAiB,EAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":";;;AACA,+CAA6E;AAE7E,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAFD,wBAEC;AAEY,QAAA,uBAAuB,GAAG;MACjC,sCAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEW,QAAA,gBAAgB,GAAG;SACvB,sCAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,sCAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAEM,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAAzD,QAAA,SAAS,aAAgD;AAE/D,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA3D,QAAA,WAAW,eAAgD;AAEjE,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAA5D,QAAA,UAAU,cAAkD;AAElE,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,UAAmB,EAAE,EAAE;IAC1D,IAAI,UAAU,KAAK,KAAK,EAAE;QACtB,OAAO,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACvC;SAAM;QACH,OAAO,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACvC;AACL,CAAC,CAAC;AANW,QAAA,UAAU,cAMrB;AAEK,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAElE,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAA5D,QAAA,YAAY,gBAAgD;AAEzE;;GAEG;AACI,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAE,EAAE,CAC5C,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,CAAC;AADtC,QAAA,iBAAiB,qBACqB;AAEnD,SAAgB,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,9 @@ function generalDateDif(start, end, unit, omitQuotesForUnit = false) {
|
|
|
10
10
|
Y: 'year',
|
|
11
11
|
M: 'month',
|
|
12
12
|
D: 'day',
|
|
13
|
+
H: 'hour',
|
|
14
|
+
MI: 'minute',
|
|
15
|
+
S: 'second',
|
|
13
16
|
};
|
|
14
17
|
const currentUnit = units[unit];
|
|
15
18
|
return omitQuotesForUnit
|
|
@@ -38,6 +41,9 @@ function dateDif(start, end, unit) {
|
|
|
38
41
|
Y: commonSQLDifYear,
|
|
39
42
|
M: generalDateDif,
|
|
40
43
|
D: generalDateDif,
|
|
44
|
+
H: generalDateDif,
|
|
45
|
+
MI: generalDateDif,
|
|
46
|
+
S: generalDateDif,
|
|
41
47
|
};
|
|
42
48
|
return units[unit](start, end, unit);
|
|
43
49
|
}
|
|
@@ -46,8 +52,18 @@ function dateDifPostgres(start, end, unit) {
|
|
|
46
52
|
if (unit === 'D')
|
|
47
53
|
return `DATE_PART('day', ${end} - ${start})`;
|
|
48
54
|
const yearDif = `DATE_PART('year', ${end}) - DATE_PART('year', ${start})`;
|
|
49
|
-
if (unit === 'M')
|
|
55
|
+
if (unit === 'M') {
|
|
50
56
|
return `(${yearDif}) * 12 + (DATE_PART('month', ${end}) - DATE_PART('month', ${start}))`;
|
|
57
|
+
}
|
|
58
|
+
if (unit === 'H') {
|
|
59
|
+
return `EXTRACT(EPOCH FROM (${end} - ${start})) / 3600`;
|
|
60
|
+
}
|
|
61
|
+
if (unit === 'MI') {
|
|
62
|
+
return `EXTRACT(EPOCH FROM (${end} - ${start})) / 60`;
|
|
63
|
+
}
|
|
64
|
+
if (unit === 'S') {
|
|
65
|
+
return `EXTRACT(EPOCH FROM (${end} - ${start}))`;
|
|
66
|
+
}
|
|
51
67
|
return customDateDifYear({ start, end, yearDif });
|
|
52
68
|
}
|
|
53
69
|
exports.dateDifPostgres = dateDifPostgres;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":";;;AAEA,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAFD,wBAEC;AAED,SAAS,cAAc,CACnB,KAAa,EACb,GAAW,EACX,IAAsB,EACtB,iBAAiB,GAAG,KAAK;IAEzB,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"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"}
|
|
@@ -156,7 +156,7 @@ export interface IsValidOrError {
|
|
|
156
156
|
error?: BaseError;
|
|
157
157
|
}
|
|
158
158
|
export type DateUnit = 'Y' | 'M' | 'D';
|
|
159
|
-
export type DateDifUnitParam = DateUnit;
|
|
160
159
|
export type DateTimeUnit = DateUnit | 'H' | 'MI' | 'S';
|
|
160
|
+
export type DateDifUnitParam = DateTimeUnit;
|
|
161
161
|
export type DayOfWeekFormat = 'Day' | 'D';
|
|
162
162
|
export {};
|
|
@@ -27,7 +27,10 @@ export const DATEDIF = {
|
|
|
27
27
|
identifier: 'UNIT',
|
|
28
28
|
optional: false,
|
|
29
29
|
expectedPrimitive: AST_PRIMITIVES.STRING,
|
|
30
|
-
validator: [
|
|
30
|
+
validator: [
|
|
31
|
+
isStringParam,
|
|
32
|
+
isAnAllowedValue(['Y', 'M', 'D', 'H', 'S', 'MI']),
|
|
33
|
+
],
|
|
31
34
|
},
|
|
32
35
|
],
|
|
33
36
|
transpiler: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"datedif.js","sourceRoot":"","sources":["../../../src/functions/datedif.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,OAAO,IAAI,UAAU,EACrB,iBAAiB,EACjB,eAAe,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,eAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;IACpC,UAAU,EAAE;QACR;YACI,UAAU,EAAE,YAAY;YACxB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,
|
|
1
|
+
{"version":3,"file":"datedif.js","sourceRoot":"","sources":["../../../src/functions/datedif.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,gCAAgC,CAAC;AACtE,OAAO,EACH,OAAO,IAAI,UAAU,EACrB,iBAAiB,EACjB,eAAe,GAClB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,eAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;IACpC,UAAU,EAAE;QACR;YACI,UAAU,EAAE,YAAY;YACxB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,UAAU;YACtB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,IAAI;YACtC,SAAS,EAAE,CAAC,WAAW,CAAC;SAC3B;QACD;YACI,UAAU,EAAE,MAAM;YAClB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE;gBACP,aAAa;gBACb,gBAAgB,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;aACpD;SACJ;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,MAAM;CACzC,CAAC;AAEF,SAAS,aAAa,CAClB,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,GAAG,YAAY,CAAC,IAAI,CAAqB,CAAC;IAC9C,OAAO,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACvC,CAAC;AAED,SAAS,GAAG,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IAC3D,IAAI,GAAG,YAAY,CAAC,IAAI,CAAqB,CAAC;IAC9C,OAAO,UAAU,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACjE,OAAO,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AACjC,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IAChE,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACrC,OAAO,QAAQ,MAAM,UAAU,CAAC;AACpC,CAAC;AAED,SAAS,UAAU,CACf,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,GAAG,YAAY,CAAC,IAAI,CAAqB,CAAC;IAC9C,MAAM,MAAM,GAAG,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;IACjD,OAAO,QAAQ,MAAM,UAAU,CAAC;AACpC,CAAC;AAED,SAAS,UAAU,CACf,KAAa,EACb,GAAW,EACX,IAAsB;IAEtB,IAAI,GAAG,YAAY,CAAC,IAAI,CAAqB,CAAC;IAC9C,OAAO,iBAAiB,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;AAC/C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE7E,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;MACjC,YAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;SACvB,YAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,YAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,UAAmB,EAAE,EAAE;IAC1D,IAAI,UAAU,KAAK,KAAK,EAAE;QACtB,OAAO,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACvC;SAAM;QACH,OAAO,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACvC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAE,EAAE,CAC5C,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,CAAC;AAEnD,MAAM,UAAU,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/elasticsearch/scripts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,0BAA0B,IAAI,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAE7E,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,wBAAwB,KAAK,IAAI,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,MAAM,uBAAuB,GAAG;MACjC,YAAY,CAAC,WAAW;;;;;;;;;;;CAW7B,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG;SACvB,YAAY,CAAC,UAAU;;;;;;;;CAQ/B,CAAC;AAEF,SAAS,eAAe,CAAC,KAAU,EAAE,MAAc;IAC/C,OAAO,oBAAoB,YAAY,CAAC,UAAU,IAAI,KAAK,MAAM,MAAM,KAAK,CAAC;AACjF,CAAC;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEtE,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAExE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,KAAU,EAAE,UAAmB,EAAE,EAAE;IAC1D,IAAI,UAAU,KAAK,KAAK,EAAE;QACtB,OAAO,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACvC;SAAM;QACH,OAAO,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;KACvC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE,MAAM,CAAC,MAAM,YAAY,GAAG,CAAC,KAAU,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;AAEzE;;GAEG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,KAAU,EAAE,EAAE,CAC5C,IAAI,eAAe,CAAC,KAAK,EAAE,GAAG,CAAC,eAAe,CAAC;AAEnD,MAAM,UAAU,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,QAAQ;QACX,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,EAAE,EAAE,SAAS;QACb,CAAC,EAAE,SAAS;KACf,CAAC;IACF,MAAM,WAAW,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC;IAChC,OAAO,cAAc,WAAW,YAAY,KAAK,KAAK,GAAG,GAAG,CAAC;AACjE,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,yDAAyD,CAAC;AAExF,MAAM,CAAC,MAAM,YAAY,GAAG,iFAAiF,CAAC;AAE9G,MAAM,CAAC,MAAM,YAAY,GAAG;;;;;;;;;;;;;;;;;;IAkBxB,CAAC;AAEL,MAAM,CAAC,MAAM,cAAc,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwB5B,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;EAwBzB,CAAC;AAEH,MAAM,CAAC,MAAM,YAAY,GAAG,4DAA4D,CAAC;AAEzF,MAAM,CAAC,MAAM,UAAU,GAAG,2EAA2E,CAAC;AAEtG,MAAM,CAAC,MAAM,SAAS,GAAG,6DAA6D,CAAC;AAEvF,MAAM,CAAC,MAAM,aAAa,GAAG;;;;EAI3B,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,oIAAoI,CAAC;AAElK,MAAM,CAAC,MAAM,UAAU,GAAG;;;;;EAKxB,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;;;;EAIvB,CAAC;AAEH,MAAM,CAAC,MAAM,SAAS,GAAG;;;;;EAKvB,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG;;;;EAIzB,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG;;;;;;;;EAQ7B,CAAC;AAEH,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,eAAe;;;;;;;;;EAS3C,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,eAAe;;;;;;;;;EAS7C,CAAC;AAEH,MAAM,CAAC,MAAM,eAAe,GAAG,GAAG,eAAe;SACxC,YAAY,CAAC,SAAS;;;;;;;;;;;;;;;;;;CAkB9B,CAAC;AAEF,MAAM,CAAC,MAAM,UAAU,GAAG,6DAA6D,CAAC"}
|
|
@@ -6,6 +6,9 @@ function generalDateDif(start, end, unit, omitQuotesForUnit = false) {
|
|
|
6
6
|
Y: 'year',
|
|
7
7
|
M: 'month',
|
|
8
8
|
D: 'day',
|
|
9
|
+
H: 'hour',
|
|
10
|
+
MI: 'minute',
|
|
11
|
+
S: 'second',
|
|
9
12
|
};
|
|
10
13
|
const currentUnit = units[unit];
|
|
11
14
|
return omitQuotesForUnit
|
|
@@ -34,6 +37,9 @@ export function dateDif(start, end, unit) {
|
|
|
34
37
|
Y: commonSQLDifYear,
|
|
35
38
|
M: generalDateDif,
|
|
36
39
|
D: generalDateDif,
|
|
40
|
+
H: generalDateDif,
|
|
41
|
+
MI: generalDateDif,
|
|
42
|
+
S: generalDateDif,
|
|
37
43
|
};
|
|
38
44
|
return units[unit](start, end, unit);
|
|
39
45
|
}
|
|
@@ -41,8 +47,18 @@ export function dateDifPostgres(start, end, unit) {
|
|
|
41
47
|
if (unit === 'D')
|
|
42
48
|
return `DATE_PART('day', ${end} - ${start})`;
|
|
43
49
|
const yearDif = `DATE_PART('year', ${end}) - DATE_PART('year', ${start})`;
|
|
44
|
-
if (unit === 'M')
|
|
50
|
+
if (unit === 'M') {
|
|
45
51
|
return `(${yearDif}) * 12 + (DATE_PART('month', ${end}) - DATE_PART('month', ${start}))`;
|
|
52
|
+
}
|
|
53
|
+
if (unit === 'H') {
|
|
54
|
+
return `EXTRACT(EPOCH FROM (${end} - ${start})) / 3600`;
|
|
55
|
+
}
|
|
56
|
+
if (unit === 'MI') {
|
|
57
|
+
return `EXTRACT(EPOCH FROM (${end} - ${start})) / 60`;
|
|
58
|
+
}
|
|
59
|
+
if (unit === 'S') {
|
|
60
|
+
return `EXTRACT(EPOCH FROM (${end} - ${start}))`;
|
|
61
|
+
}
|
|
46
62
|
return customDateDifYear({ start, end, yearDif });
|
|
47
63
|
}
|
|
48
64
|
export function dateDifDatabricks(start, end, unit) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,iBAAiB,CAAC;AAC3C,CAAC;AAED,SAAS,cAAc,CACnB,KAAa,EACb,GAAW,EACX,IAAsB,EACtB,iBAAiB,GAAG,KAAK;IAEzB,MAAM,KAAK,GAAG;QACV,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"scripts.js","sourceRoot":"","sources":["../../../../src/utils/sql/scripts.ts"],"names":[],"mappings":"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"}
|