cvs: pear /MDB2/MDB2/Driver/Manager ibase.php oci8.php /MDB2/MDB2/Driver/Reverse pgsql.php /MDB2/MDB2/Tools Manager.php /MDB2/MDB2/Wrapper
peardb.php /MDB2/tests MDB2_api_testcase.php MDB2_usage_testcase.php
| From: | Lukas Smith | Date: | Tue, 22 Feb 2005 09:53:36 +0000 |
| Subject: | cvs: pear /MDB2/MDB2/Driver/Manager ibase.php oci8.php /MDB2/MDB2/Driver/Reverse pgsql.php /MDB2/MDB2/Tools Manager.php /MDB2/MDB2/Wrapper peardb.php /MDB2/tests MDB2_api_testcase.php MDB2_usage_testcase.php |
||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-29666@lists.php.net to get a copy of this message | ||
lsmith Tue Feb 22 04:53:36 2005 EDT
Modified files:
/pear/MDB2/MDB2/Driver/Manager ibase.php oci8.php
/pear/MDB2/MDB2/Driver/Reverse pgsql.php
/pear/MDB2/MDB2/Tools Manager.php
/pear/MDB2/MDB2/Wrapper peardb.php
/pear/MDB2/tests MDB2_api_testcase.php MDB2_usage_testcase.php
Log:
- dont force the module name to ucfirst() in loadModule()
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/ibase.php?r1=1.11&r2=1.12&ty=u Index: pear/MDB2/MDB2/Driver/Manager/ibase.php diff -u pear/MDB2/MDB2/Driver/Manager/ibase.php:1.11 pear/MDB2/MDB2/Driver/Manager/ibase.php:1.12 --- pear/MDB2/MDB2/Driver/Manager/ibase.php:1.11 Sun Jan 2 16:44:24 2005 +++ pear/MDB2/MDB2/Driver/Manager/ibase.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Lorenzo Alberton <l.alberton@quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.11 2005/01/02 21:44:24 lsmith Exp $ +// $Id: ibase.php,v 1.12 2005/02/22 09:53:35 lsmith Exp $ require_once 'MDB2/Driver/Manager/Common.php'; @@ -288,7 +288,7 @@ if ($query) { $query .= ', '; } - $db->loadModule('datatype'); + $db->loadModule('Datatype'); $query .= 'ALTER '.$field_name.' TYPE '.$db->datatype->getTypeDeclaration($field['definition']); } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/oci8.php?r1=1.12&r2=1.13&ty=u Index: pear/MDB2/MDB2/Driver/Manager/oci8.php diff -u pear/MDB2/MDB2/Driver/Manager/oci8.php:1.12 pear/MDB2/MDB2/Driver/Manager/oci8.php:1.13 --- pear/MDB2/MDB2/Driver/Manager/oci8.php:1.12 Sun Jan 2 16:44:24 2005 +++ pear/MDB2/MDB2/Driver/Manager/oci8.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ -// $Id: oci8.php,v 1.12 2005/01/02 21:44:24 lsmith Exp $ +// $Id: oci8.php,v 1.13 2005/02/22 09:53:35 lsmith Exp $ require_once 'MDB2/Driver/Manager/Common.php'; @@ -279,7 +279,7 @@ $change_default = true; } if ($change_type) { - $db->loadModule('datatype'); + $db->loadModule('Datatype'); $change .= ' '.$db->datatype->getTypeDeclaration($field['definition']); } if ($change_default) { http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/pgsql.php?r1=1.13&r2=1.14&ty=u Index: pear/MDB2/MDB2/Driver/Reverse/pgsql.php diff -u pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.13 pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.14 --- pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.13 Sun Jan 2 16:44:25 2005 +++ pear/MDB2/MDB2/Driver/Reverse/pgsql.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: pgsql.php,v 1.13 2005/01/02 21:44:25 lsmith Exp $ +// $Id: pgsql.php,v 1.14 2005/02/22 09:53:35 lsmith Exp $ require_once 'MDB2/Driver/Reverse/Common.php'; @@ -244,7 +244,7 @@ 'getTableIndexDefinition: it was not specified an existing table index'); } - $db->loadModule('manager'); + $db->loadModule('Manager'); $columns = $db->manager->listTableFields($table); $definition = array(); http://cvs.php.net/diff.php/pear/MDB2/MDB2/Tools/Manager.php?r1=1.28&r2=1.29&ty=u Index: pear/MDB2/MDB2/Tools/Manager.php diff -u pear/MDB2/MDB2/Tools/Manager.php:1.28 pear/MDB2/MDB2/Tools/Manager.php:1.29 --- pear/MDB2/MDB2/Tools/Manager.php:1.28 Sun Feb 20 13:11:26 2005 +++ pear/MDB2/MDB2/Tools/Manager.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: Manager.php,v 1.28 2005/02/20 18:11:26 lsmith Exp $ +// $Id: Manager.php,v 1.29 2005/02/22 09:53:35 lsmith Exp $ // require_once 'MDB2/Tools/Manager/Parser.php'; @@ -258,7 +258,7 @@ if (is_array($options)) { $this->options = array_merge($options, $this->options); } - $this->db->loadModule('manager'); + $this->db->loadModule('Manager'); return MDB2_OK; } @@ -339,7 +339,7 @@ */ function getDefinitionFromDatabase() { - $this->db->loadModule('reverse'); + $this->db->loadModule('Reverse'); $database = $this->db->database_name; if (strlen($database) == 0) { return $this->raiseError('it was not specified a valid database name'); http://cvs.php.net/diff.php/pear/MDB2/MDB2/Wrapper/peardb.php?r1=1.19&r2=1.20&ty=u Index: pear/MDB2/MDB2/Wrapper/peardb.php diff -u pear/MDB2/MDB2/Wrapper/peardb.php:1.19 pear/MDB2/MDB2/Wrapper/peardb.php:1.20 --- pear/MDB2/MDB2/Wrapper/peardb.php:1.19 Sun Jan 2 16:44:25 2005 +++ pear/MDB2/MDB2/Wrapper/peardb.php Tue Feb 22 04:53:36 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: peardb.php,v 1.19 2005/01/02 21:44:25 lsmith Exp $ +// $Id: peardb.php,v 1.20 2005/02/22 09:53:36 lsmith Exp $ // /** @@ -296,7 +296,7 @@ function tableInfo($mode = null) { - $this->result->db->loadModule('reverse'); + $this->result->db->loadModule('Reverse'); return $this->result->db->reverse->tableInfo($this->result, $mode); } @@ -439,21 +439,21 @@ function autoPrepare($table, $table_fields, $mode = MDB2_AUTOQUERY_INSERT, $where = false) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); // types return $this->db_object->extended->autoPrepare($table, $table_fields, $mode, $where); } function &autoExecute($table, $fields_values, $mode, $where) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); // types return $this->db_object->extended->autoExecute($table, $fields_values, null, null, $mode, $where, false); } function buildManipSQL($table, $table_fields, $mode, $where = false) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); return $this->db_object->extended->buildManipSQL($table, $table_fields, null, null, $mode, $where); } @@ -465,7 +465,7 @@ function executeMultiple($stmt, $data) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); return $this->db_object->extended->executeMultiple($stmt, null, $data); } @@ -660,13 +660,13 @@ function createSequence($seq_name) { - $this->db_object->loadModule('manager'); + $this->db_object->loadModule('Manager'); return $this->db_object->manager->createSequence($seq_name, 1); } function dropSequence($seq_name) { - $this->db_object->loadModule('manager'); + $this->db_object->loadModule('Manager'); return $this->db_object->manager->dropSequence($seq_name); } @@ -723,7 +723,7 @@ { $result = $this->_wrapResource($result); if (is_string($result) || MDB2::isResultCommon($result)) { - $this->db_object->loadModule('reverse'); + $this->db_object->loadModule('Reverse'); return $this->db_object->reverse->tableInfo($result, $mode); } return $result->tableInfo($mode); @@ -736,7 +736,7 @@ function getListOf($type) { - $this->db_object->loadModule('manager'); + $this->db_object->loadModule('Manager'); switch ($type) { case 'tables': return $this->db_object->manager->listTables(); http://cvs.php.net/diff.php/pear/MDB2/tests/MDB2_api_testcase.php?r1=1.8&r2=1.9&ty=u Index: pear/MDB2/tests/MDB2_api_testcase.php diff -u pear/MDB2/tests/MDB2_api_testcase.php:1.8 pear/MDB2/tests/MDB2_api_testcase.php:1.9 --- pear/MDB2/tests/MDB2_api_testcase.php:1.8 Sun Jan 2 16:44:25 2005 +++ pear/MDB2/tests/MDB2_api_testcase.php Tue Feb 22 04:53:36 2005 @@ -41,7 +41,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: MDB2_api_testcase.php,v 1.8 2005/01/02 21:44:25 lsmith Exp $ +// $Id: MDB2_api_testcase.php,v 1.9 2005/02/22 09:53:36 lsmith Exp $ class MDB2_Api_TestCase extends PHPUnit_TestCase { //contains the dsn of the database we are testing @@ -147,7 +147,7 @@ if (!$this->methodExists($this->db, 'loadModule')) { return; } - $this->assertTrue(!MDB2::isError($this->db->loadModule('manager'))); + $this->assertTrue(!MDB2::isError($this->db->loadModule('Manager'))); } // test of the driver http://cvs.php.net/diff.php/pear/MDB2/tests/MDB2_usage_testcase.php?r1=1.27&r2=1.28&ty=u Index: pear/MDB2/tests/MDB2_usage_testcase.php diff -u pear/MDB2/tests/MDB2_usage_testcase.php:1.27 pear/MDB2/tests/MDB2_usage_testcase.php:1.28 --- pear/MDB2/tests/MDB2_usage_testcase.php:1.27 Tue Feb 22 04:34:51 2005 +++ pear/MDB2/tests/MDB2_usage_testcase.php Tue Feb 22 04:53:36 2005 @@ -41,7 +41,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: MDB2_usage_testcase.php,v 1.27 2005/02/22 09:34:51 lsmith Exp $ +// $Id: MDB2_usage_testcase.php,v 1.28 2005/02/22 09:53:36 lsmith Exp $ class MDB2_Usage_TestCase extends PHPUnit_TestCase { //contains the dsn of the database we are testing @@ -605,7 +605,7 @@ return; } - $this->db->loadModule('manager'); + $this->db->loadModule('Manager'); for ($start_value = 1; $start_value < 4; $start_value++) { $sequence_name = "test_sequence_$start_value";
http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/ibase.php?r1=1.11&r2=1.12&ty=u Index: pear/MDB2/MDB2/Driver/Manager/ibase.php diff -u pear/MDB2/MDB2/Driver/Manager/ibase.php:1.11 pear/MDB2/MDB2/Driver/Manager/ibase.php:1.12 --- pear/MDB2/MDB2/Driver/Manager/ibase.php:1.11 Sun Jan 2 16:44:24 2005 +++ pear/MDB2/MDB2/Driver/Manager/ibase.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Lorenzo Alberton <l.alberton@quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.11 2005/01/02 21:44:24 lsmith Exp $ +// $Id: ibase.php,v 1.12 2005/02/22 09:53:35 lsmith Exp $ require_once 'MDB2/Driver/Manager/Common.php'; @@ -288,7 +288,7 @@ if ($query) { $query .= ', '; } - $db->loadModule('datatype'); + $db->loadModule('Datatype'); $query .= 'ALTER '.$field_name.' TYPE '.$db->datatype->getTypeDeclaration($field['definition']); } } http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Manager/oci8.php?r1=1.12&r2=1.13&ty=u Index: pear/MDB2/MDB2/Driver/Manager/oci8.php diff -u pear/MDB2/MDB2/Driver/Manager/oci8.php:1.12 pear/MDB2/MDB2/Driver/Manager/oci8.php:1.13 --- pear/MDB2/MDB2/Driver/Manager/oci8.php:1.12 Sun Jan 2 16:44:24 2005 +++ pear/MDB2/MDB2/Driver/Manager/oci8.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ -// $Id: oci8.php,v 1.12 2005/01/02 21:44:24 lsmith Exp $ +// $Id: oci8.php,v 1.13 2005/02/22 09:53:35 lsmith Exp $ require_once 'MDB2/Driver/Manager/Common.php'; @@ -279,7 +279,7 @@ $change_default = true; } if ($change_type) { - $db->loadModule('datatype'); + $db->loadModule('Datatype'); $change .= ' '.$db->datatype->getTypeDeclaration($field['definition']); } if ($change_default) { http://cvs.php.net/diff.php/pear/MDB2/MDB2/Driver/Reverse/pgsql.php?r1=1.13&r2=1.14&ty=u Index: pear/MDB2/MDB2/Driver/Reverse/pgsql.php diff -u pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.13 pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.14 --- pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.13 Sun Jan 2 16:44:25 2005 +++ pear/MDB2/MDB2/Driver/Reverse/pgsql.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: pgsql.php,v 1.13 2005/01/02 21:44:25 lsmith Exp $ +// $Id: pgsql.php,v 1.14 2005/02/22 09:53:35 lsmith Exp $ require_once 'MDB2/Driver/Reverse/Common.php'; @@ -244,7 +244,7 @@ 'getTableIndexDefinition: it was not specified an existing table index'); } - $db->loadModule('manager'); + $db->loadModule('Manager'); $columns = $db->manager->listTableFields($table); $definition = array(); http://cvs.php.net/diff.php/pear/MDB2/MDB2/Tools/Manager.php?r1=1.28&r2=1.29&ty=u Index: pear/MDB2/MDB2/Tools/Manager.php diff -u pear/MDB2/MDB2/Tools/Manager.php:1.28 pear/MDB2/MDB2/Tools/Manager.php:1.29 --- pear/MDB2/MDB2/Tools/Manager.php:1.28 Sun Feb 20 13:11:26 2005 +++ pear/MDB2/MDB2/Tools/Manager.php Tue Feb 22 04:53:35 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: Manager.php,v 1.28 2005/02/20 18:11:26 lsmith Exp $ +// $Id: Manager.php,v 1.29 2005/02/22 09:53:35 lsmith Exp $ // require_once 'MDB2/Tools/Manager/Parser.php'; @@ -258,7 +258,7 @@ if (is_array($options)) { $this->options = array_merge($options, $this->options); } - $this->db->loadModule('manager'); + $this->db->loadModule('Manager'); return MDB2_OK; } @@ -339,7 +339,7 @@ */ function getDefinitionFromDatabase() { - $this->db->loadModule('reverse'); + $this->db->loadModule('Reverse'); $database = $this->db->database_name; if (strlen($database) == 0) { return $this->raiseError('it was not specified a valid database name'); http://cvs.php.net/diff.php/pear/MDB2/MDB2/Wrapper/peardb.php?r1=1.19&r2=1.20&ty=u Index: pear/MDB2/MDB2/Wrapper/peardb.php diff -u pear/MDB2/MDB2/Wrapper/peardb.php:1.19 pear/MDB2/MDB2/Wrapper/peardb.php:1.20 --- pear/MDB2/MDB2/Wrapper/peardb.php:1.19 Sun Jan 2 16:44:25 2005 +++ pear/MDB2/MDB2/Wrapper/peardb.php Tue Feb 22 04:53:36 2005 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@backendmedia.com> | // +----------------------------------------------------------------------+ // -// $Id: peardb.php,v 1.19 2005/01/02 21:44:25 lsmith Exp $ +// $Id: peardb.php,v 1.20 2005/02/22 09:53:36 lsmith Exp $ // /** @@ -296,7 +296,7 @@ function tableInfo($mode = null) { - $this->result->db->loadModule('reverse'); + $this->result->db->loadModule('Reverse'); return $this->result->db->reverse->tableInfo($this->result, $mode); } @@ -439,21 +439,21 @@ function autoPrepare($table, $table_fields, $mode = MDB2_AUTOQUERY_INSERT, $where = false) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); // types return $this->db_object->extended->autoPrepare($table, $table_fields, $mode, $where); } function &autoExecute($table, $fields_values, $mode, $where) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); // types return $this->db_object->extended->autoExecute($table, $fields_values, null, null, $mode, $where, false); } function buildManipSQL($table, $table_fields, $mode, $where = false) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); return $this->db_object->extended->buildManipSQL($table, $table_fields, null, null, $mode, $where); } @@ -465,7 +465,7 @@ function executeMultiple($stmt, $data) { - $this->db_object->loadModule('extended'); + $this->db_object->loadModule('Extended'); return $this->db_object->extended->executeMultiple($stmt, null, $data); } @@ -660,13 +660,13 @@ function createSequence($seq_name) { - $this->db_object->loadModule('manager'); + $this->db_object->loadModule('Manager'); return $this->db_object->manager->createSequence($seq_name, 1); } function dropSequence($seq_name) { - $this->db_object->loadModule('manager'); + $this->db_object->loadModule('Manager'); return $this->db_object->manager->dropSequence($seq_name); } @@ -723,7 +723,7 @@ { $result = $this->_wrapResource($result); if (is_string($result) || MDB2::isResultCommon($result)) { - $this->db_object->loadModule('reverse'); + $this->db_object->loadModule('Reverse'); return $this->db_object->reverse->tableInfo($result, $mode); } return $result->tableInfo($mode); @@ -736,7 +736,7 @@ function getListOf($type) { - $this->db_object->loadModule('manager'); + $this->db_object->loadModule('Manager'); switch ($type) { case 'tables': return $this->db_object->manager->listTables(); http://cvs.php.net/diff.php/pear/MDB2/tests/MDB2_api_testcase.php?r1=1.8&r2=1.9&ty=u Index: pear/MDB2/tests/MDB2_api_testcase.php diff -u pear/MDB2/tests/MDB2_api_testcase.php:1.8 pear/MDB2/tests/MDB2_api_testcase.php:1.9 --- pear/MDB2/tests/MDB2_api_testcase.php:1.8 Sun Jan 2 16:44:25 2005 +++ pear/MDB2/tests/MDB2_api_testcase.php Tue Feb 22 04:53:36 2005 @@ -41,7 +41,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: MDB2_api_testcase.php,v 1.8 2005/01/02 21:44:25 lsmith Exp $ +// $Id: MDB2_api_testcase.php,v 1.9 2005/02/22 09:53:36 lsmith Exp $ class MDB2_Api_TestCase extends PHPUnit_TestCase { //contains the dsn of the database we are testing @@ -147,7 +147,7 @@ if (!$this->methodExists($this->db, 'loadModule')) { return; } - $this->assertTrue(!MDB2::isError($this->db->loadModule('manager'))); + $this->assertTrue(!MDB2::isError($this->db->loadModule('Manager'))); } // test of the driver http://cvs.php.net/diff.php/pear/MDB2/tests/MDB2_usage_testcase.php?r1=1.27&r2=1.28&ty=u Index: pear/MDB2/tests/MDB2_usage_testcase.php diff -u pear/MDB2/tests/MDB2_usage_testcase.php:1.27 pear/MDB2/tests/MDB2_usage_testcase.php:1.28 --- pear/MDB2/tests/MDB2_usage_testcase.php:1.27 Tue Feb 22 04:34:51 2005 +++ pear/MDB2/tests/MDB2_usage_testcase.php Tue Feb 22 04:53:36 2005 @@ -41,7 +41,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: MDB2_usage_testcase.php,v 1.27 2005/02/22 09:34:51 lsmith Exp $ +// $Id: MDB2_usage_testcase.php,v 1.28 2005/02/22 09:53:36 lsmith Exp $ class MDB2_Usage_TestCase extends PHPUnit_TestCase { //contains the dsn of the database we are testing @@ -605,7 +605,7 @@ return; } - $this->db->loadModule('manager'); + $this->db->loadModule('Manager'); for ($start_value = 1; $start_value < 4; $start_value++) { $sequence_name = "test_sequence_$start_value";