- Patch #458176 by c960657: improved exception handling in database layer.

2 files changed, 5 insertions, 2 deletions

diff --git a/modules/simpletest/tests/database_test.test b/modules/simpletest/tests/database_test.test
index 0263036ef..e5d5b3fe0 100644
--- a/modules/simpletest/tests/database_test.test
+++ b/modules/simpletest/tests/database_test.test
@@ -2446,6 +2446,9 @@ class DatabaseInvalidDataTestCase extends DatabaseTestCase {
         $this->pass(t('The whole transaction is rolled back when a duplicate key insert occurs.'));
       }
 
+      // 23000 means "Integrity constraint violation" according to ANSI SQL.
+      $this->assertEqual($e->errorInfo[0], '23000', t('Exception has proper SQLSTATE.'));
+
       // Ensure the other values were not inserted.
       $record = db_select('test')
         ->fields('test', array('name', 'age'))
diff --git a/modules/simpletest/tests/error.test b/modules/simpletest/tests/error.test
index 8584e2a40..ed430bfff 100644
--- a/modules/simpletest/tests/error.test
+++ b/modules/simpletest/tests/error.test
@@ -78,7 +78,7 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
     );
     $error_pdo_exception = array(
       '%type' => 'PDOException',
-      '%message' => 'SQLSTATE',
+      '%message' => 'SELECT * FROM bananas_are_awesome',
       '%function' => 'error_test_trigger_pdo_exception()',
       '%line' => 65,
       '%file' => realpath('modules/simpletest/tests/error_test.module'),
@@ -89,7 +89,7 @@ class DrupalErrorHandlerUnitTest extends DrupalWebTestCase {
 
     $this->drupalGet('error-test/trigger-pdo-exception');
     // We cannot use assertErrorMessage() since the extact error reported
-    // varies from database to database. Check for the error keyword 'SQLSTATE'.
+    // varies from database to database. Check that the SQL string is displayed.
     $this->assertText($error_pdo_exception['%type'], t('Found %type in error page.', $error_pdo_exception));
     $this->assertText($error_pdo_exception['%message'], t('Found %message in error page.', $error_pdo_exception));
     $error_details = t('in %function (line %line of %file)', $error_pdo_exception);