Added option to create id GUID.

fernandocode · fernandocode · commit 9bcdc5f1860f · 2018-09-04T09:07:26.000-03:00
And added tests for implementation.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "database-builder",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.4",
   "description": "Library to assist in creating and maintaining SQL commands.",
   "main": "./src/index.js",
   "types": "./src/index.d.ts",
@@ -12,12 +12,14 @@
     "publish-npm": "tsc & npm publish"
   },
   "dependencies": {
+    "lambda-expression": ">=0.1.3",
     "moment": ">=2.22.0",
-    "lambda-expression": ">=0.1.3"
+    "uuid": ">=3.3.2"
   },
   "devDependencies": {
     "@types/chai": "^4.1.1",
     "@types/mocha": "^2.2.46",
+    "@types/uuid": "^3.4.4",
     "chai": "^4.1.2",
     "mocha": "^5.0.0",
     "ts-node": "^4.1.0",
diff --git a/src/core/column.ts b/src/core/column.ts
@@ -1,10 +1,12 @@
 import { ValueType} from "./utils";
 import { FieldType } from "./enums/field-type";
+import { PrimaryKeyType } from "./enums/primary-key-type";
 
 export interface Column {
     value: ValueType;
     name: string;
     type: FieldType;
-    isKeyColumn?: boolean;
-    isAutoIncrement?: boolean;
+    // isKeyColumn?: boolean;
+    // isAutoIncrement?: boolean;
+    primaryKeyType?: PrimaryKeyType;
 }
diff --git a/src/core/columns-base-builder.ts b/src/core/columns-base-builder.ts
@@ -4,6 +4,7 @@ import { MapperTable } from "../mapper-table";
 import { Column } from "./column";
 import { FieldType } from "./enums/field-type";
 import { ColumnsCompiled } from "./columns-compiled";
+import { PrimaryKeyType } from "./enums/primary-key-type";
 
 export abstract class ColumnsBaseBuilder<
     TThis extends ColumnsBaseBuilder<TThis, T, TColumn>,
@@ -28,28 +29,32 @@ export abstract class ColumnsBaseBuilder<
     public setColumn(
         column: string,
         type: FieldType,
-        isKeyColumn: boolean,
-        isAutoIncrement: boolean
+        primaryKeyType: PrimaryKeyType
+        // isKeyColumn: boolean,
+        // isAutoIncrement: boolean
     ): TThis {
         this.columns.push({
             name: column,
             type,
-            isKeyColumn,
-            isAutoIncrement
+            primaryKeyType
+            // isKeyColumn,
+            // isAutoIncrement
         } as TColumn);
         return this.getInstance();
     }
 
     public set<TReturn extends ValueTypeToParse>(
         expression: ExpressionOrColumn<TReturn, T>,
-        isKeyColumn: boolean,
-        isAutoIncrement: boolean
+        primaryKeyType: PrimaryKeyType
+        // isKeyColumn: boolean,
+        // isAutoIncrement: boolean
     ): TThis {
         return this.setColumn(
             Utils.getColumn(expression),
             Utils.getType(this.metadata.instance, expression),
-            isKeyColumn,
-            isAutoIncrement
+            primaryKeyType
+            // isKeyColumn,
+            // isAutoIncrement
         );
     }
 
@@ -62,7 +67,8 @@ export abstract class ColumnsBaseBuilder<
         for (const key in this.columns) {
             if (this.columns.hasOwnProperty(key)) {
                 const column = this.columns[key];
-                if (column.isKeyColumn) {
+                if (column.primaryKeyType) {
+                // if (column.isKeyColumn) {
                     result.keyColumns.push(column.name);
                 }
                 result.columns.push(this.columnFormat(column));
@@ -72,7 +78,8 @@ export abstract class ColumnsBaseBuilder<
     }
 
     protected isCompositeKey(): boolean {
-        return this.metadata.mapperTable.columns.filter(x => x.isKeyColumn === true).length > 1;
+        return this.metadata.mapperTable.columns.filter(x => !!x.primaryKeyType).length > 1;
+        // return this.metadata.mapperTable.columns.filter(x => x.isKeyColumn === true).length > 1;
     }
 
     protected abstract columnFormat(column: TColumn): string;
@@ -83,8 +90,9 @@ export abstract class ColumnsBaseBuilder<
         column: string,
         value: ValueTypeToParse,
         fieldType: FieldType,
-        isKeyColumn: boolean,
-        isAutoIncrement: boolean
+        primaryKeyType: PrimaryKeyType
+        // isKeyColumn: boolean,
+        // isAutoIncrement: boolean
     ): TThis;
 
     private setAllColumns(mapper: MapperTable, modelWithValue: T): void {
@@ -95,8 +103,9 @@ export abstract class ColumnsBaseBuilder<
                     column.column,
                     Utils.getValue(modelWithValue, column.fieldReference),
                     column.fieldType,
-                    column.isKeyColumn,
-                    column.isAutoIncrement
+                    column.primaryKeyType
+                    // column.isKeyColumn,
+                    // column.isAutoIncrement
                 );
             }
         }
