* MySQL sequence emulation using auto_increment

* fixed indentation

pear/DB.php

@@ -23,9 +23,6 @@
 //
 
 require_once "PEAR.php";
-  require_once "DB/ERROR.php";
-  require_once "DB/RESULT.php";
-  require_once "DB/WARNING.php";
 
 /*
  * The method mapErrorCode in each DB_dbtype implementation maps
@@ -177,8 +174,7 @@
 	$classname = "DB_" . $type;
 	$obj = @new $classname;
 
-      if( !$obj )
+	if (!$obj) {
-      {
 	    return new DB_Error(DB_ERROR_NOT_FOUND);
 	}
 
@@ -188,8 +184,9 @@
     /**
      * Create a new DB object and connect to the specified database
      *
-     * @param $dsn string "data source name", see the DB::parseDSN
+     * @param $dsn mixed "data source name", see the DB::parseDSN
-     * method for a description of the dsn format.
+     * method for a description of the dsn format.  Can also be
+     * specified as an array of the format returned by DB::parseDSN.
      *
      * @param $persistent bool whether this connection should be
      * persistent.  Ignored if the backend extension does not support
@@ -197,26 +194,29 @@
      *
      * @return object a newly created DB object, or a DB error code on
      * error
+     *
+     * @see DB::parseDSN
      */
