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

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.
@@ -1,3 +1,3 @@
1
1
  import { DateDifUnitParam } from '../../constants/interfaces';
2
- export declare function dateDif(start: any, end: any, unit: DateDifUnitParam): string;
2
+ export declare function dateDif(start: string, end: string, unit: DateDifUnitParam): string;
3
3
  export declare function toDate(value: string): string;
@@ -11,15 +11,6 @@ function dateDif(start, end, unit) {
11
11
  S: 'SECOND',
12
12
  };
13
13
  const unitName = unitMapMysql[unit];
14
- if (unit === 'Y') {
15
- const raw = `TIMESTAMPDIFF(YEAR, ${start}, ${end})`;
16
- const startComp = `MONTH(${start}) * 100 + DAY(${start})`;
17
- const endComp = `MONTH(${end}) * 100 + DAY(${end})`;
18
- return `(CASE
19
- WHEN ${startComp} <= ${endComp} THEN ${raw}
20
- ELSE ${raw} - 1
21
- END)`;
22
- }
23
14
  return `TIMESTAMPDIFF(${unitName}, ${start}, ${end})`;
24
15
  }
25
16
  exports.dateDif = dateDif;
@@ -1 +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"}
1
+ {"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"}
@@ -1,3 +1,3 @@
1
1
  import { DateDifUnitParam } from '../../constants/interfaces';
2
- export declare function dateDif(start: any, end: any, unit: DateDifUnitParam): string;
2
+ export declare function dateDif(start: string, end: string, unit: DateDifUnitParam): string;
3
3
  export declare function toDate(value: string): string;
@@ -8,15 +8,6 @@ export function dateDif(start, end, unit) {
8
8
  S: 'SECOND',
9
9
  };
10
10
  const unitName = unitMapMysql[unit];
11
- if (unit === 'Y') {
12
- const raw = `TIMESTAMPDIFF(YEAR, ${start}, ${end})`;
13
- const startComp = `MONTH(${start}) * 100 + DAY(${start})`;
14
- const endComp = `MONTH(${end}) * 100 + DAY(${end})`;
15
- return `(CASE
16
- WHEN ${startComp} <= ${endComp} THEN ${raw}
17
- ELSE ${raw} - 1
18
- END)`;
19
- }
20
11
  return `TIMESTAMPDIFF(${unitName}, ${start}, ${end})`;
21
12
  }
22
13
  export function toDate(value) {
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/formula-lang",
3
- "version": "3.1.0-rc.821",
3
+ "version": "3.1.0-rc.823",
4
4
  "description": "QFormula support for qrvey projects",
5
5
  "types": "dist/module/index.d.ts",
6
6
  "main": "dist/module/index.js",