@qrvey/formula-lang 2.0.1-rc.622 → 2.0.1-rc.626

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.
Files changed (17) hide show
  1. package/dist/cjs/functions/aggDistcount.js +2 -2
  2. package/dist/cjs/functions/aggDistcount.js.map +1 -1
  3. package/dist/cjs/functions/aggMed.js +1 -1
  4. package/dist/cjs/functions/aggMed.js.map +1 -1
  5. package/dist/cjs/functions/and.js +1 -1
  6. package/dist/cjs/functions/and.js.map +1 -1
  7. package/dist/cjs/utils/aggregatedFunctions.js +1 -1
  8. package/dist/cjs/utils/aggregatedFunctions.js.map +1 -1
  9. package/dist/module/functions/aggDistcount.js +2 -2
  10. package/dist/module/functions/aggDistcount.js.map +1 -1
  11. package/dist/module/functions/aggMed.js +1 -1
  12. package/dist/module/functions/aggMed.js.map +1 -1
  13. package/dist/module/functions/and.js +1 -1
  14. package/dist/module/functions/and.js.map +1 -1
  15. package/dist/module/utils/aggregatedFunctions.js +1 -1
  16. package/dist/module/utils/aggregatedFunctions.js.map +1 -1
  17. package/package.json +1 -1
package/dist/cjs/functions/aggDistcount.js CHANGED
@@ -28,10 +28,10 @@ exports.AGG_DISTCOUNT = {
28
28
  primitiveResult: constants_1.AST_PRIMITIVES.NUMBER,
29
29
  };
30
30
  function elasticsearch(value) {
31
- return `params.get("DISTCOUNT_${value}")`;
31
+ return `params.get("DISTINCTCOUNT_${value}")`;
32
32
  }
33
33
  function SQL(value) {
34
- return `DISTCOUNT(${value})`;
34
+ return `COUNT(DISTINCT ${value})`;
35
35
  }
