Skip to content

Commit 5d8360d

Browse files
author
fernandocode
committed
Bug fixed for parameters like number into string incorrectly convert to number type.
1 parent fb266e7 commit 5d8360d

5 files changed

Lines changed: 32 additions & 75 deletions

File tree

‎src/core/utils.ts‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,15 +309,22 @@ export class Utils {
309309
}
310310

311311
public static clearParam(param: ValueTypeToParse): ValueTypeToParse {
312+
if (Utils.isString(param)) {
313+
// remove possiveis " ou ' (aspas duplas ou simples) no inicio ou fim de uma string de valor de parametro
314+
return (param as string).replace(/(^["']|["']$)/mg, "");
315+
}
316+
return param;
317+
}
318+
319+
public static clearParamLambda(param: ValueTypeToParse): ValueTypeToParse {
320+
// Somente quando for uma expressão lambda que deve ser convertido os tipos numericos e booleans que estejam no formato string
312321
if (Utils.isString(param)) {
313322
if (Utils.isOnlyNumber(param)) {
314323
return +param;
315324
}
316325
if (Utils.isReservedBoolean(param)) {
317326
return param === "true";
318327
}
319-
// remove possiveis " ou ' (aspas duplas ou simples) no inicio ou fim de uma string de valor de parametro
320-
return (param as string).replace(/(^["']|["']$)/mg, "");
321328
}
322329
return param;
323330
}

‎src/crud/having-builder.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ export class HavingBuilder<T>
1818

1919
protected getColumnParams(expression: ProjectionsHelper<T>): ColumnParams {
2020
const compiled = Utils.resolveExpressionProjection(expression);
21-
// const compiled = Utils.resolveProjection(expression);
2221
return {
2322
column: compiled.projection,
2423
params: compiled.params

‎src/crud/where-base-builder.ts‎

Lines changed: 6 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -398,65 +398,36 @@ export abstract class WhereBaseBuilder<
398398
protected buildWhereColumn(
399399
condition: Condition[],
400400
...valuesOrColumns: (ColumnParams | string | ValueTypeToParse[])[]
401-
// left: ColumnParams | string | ValueTypeToParse[],
402401
) {
403402
const columnsParams = valuesOrColumns.map(x => this.processParam(x));
404-
// const columnRight = this.processParam(right);
405-
// const columnLeft = this.processParam(left);
406403
this.buildWhereParams(
407404
condition,
408405
columnsParams.map(x => Utils.addAlias(x.column, this._alias)),
409406
columnsParams.map((value) => value.params)
410407
// alternative Array.flat()
411408
// https://developer.mozilla.org/pt-BR/docs/Web/JavaScript/Reference/Global_Objects/Array/flat#Alternativa
412-
.reduce((acc, val) => acc.concat(val), []),
413-
// Utils.addAlias(columnRight.column, this._alias),
414-
// Utils.addAlias(columnLeft.column, this._alias),
415-
// columnRight.params.concat(columnLeft.params)
409+
.reduce((acc, val) => acc.concat(val), [])
416410
);
417411
}
418-
// protected buildWhereColumn(
419-
// condition: Condition[],
420-
// right: ColumnParams | string | ValueTypeToParse[],
421-
// left: ColumnParams | string | ValueTypeToParse[],
422-
// ) {
423-
// const columnRight = this.processParam(right);
424-
// const columnLeft = this.processParam(left);
425-
// this.buildWhereParams(
426-
// condition,
427-
// Utils.addAlias(columnRight.column, this._alias),
428-
// Utils.addAlias(columnLeft.column, this._alias),
429-
// columnRight.params.concat(columnLeft.params)
430-
// );
431-
// }
432412

433413
protected buildWhereParams(
434414
condition: Condition[],
435415
columns: string[],
436-
// column1: string,
437-
// column2: string,
438416
params: ValueTypeToParse[],
439417
) {
440418
this.buildWhere(
441419
condition,
442420
columns
443421
);
444-
// this.buildWhere(condition,
445-
// column1,
446-
// column2
447-
// );
448422
this.addParam(params);
449423
}
450424

451425
protected buildWhere(
452426
conditions: Condition[],
453-
columns: string[],
454-
// column1: string,
455-
// column2: string | string[],
427+
columns: string[]
456428
) {
457429
this.checkWhere();
458430
this._where += this.createWhere(conditions, columns);
459-
// this._where += this.createWhere(conditions, column1, column2);
460431
}
461432

462433
protected addParam(
@@ -500,15 +471,14 @@ export abstract class WhereBaseBuilder<
500471

501472
private buildWhereMetadata(metadata: LambdaMetadata) {
502473
if (!Utils.isNameColumn(metadata.left) && Utils.isValue(metadata.left)) {
503-
this.addParam(metadata.left);
474+
this.addParam(Utils.clearParamLambda(metadata.left));
504475
metadata.left = "?";
505476
}
506477
if (!Utils.isNameColumn(metadata.right) && Utils.isValue(metadata.right)) {
507-
this.addParam(metadata.right);
478+
this.addParam(Utils.clearParamLambda(metadata.right));
508479
metadata.right = "?";
509480
}
510481
this.buildWhere(metadata.condition, [Utils.addAlias(metadata.left, this._alias), Utils.addAlias(metadata.right, this._alias)]);
511-
// this.buildWhere(metadata.condition, Utils.addAlias(metadata.left, this._alias), Utils.addAlias(metadata.right, this._alias));
512482
}
513483

514484
private addValueParam(
@@ -521,9 +491,7 @@ export abstract class WhereBaseBuilder<
521491

522492
private createWhere(
523493
conditions: Condition[],
524-
columns: string[],
525-
// column1: string,
526-
// column2: string | string[],
494+
columns: string[]
527495
) {
528496
// TODO: verificar se colunas não são condition, para remover a condition
529497
let conditionsArray = this._pendingConditions.concat(conditions);
@@ -539,11 +507,6 @@ export abstract class WhereBaseBuilder<
539507
conditionsArray,
540508
columns
541509
);
542-
// return this.buildConditions(
543-
// conditionsArray,
544-
// column1,
545-
// isConditionIsNullInColumn2 ? void 0 : column2
546-
// );
547510
}
548511

549512
private conditionIsNull(currentConditions: Condition[]): Condition[] {
@@ -563,14 +526,11 @@ export abstract class WhereBaseBuilder<
563526

564527
private buildConditions(
565528
conditions: Condition[],
566-
columns: string[],
567-
// column1: string,
568-
// column2: string | string[],
529+
columns: string[]
569530
): string {
570531
// new scope
571532
if (!conditions || (conditions.length === 1 && conditions[0] === void 0)) {
572533
return `(${columns[0]})`;
573-
// return `(${column1})`;
574534
}
575535
switch (conditions.toString()) {
576536
case [Condition.Between].toString():
@@ -580,11 +540,6 @@ export abstract class WhereBaseBuilder<
580540
return `${columns[0]} ${this.builderConditions(conditions)} ${columns[1]} ${WhereBaseBuilder.AND} ${columns[2]}`;
581541
}
582542
throw new DatabaseBuilderError(`Length (${columns.length}) (values: ${columns}) parameter to '${conditions}' condition incorrect!`);
583-
// // ${column} BETWEEN ? AND ?
584-
// if (!Utils.isArray(column2) || column2.length === 2) {
585-
// return `${column1} ${this.builderConditions(conditions)} ? ${WhereBaseBuilder.AND} ?`;
586-
// }
587-
// throw new DatabaseBuilderError(`Length (${column2.length}) (values: ${column2}) parameter to '${conditions}' condition incorrect!`);
588543
case [Condition.In].toString():
589544
case [Condition.Not, Condition.In].toString():
590545
// ${column} IN (?, ?, ...)
@@ -606,26 +561,6 @@ export abstract class WhereBaseBuilder<
606561
return `${columns[0]} ${this.builderConditions(conditions)} ${columns[1]}`.trim();
607562
}
608563
return `${columns[0]} ${this.builderConditions(conditions)}`.trim();
609-
// case [Condition.Not, Condition.In].toString():
610-
// // ${column} IN (?, ?, ...)
611-
// return `${column1} ${this.builderConditions(conditions)} (${column2})`.trim();
612-
// case [Condition.Not, Condition.IsNull].toString():
613-
// return `${column1} IS NOT NULL`.trim();
614-
// case [Condition.Not, Condition.Equal].toString():
615-
// return `${column1} <> ${column2}`.trim();
616-
// case [Condition.Not, Condition.Great].toString():
617-
// return this.buildConditions([Condition.LessAndEqual], column1, column2);
618-
// case [Condition.Not, Condition.GreatAndEqual].toString():
619-
// return this.buildConditions([Condition.Less], column1, column2);
620-
// case [Condition.Not, Condition.Less].toString():
621-
// return this.buildConditions([Condition.GreatAndEqual], column1, column2);
622-
// case [Condition.Not, Condition.LessAndEqual].toString():
623-
// return this.buildConditions([Condition.Great], column1, column2);
624-
// default:
625-
// if (column2) {
626-
// return `${column1} ${this.builderConditions(conditions)} ${column2}`.trim();
627-
// }
628-
// return `${column1} ${this.builderConditions(conditions)}`.trim();
629564
}
630565
}
631566

‎src/test/lambda-test.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ describe("Lambda Expression", () => {
4747
.compile();
4848
expect(result[0].params.length).to.equal(3);
4949
expect(result[0].params[0]).to.equal("Test");
50-
expect(result[0].params[1]).to.equal(2);
50+
// expect(result[0].params[1]).to.equal(2);
5151
expect(result[0].params[2]).to.equal(false);
5252
expect(result[0].query).to.equal("SELECT cli.internalKey AS internalKey, cli.codeImport AS codeImport, cli.razaoSocial AS razaoSocial, cli.apelido AS apelido, cli.desativo AS desativo, cli.cidade_codeImport AS cidade_codeImport, cli.classificacao_codeImport AS classificacao_codeImport FROM Cliente AS cli WHERE cli.apelido = ? AND cli.codeImport > ? AND cli.desativo <> ?");
5353
});

‎src/test/where.spec.ts‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,22 @@ describe("Where", () => {
2828
expect(result[0].query).to.equal("SELECT tes.internalKey AS internalKey, tes.id AS id, tes.description AS description, tes.date AS date, tes.dateMoment AS dateMoment, tes.dateDate AS dateDate, tes.numero AS numero, tes.referenceTest_id AS referenceTest_id, tes.referenceTestCode_code AS referenceTestCode_code FROM TestClazz AS tes WHERE tes.id = ?");
2929
});
3030

31+
it("value type string", () => {
32+
const query = crud.query(TestClazz);
33+
const param1: string = "abc";
34+
const param2: string = "102";
35+
query.where(where => {
36+
where.equal(x => x.description, param1);
37+
where.equal(x => x.description, param2);
38+
});
39+
const result = query.compile();
40+
console.log(result);
41+
expect(result[0].params.length).to.equal(2);
42+
expect(result[0].params[0]).to.equal(param1);
43+
expect(result[0].params[1]).to.equal(param2);
44+
expect(result[0].query).to.equal("SELECT tes.internalKey AS internalKey, tes.id AS id, tes.description AS description, tes.date AS date, tes.dateMoment AS dateMoment, tes.dateDate AS dateDate, tes.numero AS numero, tes.referenceTest_id AS referenceTest_id, tes.referenceTestCode_code AS referenceTestCode_code FROM TestClazz AS tes WHERE tes.description = ? AND tes.description = ?");
45+
});
46+
3147
it("value is null", () => {
3248
const query = crud.query(TestClazz);
3349
const idParam: number = void 0;

0 commit comments

Comments
 (0)