Changeset 15 for trunk/lib/DB.inc.php

Timestamp:

Nov 13, 2005 4:51:22 AM (19 years ago)

Author:

scdev

Message:

M trunk/tests/run_tests.sh
Now can run tests without being in tests dir.

M trunk/tests/_config.inc.php
No change

M trunk/tests/Auth_SQLTest.php
...

M trunk/lib/RecordVersion.inc.php
Removed debugging.

M trunk/lib/DB.inc.php
Added die on connect error only if db_die_on_failure is true.

M trunk/lib/DBSessionHandler.inc.php
Added more accurate error-checking.

M trunk/lib/FormValidator.inc.php
Fixed email regex bugs.

M trunk/lib/SpellCheck.inc.php
Integrated lots of bug fixes from UK update.

M trunk/lib/Auth_SQL.inc.php
Lots of minor bug fixes.

M trunk/lib/App.inc.php
A couple minor bug fixes.

File:

• trunk/lib/DB.inc.php (modified) (3 diffs)

trunk/lib/DB.inc.php

@@ -7 +7 @@
  *
  * @author  Quinn Comendant <quinn@strangecode.com>
- * @version 1.0
+ * @version 1.0.1
  */
  
@@ -144 +144 @@
         }
         
-        // Connection errors.
+        // Test for connection errors.
         if (!$this->dbh || mysql_error($this->dbh)) {
             $mysql_error_msg = $this->dbh ? 'Codebase MySQL error: (' . mysql_errno($this->dbh) . ') ' . mysql_error($this->dbh) : 'Codebase MySQL error: Could not connect to server.';
+            App::logMsg($mysql_error_msg, LOG_EMERG, __FILE__, __LINE__);
+
+            // Print helpful or pretty error?
             if ($this->getParam('db_debug')) {
                 echo $mysql_error_msg . "\n";
@@ -152 +155 @@
                 echo _("This page is temporarily unavailable. It should be back up in a few minutes.");
             }
-            App::logMsg($mysql_error_msg, LOG_EMERG, __FILE__, __LINE__);
-            echo "\n\n<!-- Script execution stopped out of embarrassment. -->";
-            die;
+
+            // Die or continue without connection?
+            if ($this->getParam('db_die_on_failure')) {
+                echo "\n\n<!-- Script execution stopped out of embarrassment. -->";
+                die;
+            } else {
+                return false;
+            }
         }