Permalink
Browse files

moved MDB 1 back into HEAD (old MDB2 developments are inside the MOVE…

…D_MDB_1_BACK_INTO_HEAD tag)

git-svn-id: http://svn.php.net/repository/pear/packages/MDB/trunk@169773 c90b9560-bf6c-de11-be94-00142212c4b1
  • Loading branch information...
1 parent e797eef commit 4ed82daded10341b513e3def88efd95928fdb856 Lukas Smith committed Oct 1, 2004
Showing with 16,231 additions and 17,443 deletions.
  1. +188 −145 MDB.php
  2. +3,700 −1,029 MDB/Common.php
  3. +8 −17 MDB/{Modules → }/Date.php
  4. +440 −413 MDB/Manager.php
  5. +0 −1,161 MDB/Modules/Datatype/Common.php
  6. +0 −637 MDB/Modules/Datatype/fbsql.php
  7. +0 −609 MDB/Modules/Datatype/ibase.php
  8. +0 −472 MDB/Modules/Datatype/mssql.php
  9. +0 −526 MDB/Modules/Datatype/mysql.php
  10. +0 −632 MDB/Modules/Datatype/oci8.php
  11. +0 −659 MDB/Modules/Datatype/pgsql.php
  12. +0 −531 MDB/Modules/Datatype/sqlite.php
  13. +0 −633 MDB/Modules/Extended.php
  14. +142 −148 MDB/Modules/LOB.php
  15. +219 −127 MDB/Modules/Manager/Common.php
  16. +402 −169 MDB/Modules/Manager/fbsql.php
  17. +139 −154 MDB/Modules/Manager/ibase.php
  18. +310 −65 MDB/Modules/Manager/mssql.php
  19. +465 −213 MDB/Modules/Manager/mysql.php
  20. +200 −152 MDB/Modules/Manager/oci8.php
  21. +310 −154 MDB/Modules/Manager/pgsql.php
  22. +0 −525 MDB/Modules/Manager/sqlite.php
  23. +0 −85 MDB/Modules/Native/fbsql.php
  24. +0 −70 MDB/Modules/Native/ibase.php
  25. +0 −89 MDB/Modules/Native/mssql.php
  26. +0 −88 MDB/Modules/Native/mysql.php
  27. +0 −70 MDB/Modules/Native/oci8.php
  28. +0 −89 MDB/Modules/Native/pgsql.php
  29. +0 −85 MDB/Modules/Native/sqlite.php
  30. +0 −198 MDB/Modules/Result.php
  31. +0 −169 MDB/Modules/Reverse/Common.php
  32. +0 −174 MDB/Modules/Reverse/fbsql.php
  33. +0 −249 MDB/Modules/Reverse/ibase.php
  34. +0 −233 MDB/Modules/Reverse/mssql.php
  35. +0 −421 MDB/Modules/Reverse/mysql.php
  36. +0 −193 MDB/Modules/Reverse/oci8.php
  37. +0 −462 MDB/Modules/Reverse/pgsql.php
  38. +0 −417 MDB/Modules/Reverse/sqlite.php
  39. +27 −27 MDB/Parser.php
  40. +0 −645 MDB/Wrapper/metabase.php
  41. +933 −277 MDB/fbsql.php
  42. +1,329 −455 MDB/ibase.php
  43. +1,625 −0 MDB/metabase_wrapper.php
  44. +969 −306 MDB/mssql.php
  45. +984 −299 MDB/mysql.php
  46. +1,248 −482 MDB/oci8.php
  47. +157 −147 MDB/{Wrapper/peardb.php → peardb_wrapper.php}
  48. +968 −318 MDB/pgsql.php
  49. +170 −121 MDB/querysim.php
  50. +1 −6 MDB/reverse_engineer_xml_schema.php
  51. +0 −846 MDB/sqlite.php
  52. +51 −17 README
  53. +13 −11 TODO
  54. +0 −26 doc/MDB.dtd
  55. +0 −209 doc/Modules_Datatype_skeleton.php
  56. +86 −42 doc/Modules_Manager_skeleton.php
  57. +0 −70 doc/Modules_Native_skeleton.php
  58. +0 −135 doc/Modules_Reverse_skeleton.php
  59. +56 −0 doc/STATUS
  60. +1 −1 doc/datatypes.html
  61. +206 −19 doc/skeleton.php
  62. +37 −37 doc/tutorial.html
  63. +0 −127 package.php
  64. +211 −145 package.xml
  65. +1 −1 tests/Console_TestListener.php
  66. +32 −37 tests/MDB_api_testcase.php
  67. +182 −26 tests/MDB_bugs_testcase.php
  68. +32 −11 tests/MDB_manager_testcase.php
  69. +7 −7 examples/peardb_wrapper_example.php → tests/MDB_pear_wrapper_test.php
  70. +41 −68 examples/example.php → tests/MDB_test.php
  71. +290 −206 tests/MDB_usage_testcase.php
  72. +21 −18 tests/clitest.php
  73. 0 {examples → tests}/metapear_test_db.schema
  74. +1 −1 tests/setup_test.php
  75. +13 −14 tests/test.php
  76. +1 −1 tests/testUtils.php
  77. +9 −16 tests/test_setup.php.dist
  78. +6 −6 tests/testchoose.php