diff --git a/src/core/columns-values-builder.ts b/src/core/columns-values-builder.ts
@@ -1,3 +1,4 @@
+import { PrimaryKeyType } from "./enums/primary-key-type";
 import { MetadataTable } from "../metadata-table";
 import { ExpressionOrColumn, Utils, ValueTypeToParse } from "./utils";
 import { ColumnsBaseBuilder } from "./columns-base-builder";
@@ -20,43 +21,55 @@ export abstract class ColumnsValuesBuilder<
         column: string,
         value: ValueTypeToParse,
         fieldType: FieldType,
-        isKeyColumn?: boolean,
-        isAutoIncrement?: boolean): TThis {
+        primaryKeyType?: PrimaryKeyType
+        // isKeyColumn?: boolean,
+        // isAutoIncrement?: boolean
+    ): TThis {
+        // verificar se é GUID, se for gerar um valor para o mesmo
+        if (primaryKeyType === PrimaryKeyType.Guid) {
+            // gerar GUID
+            value = Utils.GUID();
+        }
         this.columns.push({
             name: column,
             type: fieldType,
             value: Utils.getValueType(value, fieldType),
-            isKeyColumn,
-            isAutoIncrement
+            primaryKeyType
+            // isKeyColumn,
+            // isAutoIncrement
         });
         return this.getInstance();
     }
 
     public setValue<TReturn extends ValueTypeToParse>(
         expression: ExpressionOrColumn<TReturn, T>,
         value: TReturn,
-        isKeyColumn?: boolean,
-        isAutoIncrement?: boolean
+        primaryKeyType?: PrimaryKeyType
+        // isKeyColumn?: boolean,
+        // isAutoIncrement?: boolean
     ): TThis {
         return this.setColumnValue(
             Utils.getColumn(expression),
             value,
             Utils.getType(value),
-            isKeyColumn,
-            isAutoIncrement
+            primaryKeyType
+            // isKeyColumn,
+            // isAutoIncrement
         );
     }
 
     public set<TReturn extends ValueTypeToParse>(
         expression: ExpressionOrColumn<TReturn, T>,
-        isKeyColumn?: boolean,
-        isAutoIncrement?: boolean
+        primaryKeyType?: PrimaryKeyType
+        // isKeyColumn?: boolean,
+        // isAutoIncrement?: boolean
     ): TThis {
         return this.setValue(
             expression,
             this.getValueByExpression(expression),
-            isKeyColumn,
-            isAutoIncrement
+            primaryKeyType
+            // isKeyColumn,
+            // isAutoIncrement
         );
     }
 
@@ -66,7 +79,8 @@ export abstract class ColumnsValuesBuilder<
             keyColumns: [],
             params: [],
         };
