Permalink
Browse files

Upgraded to AdoDB 4.00 ... starting to think seriously about the

data dictionary conversion ...
  • Loading branch information...
1 parent 1789e61 commit 06e3c5c0304e300bcecc70b29c75becb39988fd9 moodler committed Oct 22, 2003
Showing with 29,318 additions and 22,095 deletions.
  1. +316 −294 lib/adodb/adodb-cryptsession.php
  2. +217 −217 lib/adodb/adodb-csvlib.inc.php
  3. +583 −581 lib/adodb/adodb-datadict.inc.php
  4. +251 −237 lib/adodb/adodb-error.inc.php
  5. +77 −77 lib/adodb/adodb-errorhandler.inc.php
  6. +87 −87 lib/adodb/adodb-errorpear.inc.php
  7. +477 −455 lib/adodb/adodb-lib.inc.php
  8. +289 −289 lib/adodb/adodb-pager.inc.php
  9. +358 −356 lib/adodb/adodb-pear.inc.php
  10. +751 −0 lib/adodb/adodb-perf.inc.php
  11. +439 −431 lib/adodb/adodb-session-clob.php
  12. +397 −378 lib/adodb/adodb-session.php
  13. +899 −868 lib/adodb/adodb-time.inc.php
  14. BIN lib/adodb/adodb-time.zip
  15. +43 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/Changelog
  16. +8 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/INSTALL
  17. +544 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/LICENSE
  18. +36 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/README
  19. +722 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/adodb-xmlschema.inc.php
  20. +114 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/blank.html
  21. +28 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/classtrees_xmlschema.html
  22. +99 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/elementindex.html
  23. +109 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/elementindex_xmlschema.html
  24. +20 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/errors.html
  25. +17 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/index.html
  26. +38 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/li_xmlschema.html
  27. +25 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/docs/packages.html
  28. +24 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/example.php
  29. +27 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/example.xml
  30. +31 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/xmlschema.dtd
  31. +116 −0 lib/adodb/adodb-xmlschema-0.0.1-snap20030511/xmlschema.html
  32. +1,201 −722 lib/adodb/adodb-xmlschema.inc.php
  33. BIN lib/adodb/adodb-xmlschema.zip
  34. +3,604 −3,354 lib/adodb/adodb.inc.php
  35. +1 −1 lib/adodb/crypt.inc.php
  36. +91 −91 lib/adodb/datadict/datadict-access.inc.php
  37. +73 −73 lib/adodb/datadict/datadict-db2.inc.php
  38. +121 −121 lib/adodb/datadict/datadict-generic.inc.php
  39. +63 −63 lib/adodb/datadict/datadict-ibase.inc.php
  40. +76 −76 lib/adodb/datadict/datadict-informix.inc.php
  41. +210 −210 lib/adodb/datadict/datadict-mssql.inc.php
  42. +147 −146 lib/adodb/datadict/datadict-mysql.inc.php
  43. +243 −243 lib/adodb/datadict/datadict-oci8.inc.php
  44. +197 −190 lib/adodb/datadict/datadict-postgres.inc.php
  45. +211 −0 lib/adodb/datadict/datadict-sybase.inc.php
  46. +1,469 −1,017 lib/adodb/docs-adodb.htm
  47. +10 −6 lib/adodb/docs-datadict.htm
  48. +60 −31 lib/adodb/docs-session.htm
  49. +78 −73 lib/adodb/drivers/adodb-access.inc.php
  50. +588 −588 lib/adodb/drivers/adodb-ado.inc.php
  51. +45 −45 lib/adodb/drivers/adodb-ado_access.inc.php
  52. +58 −58 lib/adodb/drivers/adodb-ado_mssql.inc.php
  53. +78 −78 lib/adodb/drivers/adodb-borland_ibase.inc.php
  54. +201 −201 lib/adodb/drivers/adodb-csv.inc.php
  55. +324 −264 lib/adodb/drivers/adodb-db2.inc.php
  56. +261 −261 lib/adodb/drivers/adodb-fbsql.inc.php
  57. +66 −66 lib/adodb/drivers/adodb-firebird.inc.php
  58. +675 −664 lib/adodb/drivers/adodb-ibase.inc.php
  59. +29 −29 lib/adodb/drivers/adodb-informix.inc.php
  60. +367 −314 lib/adodb/drivers/adodb-informix72.inc.php
  61. +911 −761 lib/adodb/drivers/adodb-mssql.inc.php
  62. +58 −58 lib/adodb/drivers/adodb-mssqlpo.inc.php
  63. +599 −563 lib/adodb/drivers/adodb-mysql.inc.php
  64. +75 −75 lib/adodb/drivers/adodb-mysqlt.inc.php
  65. +1,161 −1,060 lib/adodb/drivers/adodb-oci8.inc.php
  66. +55 −55 lib/adodb/drivers/adodb-oci805.inc.php
  67. +174 −165 lib/adodb/drivers/adodb-oci8po.inc.php
  68. +702 −660 lib/adodb/drivers/adodb-odbc.inc.php
  69. +235 −163 lib/adodb/drivers/adodb-odbc_mssql.inc.php
  70. +114 −111 lib/adodb/drivers/adodb-odbc_oracle.inc.php
  71. +298 −267 lib/adodb/drivers/adodb-oracle.inc.php
  72. +13 −13 lib/adodb/drivers/adodb-postgres.inc.php
  73. +859 −738 lib/adodb/drivers/adodb-postgres64.inc.php
  74. +148 −73 lib/adodb/drivers/adodb-postgres7.inc.php
  75. +29 −29 lib/adodb/drivers/adodb-proxy.inc.php
  76. +63 −0 lib/adodb/drivers/adodb-sapdb.inc.php
  77. +166 −166 lib/adodb/drivers/adodb-sqlanywhere.inc.php
  78. +312 −0 lib/adodb/drivers/adodb-sqlite.inc.php
  79. +403 −316 lib/adodb/drivers/adodb-sybase.inc.php
  80. +97 −97 lib/adodb/drivers/adodb-vfp.inc.php
  81. +40 −0 lib/adodb/lang/adodb-cz.inc.php
  82. +33 −33 lib/adodb/lang/adodb-en.inc.php
  83. +34 −0 lib/adodb/lang/adodb-es.inc.php
  84. +32 −32 lib/adodb/lang/adodb-fr.inc.php
  85. +34 −0 lib/adodb/lang/adodb-it.inc.php
  86. +35 −0 lib/adodb/lang/adodb-pt-br.inc.php
  87. +35 −0 lib/adodb/lang/adodb-ru1251.inc.php
  88. +33 −0 lib/adodb/lang/adodb-sv.inc.php
  89. +166 −164 lib/adodb/license.txt
  90. +90 −0 lib/adodb/perf/perf-db2.inc.php
  91. +67 −0 lib/adodb/perf/perf-informix.inc.php
  92. +148 −0 lib/adodb/perf/perf-mssql.inc.php
  93. +234 −0 lib/adodb/perf/perf-mysql.inc.php
  94. +451 −0 lib/adodb/perf/perf-oci8.inc.php
  95. +109 −0 lib/adodb/perf/perf-postgres.inc.php
  96. +162 −162 lib/adodb/pivottable.inc.php
  97. +7 −4 lib/adodb/readme.htm
  98. +58 −58 lib/adodb/readme.txt
  99. +53 −53 lib/adodb/rsfilter.inc.php
  100. +97 −96 lib/adodb/server.php
  101. +84 −85 lib/adodb/tests/benchmark.php
  102. +194 −194 lib/adodb/tests/client.php
  103. +224 −218 lib/adodb/tests/test-datadict.php
  104. +50 −0 lib/adodb/tests/test-perf.php
  105. +31 −0 lib/adodb/tests/test-xmlschema.php
  106. +1,341 −1,227 lib/adodb/tests/test.php
  107. +41 −41 lib/adodb/tests/test2.php
  108. +31 −31 lib/adodb/tests/test3.php
  109. +86 −84 lib/adodb/tests/test4.php
  110. +47 −47 lib/adodb/tests/test5.php
  111. +28 −28 lib/adodb/tests/testcache.php
  112. +283 −235 lib/adodb/tests/testdatabases.inc.php
  113. +35 −35 lib/adodb/tests/testgenid.php
  114. +61 −49 lib/adodb/tests/testmssql.php
  115. +69 −69 lib/adodb/tests/testoci8.php
  116. +81 −81 lib/adodb/tests/testoci8cursor.php
  117. +82 −82 lib/adodb/tests/testpaging.php
  118. +33 −33 lib/adodb/tests/testpear.php
  119. +52 −39 lib/adodb/tests/testsessions.php
  120. +16 −4 lib/adodb/tests/time.php
  121. +2 −2 lib/adodb/tests/tmssql.php
  122. +29 −0 lib/adodb/tests/xmlschema.xml
  123. +52 −1 lib/adodb/tips_portable_sql.htm
  124. +129 −129 lib/adodb/toexport.inc.php
  125. +158 −154 lib/adodb/tohtml.inc.php
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
@@ -1,77 +1,77 @@
-<?php
-/**
- * @version V3.60 16 June 2003 (c) 2000-2003 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
- */
-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.00 20 Oct 2003 (c) 2000-2003 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
+ */
+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 V3.60 16 June 2003 (c) 2000-2003 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.00 20 Oct 2003 (c) 2000-2003 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.

0 comments on commit 06e3c5c

Please sign in to comment.