-
     function &connect($dsn, $persistent = false)
     {
+	if (is_array($dsn)) {
+	    $dsninfo = $dsn;
+	} else {
 	    $dsninfo = DB::parseDSN($dsn);
+	}
 	$type = $dsninfo["phptype"];
 	$classname = "DB_" . $type;
 
 	@include_once("DB/${type}.php");
 	$obj = @new $classname;
 
-      if( !$obj )
+	if (!$obj) {
-      {
 	    return new DB_Error(DB_ERROR_NOT_FOUND);
 	}
 
 	$err = $obj->connect($dsninfo, $persistent);
 
-      if( DB::isError( $err ) )
+	if (DB::isError($err)) {
-      {
 	    return $err;
 	}
 
@@ -228,7 +228,6 @@
      *
      * @return int the DB API version number
      */
-
     function apiVersion()
     {
 	return 2;
@@ -241,13 +240,11 @@
      *
      * @return bool whether $value is an error
      */
-
     function isError($value)
     {
 	return is_object($value) &&
 	    (get_class($value) == "db_error" ||
-        is_subclass_of( $value, "db_error" )
+	     is_subclass_of($value, "db_error"));
-      );
     }
 
     /**
@@ -259,13 +256,11 @@
      *
      * @return bool whether $value is a warning
      */
-
     function isWarning($value)
     {
 	return is_object($value) &&
 	    (get_class( $value ) == "db_warning" ||
-        is_subclass_of( $value, "db_warning" )
+	     is_subclass_of($value, "db_warning"));
-      );
     }
 
     /**
@@ -276,11 +271,9 @@
      * @return string error message, or false if the error code was
      * not recognized
      */
-
     function errorMessage($value)
     {
-      if( !isset( $errorMessages ) )
+	if (!isset($errorMessages)) {
-      {
 	    $errorMessages = array(
 		DB_ERROR                    => "unknown error",
 		DB_ERROR_ALREADY_EXISTS     => "already exists",
@@ -308,8 +301,7 @@
 	    );
 	}
 
-      if( DB::isError( $value ) )
+	if (DB::isError($value)) {
-      {
 	    $value = $value->code;
 	}
 
@@ -322,48 +314,33 @@
      * @param $dsn string Data Source Name to be parsed
      *
      * @return array an associative array with the following keys:
-     * <dl>
-     *  <dt>phptype</dt>
-     *  <dd>Database backend used in PHP (mysql, odbc etc.)</dd>
-     *  <dt>dbsyntax</dt>
-     *  <dd>Database used with regards to SQL syntax etc.</dd>
-     *  <dt>protocol</dt>
-     *  <dd>Communication protocol to use (tcp, unix etc.)</dd>
-     *  <dt>hostspec</dt>
-     *  <dd>Host specification (hostname[:port])</dd>
-     *  <dt>database</dt>
-     *  <dd>Database to use on the DBMS server</dd>
-     *  <dt>username</dt>
-     *  <dd>User name for login</dd>
-     *  <dt>password</dt>
-     *  <dd>Password for login</dd>
-     * </dl>
-     * </p>
      *
-     * <p>
+     * phptype: Database backend used in PHP (mysql, odbc etc.)
+     * dbsyntax: Database used with regards to SQL syntax etc.
+     * protocol: Communication protocol to use (tcp, unix etc.)
+     * hostspec: Host specification (hostname[:port])
+     * database: Database to use on the DBMS server
+     * username: User name for login
+     * password: Password for login
+     *
      * The format of the supplied DSN is in its fullest form:
-     * <ul>
+     *
-     *  <li>phptype(dbsyntax)://username:password@protocol+hostspec/database</li>
+     *  phptype(dbsyntax)://username:password@protocol+hostspec/database
-     * </ul>
+     *
      * Most variations are allowed:
-     * <ul>
+     *  phptype://username:password@protocol+hostspec/database</li>
-     *  <li>phptype://username:password@protocol+hostspec/database</li>
+     *  phptype://username:password@hostspec/database</li>
-     *  <li>phptype://username:password@hostspec/database</li>
+     *  phptype://username:password@hostspec</li>
-     *  <li>phptype://username:password@hostspec</li>
+     *  phptype://hostspec/database</li>
-     *  <li>phptype://hostspec/database</li>
+     *  phptype://hostspec</li>
-     *  <li>phptype://hostspec</li>
+     *  phptype(dbsyntax)</li>
-     *  <li>phptype(dbsyntax)</li>
+     *  phptype</li>
-     *  <li>phptype</li>
-     * </ul>
-     * </p>
      *
      * @return bool FALSE is returned on error
      */
-
     function parseDSN($dsn)
     {
-      if( is_array( $dsn ) )
+	if (is_array($dsn)) {
-      {
 	    return $dsn;
 	}
     
@@ -377,80 +354,193 @@
 	    "password" => false
 	);
 
-      if( preg_match( "|^([^:]+)://|", $dsn, $arr ) )
+	if (preg_match("|^([^:]+)://|", $dsn, $arr)) {
-      {
 	    $dbtype = $arr[ 1 ];
 	    $dsn = preg_replace( "|^[^:]+://|", '', $dsn);
 	    
 	    // match "phptype(dbsyntax)"
-        if( preg_match( "|^([^\(]+)\((.+)\)$|", $dbtype, $arr ) )
+	    if (preg_match("|^([^\(]+)\((.+)\)$|", $dbtype, $arr)) {
-        {
 		$parsed["phptype"] = $arr[1];
 		$parsed["dbsyntax"] = $arr[2];
-        }
+	    } else {
-
-        else
-        {
 		$parsed["phptype"] = $dbtype;
 	    }
-
+        } else {
-        }
-
-        else
-        {
 	    // match "phptype(dbsyntax)"
-          if( preg_match( "|^([^\(]+)\((.+)\)$|", $dsn, $arr ) )
+	    if (preg_match("|^([^\(]+)\((.+)\)$|", $dsn, $arr)) {
-          {
 		$parsed["phptype"] = $arr[1];
 		$parsed["dbsyntax"] = $arr[2];
-          }
+	    } else {
-
-          else
-          {
 		$parsed["phptype"] = $dsn;
 	    }
 
 	    return $parsed;
         }
 
-        if( preg_match( "|^(.*)/([^/]+)/?$|", $dsn, $arr ) )
+        if (preg_match("|^(.*)/([^/]+)/?$|", $dsn, $arr)) {
-        {
 	    $parsed["database"] = $arr[2];
 	    $dsn = $arr[1];
         }
 
-        if( preg_match( "|^([^:]+):([^@]+)@?(.*)$|", $dsn, $arr ) )
+        if (preg_match("|^([^:]+):([^@]+)@?(.*)$|", $dsn, $arr)) {
-        {
 	    $parsed["username"] = $arr[1];
 	    $parsed["password"] = $arr[2];
 	    $dsn = $arr[3];
-        }
+        } elseif (preg_match("|^([^:]+)@(.*)$|", $dsn, $arr)) {
-
-        elseif( preg_match( "|^([^:]+)@(.*)$|", $dsn, $arr ) )
-        {
 	    $parsed["username"] = $arr[1];
 	    $dsn = $arr[2];
         }
 
-        if( preg_match( "|^([^\+]+)\+(.*)$|", $dsn, $arr ) )
+        if (preg_match("|^([^\+]+)\+(.*)$|", $dsn, $arr)) {
-        {
 	    $parsed["protocol"] = $arr[1];
 	    $dsn = $arr[2];
         }
 
-        if( !$parsed[ "database" ] )
+        if (!$parsed["database"]) {
-        {
 	    $dsn = preg_replace("|/+$|", "", $dsn);
         }
 
         $parsed["hostspec"] = urldecode($dsn);
 
-        if( !$parsed[ "dbsyntax"] )
+        if(!$parsed["dbsyntax"]) {
-        {
 	    $parsed["dbsyntax"] = $parsed["phptype"];
         }
 
         return $parsed;
     }
 }
+
+/**
+ * DB_Error implements a class for reporting portable database error
+ * messages.
+ *
+ * @author Stig Bakken <ssb@fast.no>
+ */
+class DB_Error extends PEAR_Error
+{
+    /**
+     * DB_Error constructor.
+     *
+     * @param $code mixed DB error code, or string with error message.
+     * @param $mode int what "error mode" to operate in
+     * @param $level what error level to use for $mode & PEAR_ERROR_TRIGGER
+     * @param $debuginfo additional debug info, such as the last query
+     *
+     * @access public
+     *
+     * @see PEAR_Error
+     */
+
+    function DB_Error($code = DB_ERROR, $mode = PEAR_ERROR_RETURN,
+		      $level = E_USER_NOTICE, $debuginfo = null) {
+	if (is_int($code)) {
+	    $this->PEAR_Error("DB Error: " . DB::errorMessage( $code ), $code, $mode, $level, $debuginfo);
+	} else {
+	    $this->PEAR_Error("DB Error: $code", 0, $mode, $level, $debuginfo);
+	}
+    }
+}
+
+/**
+ * DB_Warning implements a class for reporting portable database
+ * warning messages.
+ *
+ * @author Stig Bakken <ssb@fast.no>
+ */
+class DB_Warning extends PEAR_Error
+{
+    /**
+     * DB_Warning constructor.
+     *
+     * @param $code mixed DB error code, or string with error message.
+     * @param $mode int what "error mode" to operate in
+     * @param $level what error level to use for $mode == PEAR_ERROR_TRIGGER
+     * @param $debuginfo additional debug info, such as the last query
+     *
+     * @access public
+     *
+     * @see PEAR_Error
+     */
+
+    function DB_Warning($code = DB_WARNING, $mode = PEAR_ERROR_RETURN,
+			$level = E_USER_NOTICE, $debuginfo = null) {
+      if (is_int($code)) {
+	  $this->PEAR_Error("DB Warning: " . DB::errorMessage( $code ), $code, $mode, $level, $debuginfo);
+      } else {
+	  $this->PEAR_Error("DB Warning: $code", 0, $mode, $level, $debuginfo);
+      }
+    }
+}
+
+/**
+ * This class implements a wrapper for a DB result set.
+ * A new instance of this class will be returned by the DB implementation
+ * after processing a query that returns data.
+ *
+ * @author Stig Bakken <ssb@fast.no>
+ */
+
+class DB_result
+{
+    var $dbh;
+    var $result;
+
+    /**
+     * DB_result constructor.
+     * @param   $dbh    DB object reference
+     * @param   $result result resource id
+     */
+
+    function DB_result(&$dbh, $result) {
+	$this->dbh = &$dbh;
+	$this->result = $result;
+    }
+
+    /**
+     * Fetch and return a row of data.
+     * @return  array   a row of data, or false on error
+     */
+    function fetchRow($fetchmode = DB_FETCHMODE_DEFAULT) {
+	if ($fetchmode == DB_FETCHMODE_DEFAULT) {
+	    $fetchmode = $this->dbh->fetchmode;
+	}
+	return $this->dbh->fetchRow($this->result, $fetchmode);
+    }
+
+    /**
+     * Fetch a row of data into an existing array.
+     *
+     * @param   $arr    reference to data array
+     * @return  int     error code
+     */
+    function fetchInto(&$arr, $fetchmode = DB_FETCHMODE_DEFAULT) {
+	if ($fetchmode == DB_FETCHMODE_DEFAULT) {
+	    $fetchmode = $this->dbh->fetchmode;
+	}
+	return $this->dbh->fetchInto($this->result, $arr, $fetchmode);
+    }
+
+    /**
+     * Get the the number of columns in a result set.
+     *
+     * @return int the number of columns, or a DB error code
+     */
+    function numCols() {
+	return $this->dbh->numCols($this->result);
+    }
+
+    /**
+     * Frees the resources allocated for this result set.
+     * @return  int     error code
+     */
+    function free() {
+	$err = $this->dbh->freeResult($this->result);
+	if( DB::isError($err)) {
+	    return $err;
+	}
+	$this->result = false;
+	return true;
+    }
+}
+
 ?>