-        result.keyColumns = this.columns.filter(x => x.isKeyColumn).map(x => x.name);
+        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) {
diff --git a/src/core/enums/field-type.ts b/src/core/enums/field-type.ts
@@ -6,5 +6,6 @@ export enum FieldType {
     OBJECT,
     FUNCTION,
     ARRAY,
-    NULL
+    NULL,
+    // GUID
 }
diff --git a/src/core/enums/primary-key-type.ts b/src/core/enums/primary-key-type.ts
@@ -0,0 +1,5 @@
+export enum PrimaryKeyType {
+    Assigned = 1,
+    AutoIncrement,
+    Guid
+}
diff --git a/src/core/utils.ts b/src/core/utils.ts
@@ -16,6 +16,7 @@ import { ProjectionsHelper } from "./projections-helper";
 import { ColumnParams } from "./column-params";
 import { ColumnRef } from "./column-ref";
 import { PlanRef } from "./plan-ref";
+import * as uuidv4 from "uuid/v4";
 
 export type ValueType = number | string | boolean;
 export type ValueTypeToParse = ValueType | moment.Moment | Date | object;
@@ -35,6 +36,11 @@ export class Utils {
     private static _expressionUtils: ExpressionUtils;
     private static _databaseHelper: DatabaseHelper;
 
+    // Fonte: https://www.npmjs.com/package/uuid
+    public static GUID() {
+        return uuidv4();
+    }
+
     public static is(value: any, type: string): boolean {
         return typeof value === type;
     }
diff --git a/src/crud/crud-base-builder.ts b/src/crud/crud-base-builder.ts
@@ -17,7 +17,7 @@ export abstract class CrudBaseBuilder<T, TColumnsBuilder extends ColumnsValuesBu
     constructor(
         protected readonly _typeT: new () => T,
         protected readonly _alias: string = void 0,
-        protected readonly _modelToSave: T = void 0,
+        // protected readonly _modelToSave: T = void 0,
     ) {
         this._tablename = _typeT.name;
         if (!this._alias) {
diff --git a/src/crud/insert/insert-builder.ts b/src/crud/insert/insert-builder.ts
@@ -10,9 +10,9 @@ export class InsertBuilder<T> extends CrudBaseBuilder<T, InsertColumnsBuilder<T>
         typeT: new () => T,
         private _metadata: MetadataTable<T>,
         alias: string = void 0,
-        modelToSave: T = void 0,
+        protected readonly _modelToSave: T = void 0,
     ) {
-        super(typeT, alias, modelToSave);
+        super(typeT, alias);
     }
 
     public columns(columnsCallback: (columns: InsertColumnsBuilder<T>) => void): InsertBuilder<T> {
diff --git a/src/crud/insert/insert-columns-builder.ts b/src/crud/insert/insert-columns-builder.ts
@@ -1,5 +1,6 @@
 import { ColumnsValuesBuilder } from "../../core/columns-values-builder";
 import { Column } from "../../core/column";
+import { PrimaryKeyType } from "../../core/enums/primary-key-type";
 
 export class InsertColumnsBuilder<T> extends ColumnsValuesBuilder<T, InsertColumnsBuilder<T>> {
 
@@ -8,6 +9,7 @@ export class InsertColumnsBuilder<T> extends ColumnsValuesBuilder<T, InsertColum
     }
 
     protected columnFormat(column: Column): string {
-        return column.isAutoIncrement ? void 0 : column.name;
+        return column.primaryKeyType === PrimaryKeyType.AutoIncrement  ? void 0 : column.name;
+        // return column.isAutoIncrement ? void 0 : column.name;
     }
 }
diff --git a/src/crud/update/update-builder.ts b/src/crud/update/update-builder.ts
@@ -10,9 +10,9 @@ export class UpdateBuilder<T> extends CrudBaseBuilder<T, UpdateColumnsBuilder<T>
         typeT: new () => T,
         private _metadata: MetadataTable<T>,
         alias: string = void 0,
-        modelToSave: T = void 0,
+        protected readonly _modelToSave: T = void 0,
     ) {
-        super(typeT, alias, modelToSave);
+        super(typeT, alias);
     }
 
     public columns(
diff --git a/src/crud/update/update-columns-builder.ts b/src/crud/update/update-columns-builder.ts
@@ -8,6 +8,7 @@ export class UpdateColumnsBuilder<T> extends ColumnsValuesBuilder<T, UpdateColum
     }
 
     protected columnFormat(column: Column): string {
-        return column.isKeyColumn ? void 0 : `${column.name} = ?`;
+        return !!column.primaryKeyType ? void 0 : `${column.name} = ?`;
+        // return column.isKeyColumn ? void 0 : `${column.name} = ?`;
     }
 }
diff --git a/src/database-helper.ts b/src/database-helper.ts
@@ -76,6 +76,7 @@ export class DatabaseHelper {
             case FieldType.STRING:
             case FieldType.ARRAY:
             case FieldType.OBJECT:
+            // case FieldType.GUID:
                 return ColumnType.TEXT;
             case FieldType.DATE:
             case FieldType.NUMBER:
diff --git a/src/ddl/ddl-columns-builder.ts b/src/ddl/ddl-columns-builder.ts
@@ -4,21 +4,24 @@ import { ColumnsBaseBuilder } from "../core/columns-base-builder";
 import { Column } from "../core/column";
 import { FieldType } from "../core/enums/field-type";
 import { DatabaseBuilderError } from "..";
+import { PrimaryKeyType } from "../core/enums/primary-key-type";
 
 export class DdlColumnsBuilder<T> extends ColumnsBaseBuilder<DdlColumnsBuilder<T>, T, Column> {
 
     protected setColumnValue(
         column: string,
         value: ValueTypeToParse,
         fieldType: FieldType,
-        isPrimaryKey: boolean,
-        isAutoIncrement: boolean
+        primaryKeyType: PrimaryKeyType
+        // isPrimaryKey: boolean,
+        // isAutoIncrement: boolean
     ): DdlColumnsBuilder<T> {
         return this.setColumn(
             column,
             fieldType,
-            isPrimaryKey,
-            isAutoIncrement
+            primaryKeyType
+            // isPrimaryKey,
+            // isAutoIncrement
         );
     }
 
@@ -28,17 +31,19 @@ export class DdlColumnsBuilder<T> extends ColumnsBaseBuilder<DdlColumnsBuilder<T
 
     protected columnFormat(column: Column): string {
         if (this.isCompositeKey()) {
-            if (column.isAutoIncrement) {
+            if (column.primaryKeyType === PrimaryKeyType.AutoIncrement) {
+            // if (column.isAutoIncrement) {
                 throw new DatabaseBuilderError(`Mapper '${this.metadata.newable.name}', auto increment not work to composite id`);
             }
             return `${column.name} ${Utils.parseColumnType(column.type)}`;
         }
-        if (column.isAutoIncrement && !column.isKeyColumn) {
-            throw new DatabaseBuilderError(`Mapper '${this.metadata.newable.name}', auto increment not work in column not primary key`);
-        }
+        // if (column.isAutoIncrement && !column.isKeyColumn) {
+        //     throw new DatabaseBuilderError(`Mapper '${this.metadata.newable.name}', auto increment not work in column not primary key`);
+        // }
         if (column.type === FieldType.NULL) {
             throw new DatabaseBuilderError(`Mapper '${this.metadata.newable.name}', column '${column.name}' of type 'NULL' not supported!`);
         }
-        return `${column.name} ${Utils.parseColumnType(column.type)}${column.isKeyColumn ? ` NOT NULL PRIMARY KEY` : ""}${column.isAutoIncrement ? ` AUTOINCREMENT` : ""}`;
+        return `${column.name} ${Utils.parseColumnType(column.type)}${!!column.primaryKeyType ? ` NOT NULL PRIMARY KEY` : ""}${column.primaryKeyType === PrimaryKeyType.AutoIncrement ? ` AUTOINCREMENT` : ""}`;
+        // return `${column.name} ${Utils.parseColumnType(column.type)}${column.isKeyColumn ? ` NOT NULL PRIMARY KEY` : ""}${column.isAutoIncrement ? ` AUTOINCREMENT` : ""}`;
     }
 }
diff --git a/src/mapper-column.ts b/src/mapper-column.ts
@@ -1,13 +1,15 @@
 import { FieldType } from "./core/enums/field-type";
+import { PrimaryKeyType } from "./core/enums/primary-key-type";
 
 export class MapperColumn {
 
     constructor(
         public column: string = void 0,
         public fieldType: FieldType = void 0,
         public fieldReference: string = column ? column.replace(/_/g, ".") : void 0,
-        public isKeyColumn: boolean = false,
-        public isAutoIncrement: boolean = false
+        public primaryKeyType?: PrimaryKeyType
+        // public isKeyColumn: boolean = false,
+        // public isAutoIncrement: boolean = false
     ) {
 
     }
diff --git a/src/mapper/mapper-base.ts b/src/mapper/mapper-base.ts
diff --git a/src/metadata-table.ts b/src/metadata-table.ts
diff --git a/src/test/create.spec.ts b/src/test/create.spec.ts
diff --git a/src/test/insert.spec.ts b/src/test/insert.spec.ts
diff --git a/src/test/mappers-table-new.ts b/src/test/mappers-table-new.ts
diff --git a/src/test/models/guid-clazz.ts b/src/test/models/guid-clazz.ts
diff --git a/src/test/objeto-to-test.ts b/src/test/objeto-to-test.ts

Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@ export enum FieldType {`
`6`	`6`	`OBJECT,`
`7`	`7`	`FUNCTION,`
`8`	`8`	`ARRAY,`
`9`		`- NULL`
	`9`	`+ NULL,`
	`10`	`+ // GUID`
`10`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`import { ColumnsValuesBuilder } from "../../core/columns-values-builder";`
`2`	`2`	`import { Column } from "../../core/column";`
	`3`	`+import { PrimaryKeyType } from "../../core/enums/primary-key-type";`
`3`	`4`
`4`	`5`	`export class InsertColumnsBuilder<T> extends ColumnsValuesBuilder<T, InsertColumnsBuilder<T>> {`
`5`	`6`
`@@ -8,6 +9,7 @@ export class InsertColumnsBuilder<T> extends ColumnsValuesBuilder<T, InsertColum`
`8`	`9`	`}`
`9`	`10`
`10`	`11`	`protected columnFormat(column: Column): string {`
`11`		`- return column.isAutoIncrement ? void 0 : column.name;`
	`12`	`+ return column.primaryKeyType === PrimaryKeyType.AutoIncrement ? void 0 : column.name;`
	`13`	`+ // return column.isAutoIncrement ? void 0 : column.name;`
`12`	`14`	`}`
`13`	`15`	`}`