Add schema and database error properties

Author: cliedeman

.travis.yml

@@ -13,12 +13,12 @@ addons:
       - postgresql-client-10
 
 node_js:
-  - "6"
-  - "7"
-  - "8"
-  - "9"
-  - "10"
-  - "11"
+  - '6'
+  - '7'
+  - '8'
+  - '9'
+  - '10'
+  - '11'
 
 env:
   - POSTGRESQL_VERSION=9.4 MYSQL_VERSION=5.5

index.d.ts

@@ -17,17 +17,21 @@ declare namespace DbTypes {
   class ForeignKeyViolationError extends ConstraintViolationError {
     table: string;
     constraint: string;
+    schema?: string;
   }
 
   class NotNullViolationError extends ConstraintViolationError {
     table: string;
     column: string;
+    database?: string;
+    schema?: string;
   }
 
   class UniqueViolationError extends ConstraintViolationError {
     table: string;
     columns: string[];
     constraint: string;
+    schema?: string;
   }
 
   function wrapError(err: Error): DBError

lib/errors/ForeignKeyViolationError.js

@@ -9,6 +9,7 @@ class ForeignKeyViolationError extends ConstraintViolationError {
 
     this.table = args.table;
     this.constraint = args.constraint;
+    this.schema = args.schema;
   }
 }
 

lib/errors/NotNullViolationError.js

@@ -9,6 +9,8 @@ class NotNullViolationError extends ConstraintViolationError {
 
     this.table = args.table;
     this.column = args.column;
+    this.schema = args.schema;
+    this.database = args.database;
   }
 }
 

lib/errors/UniqueViolationError.js

@@ -10,6 +10,7 @@ class UniqueViolationError extends ConstraintViolationError {
     this.table = args.table;
     this.columns = args.columns;
     this.constraint = args.constraint;
+    this.schema = args.schema;
   }
 }
 

lib/parsers/mssql/DBError/ForeignKeyViolationError/parser.js

@@ -1,8 +1,8 @@
 const ForeignKeyViolationError = require('../../../../errors/ForeignKeyViolationError');
 const { isCode } = require('../util');
 
-const INSERT_UPDATE_REGEX = /The (?:INSERT|UPDATE) statement conflicted with the FOREIGN KEY constraint "(.+)". The conflict occurred in database "(.+)", table "(.+)", column '(.+)'./;
-const DELETE_REGEX = /The DELETE statement conflicted with the REFERENCE constraint "(.+)". The conflict occurred in database "(.+)", table "(.+)", column '(.+)'./;
+const INSERT_UPDATE_REGEX = /The (?:INSERT|UPDATE) statement conflicted with the FOREIGN KEY constraint "(.+)". The conflict occurred in database "(.+)", table "(.+)\.(.+)", column '(.+)'./;
+const DELETE_REGEX = /The DELETE statement conflicted with the REFERENCE constraint "(.+)". The conflict occurred in database "(.+)", table "(.+)\.(.+)", column '(.+)'./;
 
 module.exports = {
   error: ForeignKeyViolationError,
@@ -13,7 +13,8 @@ module.exports = {
 
       if (insertUpdateMatch) {
         return {
-          table: insertUpdateMatch[3],
+          table: insertUpdateMatch[4],
+          schema: insertUpdateMatch[3],
           constraint: insertUpdateMatch[1],
         };
       }
@@ -22,7 +23,8 @@ module.exports = {
 
       if (deleteMatch) {
         return {
-          table: deleteMatch[3],
+          table: deleteMatch[4],
+          schema: deleteMatch[3],
           constraint: deleteMatch[1],
         };
       }

lib/parsers/mssql/DBError/NotNullViolationError/parser.js

@@ -1,7 +1,7 @@
 const NotNullViolationError = require('../../../../errors/NotNullViolationError');
 const { isCode } = require('../util');
 
-const REGEX = /Cannot insert the value NULL into column '(.+)', table '(.+)'; column does not allow nulls. (?:INSERT|UPDATE) fails./;
+const REGEX = /Cannot insert the value NULL into column '(.+)', table '(.+)\.(.+)\.(.+)'; column does not allow nulls. (?:INSERT|UPDATE) fails./;
 
 module.exports = {
   error: NotNullViolationError,
@@ -15,8 +15,10 @@ module.exports = {
       }
 
       return {
-        table: match[2],
         column: match[1],
+        database: match[2],
+        schema: match[3],
+        table: match[4],
       };
     } else {
       return null;

lib/parsers/mssql/DBError/UniqueViolationError/parser.js

@@ -1,8 +1,8 @@
 const UniqueViolationError = require('../../../../errors/UniqueViolationError');
 const { isCode } = require('../util');
 
-const UNIQUE_INDEX_REGEX = /Cannot insert duplicate key row in object '(.+)' with unique index '(.+)'. The duplicate key value is (.+)./;
-const UNIQUE_CONSTRAINT_REGEX = /Violation of UNIQUE KEY constraint '(.+)'. Cannot insert duplicate key in object '(.+)'. The duplicate key value is \((.+)\)/;
+const UNIQUE_INDEX_REGEX = /Cannot insert duplicate key row in object '(.+)\.(.+)' with unique index '(.+)'. The duplicate key value is (.+)./;
+const UNIQUE_CONSTRAINT_REGEX = /Violation of UNIQUE KEY constraint '(.+)'. Cannot insert duplicate key in object '(.+)\.(.+)'. The duplicate key value is \((.+)\)/;
 
 // 2601 - Violation in unique index
 // 2627 - Violation in unique constraint (although it is implemented using unique index)
@@ -19,7 +19,8 @@ module.exports = {
       }
 
       return {
-        table: constraintMatch[2],
+        table: constraintMatch[3],
+        schema: constraintMatch[2],
         constraint: constraintMatch[1]
       };
     }
@@ -33,8 +34,9 @@ module.exports = {
       }
 
       return {
-        table: indexMatch[1],
-        constraint: indexMatch[2]
+        table: indexMatch[2],
+        constraint: indexMatch[3],
+        schema: indexMatch[1],
       };
     }
 

tests/ForeignKeyViolationError.js

@@ -52,7 +52,8 @@ module.exports = (session) => {
             }
 
             if (session.isMssql()) {
-              expect(error.table).to.equal('dbo.target');
+              expect(error.schema).to.equal('dbo');
+              expect(error.table).to.equal('target');
               expect(error.constraint).to.equal('source_foreign_key_foreign');
             }
           });
