From 7109dbc7b680ce5fa4f6f96d394824c48e12ffa9 Mon Sep 17 00:00:00 2001 From: Theo Date: Wed, 3 Feb 2016 11:27:51 +0000 Subject: [PATCH 1/4] Add constructor for Virtual DataType --- sequelize/sequelize.d.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts index a7a085e20..5b913b184 100644 --- a/sequelize/sequelize.d.ts +++ b/sequelize/sequelize.d.ts @@ -1777,8 +1777,10 @@ declare module "sequelize" { interface DataTypeUUIDv1 extends DataTypeAbstract { } interface DataTypeUUIDv4 extends DataTypeAbstract { } - - interface DataTypeVirtual extends DataTypeAbstract { } + + interface DataTypeVirtual extends DataTypeAbstract { + new( subtype : DataTypeAbstract, requireAttributes? : Array ) : DataTypeVirtual; + } interface DataTypeEnum extends DataTypeAbstract { From d1777f15c4d7b1bec5253674e577d12d12a7717e Mon Sep 17 00:00:00 2001 From: Theo Date: Wed, 3 Feb 2016 11:45:16 +0000 Subject: [PATCH 2/4] Comment for VirtualDataType --- sequelize/sequelize.d.ts | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts index 5b913b184..ae1927ae2 100644 --- a/sequelize/sequelize.d.ts +++ b/sequelize/sequelize.d.ts @@ -1777,8 +1777,15 @@ declare module "sequelize" { interface DataTypeUUIDv1 extends DataTypeAbstract { } interface DataTypeUUIDv4 extends DataTypeAbstract { } - + interface DataTypeVirtual extends DataTypeAbstract { + + /** + * Virtual field + * + * Accepts subtype any of the DataTypes + * Array of required attributes that are available on the model + */ new( subtype : DataTypeAbstract, requireAttributes? : Array ) : DataTypeVirtual; } From 509d82f8dee7db02ea6f9d25baa6634c398f9cfd Mon Sep 17 00:00:00 2001 From: Theo Date: Thu, 4 Feb 2016 09:38:04 +0000 Subject: [PATCH 3/4] Add tests for VIRTUAL DataType --- sequelize/sequelize-tests.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts index 522f51dab..39c38e0d4 100644 --- a/sequelize/sequelize-tests.ts +++ b/sequelize/sequelize-tests.ts @@ -581,6 +581,9 @@ Sequelize.GEOMETRY( 'POINT' ); Sequelize.GEOMETRY( 'LINESTRING' ); Sequelize.GEOMETRY( 'POLYGON' ); Sequelize.GEOMETRY( 'POINT', 4326 ); +Sequelize.VIRTUAL; +Sequelize.VIRTUAL( Sequelize.STRING ); +new Sequelize.VIRTUAL( Sequelize.DATE , ['property1', 'property2']); // // Deferrable From 8b566aaea0eac1f9241012c205ba4679cde4b9f9 Mon Sep 17 00:00:00 2001 From: Theo Date: Thu, 4 Feb 2016 09:40:28 +0000 Subject: [PATCH 4/4] Forgot new in creating the Virtual DataType --- sequelize/sequelize-tests.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequelize/sequelize-tests.ts b/sequelize/sequelize-tests.ts index 39c38e0d4..15010e544 100644 --- a/sequelize/sequelize-tests.ts +++ b/sequelize/sequelize-tests.ts @@ -582,7 +582,7 @@ Sequelize.GEOMETRY( 'LINESTRING' ); Sequelize.GEOMETRY( 'POLYGON' ); Sequelize.GEOMETRY( 'POINT', 4326 ); Sequelize.VIRTUAL; -Sequelize.VIRTUAL( Sequelize.STRING ); +new Sequelize.VIRTUAL( Sequelize.STRING ); new Sequelize.VIRTUAL( Sequelize.DATE , ['property1', 'property2']); //