From a609728f561adc647d436d028c3e864c4ca04d63 Mon Sep 17 00:00:00 2001 From: TANAKA Koichi Date: Mon, 15 May 2017 14:23:18 +0900 Subject: [PATCH] sequelize: fix inheritance of UniqueConstraintError class. UniqueConstraintError class is subclass of ValidationError in both of v3 and v4(current). authorities: for v4 http://docs.sequelizejs.com/class/lib/errors/index.js~UniqueConstraintError.html for v3 (official doc is wrong.) https://github.com/sequelize/sequelize/blob/v3/lib/errors.js#L153 --- types/sequelize/index.d.ts | 6 +++--- types/sequelize/sequelize-tests.ts | 2 ++ types/sequelize/v3/index.d.ts | 2 +- types/sequelize/v3/sequelize-tests.ts | 1 + 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts index a7f5b0afe5..43196e4aec 100644 --- a/types/sequelize/index.d.ts +++ b/types/sequelize/index.d.ts @@ -2097,7 +2097,7 @@ declare namespace sequelize { } - interface UniqueConstraintError extends DatabaseError { + interface UniqueConstraintError extends ValidationError { /** * Thrown when a unique constraint is violated in the database @@ -3247,8 +3247,8 @@ declare namespace sequelize { * https://github.com/sequelize/sequelize/blob/master/docs/docs/models-usage.md#user-content-manipulating-the-dataset-with-limit-offset-order-and-group */ group?: string | string[] | Object; - - + + /** * Apply DISTINCT(col) for FindAndCount(all) */ diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts index cc4462fa86..a02b1a38f8 100644 --- a/types/sequelize/sequelize-tests.ts +++ b/types/sequelize/sequelize-tests.ts @@ -630,6 +630,8 @@ new s.HostNotReachableError( new Error( 'original connection error message' ) ); new s.InvalidConnectionError( new Error( 'original connection error message' ) ); new s.ConnectionTimedOutError( new Error( 'original connection error message' ) ); +const uniqueConstraintError: Sequelize.ValidationError = new s.UniqueConstraintError({}); + // // Hooks // ~~~~~~~ diff --git a/types/sequelize/v3/index.d.ts b/types/sequelize/v3/index.d.ts index 2f2f973c19..59c06f05bf 100644 --- a/types/sequelize/v3/index.d.ts +++ b/types/sequelize/v3/index.d.ts @@ -2096,7 +2096,7 @@ declare namespace sequelize { } - interface UniqueConstraintError extends DatabaseError { + interface UniqueConstraintError extends ValidationError { /** * Thrown when a unique constraint is violated in the database diff --git a/types/sequelize/v3/sequelize-tests.ts b/types/sequelize/v3/sequelize-tests.ts index 9f5eac61ad..3cce75b440 100644 --- a/types/sequelize/v3/sequelize-tests.ts +++ b/types/sequelize/v3/sequelize-tests.ts @@ -628,6 +628,7 @@ new s.HostNotReachableError( new Error( 'original connection error message' ) ); new s.InvalidConnectionError( new Error( 'original connection error message' ) ); new s.ConnectionTimedOutError( new Error( 'original connection error message' ) ); +const uniqueConstraintError: Sequelize.ValidationError = new s.UniqueConstraintError({}); // // Hooks // ~~~~~~~