Permalink
Browse files

Adding latest ADOdb to stable

  • Loading branch information...
1 parent ad6c367 commit 00231a7498f316cbf6cc630d52d789f6190e8985 moodler committed Jul 16, 2004
Showing with 24,807 additions and 24,057 deletions.
  1. +251 −217 lib/adodb/adodb-csvlib.inc.php
  2. +673 −666 lib/adodb/adodb-datadict.inc.php
  3. +256 −252 lib/adodb/adodb-error.inc.php
  4. +79 −78 lib/adodb/adodb-errorhandler.inc.php
  5. +87 −87 lib/adodb/adodb-errorpear.inc.php
  6. +78 −77 lib/adodb/adodb-exceptions.inc.php
  7. +83 −55 lib/adodb/adodb-iterator.inc.php
  8. +695 −557 lib/adodb/adodb-lib.inc.php
  9. +285 −284 lib/adodb/adodb-pager.inc.php
  10. +364 −358 lib/adodb/adodb-pear.inc.php
  11. +908 −902 lib/adodb/adodb-perf.inc.php
  12. +15 −15 lib/adodb/adodb-php4.inc.php
  13. +67 −15 lib/adodb/adodb-time.inc.php
  14. BIN lib/adodb/adodb-time.zip
  15. +3,682 −3,667 lib/adodb/adodb.inc.php
  16. +94 −91 lib/adodb/datadict/datadict-access.inc.php
  17. +75 −73 lib/adodb/datadict/datadict-db2.inc.php
  18. +124 −121 lib/adodb/datadict/datadict-generic.inc.php
  19. +66 −63 lib/adodb/datadict/datadict-ibase.inc.php
  20. +79 −76 lib/adodb/datadict/datadict-informix.inc.php
  21. +249 −228 lib/adodb/datadict/datadict-mssql.inc.php
  22. +178 −175 lib/adodb/datadict/datadict-mysql.inc.php
  23. +276 −262 lib/adodb/datadict/datadict-oci8.inc.php
  24. +216 −213 lib/adodb/datadict/datadict-postgres.inc.php
  25. +227 −224 lib/adodb/datadict/datadict-sybase.inc.php
  26. +85 −78 lib/adodb/drivers/adodb-access.inc.php
  27. +619 −612 lib/adodb/drivers/adodb-ado.inc.php
  28. +48 −45 lib/adodb/drivers/adodb-ado_access.inc.php
  29. +96 −61 lib/adodb/drivers/adodb-ado_mssql.inc.php
  30. +90 −78 lib/adodb/drivers/adodb-borland_ibase.inc.php
  31. +202 −199 lib/adodb/drivers/adodb-csv.inc.php
  32. +315 −312 lib/adodb/drivers/adodb-db2.inc.php
  33. +264 −261 lib/adodb/drivers/adodb-fbsql.inc.php
  34. +74 −68 lib/adodb/drivers/adodb-firebird.inc.php
  35. +858 −811 lib/adodb/drivers/adodb-ibase.inc.php
  36. +33 −29 lib/adodb/drivers/adodb-informix.inc.php
  37. +404 −391 lib/adodb/drivers/adodb-informix72.inc.php
  38. +930 −927 lib/adodb/drivers/adodb-mssql.inc.php
  39. +61 −58 lib/adodb/drivers/adodb-mssqlpo.inc.php
  40. +679 −670 lib/adodb/drivers/adodb-mysql.inc.php
  41. +801 −827 lib/adodb/drivers/adodb-mysqli.inc.php
  42. +78 −75 lib/adodb/drivers/adodb-mysqlt.inc.php
  43. +1,246 −1,171 lib/adodb/drivers/adodb-oci8.inc.php
  44. +58 −55 lib/adodb/drivers/adodb-oci805.inc.php
  45. +192 −189 lib/adodb/drivers/adodb-oci8po.inc.php
  46. +714 −710 lib/adodb/drivers/adodb-odbc.inc.php
  47. +241 −238 lib/adodb/drivers/adodb-odbc_mssql.inc.php
  48. +116 −114 lib/adodb/drivers/adodb-odbc_oracle.inc.php
  49. +319 −298 lib/adodb/drivers/adodb-oracle.inc.php
  50. +13 −13 lib/adodb/drivers/adodb-postgres.inc.php
  51. +958 −954 lib/adodb/drivers/adodb-postgres64.inc.php
  52. +191 −188 lib/adodb/drivers/adodb-postgres7.inc.php
  53. +32 −29 lib/adodb/drivers/adodb-proxy.inc.php
  54. +65 −62 lib/adodb/drivers/adodb-sapdb.inc.php
  55. +169 −166 lib/adodb/drivers/adodb-sqlanywhere.inc.php
  56. +321 −318 lib/adodb/drivers/adodb-sqlite.inc.php
  57. +408 −405 lib/adodb/drivers/adodb-sybase.inc.php
  58. +107 −97 lib/adodb/drivers/adodb-vfp.inc.php
  59. +181 −181 lib/adodb/license.txt
  60. +101 −99 lib/adodb/perf/perf-db2.inc.php
  61. +70 −67 lib/adodb/perf/perf-informix.inc.php
  62. +163 −160 lib/adodb/perf/perf-mssql.inc.php
  63. +258 −255 lib/adodb/perf/perf-mysql.inc.php
  64. +483 −475 lib/adodb/perf/perf-oci8.inc.php
  65. +122 −119 lib/adodb/perf/perf-postgres.inc.php
  66. +163 −163 lib/adodb/pivottable.inc.php
  67. +3 −2 lib/adodb/readme.txt
  68. +53 −53 lib/adodb/rsfilter.inc.php
  69. +97 −97 lib/adodb/server.php
  70. +3 −0 lib/adodb/session/adodb-encrypt-md5.php
  71. +3 −2 lib/adodb/session/adodb-session.php
  72. +84 −84 lib/adodb/tests/benchmark.php
  73. +194 −194 lib/adodb/tests/client.php
  74. +232 −232 lib/adodb/tests/test-datadict.php
  75. +62 −57 lib/adodb/tests/test-php5.php
  76. +50 −33 lib/adodb/tests/test-xmlschema.php
  77. +1,497 −1,463 lib/adodb/tests/test.php
  78. +41 −41 lib/adodb/tests/test2.php
  79. +43 −43 lib/adodb/tests/test3.php
  80. +9 −4 lib/adodb/tests/test4.php
  81. +47 −47 lib/adodb/tests/test5.php
  82. +28 −28 lib/adodb/tests/testcache.php
  83. +301 −285 lib/adodb/tests/testdatabases.inc.php
  84. +35 −35 lib/adodb/tests/testgenid.php
  85. +75 −75 lib/adodb/tests/testmssql.php
  86. +68 −69 lib/adodb/tests/testoci8.php
  87. +110 −114 lib/adodb/tests/testoci8cursor.php
  88. +82 −82 lib/adodb/tests/testpaging.php
  89. +33 −33 lib/adodb/tests/testpear.php
  90. +65 −65 lib/adodb/tests/testsessions.php
  91. +130 −130 lib/adodb/toexport.inc.php
  92. +27 −5 lib/adodb/tohtml.inc.php