36
36
  function snowflake(value) {
37
37
  return SQL(value);
package/dist/cjs/functions/aggDistcount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyD;AAEzD;;GAEG;AACU,QAAA,aAAa,GAAuB;IAC7C,UAAU,EAAE,eAAe;IAC3B,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,EAAE,sBAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,yBAAyB,KAAK,IAAI,CAAC;AAC9C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,aAAa,KAAK,GAAG,CAAC;AACjC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyD;AAEzD;;GAEG;AACU,QAAA,aAAa,GAAuB;IAC7C,UAAU,EAAE,eAAe;IAC3B,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,EAAE,sBAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,6BAA6B,KAAK,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,kBAAkB,KAAK,GAAG,CAAC;AACtC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/cjs/functions/aggMed.js CHANGED
@@ -40,7 +40,7 @@ function redshift(value) {
40
40
  return SQL(value);
41
41
  }
42
42
  function postgresql(value) {
43
- return SQL(value);
43
+ return `PERCENTILE_CONT(0.5) WITHIN GROUP(ORDER BY ${value})`;
44
44
  }
45
45
  function databricks(value) {
46
46
  return SQL(value);
package/dist/cjs/functions/aggMed.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyD;AAEzD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,EAAE,sBAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,sBAAsB,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,oCAAyD;AAEzD;;GAEG;AACU,QAAA,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,2BAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,2BAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,qBAAa,EAAE,sBAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,sBAAsB,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,8CAA8C,KAAK,GAAG,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/cjs/functions/and.js CHANGED
@@ -9,7 +9,7 @@ const isBooleanExpression_1 = require("../utils/isBooleanExpression");
9
9
  exports.AND = {
10
10
  identifier: 'AND',
11
11
  operationScope: constants_1.OPERATION_SCOPE.RAW,
12
- functionScope: [constants_1.OPERATION_SCOPE.RAW],
12
+ functionScope: [constants_1.OPERATION_SCOPE.RAW, constants_1.OPERATION_SCOPE.AGGREGATE],
13
13
  recursiveStartIn: 1,
14
14
  parameters: [
15
15
  {
package/dist/cjs/functions/and.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"and.js","sourceRoot":"","sources":["../../../src/functions/and.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,sEAAmE;AAEnE;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,cAAc,EAAE,2BAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,2BAAe,CAAC,GAAG,CAAC;IACpC,gBAAgB,EAAE,CAAC;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAG,IAAW;IACjC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;AACpC,CAAC;AAED,SAAS,GAAG,CAAC,GAAG,IAAW;IACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAAC,GAAG,IAAW;IAC7B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAG,IAAW;IAC5B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"and.js","sourceRoot":"","sources":["../../../src/functions/and.ts"],"names":[],"mappings":";;;AAAA,4CAA+D;AAE/D,sEAAmE;AAEnE;;GAEG;AACU,QAAA,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,cAAc,EAAE,2BAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,2BAAe,CAAC,GAAG,EAAE,2BAAe,CAAC,SAAS,CAAC;IAC/D,gBAAgB,EAAE,CAAC;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,0BAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,yCAAmB,CAAC;SACnC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,0BAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAG,IAAW;IACjC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;AACpC,CAAC;AAED,SAAS,GAAG,CAAC,GAAG,IAAW;IACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAAC,GAAG,IAAW;IAC7B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAG,IAAW;IAC5B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC"}
package/dist/cjs/utils/aggregatedFunctions.js CHANGED
@@ -42,7 +42,7 @@ function getAggregateName(name) {
42
42
  AGG_MIN: 'MIN',
43
43
  AGG_MAX: 'MAX',
44
44
  AGG_COUNT: 'COUNT',
45
- AGG_DISTCOUNT: 'DISTCOUNT',
45
+ AGG_DISTCOUNT: 'DISTINCTCOUNT',
46
46
  };
47
47
  return definition[name] || '';
48
48
  }
package/dist/cjs/utils/aggregatedFunctions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":";;;AAAA,4CAAmE;AAgBnE,SAAgB,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAXD,8CAWC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,IAAI,CAAC,aAAa,KAAK,2BAAe,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC1C,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,OAAO;QAClB,aAAa,EAAE,WAAW;KAC7B,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":";;;AAAA,4CAAmE;AAgBnE,SAAgB,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,mBAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAXD,8CAWC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,IAAI,CAAC,aAAa,KAAK,2BAAe,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,qBAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC1C,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,OAAO;QAClB,aAAa,EAAE,eAAe;KACjC,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC"}
package/dist/module/functions/aggDistcount.js CHANGED
@@ -25,10 +25,10 @@ export const AGG_DISTCOUNT = {
25
25
  primitiveResult: AST_PRIMITIVES.NUMBER,
26
26
  };
27
27
  function elasticsearch(value) {
28
- return `params.get("DISTCOUNT_${value}")`;
28
+ return `params.get("DISTINCTCOUNT_${value}")`;
29
29
  }
30
30
  function SQL(value) {
31
- return `DISTCOUNT(${value})`;
31
+ return `COUNT(DISTINCT ${value})`;
32
32
  }
33
33
  function snowflake(value) {
34
34
  return SQL(value);
package/dist/module/functions/aggDistcount.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzD;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAuB;IAC7C,UAAU,EAAE,eAAe;IAC3B,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,yBAAyB,KAAK,IAAI,CAAC;AAC9C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,aAAa,KAAK,GAAG,CAAC;AACjC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"aggDistcount.js","sourceRoot":"","sources":["../../../src/functions/aggDistcount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzD;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAuB;IAC7C,UAAU,EAAE,eAAe;IAC3B,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,6BAA6B,KAAK,IAAI,CAAC;AAClD,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,kBAAkB,KAAK,GAAG,CAAC;AACtC,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/module/functions/aggMed.js CHANGED
@@ -37,7 +37,7 @@ function redshift(value) {
37
37
  return SQL(value);
38
38
  }
39
39
  function postgresql(value) {
40
- return SQL(value);
40
+ return `PERCENTILE_CONT(0.5) WITHIN GROUP(ORDER BY ${value})`;
41
41
  }
42
42
  function databricks(value) {
43
43
  return SQL(value);
package/dist/module/functions/aggMed.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzD;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,sBAAsB,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
1
+ {"version":3,"file":"aggMed.js","sourceRoot":"","sources":["../../../src/functions/aggMed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAEzD;;GAEG;AACH,MAAM,CAAC,MAAM,OAAO,GAAuB;IACvC,UAAU,EAAE,SAAS;IACrB,cAAc,EAAE,eAAe,CAAC,SAAS;IACzC,aAAa,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC;IAC1C,UAAU,EAAE;QACR;YACI,UAAU,EAAE,OAAO;YACnB,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,MAAM;YACxC,SAAS,EAAE,CAAC,aAAa,EAAE,cAAc,CAAC;SAC7C;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,CAAC,KAAa;IAChC,OAAO,sBAAsB,KAAK,IAAI,CAAC;AAC3C,CAAC;AAED,SAAS,GAAG,CAAC,KAAa;IACtB,OAAO,UAAU,KAAK,GAAG,CAAC;AAC9B,CAAC;AAED,SAAS,SAAS,CAAC,KAAa;IAC5B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,QAAQ,CAAC,KAAa;IAC3B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,8CAA8C,KAAK,GAAG,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CAAC,KAAa;IAC7B,OAAO,GAAG,CAAC,KAAK,CAAC,CAAC;AACtB,CAAC"}
package/dist/module/functions/and.js CHANGED
@@ -6,7 +6,7 @@ import { isBooleanExpression } from '../utils/isBooleanExpression';
6
6
  export const AND = {
7
7
  identifier: 'AND',
8
8
  operationScope: OPERATION_SCOPE.RAW,
9
- functionScope: [OPERATION_SCOPE.RAW],
9
+ functionScope: [OPERATION_SCOPE.RAW, OPERATION_SCOPE.AGGREGATE],
10
10
  recursiveStartIn: 1,
11
11
  parameters: [
12
12
  {
package/dist/module/functions/and.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"and.js","sourceRoot":"","sources":["../../../src/functions/and.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,cAAc,EAAE,eAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,eAAe,CAAC,GAAG,CAAC;IACpC,gBAAgB,EAAE,CAAC;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACnC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAG,IAAW;IACjC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;AACpC,CAAC;AAED,SAAS,GAAG,CAAC,GAAG,IAAW;IACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAAC,GAAG,IAAW;IAC7B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAG,IAAW;IAC5B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC"}
1
+ {"version":3,"file":"and.js","sourceRoot":"","sources":["../../../src/functions/and.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAE/D,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;GAEG;AACH,MAAM,CAAC,MAAM,GAAG,GAAuB;IACnC,UAAU,EAAE,KAAK;IACjB,cAAc,EAAE,eAAe,CAAC,GAAG;IACnC,aAAa,EAAE,CAAC,eAAe,CAAC,GAAG,EAAE,eAAe,CAAC,SAAS,CAAC;IAC/D,gBAAgB,EAAE,CAAC;IACnB,UAAU,EAAE;QACR;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,KAAK;YACf,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACnC;QACD;YACI,UAAU,EAAE,oBAAoB;YAChC,QAAQ,EAAE,IAAI;YACd,iBAAiB,EAAE,cAAc,CAAC,OAAO;YACzC,SAAS,EAAE,CAAC,mBAAmB,CAAC;SACnC;KACJ;IACD,UAAU,EAAE;QACR,aAAa;QACb,SAAS;QACT,QAAQ;QACR,UAAU;QACV,UAAU;KACb;IACD,eAAe,EAAE,cAAc,CAAC,OAAO;CAC1C,CAAC;AAEF,SAAS,aAAa,CAAC,GAAG,IAAW;IACjC,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC;AACpC,CAAC;AAED,SAAS,GAAG,CAAC,GAAG,IAAW;IACvB,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC;AACrC,CAAC;AAED,SAAS,SAAS,CAAC,GAAG,IAAW;IAC7B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,QAAQ,CAAC,GAAG,IAAW;IAC5B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC;AAED,SAAS,UAAU,CAAC,GAAG,IAAW;IAC9B,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;AACxB,CAAC"}
package/dist/module/utils/aggregatedFunctions.js CHANGED
@@ -38,7 +38,7 @@ function getAggregateName(name) {
38
38
  AGG_MIN: 'MIN',
39
39
  AGG_MAX: 'MAX',
40
40
  AGG_COUNT: 'COUNT',
41
- AGG_DISTCOUNT: 'DISTCOUNT',
41
+ AGG_DISTCOUNT: 'DISTINCTCOUNT',
42
42
  };
43
43
  return definition[name] || '';
44
44
  }
package/dist/module/utils/aggregatedFunctions.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAgBnE,MAAM,UAAU,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,IAAI,CAAC,aAAa,KAAK,eAAe,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC1C,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,OAAO;QAClB,aAAa,EAAE,WAAW;KAC7B,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC"}
1
+ {"version":3,"file":"aggregatedFunctions.js","sourceRoot":"","sources":["../../../src/utils/aggregatedFunctions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAgBnE,MAAM,UAAU,iBAAiB,CAC7B,MAAe,EACf,aAA2B,EAC3B,IAAqB;IAErB,QAAQ,MAAM,EAAE;QACZ,KAAK,OAAO,CAAC,aAAa;YACtB,OAAO,oBAAoB,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QACrD;YACI,OAAO,KAAK,CAAC;KACpB;AACL,CAAC;AAED,SAAS,oBAAoB,CACzB,UAAwB,EACxB,IAAqB;;IAErB,IAAI,IAAI,CAAC,aAAa,KAAK,eAAe,CAAC,SAAS;QAAE,OAAO,KAAK,CAAC;IACnE,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9C,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAgB,CAAC;IAC7C,IAAI,GAAG,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM;QAAE,OAAO,KAAK,CAAC;IAEhD,MAAM,QAAQ,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,EAAE,KAAI,EAAE,CAAC;IACvC,MAAM,KAAK,GAAG,CAAA,MAAA,GAAG,CAAC,OAAO,0CAAE,WAAW,KAAI,EAAE,CAAC;IAC7C,MAAM,SAAS,GAAG,gBAAgB,CAAC,IAAI,CAAC,IAAsB,CAAC,CAAC;IAEhE,MAAM,GAAG,GAAG,GAAG,SAAS,IAAI,KAAK,EAAE,CAAC;IACpC,wFAAwF;IAExF,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC;QAAE,OAAO,UAAU,CAAC;IAE3C,UAAU,CAAC,GAAG,CAAC,GAAG,EAAE;QAChB,GAAG;QACH,QAAQ;QACR,SAAS;KACZ,CAAC,CAAC;IACH,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,SAAS,gBAAgB,CAAC,IAAoB;IAC1C,MAAM,UAAU,GAAG;QACf,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,KAAK;QACd,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,OAAO;QAClB,aAAa,EAAE,eAAe;KACjC,CAAC;IACF,OAAO,UAAU,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;AAClC,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@qrvey/formula-lang",
3
- "version": "2.0.1-rc.622",
3
+ "version": "2.0.1-rc.626",
4
4
  "description": "QFormula support for qrvey projects",
5
5
  "types": "dist/module/index.d.ts",
6
6
  "main": "dist/module/index.js",