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.

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: count() method for multiple primary keys for cockroachdb #6745

Merged
merged 5 commits into from Sep 21, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 11 additions & 0 deletions src/query-builder/SelectQueryBuilder.ts
Expand Up @@ -36,6 +36,7 @@ import {SelectQueryBuilderOption} from "./SelectQueryBuilderOption";
import {ObjectUtils} from "../util/ObjectUtils";
import {DriverUtils} from "../driver/DriverUtils";
import {AuroraDataApiDriver} from "../driver/aurora-data-api/AuroraDataApiDriver";
import {CockroachDriver} from "../driver/cockroachdb/CockroachDriver";

/**
* Allows to build complex sql queries in a fashion way and execute those queries.
Expand Down Expand Up @@ -1787,6 +1788,16 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
return `${distinctAlias}.${propertyName}`;
}).join(" || ") + ")) as \"cnt\"";

} else if (this.connection.driver instanceof CockroachDriver) {
countSql = `COUNT(DISTINCT(CONCAT(` + metadata.primaryColumns.map((primaryColumn, index) => {
const propertyName = this.escape(primaryColumn.databaseName);
return `${distinctAlias}.${propertyName}::text`;
}).join(", ") + "))) as \"cnt\"";
} else if (this.connection.driver instanceof OracleDriver) {
countSql = `COUNT(DISTINCT(` + metadata.primaryColumns.map((primaryColumn, index) => {
const propertyName = this.escape(primaryColumn.databaseName);
return `${distinctAlias}.${propertyName}`;
}).join(" || ") + ")) as \"cnt\"";
} else {
countSql = `COUNT(DISTINCT(CONCAT(` + metadata.primaryColumns.map((primaryColumn, index) => {
const propertyName = this.escape(primaryColumn.databaseName);
Expand Down
13 changes: 13 additions & 0 deletions test/functional/query-builder/count/entity/Test.ts
@@ -0,0 +1,13 @@
import {Entity, PrimaryColumn} from "../../../../../src";

@Entity("tests")
export class Test {
@PrimaryColumn()
varcharField: string;

@PrimaryColumn("uuid")
uuidField: string;

@PrimaryColumn()
intField: number;
}
22 changes: 22 additions & 0 deletions test/functional/query-builder/count/query-builder-count.ts
@@ -0,0 +1,22 @@
import {closeTestingConnections, createTestingConnections, reloadTestingDatabases} from "../../../utils/test-utils";
import {Connection} from "../../../../src/connection/Connection";
import {expect} from "chai";
import {Test} from "./entity/Test";

describe("query builder > count", () => {

let connections: Connection[];
before(async () => connections = await createTestingConnections({
entities: [Test],
schemaCreate: true,
dropSchema: true,
}));
beforeEach(() => reloadTestingDatabases(connections));
after(() => closeTestingConnections(connections));

it("Count query should be completed successfully", () => Promise.all(connections.map(async connection => {
const count = await connection.getRepository(Test).count();
expect(count).to.be.equal(0);
})));

});