View
333 MDB.php

Large diffs are not rendered by default.

Oops, something went wrong.
View

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -2,7 +2,7 @@
// +----------------------------------------------------------------------+
// | PHP Version 4 |
// +----------------------------------------------------------------------+
-// | Copyright (c) 1998-2002 Manuel Lemos, Tomas V.V.Cox, |
+// | Copyright (c) 1998-2004 Manuel Lemos, Tomas V.V.Cox, |
// | Stig. S. Bakken, Lukas Smith |
// | All rights reserved. |
// +----------------------------------------------------------------------+
@@ -46,12 +46,6 @@
//
/**
- * @package MDB
- * @category Database
- * @author Lukas Smith <smith@backendmedia.com>
- */
-
-/**
* Several methods to convert the MDB native timestamp format (ISO based)
* to and from data structures that are convienient to worth with in side of php.
* For more complex date arithmetic please take a look at the Date package in PEAR
@@ -72,7 +66,7 @@ class MDB_Date
*/
function mdbNow()
{
- return date('Y-m-d H:i:s');
+ return(date('Y-m-d H:i:s'));
}
// }}}
@@ -86,7 +80,7 @@ function mdbNow()
*/
function mdbToday()
{
- return date('Y-m-d');
+ return(date('Y-m-d'));
}
// }}}
@@ -100,7 +94,7 @@ function mdbToday()
*/
function mdbTime()
{
- return date('H:i:s');
+ return(date('H:i:s'));
}
// }}}
@@ -118,10 +112,10 @@ function mdbTime()
* @return string a valid MDB timestamp
* @access public
*/
- function date2Mdbstamp($hour = null, $minute = null, $second = null,
- $month = null, $day = null, $year = null)
+ function date2Mdbstamp($hour = NULL, $minute = NULL, $second = NULL,
+ $month = NULL, $day = NULL, $year = NULL)
{
- return MDB_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year, 0));
+ return MDB_Date::unix2Mdbstamp(mktime($hour, $minute, $second, $month, $day, $year));
}
// }}}
@@ -136,9 +130,6 @@ function date2Mdbstamp($hour = null, $minute = null, $second = null,
*/
function unix2Mdbstamp($unix_timestamp)
{
- if (date('I', $unix_timestamp)) {
- $unix_timestamp -= 3600;
- }
return date('Y-m-d H:i:s', $unix_timestamp);
}
@@ -174,7 +165,7 @@ function mdbstamp2Date($mdb_timestamp)
{
list($arr['year'], $arr['month'], $arr['day'], $arr['hour'], $arr['minute'], $arr['second']) =
sscanf($mdb_timestamp, "%04u-%02u-%02u %02u:%02u:%02u");
- return $arr;
+ return($arr);
}
// }}}
View

Large diffs are not rendered by default.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 4ed82da

Please sign in to comment.