Skip to content

fix clickhouse join issue #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
osbertngok merged 1 commit into from
Aug 25, 2017
Merged

fix clickhouse join issue #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 25 additions & 2 deletions lib/dialect/clickhouse.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,37 @@ Clickhouse.prototype.visitArrayCall = function(arrayCall) {
return [txt];
};

Clickhouse.prototype.visitJoin = function(join) {
Clickhouse.prototype.visitFrom = function(from) {
var result = [];
if (from.skipFromStatement) {
result.push(',');
} else {
result.push('FROM');
}
for(var i = 0; i < from.nodes.length; i++) {
// Currently clickhouse only support single table, but anyway
result = result.concat(this.visit(from.nodes[i], {"parentIsFrom": true}));
}
return result;
};

Clickhouse.prototype.visitJoin = function(join, config) {
var result = [];
var parentIsFrom = config && config.parentIsFrom;
this._visitingJoin = true;
result = result.concat(this.visit(join.from));
if (parentIsFrom) {
result = result.concat('(');
}

result = result.concat(this.visit(join.from, {"joinFromQuery": true}));
result = result.concat('ALL ' + join.subType + ' JOIN');
result = result.concat(this.visit(join.to));
result = result.concat('USING');
result = result.concat(this.visit(join.on));
if (parentIsFrom) {
result = result.concat(')');
}

return result;
};

Expand Down
4 changes: 2 additions & 2 deletions lib/dialect/postgres.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ Postgres.prototype.visit = function(node, config) {
case 'TABLE' : return this.visitTable(node);
case 'COLUMN' : return this.visitColumn(node);
case 'FOREIGN KEY' : return this.visitForeignKey(node);
case 'JOIN' : return this.visitJoin(node);
case 'JOIN' : return this.visitJoin(node, config);
case 'LITERAL' : return this.visitLiteral(node);
case 'TEXT' : return node.text;
case 'PARAMETER' : return this.visitParameter(node);
Expand Down Expand Up @@ -1028,7 +1028,7 @@ Postgres.prototype.visitForShare = function() {
Postgres.prototype.visitJoin = function(join) {
var result = [];
this._visitingJoin = true;
result = result.concat(this.visit(join.from, {"joinFromQuery": true}));
result = result.concat(this.visit(join.from));
result = result.concat(join.subType + ' JOIN');
result = result.concat(this.visit(join.to));
result = result.concat('ON');
Expand Down