@cubejs-backend/schema-compiler 0.29.35 → 0.29.37

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 (6) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/dist/src/adapter/BaseGroupFilter.d.ts +2 -0
  3. package/dist/src/adapter/BaseGroupFilter.d.ts.map +1 -1
  4. package/dist/src/adapter/BaseGroupFilter.js +6 -0
  5. package/dist/src/adapter/BaseGroupFilter.js.map +1 -1
  6. package/package.json +4 -4
package/CHANGELOG.md CHANGED
@@ -3,6 +3,17 @@
3
3
  All notable changes to this project will be documented in this file.
4
4
  See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
5
5
 
6
+ ## [0.29.37](https://github.com/cube-js/cube.js/compare/v0.29.36...v0.29.37) (2022-03-29)
7
+
8
+
9
+ ### Features
10
+
11
+ * **@cubejs-backend/schema-compiler:** Allow filtering with or/and in FILTER_PARAMS ([#4253](https://github.com/cube-js/cube.js/issues/4253)) Thanks [@tchell](https://github.com/tchell)! ([cb1446c](https://github.com/cube-js/cube.js/commit/cb1446c4e788bcb43bdc90fc0a48ffc49fd0d891))
12
+
13
+
14
+
15
+
16
+
6
17
  ## [0.29.35](https://github.com/cube-js/cube.js/compare/v0.29.34...v0.29.35) (2022-03-24)
7
18
 
8
19
  **Note:** Version bump only for package @cubejs-backend/schema-compiler
package/dist/src/adapter/BaseGroupFilter.d.ts CHANGED
@@ -4,7 +4,9 @@ export class BaseGroupFilter {
4
4
  operator: any;
5
5
  measure: any;
6
6
  dimension: any;
7
+ conditionSql(column: any): string;
7
8
  filterToWhere(): any;
9
+ filterParams(): any;
8
10
  getMembers(): any;
9
11
  }
10
12
  //# sourceMappingURL=BaseGroupFilter.d.ts.map
package/dist/src/adapter/BaseGroupFilter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseGroupFilter.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":"AAEA;IACE,qCAKC;IAJC,YAA2B;IAC3B,cAA+B;IAC/B,aAA6B;IAC7B,eAAiC;IAGnC,qBAaC;IAED,kBAOC;CACF"}
1
+ {"version":3,"file":"BaseGroupFilter.d.ts","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":"AAEA;IACE,qCAKC;IAJC,YAA2B;IAC3B,cAA+B;IAC/B,aAA6B;IAC7B,eAAiC;IAGnC,kCAEC;IAED,qBAaC;IAED,oBAEC;IAED,kBAOC;CACF"}
package/dist/src/adapter/BaseGroupFilter.js CHANGED
@@ -12,6 +12,9 @@ class BaseGroupFilter {
12
12
  this.measure = filter.measure;
13
13
  this.dimension = filter.dimension;
14
14
  }
15
+ conditionSql(column) {
16
+ return `(\n${this.values.map(f => f.conditionSql(column)).join(` ${this.operator.toUpperCase()} `)}\n)`;
17
+ }
15
18
  filterToWhere() {
16
19
  const r = this.values.map(f => {
17
20
  const sql = f.filterToWhere();
@@ -25,6 +28,9 @@ class BaseGroupFilter {
25
28
  }
26
29
  return r;
27
30
  }
31
+ filterParams() {
32
+ return this.values.map(f => f.filterParams());
33
+ }
28
34
  getMembers() {
29
35
  return this.values.map(f => {
30
36
  if (f.getMembers) {
package/dist/src/adapter/BaseGroupFilter.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"BaseGroupFilter.js","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":";;;;;;AAAA,kDAAsB;AAEtB,MAAa,eAAe;IAC1B,YAAY,KAAK,EAAE,MAAM;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,aAAa;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC,CAAC,MAAM,CAAC,eAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACzB,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;aACvB;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA/BD,0CA+BC"}
1
+ {"version":3,"file":"BaseGroupFilter.js","sourceRoot":"","sources":["../../../src/adapter/BaseGroupFilter.js"],"names":[],"mappings":";;;;;;AAAA,kDAAsB;AAEtB,MAAa,eAAe;IAC1B,YAAY,KAAK,EAAE,MAAM;QACvB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC5B,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC;QAChC,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,MAAM;QACjB,OAAO,MAAM,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,WAAW,EAAE,GAAG,CAAC,KAAK,CAAC;IAC1G,CAAC;IAED,aAAa;QACX,MAAM,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YAC5B,MAAM,GAAG,GAAG,CAAC,CAAC,aAAa,EAAE,CAAC;YAC9B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,IAAI,CAAC;aACb;YACD,OAAO,IAAI,GAAG,GAAG,CAAC;QACpB,CAAC,CAAC,CAAC,MAAM,CAAC,eAAC,CAAC,QAAQ,CAAC,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,QAAQ,GAAG,CAAC,CAAC;QAEjD,IAAI,CAAC,CAAC,CAAC,MAAM,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QACD,OAAO,CAAC,CAAC;IACX,CAAC;IAED,YAAY;QACV,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,UAAU;QACR,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;YACzB,IAAI,CAAC,CAAC,UAAU,EAAE;gBAChB,OAAO,CAAC,CAAC,UAAU,EAAE,CAAC;aACvB;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AAvCD,0CAuCC"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/schema-compiler",
3
3
  "description": "Cube.js schema compiler",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.29.35",
5
+ "version": "0.29.37",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.js.git",
@@ -42,7 +42,7 @@
42
42
  "@babel/standalone": "^7.12.10",
43
43
  "@babel/traverse": "^7.12.10",
44
44
  "@babel/types": "^7.12.12",
45
- "@cubejs-backend/shared": "^0.29.33",
45
+ "@cubejs-backend/shared": "^0.29.37",
46
46
  "@hapi/joi": "^17.1.1",
47
47
  "antlr4ts": "0.5.0-alpha.4",
48
48
  "camelcase": "^6.2.0",
@@ -59,7 +59,7 @@
59
59
  "devDependencies": {
60
60
  "@apla/clickhouse": "^1.5.5",
61
61
  "@cubejs-backend/linter": "^0.29.23",
62
- "@cubejs-backend/query-orchestrator": "^0.29.35",
62
+ "@cubejs-backend/query-orchestrator": "^0.29.37",
63
63
  "@types/babel__code-frame": "^7.0.2",
64
64
  "@types/babel__generator": "^7.6.2",
65
65
  "@types/babel__parser": "^7.1.1",
@@ -102,5 +102,5 @@
102
102
  ".*\\.d\\.ts"
103
103
  ]
104
104
  },
105
- "gitHead": "15911bbb428a3a4dcc509edb84587f718b2ccdfd"
105
+ "gitHead": "a57ae4bc3b434bb54f7f97f00262c1c4cce02b61"
106
106
  }