Skip to content

Commit 8fce81e

Browse files
committed
update test
1 parent 1eb273e commit 8fce81e

3 files changed

Lines changed: 18 additions & 4 deletions

File tree

src/test/models/test-clazz.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { TestClazzRef } from "./test-clazz-ref";
2+
import * as moment from "moment";
23

34
export class TestClazz {
45
public id: number = 0;
56
public description: string = "";
67
public referenceTest: TestClazzRef = new TestClazzRef();
78
public disabled: boolean = false;
89
public date: number = 0;
10+
public dateMoment: moment.Moment = moment();
911
}

src/test/projections.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ describe("Projections", () => {
3333
});
3434
const result = query.compile();
3535
expect(result.params.length).to.equal(0);
36-
expect(result.query).to.equal("SELECT tes.id AS id, tes.description AS description, tes.disabled AS disabled, tes.date AS date, tes.referenceTest_id AS referenceTest_id FROM TestClazz AS tes");
36+
expect(result.query).to.equal("SELECT tes.id AS id, tes.description AS description, tes.disabled AS disabled, tes.date AS date, tes.dateMoment AS dateMoment, tes.referenceTest_id AS referenceTest_id FROM TestClazz AS tes");
3737
});
3838

3939
it("add column", () => {

src/test/where.spec.ts

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { ReferencesModelTest } from "./models/reference-model-test";
22
import { assert, expect } from "chai";
33
import { TestClazz } from "./models/test-clazz";
44
import { Query } from "..";
5+
import * as moment from "moment";
56

67
describe("Where", () => {
78

@@ -348,23 +349,34 @@ describe("Where", () => {
348349
it("between", () => {
349350
const query = new Query(TestClazz);
350351
query.where(where => {
352+
// number
351353
where.not().between(x => x.id, 2, 4)
352354
.or()
353355
.scope(scope => {
356+
// string
354357
scope.between(x => x.description, "this value", "b")
355358
.or()
359+
// boolean
356360
.between(x => x.disabled, false, true);
357-
});
361+
})
362+
.and()
363+
// moment
364+
.between(x => x.dateMoment,
365+
moment.utc(`2001-1-20`, "YYYY-MM-DD"),
366+
moment.utc(`2001-7-13`, "YYYY-MM-DD"))
367+
;
358368
});
359369
const result = query.compile();
360-
expect(result.params.length).to.equal(6);
370+
expect(result.params.length).to.equal(8);
361371
expect(result.params[0]).to.equal(2);
362372
expect(result.params[1]).to.equal(4);
363373
expect(result.params[2]).to.equal("this value");
364374
expect(result.params[3]).to.equal("b");
365375
expect(result.params[4]).to.equal(false);
366376
expect(result.params[5]).to.equal(true);
367-
expect(result.query).to.equal("SELECT tes.* FROM TestClazz AS tes WHERE tes.id NOT BETWEEN ? AND ? OR (tes.description BETWEEN ? AND ? OR tes.disabled BETWEEN ? AND ?)");
377+
expect(result.params[6]).to.equal(979948800);
378+
expect(result.params[7]).to.equal(994982400);
379+
expect(result.query).to.equal("SELECT tes.* FROM TestClazz AS tes WHERE tes.id NOT BETWEEN ? AND ? OR (tes.description BETWEEN ? AND ? OR tes.disabled BETWEEN ? AND ?) AND tes.dateMoment BETWEEN ? AND ?");
368380
});
369381

370382
it("between (deprecated)", () => {

0 commit comments

Comments
 (0)