- Made some improvements/updates to the database abstraction layer.

1 files changed, 6 insertions, 59 deletions

diff --git a/includes/database.inc b/includes/database.inc
index 9621193f1..4022fbc2a 100644
--- a/includes/database.inc
+++ b/includes/database.inc
@@ -1,67 +1,14 @@
 <?php
-// $Id$
 
-require_once 'DB.php';
+$db_type = substr($db_url, 0, strpos($db_url, "://"));
 
-/*
-** Setup a database connection:
-*/
-
-$db_handle = DB::connect($db_url);
-if (DB::isError($db_handle)) {
-  die ("Database problem: ". $db_handle->getMessage());
-}
-$db_handle->setFetchMode(DB_FETCHMODE_ASSOC);
-
-function db_query($sql, $debug = 0) {
-  global $db_handle;
-
-  $result = $db_handle->query($sql);
-
-  if ($debug) {
-    print "<p>query: $sql<br />"; // error:". $result->getMessage() ."</p>";
-  }
-
-  if (DB::isError($result)) {
-    watchdog("error", "database: ". $result->getMessage() ."\nquery: ". htmlspecialchars($sql));
-  }
-
-  return $result;
-}
-
-function db_fetch_object($result) {
-  if ($result) {
-    return $result->fetchRow(DB_FETCHMODE_OBJECT);
-  }
-}
-
-function db_fetch_array($result) {
-  if ($result) {
-    return $result->fetchRow(DB_FETCHMODE_ASSOC);
-  }
-}
-
-function db_num_rows($result) {
-  if ($result) {
-    return $result->numRows($result);
-  }
+if (file_exists("includes/database.$db_type.inc")) {
+  include_once "includes/database.$db_type.inc";
 }
-
-function db_result($result, $field = 0) {
-  if ($result) {
-    $tmp = $result->fetchRow(DB_FETCHMODE_ORDERED);
-    return $tmp[$field];
-  }
+else {
+  include_once "includes/database.pear.inc";
 }
 
-function db_error($result) {
-  global $db_handle;
+db_connect($db_url);
 
-  if (DB::isError($db_handle)) {
-    return 1;
-  }
-
-  return 0;
-}
-

 ?>
\ No newline at end of file