-
-
Notifications
You must be signed in to change notification settings - Fork 6.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: resolve FindOptionsOrder.nulls to allow FIRST/LAST in uppercase (#…
…8978) * fix: resolve FindOptionsOrder.nulls issue to accept FIRST/LAST in uppercase Closes #8970 * fixed failing test Co-authored-by: Alex Messer <dmzt08@gmail.com>
- Loading branch information
1 parent
72728f1
commit 5e5abbd
Showing
3 changed files
with
87 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
import { | ||
Column, | ||
Entity, | ||
ObjectIdColumn, | ||
PrimaryGeneratedColumn, | ||
} from "../../../../src" | ||
|
||
@Entity() | ||
export class TestEntity { | ||
@ObjectIdColumn() | ||
@PrimaryGeneratedColumn() | ||
id: number | ||
|
||
@Column({ nullable: true }) | ||
testColumn: string | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,69 @@ | ||
import "reflect-metadata" | ||
import { | ||
closeTestingConnections, | ||
createTestingConnections, | ||
reloadTestingDatabases, | ||
} from "../../utils/test-utils" | ||
import { DataSource } from "../../../src" | ||
import { TestEntity } from "./entities/TestEntity" | ||
import { expect } from "chai" | ||
|
||
describe("query builder order nulls first/last", async () => { | ||
let dataSources: DataSource[] | ||
|
||
before(async () => { | ||
dataSources = await createTestingConnections({ | ||
entities: [__dirname + "/entities/*{.js,.ts}"], | ||
enabledDrivers: ["postgres", "sqlite", "better-sqlite3"], | ||
schemaCreate: true, | ||
dropSchema: false, | ||
}) | ||
}) | ||
beforeEach(() => reloadTestingDatabases(dataSources)) | ||
after(() => closeTestingConnections(dataSources)) | ||
|
||
const runTest = async ( | ||
dataSource: DataSource, | ||
firstOrLastString: "first" | "FIRST" | "last" | "LAST", | ||
) => { | ||
const repository = dataSource.getRepository(TestEntity) | ||
|
||
const testArray = await repository.find({ | ||
order: { | ||
testColumn: { direction: "DESC", nulls: firstOrLastString }, | ||
}, | ||
}) | ||
const test = | ||
["first", "FIRST"].indexOf(firstOrLastString) !== -1 | ||
? testArray.shift() | ||
: testArray.pop() | ||
|
||
expect(test?.testColumn).to.be.null | ||
} | ||
|
||
it(`should work with uppercase/lowercase first/last`, async () => { | ||
return Promise.all( | ||
dataSources.map(async (dataSource) => { | ||
const repository = dataSource.getRepository(TestEntity) | ||
|
||
for (let i = 0; i < 5; i++) { | ||
const entity = new TestEntity() | ||
entity.testColumn = "" | ||
|
||
await repository.save(entity) | ||
} | ||
|
||
for (let i = 0; i < 5; i++) { | ||
const entity = new TestEntity() | ||
|
||
await repository.save(entity) | ||
} | ||
|
||
await runTest(dataSource, "first") | ||
await runTest(dataSource, "FIRST") | ||
await runTest(dataSource, "last") | ||
await runTest(dataSource, "LAST") | ||
}), | ||
) | ||
}) | ||
}) |