#5309 - Implementado como padrão das rotinas de cascade em dependencias a utilização de insert otimizado, em um unico comando para cada tabela.

Fernando Leal · Fernando Leal · commit eb426ab51d00 · 2022-03-23T16:13:53.000-03:00
diff --git a/src/core/model-utils.ts b/src/core/model-utils.ts
@@ -28,34 +28,21 @@ export class ModelUtils {
     public static mergeValues(oldValue: any, newValue: any) {
         const newIsUndefined = Utils.isNull(newValue);
         const oldIsUndefined = Utils.isNull(oldValue);
-        // const newIsUndefined = lodash.isUndefined(newValue);
-        // const oldIsUndefined = lodash.isUndefined(oldValue);
         const newIsNumber = Utils.isValueNumber(newValue);
         const oldIsNumber = Utils.isValueNumber(oldValue);
         const newIsEmpty = newIsNumber && !newIsUndefined ? false : Utils.isEmpty(newValue);
         const oldIsEmpty = oldIsNumber && !oldIsUndefined ? false : Utils.isEmpty(oldValue);
 
-        // const oldIsGreatZero = oldIsNumber ? oldValue as number > 0 : false;
-        // const newIsGreatZero = Utils.isValueNumber(newValue) ? newValue as number > 0 : false;
         const newIsValueDefault = Utils.isValueDefault(newValue);
         const oldIsValueDefault = Utils.isValueDefault(oldValue);
-        // const oldIsNumberDefaultAndNewIsNumberValid = !oldIsGreatZero && newIsGreatZero;
 
-        // const newValueScoreGood = (newIsUndefined && -1) + (newIsEmpty && -1) + (newIsValueDefault && 1);
-        // const oldValueScoreGood = (oldIsUndefined && -1) + (oldIsEmpty && -1) + (oldIsValueDefault && 1);
         const newValueScoreBad = (newIsUndefined && 3) + (newIsEmpty && 2) + (newIsValueDefault && 1);
         const oldValueScoreBad = (oldIsUndefined && 3) + (oldIsEmpty && 2) + (oldIsValueDefault && 1);
         const newValueIsGood = !newIsUndefined && !newIsEmpty && !newIsValueDefault;
-        // const oldValueIsGood = !oldIsUndefined && !oldIsEmpty && !oldIsValueDefault;
 
-        // const useNewValue: boolean = (oldIsUndefined || oldIsEmpty) || (oldIsValueDefault && (!newIsUndefined || !newIsEmpty));
         const useNewValue: boolean =
-            // (oldIsUndefined || oldIsEmpty) ||
             (oldIsValueDefault && (!newIsUndefined || !newIsEmpty)) ||
-            // (newValueIsGood)
-            (newValueScoreBad <= oldValueScoreBad)
-            ;
-        // const useNewValue: boolean = (oldIsUndefined || oldIsEmpty) || (oldIsNumberDefaultAndNewIsNumberValid);
+            (newValueScoreBad <= oldValueScoreBad);
         const result = useNewValue
             ? newValue
             : oldValue;
diff --git a/src/crud/crud-base.ts b/src/crud/crud-base.ts
@@ -71,7 +71,6 @@ export abstract class CrudBase<
                     throw new DatabaseBuilderError(`Há ${models.length} models e ${results.length} results, e o "checkDatabaseResult" ainda não sabe como proceder nessa situação, possivelmente você está tentando executar multi comandos em combinação com comandos em cascade`);
                 }
                 // como não sei qual será o retorno do insertMultiple, vou continuar considerando apenas o primeiro para pegar o id inserted do head
-                // let index = 0;
                 for (let index = 0; index < models.length; index++) {
                     const result = results[index];
                     const model = models[index];
diff --git a/src/crud/delete/delete.ts b/src/crud/delete/delete.ts
@@ -10,7 +10,7 @@ import { DependencyListSimpleModel } from "../../definitions/dependency-definiti
 import { KeyUtils } from "../../core/key-utils";
 import { ColumnRef } from "../../core/column-ref";
 import { DatabaseBuilderError } from "../../core";
-import { Utils } from "../../core/utils";
+import { Utils, ValueTypeToParse } from "../../core/utils";
 
 export class Delete<T> extends CrudBase<T, DeleteBuilder<T>, DeleteColumnsBuilder<T>> {
 
@@ -41,7 +41,7 @@ export class Delete<T> extends CrudBase<T, DeleteBuilder<T>, DeleteColumnsBuilde
         return this;
     }
 
-    protected resolveDependencyByValue(dependency: MapperTable, value: any, index: number): QueryCompiled {
+    protected resolveDependencyByValue(dependency: MapperTable, value: ValueTypeToParse, index: number): QueryCompiled {
         const builder = new DeleteBuilder(void 0, void 0, dependency);
         return builder.compile();
     }
diff --git a/src/crud/insert/insert.ts b/src/crud/insert/insert.ts
@@ -37,12 +37,27 @@ export class Insert<T> extends CrudBase<T, InsertBuilder<T>, InsertColumnsBuilde
         return this;
     }
 
-    protected resolveDependencyByValue(dependency: MapperTable, value: ValueTypeToParse, index: number): QueryCompiled {
+    protected compileValuesDependency(dependency: MapperTable, valuesDependencyArray: ValueTypeToParse[][], fieldReferenceSubItem: string): QueryCompiled[] {
+        const scripts: QueryCompiled[] = [];
+        valuesDependencyArray.forEach((valuesDependency) => {
+            if (valuesDependency) {
+                const dependenciesListSimpleModel = valuesDependency.map((value, index) => {
+                    const valueItem = fieldReferenceSubItem ? ModelUtils.get(value, fieldReferenceSubItem) : value;
+                    return this.createDependencyListSimpleModel(dependency, valueItem, index);
+                });
+                const builder = new InsertBuilder(void 0, dependency, void 0, dependenciesListSimpleModel);
+                this.checkAndPush(scripts, builder.compile());
+            }
+        });
+        return scripts;
+    }
+
+
+    private createDependencyListSimpleModel(dependency: MapperTable, value: ValueTypeToParse, index: number) {
         const modelBase = this.model();
         const modelDependency = {
             index,
             value,
-            // reference: new ReplacementParam("0", "insertId")
         } as DependencyListSimpleModel;
         // Verificar se é Assigned a estrategia de Id, se for já adicionar como parametro
         if (this.mapperTable.keyColumns().length > 1) {
@@ -63,8 +78,7 @@ export class Insert<T> extends CrudBase<T, InsertBuilder<T>, InsertColumnsBuilde
             default:
                 break;
         }
-        const builder = new InsertBuilder(void 0, dependency, void 0, modelDependency);
-        return builder.compile();
+        return modelDependency;
     }
 
     protected resolveDependency(dependency: MapperTable): QueryCompiled {
diff --git a/src/crud/query/query.ts b/src/crud/query/query.ts
@@ -8,7 +8,7 @@ import { WhereBuilder } from "../where-builder";
 import { DatabaseBase, DatabaseResult } from "../../definitions/database-definition";
 import { MetadataTable } from "../../metadata-table";
 import { QueryBuilder } from "./query-builder";
-import { ExpressionOrColumn, ParamType, TypeOrderBy, Utils } from "../../core/utils";
+import { ExpressionOrColumn, ParamType, TypeOrderBy, Utils, ValueTypeToParse } from "../../core/utils";
 import { OrderBy } from "../../core/enums/order-by";
 import { HavingBuilder } from "../having-builder";
 import { LambdaExpression } from "lambda-expression";
@@ -248,7 +248,7 @@ export class Query<TType> extends SqlBase<TType> {
      * @param cascade use cascade fetch in `hasMany` mapper (default = true)
      * @returns first or default @type {TPrimitiveType}
      */
-    public toSingle<TPrimitiveType extends string|number|boolean>(
+    public toSingle<TPrimitiveType extends string | number | boolean>(
         {
             cascade = true,
             database,
@@ -260,7 +260,7 @@ export class Query<TType> extends SqlBase<TType> {
             where?: (whereCallback: WhereBuilder<TType>) => void,
             _default?: any
         } = {}
-    ): Observable<TPrimitiveType> {        
+    ): Observable<TPrimitiveType> {
         if (where) {
             this.where(where);
         }
@@ -276,7 +276,7 @@ export class Query<TType> extends SqlBase<TType> {
      * @param cascade use cascade fetch in `hasMany` mapper (default = true)
      * @returns Array of @type {TPrimitiveType}
      */
-    public toSingleList<TPrimitiveType extends string|number|boolean>(
+    public toSingleList<TPrimitiveType extends string | number | boolean>(
         {
             cascade = true,
             database
@@ -501,7 +501,7 @@ export class Query<TType> extends SqlBase<TType> {
         return this._queryBuilder.compile();
     }
 
-    protected resolveDependencyByValue(dependency: MapperTable, value: any, index: number): QueryCompiled {
+    protected resolveDependencyByValue(dependency: MapperTable, value: ValueTypeToParse, index: number): QueryCompiled {
         const insert = new QueryBuilder(void 0, dependency, void 0);
         return insert.compile();
     }
@@ -541,7 +541,6 @@ export class Query<TType> extends SqlBase<TType> {
                         database: this.database,
                         enableLog: this.enableLog
                     });
-                    // const queryDependency = new Query<DependencyListSimpleModel>(void 0, void 0, this._getMapper, dependency, this.database, this.enableLog);
                     queryDependency.where(where => {
                         const columnReference = dependency.getColumnNameByField<DependencyListSimpleModel, any>(x => x.reference);
                         where.equal(new ColumnRef(columnReference), KeyUtils.getKey(mapperTable, model));
@@ -588,4 +587,8 @@ export class Query<TType> extends SqlBase<TType> {
                 });
         });
     }
+
+    protected dependencies(): MapperTable[] {
+        return this.mapperTable.dependencies;
+    }
 }
diff --git a/src/crud/sql-base.ts b/src/crud/sql-base.ts
@@ -75,30 +75,35 @@ export abstract class SqlBase<T> implements SqlCompilable, SqlExecutable {
         const columnDependency = this.mapperTable.columns.find(x => x.tableReference === dependency.tableName);
         const fieldArraySplit = columnDependency.fieldReference.split("[?].");
         const valuesDependencyArray: ValueTypeToParse[][] = Utils.getValue(this.model(), fieldArraySplit[0]);
+        return [...script, ...this.compileValuesDependency(dependency, valuesDependencyArray, fieldArraySplit?.[1])];
+    }
+
+    protected compileValuesDependency(dependency: MapperTable, valuesDependencyArray: ValueTypeToParse[][], fieldReferenceSubItem: string): QueryCompiled[] {
+        const scripts: QueryCompiled[] = [];
         valuesDependencyArray.forEach((valuesDependency) => {
             if (valuesDependency) {
                 valuesDependency.forEach((value, index) => {
-                    const valueItem = fieldArraySplit.length > 1 ? ModelUtils.get(value, fieldArraySplit[1]) : value;
-                    this.checkAndPush(script, this.resolveDependencyByValue(dependency, valueItem, index));
+                    const valueItem = fieldReferenceSubItem ? ModelUtils.get(value, fieldReferenceSubItem) : value;
+                    this.checkAndPush(scripts, this.resolveDependencyByValue(dependency, valueItem, index));
                 });
             }
         });
-        return script;
+        return scripts;
     }
 
-    protected dependencies(): MapperTable[] {
-        return this.mapperTable.dependencies;
-    }
-    // protected abstract dependencies(): MapperTable[];
+    protected abstract dependencies(): MapperTable[];
 
     protected abstract model(): T | Array<T>;
 
     protected abstract builderCompiled(): QueryCompiled;
 
-    protected abstract resolveDependencyByValue(dependency: MapperTable, value: ValueTypeToParse, index: number): QueryCompiled;
     protected abstract resolveDependency(dependency: MapperTable): QueryCompiled;
-
+    
     protected abstract checkDatabaseResult(promise: Observable<DatabaseResult[]>): Observable<DatabaseResult[]>;
+    
+    protected resolveDependencyByValue(dependency: MapperTable, value: ValueTypeToParse, index: number): QueryCompiled{
+        return void 0;
+    }
 
     protected getDatabase(database: DatabaseBase): DatabaseBase {
         const result = (database ? database : this.database);
diff --git a/src/crud/update/update.ts b/src/crud/update/update.ts
@@ -11,6 +11,8 @@ import { DeleteBuilder } from "../delete/delete-builder";
 import { InsertBuilder } from "../insert/insert-builder";
 import { KeyUtils } from "../../core/key-utils";
 import { ColumnRef } from "../../core/column-ref";
+import { ValueTypeToParse } from "../../core/utils";
+import { ModelUtils } from "../../core/model-utils";
 
 export class Update<T> extends CrudBase<T, UpdateBuilder<T>, UpdateColumnsBuilder<T>> {
 
@@ -43,15 +45,23 @@ export class Update<T> extends CrudBase<T, UpdateBuilder<T>, UpdateColumnsBuilde
         return this;
     }
 
-    protected resolveDependencyByValue(dependency: MapperTable, value: any, index: number): QueryCompiled {
-        const builder = new InsertBuilder(void 0, dependency, void 0,
-            {
-                index,
-                value,
-                reference: KeyUtils.getKey(this.mapperTable, this.model())
-            } as DependencyListSimpleModel
-        );
-        return builder.compile();
+    protected compileValuesDependency(dependency: MapperTable, valuesDependencyArray: ValueTypeToParse[][], fieldReferenceSubItem: string): QueryCompiled[] {
+        const scripts: QueryCompiled[] = [];
+        valuesDependencyArray.forEach((valuesDependency) => {
+            if (valuesDependency) {
+                const dependenciesListSimpleModel = valuesDependency.map((value, index) => {
+                    const valueItem = fieldReferenceSubItem ? ModelUtils.get(value, fieldReferenceSubItem) : value;
+                    return {
+                        index,
+                        value: valueItem,
+                        reference: KeyUtils.getKey(this.mapperTable, this.model())
+                    } as DependencyListSimpleModel;
+                });
+                const builder = new InsertBuilder(void 0, dependency, void 0, dependenciesListSimpleModel);
+                this.checkAndPush(scripts, builder.compile());
+            }
+        });
+        return scripts;
     }
 
     protected resolveDependency(dependency: MapperTable): QueryCompiled {
diff --git a/src/definitions/dependency-definition.ts b/src/definitions/dependency-definition.ts
@@ -2,7 +2,7 @@ import { ValueTypeToParse } from "../core/utils";
 
 export interface DependencyListSimpleModel {
     index: number;
-    value: ValueTypeToParse;
+    value: ValueTypeToParse | Array<ValueTypeToParse>;
     reference: any;
 }
 
diff --git a/src/test/cascade.spec.ts b/src/test/cascade.spec.ts
diff --git a/src/test/single-transaction-manager.spec.ts b/src/test/single-transaction-manager.spec.ts
diff --git a/src/test/withData/sqlite.spec.ts b/src/test/withData/sqlite.spec.ts

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ export abstract class CrudBase<`
`71`	`71`	throw new DatabaseBuilderError(`Há ${models.length} models e ${results.length} results, e o "checkDatabaseResult" ainda não sabe como proceder nessa situação, possivelmente você está tentando executar multi comandos em combinação com comandos em cascade`);
`72`	`72`	`}`
`73`	`73`	`// como não sei qual será o retorno do insertMultiple, vou continuar considerando apenas o primeiro para pegar o id inserted do head`
`74`		`- // let index = 0;`
`75`	`74`	`for (let index = 0; index < models.length; index++) {`
`76`	`75`	`const result = results[index];`
`77`	`76`	`const model = models[index];`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import { DependencyListSimpleModel } from "../../definitions/dependency-definiti`
`10`	`10`	`import { KeyUtils } from "../../core/key-utils";`
`11`	`11`	`import { ColumnRef } from "../../core/column-ref";`
`12`	`12`	`import { DatabaseBuilderError } from "../../core";`
`13`		`-import { Utils } from "../../core/utils";`
	`13`	`+import { Utils, ValueTypeToParse } from "../../core/utils";`
`14`	`14`
`15`	`15`	`export class Delete<T> extends CrudBase<T, DeleteBuilder<T>, DeleteColumnsBuilder<T>> {`
`16`	`16`
`@@ -41,7 +41,7 @@ export class Delete<T> extends CrudBase<T, DeleteBuilder<T>, DeleteColumnsBuilde`
`41`	`41`	`return this;`
`42`	`42`	`}`
`43`	`43`
`44`		`- protected resolveDependencyByValue(dependency: MapperTable, value: any, index: number): QueryCompiled {`
	`44`	`+ protected resolveDependencyByValue(dependency: MapperTable, value: ValueTypeToParse, index: number): QueryCompiled {`
`45`	`45`	`const builder = new DeleteBuilder(void 0, void 0, dependency);`
`46`	`46`	`return builder.compile();`
`47`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ import { ValueTypeToParse } from "../core/utils";`
`2`	`2`
`3`	`3`	`export interface DependencyListSimpleModel {`
`4`	`4`	`index: number;`
`5`		`- value: ValueTypeToParse;`
	`5`	`+ value: ValueTypeToParse \| Array<ValueTypeToParse>;`
`6`	`6`	`reference: any;`
`7`	`7`	`}`
`8`	`8`