#276 - Incluir exceção para PK Assigned que não tiver valor informado no insert.

Author: fernandocode

src/core/columns-values-builder.ts

@@ -1,3 +1,4 @@
+import { DatabaseBuilderError } from "./errors";
 import { KeyUtils } from "./key-utils";
 import { PrimaryKeyType } from "./enums/primary-key-type";
 import { MetadataTable } from "../metadata-table";
@@ -24,15 +25,22 @@ export abstract class ColumnsValuesBuilder<
         fieldType: FieldType,
         primaryKeyType?: PrimaryKeyType
     ): TThis {
-        if (
-            primaryKeyType === PrimaryKeyType.Guid
-            && !value
-            && this.allowGenerateKey()
-        ) {
-            // gerar GUID
-            value = Utils.GUID();
-            // set value GUID in model
-            KeyUtils.setKey(this.metadata, this.modelToSave, value);
+        switch (primaryKeyType) {
+            case PrimaryKeyType.Assigned:
+                if (!value) {
+                    throw new DatabaseBuilderError("Primary key to be informed when generation strategy is 'Assigned'!");
+                }
+            case PrimaryKeyType.Guid:
+                if (!value && this.allowGenerateKey()) {
+                    // gerar GUID
+                    value = Utils.GUID();
+                    // set value GUID in model
+                    KeyUtils.setKey(this.metadata, this.modelToSave, value);
+                }
+                break;
+            case PrimaryKeyType.AutoIncrement:
+            default:
+                break;
         }
         this.columns.push({
             name: column,
@@ -74,7 +82,6 @@ export abstract class ColumnsValuesBuilder<
             params: [],
         };
         result.keyColumns = this.columns.filter(x => !!x.primaryKeyType).map(x => x.name);
-        // result.keyColumns = this.columns.filter(x => x.isKeyColumn).map(x => x.name);
         this.columns.forEach((column) => {
             const columnName = this.columnFormat(column);
             if (columnName !== void 0) {

src/core/errors.ts

@@ -1,7 +1,10 @@
 
 export class DatabaseBuilderError extends Error {
     constructor(message: string) {
-        super();
-        this.message = message;
+        super(message);
+        // Maintains proper stack trace for where our error was thrown (only available on V8)
+        if (Error.captureStackTrace) {
+            Error.captureStackTrace(this, DatabaseBuilderError);
+        }
     }
 }

src/crud/crud-base-builder.ts

@@ -45,30 +45,6 @@ export abstract class CrudBaseBuilder<T, TColumnsBuilder extends ColumnsValuesBu
         };
     }
 
-    // public setKeyByModel(keyValue: any): void {
-    //     (this.getModel() as any)[this.primaryKeyMapper().fieldReference] = keyValue;
-    // }
-
-    // public getKeyByModel(): any {
-    //     return Utils.getValue(this.getModel(), this.primaryKeyMapper().fieldReference);
-    // }
-
-    // public primaryKeyType(): PrimaryKeyType {
-    //     return this.primaryKeyMapper().primaryKeyType;
-    // }
-
-    // public isCompositeKey(): boolean {
-    //     return this.primaryKeysMapper().length > 1;
-    // }
-
-    // public primaryKeyMapper(): MapperColumn {
-    //     return this.primaryKeysMapper().find(_ => true);
-    // }
-
-    // public primaryKeysMapper(): MapperColumn[] {
-    //     return this.metadata.mapperTable.columns.filter(x => !!x.primaryKeyType);
-    // }
-
     protected getColumnsCompiled(): ColumnsCompiled {
         if (!this._columnsCompiled.columns.length) {
             this.setDefaultColumns();

src/test/insert.spec.ts

@@ -1,3 +1,4 @@
+import { DatabaseBuilderError } from './../core/errors';
 import { Pedido } from "./models/pedido";
 import { Marca } from "./models/marca";
 import { CondicaoPagamento } from "./models/condicao-pagamento";
@@ -34,6 +35,13 @@ describe("Insert", () => {
         expect(result.query).to.equal("INSERT INTO Regiao (codeImport, nome) VALUES (?, ?)");
     });
 
+    it("Regiao (primary key Assigned) key not informed!", () => {
+        const sql = new Insert(Regiao, {
+            nome: "Sul"
+        } as Regiao, mapper.get(Regiao));
+        expect(() => sql.compile()).to.throw("Primary key to be informed when generation strategy is 'Assigned'!");
+    });
+
     it("SubRegiao", () => {
         const result = new Insert(SubRegiao, ObjectToTest.subRegiao, mapper.get(SubRegiao)).compile();
         expect(result.params.toString()).to.equal([

tsconfig.json

@@ -11,7 +11,7 @@
     // "allowJs": true,                       /* Allow javascript files to be compiled. */
     // "checkJs": true,                       /* Report errors in .js files. */
     // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
-    "declaration": true, /* Generates corresponding '.d.ts' file. */
+    "declaration": false, /* Generates corresponding '.d.ts' file. */
     // "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
     // "outDir": "./",                        /* Redirect output structure to the directory. */