Skip to content

Commit 0b5d4ab

Browse files
committed
v.0.0.13 bug fixed not condition
1 parent ed5a6f0 commit 0b5d4ab

3 files changed

Lines changed: 6 additions & 4 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "database-builder",
3-
"version": "0.0.12",
3+
"version": "0.0.13",
44
"description": "Framework to assist in database manipulation (DDL and CRUD)",
55
"main": "./src/index.js",
66
"types": "./src/index.d.ts",

src/crud/where-builder.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,9 @@ export class WhereBuilder<T> {
339339
column1: string,
340340
column2: string | string[],
341341
) {
342-
return this.buildConditions(conditions, column1, column2)
342+
let conditionsArray = this._pendingConditions.concat(conditions);
343+
this._pendingConditions = [];
344+
return this.buildConditions(conditionsArray, column1, column2)
343345
// const pendingCondition = this._pendingCondition;
344346
// this._pendingCondition = void 0;
345347
// const appendCondition = this.checkAppendPendingCondition(condition, pendingCondition);

src/test/test.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ describe("Query method", () => {
7171
select.add(x => x.desativo, 'inativo')
7272
})
7373
.where(where => {
74-
where.equalValue(x => x.razaoSocial, "ABC");
74+
where.not().equalValue(x => x.razaoSocial, "ABC");
7575
where.greatAndEqualValue(x => x.id, 10);
7676
})
7777
.join(
@@ -91,7 +91,7 @@ describe("Query method", () => {
9191
expect(result.params.length).to.equal(2);
9292
expect(result.params[0]).to.equal("ABC");
9393
expect(result.params[1]).to.equal(10);
94-
expect(result.query).to.equal(`SELECT cli.cidade_id AS cidade_id, cli.apelido AS apelido, cli.razaoSocial AS razaoSocial, cli.id AS id, cli.desativo AS inativo, cid.nome AS cidade_nome, cid.id AS cid_id FROM Cliente AS cli LEFT JOIN Cidade AS cid ON (cid.id = cli.cidade_id) WHERE cli.razaoSocial = ? AND cli.id >= ?`);
94+
expect(result.query).to.equal(`SELECT cli.cidade_id AS cidade_id, cli.apelido AS apelido, cli.razaoSocial AS razaoSocial, cli.id AS id, cli.desativo AS inativo, cid.nome AS cidade_nome, cid.id AS cid_id FROM Cliente AS cli LEFT JOIN Cidade AS cid ON (cid.id = cli.cidade_id) WHERE cli.razaoSocial <> ? AND cli.id >= ?`);
9595
});
9696

9797
it("test select with projection case", () => {

0 commit comments

Comments
 (0)