Skip to content
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

fix: Postrgres group aggregation #6522

Merged
merged 5 commits into from
Apr 6, 2020
Merged

fix: Postrgres group aggregation #6522

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
95d3eba
Postrgres group aggregation
srameshr Mar 21, 2020
efaa7a7
Merge branch 'master' into postgres-group-aggregation
srameshr Apr 4, 2020
a0e1360
Merge branch 'master' into postgres-group-aggregation
srameshr Apr 4, 2020
71f5b2a
Merge branch 'postgres-group-aggregation' of github.com:srameshr/pars…
srameshr Apr 5, 2020
abd4147
convert tabs to spaces
dplewis Apr 6, 2020
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
13 changes: 12 additions & 1 deletion src/Adapters/Storage/Postgres/PostgresStorageAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2370,7 +2370,18 @@ export class PostgresStorageAdapter implements StorageAdapter {
}
}

const qs = `SELECT ${columns.join()} FROM $1:name ${wherePattern} ${sortPattern} ${limitPattern} ${skipPattern} ${groupPattern}`;
if (groupPattern) {
columns.forEach((e, i, a) => {
if (e && e.trim() === '*') {
a[i] = '';
}
});
}

const qs = `SELECT ${columns
.filter(Boolean)
.join()} FROM $1:name ${wherePattern} ${skipPattern} ${groupPattern} ${sortPattern} ${limitPattern}`;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you explain the problem you are trying to fix? Just so we can determine if there are side-effects.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dplewis
The queries used to fail when * was used with GROUPBY operators and the order of few operators where off when GROUPBY was present.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dplewis
Can you please merge this? All the existing test cases that was there to handle groupBy and other conditions are working as it sits.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@dplewis Anything on this?


debug(qs, values);
return this._client
.map(qs, values, a =>
Expand Down