mirror of
https://github.com/typeorm/typeorm.git
synced 2025-12-08 21:26:23 +00:00
fix compiler error
This commit is contained in:
parent
b8a5b09152
commit
f1399ee312
12
gulpfile.ts
12
gulpfile.ts
@ -361,8 +361,8 @@ export class Gulpfile {
|
||||
@SequenceTask()
|
||||
tests() {
|
||||
return [
|
||||
"compile",
|
||||
"tslint",
|
||||
"coveragePre",
|
||||
"runTests",
|
||||
"coveragePost",
|
||||
"coverageRemap"
|
||||
];
|
||||
@ -384,14 +384,6 @@ export class Gulpfile {
|
||||
];
|
||||
}
|
||||
|
||||
/**
|
||||
* Compiles the code and runs only mocha tests.
|
||||
*/
|
||||
@SequenceTask()
|
||||
mocha() {
|
||||
return ["compile", "quickTests"];
|
||||
}
|
||||
|
||||
// -------------------------------------------------------------------------
|
||||
// CI tasks
|
||||
// -------------------------------------------------------------------------
|
||||
|
||||
@ -1622,6 +1622,9 @@ export class SelectQueryBuilder<Entity> extends QueryBuilder<Entity> implements
|
||||
// if user used partial selection and did not select some primary columns which are required to be selected
|
||||
// we select those primary columns and mark them as "virtual". Later virtual column values will be removed from final entity
|
||||
// to make entity contain exactly what user selected
|
||||
// if (columns.length === 0) // however not in the case when nothing (even partial) was selected from this target (for example joins without selection)
|
||||
// return [];
|
||||
|
||||
const nonSelectedPrimaryColumns = this.expressionMap.queryEntity ? metadata.primaryColumns.filter(primaryColumn => columns.indexOf(primaryColumn) === -1) : [];
|
||||
const allColumns = [...columns, ...nonSelectedPrimaryColumns];
|
||||
|
||||
|
||||
@ -22,7 +22,7 @@ describe("github issues > #1369 EntitySubscriber not firing events on abstract c
|
||||
entity.position = "Regional Manager";
|
||||
await connection.manager.save(entity);
|
||||
|
||||
const foundEntity = await connection.manager.findOneById(ConcreteEntity, 1);
|
||||
const foundEntity = await connection.manager.findOne(ConcreteEntity, 1);
|
||||
expect(foundEntity).to.not.be.undefined;
|
||||
|
||||
const assertObject = Object.assign({}, foundEntity);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user