@@ -1,78 +1,79 @@
-<?php
-/**
- * @version V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- * Whenever there is any discrepancy between the two licenses,
- * the BSD license will take precedence.
- *
- * Set tabs to 4 for best viewing.
- *
- * Latest version is available at http://php.weblogs.com
- *
-*/
-
-// added Claudio Bustos clbustos#entelchile.net
-if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
-
-define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
-
-/**
-* Default Error Handler. This will be called with the following params
-*
-* @param $dbms the RDBMS you are connecting to
-* @param $fn the name of the calling function (in uppercase)
-* @param $errno the native error number from the database
-* @param $errmsg the native error msg from the database
-* @param $p1 $fn specific parameter - see below
-* @param $p2 $fn specific parameter - see below
-* @param $thisConn $current connection object - can be false if no connection object created
-*/
-function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
-{
- if (error_reporting() == 0) return; // obey @ protocol
- switch($fn) {
- case 'EXECUTE':
- $sql = $p1;
- $inputparams = $p2;
-
- $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
- break;
-
- case 'PCONNECT':
- case 'CONNECT':
- $host = $p1;
- $database = $p2;
-
- $s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
- break;
- default:
- $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
- break;
- }
- /*
- * Log connection error somewhere
- * 0 message is sent to PHP's system logger, using the Operating System's system
- * logging mechanism or a file, depending on what the error_log configuration
- * directive is set to.
- * 1 message is sent by email to the address in the destination parameter.
- * This is the only message type where the fourth parameter, extra_headers is used.
- * This message type uses the same internal function as mail() does.
- * 2 message is sent through the PHP debugging connection.
- * This option is only available if remote debugging has been enabled.
- * In this case, the destination parameter specifies the host name or IP address
- * and optionally, port number, of the socket receiving the debug information.
- * 3 message is appended to the file destination
- */
- if (defined('ADODB_ERROR_LOG_TYPE')) {
- $t = date('Y-m-d H:i:s');
- if (defined('ADODB_ERROR_LOG_DEST'))
- error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST);
- else
- error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
- }
-
-
- //print "<p>$s</p>";
- trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
-}
-?>
+<?php
+/**
+ * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license.
+ * Whenever there is any discrepancy between the two licenses,
+ * the BSD license will take precedence.
+ *
+ * Set tabs to 4 for best viewing.
+ *
+ * Latest version is available at http://php.weblogs.com
+ *
+*/
+
+
+// added Claudio Bustos clbustos#entelchile.net
+if (!defined('ADODB_ERROR_HANDLER_TYPE')) define('ADODB_ERROR_HANDLER_TYPE',E_USER_ERROR);
+
+define('ADODB_ERROR_HANDLER','ADODB_Error_Handler');
+
+/**
+* Default Error Handler. This will be called with the following params
+*
+* @param $dbms the RDBMS you are connecting to
+* @param $fn the name of the calling function (in uppercase)
+* @param $errno the native error number from the database
+* @param $errmsg the native error msg from the database
+* @param $p1 $fn specific parameter - see below
+* @param $p2 $fn specific parameter - see below
+* @param $thisConn $current connection object - can be false if no connection object created
+*/
+function ADODB_Error_Handler($dbms, $fn, $errno, $errmsg, $p1, $p2, &$thisConnection)
+{
+ if (error_reporting() == 0) return; // obey @ protocol
+ switch($fn) {
+ case 'EXECUTE':
+ $sql = $p1;
+ $inputparams = $p2;
+
+ $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")\n";
+ break;
+
+ case 'PCONNECT':
+ case 'CONNECT':
+ $host = $p1;
+ $database = $p2;
+
+ $s = "$dbms error: [$errno: $errmsg] in $fn($host, '****', '****', $database)\n";
+ break;
+ default:
+ $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)\n";
+ break;
+ }
+ /*
+ * Log connection error somewhere
+ * 0 message is sent to PHP's system logger, using the Operating System's system
+ * logging mechanism or a file, depending on what the error_log configuration
+ * directive is set to.
+ * 1 message is sent by email to the address in the destination parameter.
+ * This is the only message type where the fourth parameter, extra_headers is used.
+ * This message type uses the same internal function as mail() does.
+ * 2 message is sent through the PHP debugging connection.
+ * This option is only available if remote debugging has been enabled.
+ * In this case, the destination parameter specifies the host name or IP address
+ * and optionally, port number, of the socket receiving the debug information.
+ * 3 message is appended to the file destination
+ */
+ if (defined('ADODB_ERROR_LOG_TYPE')) {
+ $t = date('Y-m-d H:i:s');
+ if (defined('ADODB_ERROR_LOG_DEST'))
+ error_log("($t) $s", ADODB_ERROR_LOG_TYPE, ADODB_ERROR_LOG_DEST);
+ else
+ error_log("($t) $s", ADODB_ERROR_LOG_TYPE);
+ }
+
+
+ //print "<p>$s</p>";
+ trigger_error($s,ADODB_ERROR_HANDLER_TYPE);
+}
+?>
@@ -1,88 +1,88 @@
-<?php
-/**
- * @version V4.20 22 Feb 2004 (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
- * Released under both BSD license and Lesser GPL library license.
- Whenever there is any discrepancy between the two licenses,
- the BSD license will take precedence.
- *
- * Set tabs to 4 for best viewing.
- *
- * Latest version is available at http://php.weblogs.com
- *
-*/
-include_once('PEAR.php');
-
-define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
-
-/*
-* Enabled the following if you want to terminate scripts when an error occurs
-*/
-//PEAR::setErrorHandling (PEAR_ERROR_DIE);
-
-/*
-* Name of the PEAR_Error derived class to call.
-*/
-if (!defined('ADODB_PEAR_ERROR_CLASS')) define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
-
-/*
-* Store the last PEAR_Error object here
-*/
-global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
-
- /**
-* Error Handler with PEAR support. This will be called with the following params
-*
-* @param $dbms the RDBMS you are connecting to
-* @param $fn the name of the calling function (in uppercase)
-* @param $errno the native error number from the database
-* @param $errmsg the native error msg from the database
-* @param $p1 $fn specific parameter - see below
-* @param $P2 $fn specific parameter - see below
- */
-function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
-{
-global $ADODB_Last_PEAR_Error;
-
- if (error_reporting() == 0) return; // obey @ protocol
- switch($fn) {
- case 'EXECUTE':
- $sql = $p1;
- $inputparams = $p2;
-
- $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
- break;
-
- case 'PCONNECT':
- case 'CONNECT':
- $host = $p1;
- $database = $p2;
-
- $s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
- break;
-
- default:
- $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
- break;
- }
-
- $class = ADODB_PEAR_ERROR_CLASS;
- $ADODB_Last_PEAR_Error = new $class($s, $errno,
- $GLOBALS['_PEAR_default_error_mode'],
- $GLOBALS['_PEAR_default_error_options'],
- $errmsg);
-
- //print "<p>!$s</p>";
-}
-
-/**
-* Returns last PEAR_Error object. This error might be for an error that
-* occured several sql statements ago.
-*/
-function &ADODB_PEAR_Error()
-{
-global $ADODB_Last_PEAR_Error;
-
- return $ADODB_Last_PEAR_Error;
-}
-
+<?php
+/**
+ * @version V4.50 6 July 2004 (c) 2000-2004 John Lim (jlim@natsoft.com.my). All rights reserved.
+ * Released under both BSD license and Lesser GPL library license.
+ Whenever there is any discrepancy between the two licenses,
+ the BSD license will take precedence.
+ *
+ * Set tabs to 4 for best viewing.
+ *
+ * Latest version is available at http://php.weblogs.com
+ *
+*/
+include_once('PEAR.php');
+
+define('ADODB_ERROR_HANDLER','ADODB_Error_PEAR');
+
+/*
+* Enabled the following if you want to terminate scripts when an error occurs
+*/
+//PEAR::setErrorHandling (PEAR_ERROR_DIE);
+
+/*
+* Name of the PEAR_Error derived class to call.
+*/
+if (!defined('ADODB_PEAR_ERROR_CLASS')) define('ADODB_PEAR_ERROR_CLASS','PEAR_Error');
+
+/*
+* Store the last PEAR_Error object here
+*/
+global $ADODB_Last_PEAR_Error; $ADODB_Last_PEAR_Error = false;
+
+ /**
+* Error Handler with PEAR support. This will be called with the following params
+*
+* @param $dbms the RDBMS you are connecting to
+* @param $fn the name of the calling function (in uppercase)
+* @param $errno the native error number from the database
+* @param $errmsg the native error msg from the database
+* @param $p1 $fn specific parameter - see below
+* @param $P2 $fn specific parameter - see below
+ */
+function ADODB_Error_PEAR($dbms, $fn, $errno, $errmsg, $p1=false, $p2=false)
+{
+global $ADODB_Last_PEAR_Error;
+
+ if (error_reporting() == 0) return; // obey @ protocol
+ switch($fn) {
+ case 'EXECUTE':
+ $sql = $p1;
+ $inputparams = $p2;
+
+ $s = "$dbms error: [$errno: $errmsg] in $fn(\"$sql\")";
+ break;
+
+ case 'PCONNECT':
+ case 'CONNECT':
+ $host = $p1;
+ $database = $p2;
+
+ $s = "$dbms error: [$errno: $errmsg] in $fn('$host', ?, ?, '$database')";
+ break;
+
+ default:
+ $s = "$dbms error: [$errno: $errmsg] in $fn($p1, $p2)";
+ break;
+ }
+
+ $class = ADODB_PEAR_ERROR_CLASS;
+ $ADODB_Last_PEAR_Error = new $class($s, $errno,
+ $GLOBALS['_PEAR_default_error_mode'],
+ $GLOBALS['_PEAR_default_error_options'],
+ $errmsg);
+
+ //print "<p>!$s</p>";
+}
+
+/**
+* Returns last PEAR_Error object. This error might be for an error that
+* occured several sql statements ago.
+*/
+function &ADODB_PEAR_Error()
+{
+global $ADODB_Last_PEAR_Error;
+
+ return $ADODB_Last_PEAR_Error;
+}
+
?>
Oops, something went wrong. Retry.

0 comments on commit 00231a7

Please sign in to comment.