@cubejs-backend/schema-compiler 0.34.29 → 0.34.30

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 (4) hide show
  1. package/dist/src/compiler/JoinGraph.d.ts.map +1 -1
  2. package/dist/src/compiler/JoinGraph.js +5 -0
  3. package/dist/src/compiler/JoinGraph.js.map +1 -1
  4. package/package.json +3 -3
package/dist/src/compiler/JoinGraph.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JoinGraph.d.ts","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"AAIA;IACE,oDAMC;IALC,mBAAkC;IAClC,mBAAkC;IAClC,UAAe;IACf,UAAe;IACf,eAAoB;IAGtB,8CAqBC;IARC;;oBAMa;IACb,WAAkC;IAGpC,mDA+CC;IAED;;MAMC;IAED,iCAwBC;IAED;;;aA6CC;IAED,4DAsBC;IAED,qDAGC;IAED,8BAEC;IAED,0BAWC;IAHG,0CAA2C;IAK/C,2EASC;CACF"}
1
+ {"version":3,"file":"JoinGraph.d.ts","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"AAIA;IACE,oDAMC;IALC,mBAAkC;IAClC,mBAAkC;IAClC,UAAe;IACf,UAAe;IACf,eAAoB;IAGtB,8CAqBC;IARC;;oBAMa;IACb,WAAkC;IAGpC,mDA+CC;IAED;;MAMC;IAED,iCAwBC;IAED;;;aAkDC;IAED,4DAsBC;IAED,qDAGC;IAED,8BAEC;IAED,0BAWC;IAHG,0CAA2C;IAK/C,2EASC;CACF"}
package/dist/src/compiler/JoinGraph.js CHANGED
@@ -81,18 +81,23 @@ class JoinGraph {
81
81
  }
82
82
  root = newRoot;
83
83
  }
84
+ const nodesJoined = {};
84
85
  const result = cubesToJoin.map(joinHints => {
85
86
  if (!Array.isArray(joinHints)) {
86
87
  joinHints = [joinHints];
87
88
  }
88
89
  let prevNode = root;
89
90
  return joinHints.filter(toJoin => toJoin !== prevNode).map(toJoin => {
91
+ if (nodesJoined[toJoin]) {
92
+ return { joins: [] };
93
+ }
90
94
  const path = this.graph.path(prevNode, toJoin);
91
95
  if (!path) {
92
96
  return null;
93
97
  }
94
98
  const foundJoins = self.joinsByPath(path);
95
99
  prevNode = toJoin;
100
+ nodesJoined[toJoin] = true;
96
101
  return { cubes: path, joins: foundJoins };
97
102
  });
98
103
  }).reduce((a, b) => a.concat(b), []).reduce((joined, res) => {
package/dist/src/compiler/JoinGraph.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"JoinGraph.js","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"JoinGraph.js","sourceRoot":"","sources":["../../../src/compiler/JoinGraph.js"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "@cubejs-backend/schema-compiler",
3
3
  "description": "Cube schema compiler",
4
4
  "author": "Cube Dev, Inc.",
5
- "version": "0.34.29",
5
+ "version": "0.34.30",
6
6
  "repository": {
7
7
  "type": "git",
8
8
  "url": "https://github.com/cube-js/cube.git",
@@ -59,7 +59,7 @@
59
59
  "devDependencies": {
60
60
  "@apla/clickhouse": "^1.5.5",
61
61
  "@cubejs-backend/linter": "^0.34.25",
62
- "@cubejs-backend/query-orchestrator": "^0.34.27",
62
+ "@cubejs-backend/query-orchestrator": "^0.34.30",
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
  ],
103
103
  "globalSetup": "<rootDir>/dist/test/global-setup.js"
104
104
  },
105
- "gitHead": "8649bec964f239e0db28f63ff9e78e38e934eba5"
105
+ "gitHead": "2875265241de4da5b6b355496ac1414dd9d4fdba"
106
106
  }