@qrvey/formula-lang 3.1.0-rc.816 → 3.1.0-rc.823

package/dist/cjs/functions/include.js

@@ -54,7 +54,7 @@ function databricks(str, targetSearch) {
     return SQL(str, targetSearch);
 }
 function mysql(str, targetSearch) {
-    return `(${str} COLLATE utf8mb4_bin LIKE CONCAT('%', ${targetSearch}, '%'))`;
+    return `(BINARY ${str} LIKE CONCAT('%', ${targetSearch}, '%'))`;
 }
 function mssql(str, targetSearch) {
     const collation = 'Latin1_General_CS_AS';

package/dist/cjs/functions/include.js.map

@@ -1 +1 @@
-{"version":3,"file":"include.js","sourceRoot":"","sources":["../../../src/functions/include.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyC;AAEzC;;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,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAW,EAAE,YAAoB;IACpD,OAAO,WAAW,GAAG,KAAK,YAAY,GAAG,CAAC;AAC9C,CAAC;AAED,SAAS,GAAG,CAAC,GAAW,EAAE,YAAoB;IAC1C,OAAO,IAAI,GAAG,iBAAiB,YAAY,WAAW,CAAC;AAC3D,CAAC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,YAAoB;IAChD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,YAAoB;IAC/C,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,OAAO,IAAI,GAAG,yCAAyC,YAAY,SAAS,CAAC;AACjF,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,MAAM,IAAI,GAAG;WACN,GAAG,8BAA8B,SAAS;;eAEtC,YAAY,8BAA8B,SAAS;;GAE/D,CAAC;IACA,OAAO,OAAO,IAAI,CAAC,IAAI,EAAE,mCAAmC,CAAC;AACjE,CAAC"}
+{"version":3,"file":"include.js","sourceRoot":"","sources":["../../../src/functions/include.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyC;AAEzC;;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,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,0BAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAW,EAAE,YAAoB;IACpD,OAAO,WAAW,GAAG,KAAK,YAAY,GAAG,CAAC;AAC9C,CAAC;AAED,SAAS,GAAG,CAAC,GAAW,EAAE,YAAoB;IAC1C,OAAO,IAAI,GAAG,iBAAiB,YAAY,WAAW,CAAC;AAC3D,CAAC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,YAAoB;IAChD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,YAAoB;IAC/C,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,OAAO,WAAW,GAAG,qBAAqB,YAAY,SAAS,CAAC;AACpE,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,MAAM,IAAI,GAAG;WACN,GAAG,8BAA8B,SAAS;;eAEtC,YAAY,8BAA8B,SAAS;;GAE/D,CAAC;IACA,OAAO,OAAO,IAAI,CAAC,IAAI,EAAE,mCAAmC,CAAC;AACjE,CAAC"}

package/dist/cjs/utils/mysql/script.d.ts

@@ -1,3 +1,3 @@
 import { DateDifUnitParam } from '../../constants/interfaces';
-export declare function dateDif(start: any, end: any, unit: DateDifUnitParam): string;
+export declare function dateDif(start: string, end: string, unit: DateDifUnitParam): string;
 export declare function toDate(value: string): string;

package/dist/cjs/utils/mysql/script.js

@@ -11,15 +11,6 @@ function dateDif(start, end, unit) {
         S: 'SECOND',
     };
     const unitName = unitMapMysql[unit];
-    if (unit === 'Y') {
-        const raw = `TIMESTAMPDIFF(YEAR, ${start}, ${end})`;
-        const startComp = `MONTH(${start}) * 100 + DAY(${start})`;
-        const endComp = `MONTH(${end}) * 100 + DAY(${end})`;
-        return `(CASE
-      WHEN ${startComp} <= ${endComp} THEN ${raw}
-      ELSE ${raw} - 1
-    END)`;
-    }
     return `TIMESTAMPDIFF(${unitName}, ${start}, ${end})`;
 }
 exports.dateDif = dateDif;

package/dist/cjs/utils/mysql/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../../src/utils/mysql/script.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,YAAY,GAAqC;QACnD,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,MAAM;QACT,EAAE,EAAE,QAAQ;QACZ,CAAC,EAAE,QAAQ;KACd,CAAC;IACF,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAEpC,IAAI,IAAI,KAAK,GAAG,EAAE;QACd,MAAM,GAAG,GAAG,uBAAuB,KAAK,KAAK,GAAG,GAAG,CAAC;QACpD,MAAM,SAAS,GAAG,SAAS,KAAK,iBAAiB,KAAK,GAAG,CAAC;QAC1D,MAAM,OAAO,GAAG,SAAS,GAAG,iBAAiB,GAAG,GAAG,CAAC;QACpD,OAAO;aACF,SAAS,OAAO,OAAO,SAAS,GAAG;aACnC,GAAG;SACP,CAAC;KACL;IAED,OAAO,iBAAiB,QAAQ,KAAK,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAtBD,0BAsBC;AAED,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,gBAAgB,CAAC;AAC1C,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../../src/utils/mysql/script.ts"],"names":[],"mappings":";;;AAEA,SAAgB,OAAO,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,YAAY,GAAqC;QACnD,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,MAAM;QACT,EAAE,EAAE,QAAQ;QACZ,CAAC,EAAE,QAAQ;KACd,CAAC;IAEF,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,iBAAiB,QAAQ,KAAK,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAZD,0BAYC;AAED,SAAgB,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,gBAAgB,CAAC;AAC1C,CAAC;AAFD,wBAEC"}

package/dist/module/functions/include.js

@@ -51,7 +51,7 @@ function databricks(str, targetSearch) {
     return SQL(str, targetSearch);
 }
 function mysql(str, targetSearch) {
-    return `(${str} COLLATE utf8mb4_bin LIKE CONCAT('%', ${targetSearch}, '%'))`;
+    return `(BINARY ${str} LIKE CONCAT('%', ${targetSearch}, '%'))`;
 }
 function mssql(str, targetSearch) {
     const collation = 'Latin1_General_CS_AS';

package/dist/module/functions/include.js.map

@@ -1 +1 @@
-{"version":3,"file":"include.js","sourceRoot":"","sources":["../../../src/functions/include.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC;;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,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAW,EAAE,YAAoB;IACpD,OAAO,WAAW,GAAG,KAAK,YAAY,GAAG,CAAC;AAC9C,CAAC;AAED,SAAS,GAAG,CAAC,GAAW,EAAE,YAAoB;IAC1C,OAAO,IAAI,GAAG,iBAAiB,YAAY,WAAW,CAAC;AAC3D,CAAC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,YAAoB;IAChD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,YAAoB;IAC/C,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,OAAO,IAAI,GAAG,yCAAyC,YAAY,SAAS,CAAC;AACjF,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,MAAM,IAAI,GAAG;WACN,GAAG,8BAA8B,SAAS;;eAEtC,YAAY,8BAA8B,SAAS;;GAE/D,CAAC;IACA,OAAO,OAAO,IAAI,CAAC,IAAI,EAAE,mCAAmC,CAAC;AACjE,CAAC"}
+{"version":3,"file":"include.js","sourceRoot":"","sources":["../../../src/functions/include.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzC;;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,QAAQ;YACpB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;QACD;YACI,UAAU,EAAE,eAAe;YAC3B,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,CAAC;SAC7B;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;QACV,KAAK;QACL,KAAK;KACR;IACD,eAAe,EAAE,cAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAW,EAAE,YAAoB;IACpD,OAAO,WAAW,GAAG,KAAK,YAAY,GAAG,CAAC;AAC9C,CAAC;AAED,SAAS,GAAG,CAAC,GAAW,EAAE,YAAoB;IAC1C,OAAO,IAAI,GAAG,iBAAiB,YAAY,WAAW,CAAC;AAC3D,CAAC;AAED,SAAS,SAAS,CAAC,GAAW,EAAE,YAAoB;IAChD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,QAAQ,CAAC,GAAW,EAAE,YAAoB;IAC/C,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,UAAU,CAAC,GAAW,EAAE,YAAoB;IACjD,OAAO,GAAG,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;AAClC,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,OAAO,WAAW,GAAG,qBAAqB,YAAY,SAAS,CAAC;AACpE,CAAC;AAED,SAAS,KAAK,CAAC,GAAW,EAAE,YAAoB;IAC5C,MAAM,SAAS,GAAG,sBAAsB,CAAC;IACzC,MAAM,IAAI,GAAG;WACN,GAAG,8BAA8B,SAAS;;eAEtC,YAAY,8BAA8B,SAAS;;GAE/D,CAAC;IACA,OAAO,OAAO,IAAI,CAAC,IAAI,EAAE,mCAAmC,CAAC;AACjE,CAAC"}

package/dist/module/utils/mysql/script.d.ts

@@ -1,3 +1,3 @@
 import { DateDifUnitParam } from '../../constants/interfaces';
-export declare function dateDif(start: any, end: any, unit: DateDifUnitParam): string;
+export declare function dateDif(start: string, end: string, unit: DateDifUnitParam): string;
 export declare function toDate(value: string): string;

package/dist/module/utils/mysql/script.js

@@ -8,15 +8,6 @@ export function dateDif(start, end, unit) {
         S: 'SECOND',
     };
     const unitName = unitMapMysql[unit];
-    if (unit === 'Y') {
-        const raw = `TIMESTAMPDIFF(YEAR, ${start}, ${end})`;
-        const startComp = `MONTH(${start}) * 100 + DAY(${start})`;
-        const endComp = `MONTH(${end}) * 100 + DAY(${end})`;
-        return `(CASE
-      WHEN ${startComp} <= ${endComp} THEN ${raw}
-      ELSE ${raw} - 1
-    END)`;
-    }
     return `TIMESTAMPDIFF(${unitName}, ${start}, ${end})`;
 }
 export function toDate(value) {

package/dist/module/utils/mysql/script.js.map

@@ -1 +1 @@
-{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../../src/utils/mysql/script.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,OAAO,CAAC,KAAU,EAAE,GAAQ,EAAE,IAAsB;IAChE,MAAM,YAAY,GAAqC;QACnD,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,MAAM;QACT,EAAE,EAAE,QAAQ;QACZ,CAAC,EAAE,QAAQ;KACd,CAAC;IACF,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IAEpC,IAAI,IAAI,KAAK,GAAG,EAAE;QACd,MAAM,GAAG,GAAG,uBAAuB,KAAK,KAAK,GAAG,GAAG,CAAC;QACpD,MAAM,SAAS,GAAG,SAAS,KAAK,iBAAiB,KAAK,GAAG,CAAC;QAC1D,MAAM,OAAO,GAAG,SAAS,GAAG,iBAAiB,GAAG,GAAG,CAAC;QACpD,OAAO;aACF,SAAS,OAAO,OAAO,SAAS,GAAG;aACnC,GAAG;SACP,CAAC;KACL;IAED,OAAO,iBAAiB,QAAQ,KAAK,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,gBAAgB,CAAC;AAC1C,CAAC"}
+{"version":3,"file":"script.js","sourceRoot":"","sources":["../../../../src/utils/mysql/script.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,OAAO,CAAC,KAAa,EAAE,GAAW,EAAE,IAAsB;IACtE,MAAM,YAAY,GAAqC;QACnD,CAAC,EAAE,MAAM;QACT,CAAC,EAAE,OAAO;QACV,CAAC,EAAE,KAAK;QACR,CAAC,EAAE,MAAM;QACT,EAAE,EAAE,QAAQ;QACZ,CAAC,EAAE,QAAQ;KACd,CAAC;IAEF,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,OAAO,iBAAiB,QAAQ,KAAK,KAAK,KAAK,GAAG,GAAG,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAa;IAChC,OAAO,SAAS,KAAK,gBAAgB,CAAC;AAC1C,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/formula-lang",
-  "version": "3.1.0-rc.816",
+  "version": "3.1.0-rc.823",
   "description": "QFormula support for qrvey projects",
   "types": "dist/module/index.d.ts",
   "main": "dist/module/index.js",