@@ -76,7 +77,8 @@ module.exports = (session) => {
             }
 
             if (session.isMssql()) {
-              expect(error.table).to.equal('dbo.target');
+              expect(error.schema).to.equal('dbo');
+              expect(error.table).to.equal('target');
               expect(error.constraint).to.equal('source_foreignkey_foreign');
             }
           });
@@ -105,7 +107,8 @@ module.exports = (session) => {
           }
 
           if (session.isMssql()) {
-            expect(error.table).to.equal('dbo.target');
+            expect(error.schema).to.equal('dbo');
+            expect(error.table).to.equal('target');
             expect(error.constraint).to.equal('source_foreign_key_foreign');
           }
         });
@@ -130,7 +133,8 @@ module.exports = (session) => {
           }
 
           if (session.isMssql()) {
-            expect(error.table).to.equal('dbo.target');
+            expect(error.schema).to.equal('dbo');
+            expect(error.table).to.equal('target');
             expect(error.constraint).to.equal('source_foreignkey_foreign');
           }
         });
@@ -159,7 +163,8 @@ module.exports = (session) => {
           }
 
           if (session.isMssql()) {
-            expect(error.table).to.equal('dbo.source');
+            expect(error.schema).to.equal('dbo');
+            expect(error.table).to.equal('source');
             expect(error.constraint).to.equal('source_foreign_key_foreign');
           }
         });

tests/NotNullViolationError.js

@@ -43,7 +43,9 @@ module.exports = (session) => {
             }
 
             if (session.isMssql()) {
-              expect(error.table).to.equal('master.dbo.' + table);
+              expect(error.database).to.equal('master');
+              expect(error.schema).to.equal('dbo');
+              expect(error.table).to.equal(table);
             }
           });
       });
@@ -69,7 +71,9 @@ module.exports = (session) => {
           }
 
           if (session.isMssql()) {
-            expect(error.table).to.equal('master.dbo.' + table);
+            expect(error.database).to.equal('master');
+            expect(error.schema).to.equal('dbo');
+            expect(error.table).to.equal(table);
           }
         });
       });
@@ -95,7 +99,9 @@ module.exports = (session) => {
             }
 
             if (session.isMssql()) {
-              expect(error.table).to.equal('master.dbo.' + table);
+              expect(error.database).to.equal('master');
+              expect(error.schema).to.equal('dbo');
+              expect(error.table).to.equal(table);
             }
           });
       });
@@ -125,7 +131,9 @@ module.exports = (session) => {
           }
 
           if (session.isMssql()) {
-            expect(error.table).to.equal('master.dbo.' + table);
+            expect(error.database).to.equal('master');
+            expect(error.schema).to.equal('dbo');
+            expect(error.table).to.equal(table);
           }
         });
       });
@@ -150,7 +158,9 @@ module.exports = (session) => {
           }
 
           if (session.isMssql()) {
-            expect(error.table).to.equal('master.dbo.' + table);
+            expect(error.database).to.equal('master');
+            expect(error.schema).to.equal('dbo');
+            expect(error.table).to.equal(table);
           }
         });
       });