From: Stig Bakken <ssb@php.net>
Date: Fri, 23 Mar 2001 01:15:05 +0000 (+0000)
Subject: * fixed Oracle tests, fixed some bugs in DB_oci8, all tests but
X-Git-Tag: php-4.0.6RC1~595
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4651aa04c0cca91dbffd025bd9556407654c60a6;p=php

* fixed Oracle tests, fixed some bugs in DB_oci8, all tests but
  errorNative() pass now (but that may be a bug in the test :-)
* implemented numRows() emulation in DB_oci8 that is available
  in "optimize portability" mode only
---

diff --git a/pear/DB.php b/pear/DB.php
index ee6b8148b5..06eee72fa3 100644
--- a/pear/DB.php
+++ b/pear/DB.php
@@ -56,6 +56,7 @@ define("DB_ERROR_NEED_MORE_DATA",     -20);
 define("DB_ERROR_NOT_LOCKED",         -21);
 define("DB_ERROR_VALUE_COUNT_ON_ROW", -22);
 define("DB_ERROR_INVALID_DSN",        -23);
+define("DB_ERROR_CONNECT_FAILED",     -24);
 
 /*
  * Warnings are not detected as errors by DB::isError(), and are not
@@ -326,6 +327,8 @@ class DB
                 DB_ERROR_SYNTAX             => 'syntax error',
                 DB_ERROR_UNSUPPORTED        => 'not supported',
                 DB_ERROR_VALUE_COUNT_ON_ROW => 'value count on row',
+                DB_ERROR_INVALID_DSN        => "invalid DSN",
+                DB_ERROR_CONNECT_FAILED     => "connect failed",
                 DB_OK                       => 'no error',
                 DB_WARNING                  => 'unknown warning',
                 DB_WARNING_READ_ONLY        => 'read only'
diff --git a/pear/PEAR.php.in b/pear/PEAR.php.in
index 9ff0e54619..29b77e7f2e 100644
--- a/pear/PEAR.php.in
+++ b/pear/PEAR.php.in
@@ -513,12 +513,12 @@ class PEAR_Error
             $modes[] = "return";
         }
         return sprintf('[%s: message="%s" code=%d mode=%s level=%s prefix="%s" '.
-                       'prepend="%s" append="%s" debug="%s"]',
+                       'prepend="%s" append="%s" info="%s"]',
                        get_class($this), $this->message, $this->code,
                        implode("|", $modes), $levels[$this->level],
                        $this->error_message_prefix,
                        $this->error_prepend, $this->error_append,
-                       $this->debuginfo);
+                       $this->userinfo);
     }
 
     // }}}