Normalize uniqueness errors (could use some refactoring)

mikermcneil · mikermcneil · commit 20fd310f18f5 · 2014-03-22T06:46:01.000-05:00
diff --git a/lib/connections/spawn.js b/lib/connections/spawn.js
@@ -87,8 +87,30 @@ module.exports = function spawnConnection (connectionObject, fn, cb__spawnConnec
 
       // Handle errors passed back from our adapter logic.
       if (err) {
+        var formattedErr;
+
+
+        // Check for uniqueness constraint violations:
+        if (err.code === 'ER_DUP_ENTRY') {
+
+          // Manually parse the MySQL error response and extract the relevant bits,
+          // then build the formatted properties that will be passed directly to
+          // WLValidationError in Waterline core.
+          var matches = err.message.match(/Duplicate entry '(.*)' for key '(.*?)'$/);
+          if (matches && matches.length) {
+            formattedErr = {};
+            formattedErr.code = 'E_UNIQUE';
+            formattedErr.invalidAttributes = {};
+            formattedErr.invalidAttributes[matches[2]] = [{
+              value: matches[1],
+              rule: 'unique'
+            }];
+          }
+        }
+
+        // Release the connection, then pass control back to Waterline core.
         connectionObject.connection.releaseConnection(liveConnection, function sendBackError ( /* thisErrDoesntMatter */ ) {
-          cb__spawnConnection(err);
+          cb__spawnConnection(formattedErr || err);
         });
         return;
       }
diff --git a/lib/sql.js b/lib/sql.js
@@ -499,8 +499,8 @@ function sqlTypeCast(attr) {
       return 'TIME';
 
     default:
-      console.error("Unregistered type given: " + type);
-      return "TEXT";
+      console.error('Unregistered type given: ' + type);
+      return 'TEXT';
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -499,8 +499,8 @@ function sqlTypeCast(attr) {`
`499`	`499`	`return 'TIME';`
`500`	`500`
`501`	`501`	`default:`
`502`		`- console.error("Unregistered type given: " + type);`
`503`		`- return "TEXT";`
	`502`	`+ console.error('Unregistered type given: ' + type);`
	`503`	`+ return 'TEXT';`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`