MDB2 data types

".get_class($test).' : Starting '.$test->getName().' ...'); - } -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/import.schema.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/import.schema.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/import.schema.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/import.schema.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,45 +0,0 @@ - 'mysql', - 'username' => 'username', - 'password' => 'password', - 'hostspec' => 'host', -); -$db_options = array(); - - -$file = dirname(__FILE__).DIRECTORY_SEPARATOR.'driver_test.schema.xml'; -$variables = array( - 'name' => 'driver_test', - 'create' => true, -); - -$options = array( - 'log_line_break' => '
', - 'idxname_format' => '%s', - 'debug' => true, - 'quote_identifier' => true, - 'force_defaults' => false, - 'portability' => false -); -$options = array_merge($options, $db_options); - -$schema =& MDB2_Schema::factory($dsn, $options); -if (PEAR::isError($schema)) { - echo $schema->getMessage() . ' ' . $schema->getUserInfo(); - exit; -} - -$definition = $schema->parseDatabaseDefinitionFile($file, $variables, true, true); -if (PEAR::isError($definition)) { - echo $definition->getMessage() . ' - ' . $definition->getUserInfo(); -} else { - $operation = $schema->createDatabase($definition); - if (PEAR::isError($operation)) { - echo $operation->getMessage() . ' ' . $operation->getUserInfo(); - } -} -?> -DONE! \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_api_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_api_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_api_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_api_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,297 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_api_testcase.php,v 1.22 2007/04/25 09:11:35 quipo Exp $ - -require_once 'MDB2_testcase.php'; - -class MDB2_Api_TestCase extends MDB2_TestCase { - var $clear_tables = false; - - function testParseDSN() { - $expected = array ( - 'phptype' => 'phptype', - 'dbsyntax' => 'phptype', - 'username' => 'username', - 'password' => 'password', - 'protocol' => 'protocol', - 'hostspec' => false, - 'port' => '110', - 'socket' => false, - 'database' => '/usr/db_file.db', - 'mode' => false, - ); - $original = 'phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644'; - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - $original = 'phptype(dbsyntax)://username:password@hostspec/database_name'; - $expected = array ( - 'phptype' => 'phptype', - 'dbsyntax' => 'dbsyntax', - 'username' => 'username', - 'password' => 'password', - 'protocol' => 'tcp', - 'hostspec' => 'hostspec', - 'port' => false, - 'socket' => false, - 'database' => 'database_name', - 'mode' => false, - ); - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - $original = 'phptype://username:password@hostspec/database_name'; - $expected['dbsyntax'] = 'phptype'; - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - $original = 'phptype://username:password@hostspec'; - $expected['database'] = false; - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - $original = 'phptype://username@hostspec'; - $expected['password'] = false; - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - $original = 'phptype://hostspec/database'; - $expected['username'] = false; - $expected['database'] = 'database'; - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - $original = 'phptype(dbsyntax)'; - $expected['database'] = false; - $expected['hostspec'] = false; - $expected['protocol'] = false; - $expected['dbsyntax'] = 'dbsyntax'; - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - //oracle's "Easy Connect" syntax (Oracle 10g, @see Bug #4854) - $original = 'oci8://scott:tiger@//localhost/XE'; - $expected = array ( - 'phptype' => 'oci8', - 'dbsyntax' => 'oci8', - 'username' => 'scott', - 'password' => 'tiger', - 'protocol' => 'tcp', - 'hostspec' => '//localhost/XE', - 'port' => false, - 'socket' => false, - 'database' => false, - 'mode' => false, - ); - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - //ibase dbname+path on windows - $original = 'ibase://user:pwd@localhost/C:\\PATH_TO_DB\\TEST.FDB'; - $expected = array ( - 'phptype' => 'ibase', - 'dbsyntax' => 'ibase', - 'username' => 'user', - 'password' => 'pwd', - 'protocol' => 'tcp', - 'hostspec' => 'localhost', - 'port' => false, - 'socket' => false, - 'database' => 'C:\\PATH_TO_DB\\TEST.FDB', - 'mode' => false, - ); - $this->assertEquals($expected, MDB2::parseDSN($original)); - - // --------------------------------------------------------------------- - - //sqlite dbname+path on unix - $original = 'sqlite:////full/unix/path/to/file.db?mode=0666'; - $expected = array ( - 'phptype' => 'sqlite', - 'dbsyntax' => 'sqlite', - 'username' => false, - 'password' => false, - 'protocol' => 'tcp', - 'hostspec' => '', - 'port' => false, - 'socket' => false, - 'database' => '/full/unix/path/to/file.db', - 'mode' => false, - ); - $this->assertEquals($expected, MDB2::parseDSN($original)); - } - - //test stuff in common.php - function testConnect() { - $db =& MDB2::factory($this->dsn, $this->options); - if (PEAR::isError($db)) { - $this->assertTrue(false, 'Connect failed bailing out - ' .$db->getMessage() . ' - ' .$db->getUserInfo()); - } - if (PEAR::isError($this->db)) { - exit; - } - } - - function testGetOption() { - if (!$this->methodExists($this->db, 'getOption')) { - return; - } - $option = $this->db->getOption('persistent'); - $this->assertEquals($option, $this->db->options['persistent']); - } - - function testSetOption() { - if (!$this->methodExists($this->db, 'setOption')) { - return; - } - $option = $this->db->getOption('persistent'); - $this->db->setOption('persistent', !$option); - $this->assertEquals(!$option, $this->db->getOption('persistent')); - $this->db->setOption('persistent', $option); - } - - function testLoadModule() { - if (!$this->methodExists($this->db, 'loadModule')) { - return; - } - $this->assertTrue(!PEAR::isError($this->db->loadModule('Manager', null, true))); - } - - // test of the driver - // helper function so that we don't have to write out a query a million times - function standardQuery() { - $query = 'SELECT * FROM users'; - // run the query and get a result handler - if (!PEAR::isError($this->db)) { - return $this->db->query($query); - } - return false; - } - - function testQuery() { - if (!$this->methodExists($this->db, 'query')) { - return; - } - $result = $this->standardQuery(); - - $this->assertTrue(MDB2::isResult($result), 'query: $result returned is not a resource'); - } - - function testExec() { - if (!$this->methodExists($this->db, 'exec')) { - return; - } - $result = $this->db->exec('UPDATE users SET user_name = user_name WHERE user_id = user_id'); - $this->assertFalse(PEAR::isError($result), 'exec: $result returned is an error'); - $this->assertEquals(0, $result, 'exec: incorrect number of affected rows returned'); - } - - function testFetchRow() { - $result = $this->standardQuery(); - if (!$this->methodExists($result, 'fetchRow')) { - return; - } - $err = $result->fetchRow(); - $result->free(); - - if (PEAR::isError($err)) { - $this->assertTrue(false, 'Error testFetch: '.$err->getMessage().' - '.$err->getUserInfo()); - } - } - - function testNumRows() { - $result = $this->standardQuery(); - if (!$this->methodExists($result, 'numRows')) { - return; - } - $numrows = $result->numRows(); - $this->assertTrue(!PEAR::isError($numrows) && is_int($numrows)); - $result->free(); - } - - function testNumCols() { - $result = $this->standardQuery(); - if (!$this->methodExists($result, 'numCols')) { - return; - } - $numcols = $result->numCols(); - $this->assertTrue(!PEAR::isError($numcols) && $numcols > 0); - $result->free(); - } - - function testSingleton() { - $db =& MDB2::singleton(); - $this->assertTrue(MDB2::isConnection($db)); - - // should have a different database name set - $db =& MDB2::singleton($this->dsn, $this->options); - - $this->assertTrue($db->db_index != $this->db->db_index); - } - - function testGetServerVersion() { - $server_info = $this->db->getServerVersion(true); - if (PEAR::isError($server_info)) { - $this->assertTrue(false, 'Error: '.$server_info->getMessage().' - '.$server_info->getUserInfo()); - } else { - $this->assertTrue(is_string($server_info), 'Error: Server info is not returned as a string: '. serialize($server_info)); - } - $server_info = $this->db->getServerVersion(); - if (PEAR::isError($server_info)) { - $this->assertTrue(false, 'Error: '.$server_info->getMessage().' - '.$server_info->getUserInfo()); - } else { - $this->assertTrue(is_array($server_info), 'Error: Server info is not returned as an array: '. serialize($server_info)); - } - } -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_bugs_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_bugs_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_bugs_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_bugs_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,291 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_bugs_testcase.php,v 1.31 2006/12/09 16:58:16 quipo Exp $ - -require_once 'MDB2_testcase.php'; - -class MDB2_Bugs_TestCase extends MDB2_TestCase { - /** - * - */ - function testFetchModeBug() { - $data = array(); - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); - - $data['user_name'] = 'user_='; - $data['user_password'] = 'somepass'; - $data['subscribed'] = true; - $data['user_id'] = 0; - $data['quota'] = sprintf("%.2f", strval(2/100)); - $data['weight'] = sqrt(0); - $data['access_date'] = MDB2_Date::mdbToday(); - $data['access_time'] = MDB2_Date::mdbTime(); - $data['approved'] = MDB2_Date::mdbNow(); - - $result = $stmt->execute(array_values($data)); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query '.$result->getMessage()); - } - - $stmt->free(); - - $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_name'; - $result =& $this->db->query($query); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); - } - - $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); - - $firstRow = $result->fetchRow(); - $this->assertEquals($firstRow['user_name'], $data['user_name'], 'The data returned does not match that expected'); - - $result =& $this->db->query('SELECT user_name, user_id, quota FROM users ORDER BY user_name'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); - } - $this->db->setFetchMode(MDB2_FETCHMODE_ORDERED); - - $value = $result->fetchOne(); - $this->assertEquals($data['user_name'], $value, 'The data returned does not match that expected'); - $result->free(); - } - - /** - * @see http://bugs.php.net/bug.php?id=22328 - */ - function testBug22328() { - $result =& $this->db->query('SELECT * FROM users'); - $this->db->pushErrorHandling(PEAR_ERROR_RETURN); - $result2 = $this->db->query('SELECT * FROM foo'); - - $data = $result->fetchRow(); - $this->db->popErrorHandling(); - $this->assertFalse(PEAR::isError($data), 'Error messages for a query affect result reading of other queries'); - } - - /** - * @see http://pear.php.net/bugs/bug.php?id=670 - */ - function testBug670() { - $data['user_name'] = null; - $data['user_password'] = 'somepass'; - $data['subscribed'] = true; - $data['user_id'] = 1; - $data['quota'] = sprintf("%.2f",strval(3/100)); - $data['weight'] = sqrt(1); - $data['access_date'] = MDB2_Date::mdbToday(); - $data['access_time'] = MDB2_Date::mdbTime(); - $data['approved'] = MDB2_Date::mdbNow(); - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - - $result =& $this->db->query('SELECT user_name FROM users'); - $col = $result->fetchCol('user_name'); - if (PEAR::isError($col)) { - $this->assertTrue(false, 'Error when fetching column first first row as NULL: '.$col->getMessage()); - } - - $data['user_name'] = "user_1"; - $data['user_id'] = 2; - - $result = $stmt->execute(array_values($data)); - - $result =& $this->db->query('SELECT user_name FROM users'); - $col = $result->fetchCol('user_name'); - if (PEAR::isError($col)) { - $this->assertTrue(false, 'Error when fetching column: '.$col->getMessage()); - } - - $data['user_name'] = null; - - $stmt->free(); - } - - /** - * @see http://pear.php.net/bugs/bug.php?id=681 - */ - function testBug681() { - $result =& $this->db->query('SELECT * FROM users WHERE 1=0'); - - $numrows = $result->numRows(); - $this->assertEquals(0, $numrows, 'Numrows is not returning 0 for empty result sets'); - - $data = $this->getSampleData(1); - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - - $result =& $this->db->query('SELECT * FROM users'); - $numrows = $result->numRows(); - $this->assertEquals(1, $numrows, 'Numrows is not returning proper value'); - - $stmt->free(); - } - - /** - * @see http://pear.php.net/bugs/bug.php?id=718 - */ - function testBug718() { - $data = $this->getSampleData(1); - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - - $row = $this->db->queryRow('SELECT a.user_id, b.user_id FROM users a, users b where a.user_id = b.user_id', array('integer', 'integer'), MDB2_FETCHMODE_ORDERED); - $this->assertEquals(2, count($row), "Columns with the same name get overwritten in ordered mode"); - - $stmt->free(); - } - - /** - * @see http://pear.php.net/bugs/bug.php?id=946 - */ - function testBug946() { - $data = array(); - $total_rows = 5; - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); - - for ($row = 0; $row < $total_rows; $row++) { - $data[$row] = $this->getSampleData($row); - - $result = $stmt->execute(array_values($data[$row])); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - } - $stmt->free(); - - $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users'; - - $this->db->setLimit(3, 1); - $result =& $this->db->query($query); - $numrows = $result->numRows(); - while ($row = $result->fetchRow()) { - if (PEAR::isError($row)) { - $this->assertTrue(false, 'Error fetching a row: '.$row->getMessage()); - } - } - $result->free(); - - $result =& $this->db->query($query); - $numrows = $result->numRows(); - while ($row = $result->fetchRow()) { - if (PEAR::isError($row)) { - $this->assertTrue(false, 'Error fetching a row: '.$row->getMessage()); - } - } - $result->free(); - } - - /** - * @see http://pear.php.net/bugs/bug.php?id=3146 - */ - function testBug3146() { - $data = array(); - $total_rows = 5; - - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - - for ($row = 0; $row < $total_rows; $row++) { - $data[$row] = $this->getSampleData($row); - - $result = $stmt->execute(array_values($data[$row])); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - } - $stmt->free(); - - $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_id'; - $result =& $this->db->query($query, $this->fields); - - $numrows = $result->numRows($result); - - $this->verifyFetchedValues($result, 0, $data[0]); - $this->verifyFetchedValues($result, 2, $data[2]); - $this->verifyFetchedValues($result, null, $data[3]); - $this->verifyFetchedValues($result, 1, $data[1]); - - $result->free(); - } - - /** - * Strong typing query result misbehaves when $n_columns > $n_types - * @see http://pear.php.net/bugs/bug.php?id=9502 - */ - function testBug9502() { - $row = 5; - $data = $this->getSampleData($row); - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - $stmt->free(); - - //provide an incomplete and scrambled types array - $types = array(); - $types['subscribed'] = $this->fields['subscribed']; - $types['user_name'] = $this->fields['user_name']; - $types['weight'] = $this->fields['weight']; - - $query = 'SELECT weight, user_name, user_id, quota, subscribed FROM users WHERE user_id = '.$row; - $result =& $this->db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing query: '.$result->getMessage() .' - '. $result->getUserInfo()); - } else { - $this->assertTrue(is_bool($result['subscribed'])); - $this->assertTrue(is_numeric($result['user_id'])); - $this->assertTrue(is_float($result['weight'])); - $this->assertFalse(is_bool($result['user_name'])); - } - } -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_Connect_Test.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_Connect_Test.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_Connect_Test.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_Connect_Test.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ -_dsn = array( - 'phptype' => DSN_PHPTYPE, - 'username' => DSN_USERNAME, - 'password' => DSN_PASSWORD, - 'hostspec' => DSN_HOSTNAME, - 'database' => DSN_DATABASE, - ); - - } - // }}} - // {{{ PHP4 constructor.. - function MDB2_Connect_Test() - { - $this->__construct($connect); - } - // }}} - // {{{ connect - function connect() - { - // connect to database - $options = array( - 'portability' => (MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL), - ); - - $this->dbc =& MDB2::singleton($this->_dsn, $options); - if (PEAR::isError($this->dbc)) { - return $this->dbc; - } - } - // }}} -} -// }}} -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_datatype_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_datatype_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_datatype_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_datatype_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,861 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_datatype_testcase.php,v 1.18 2007/03/28 16:39:02 quipo Exp $ - -require_once 'MDB2_testcase.php'; - -/** - * A test callback function to be used in the test class below for - * ensuring that custom datatype callback features are handled - * correctly. - * - * @param MDB2 $db The MDB2 database resource object. - * @param string $method The name of the MDB2_Driver_Datatype_Common method - * the callback function was called from. One of - * "getValidTypes", "convertResult", "getDeclaration", - * "compareDefinition", "quote" and "mapPrepareDatatype". - * See {@link MDB2_Driver_Datatype_Common} for the - * details of what each method does. - * @param array $aParameters An array of parameters, being the parameters that - * were passed to the method calling the callback - * function. - * @return mixed Returns the appropriate value depending on the method that - * called the function. See {@link MDB2_Driver_Datatype_Common} - * for details of the expected return values of the five possible - * calling methods. - */ -function datatype_test_callback(&$db, $method, $aParameters) -{ - // Ensure the datatype module is loaded - if (is_null($db->datatype)) { - $db->loadModule('Datatype', null, true); - } - // Lowercase method names for PHP4/PHP5 compatibility - $method = strtolower($method); - switch($method) { - // For all cases, return a string that identifies that the - // callback method was able to call to the appropriate point - case 'getvalidtypes': - return 'datatype_test_callback::getvalidtypes'; - case 'convertresult': - return 'datatype_test_callback::convertresult'; - case 'getdeclaration': - return 'datatype_test_callback::getdeclaration'; - case 'comparedefinition': - return 'datatype_test_callback::comparedefinition'; - case 'quote': - return 'datatype_test_callback::quote'; - case 'mappreparedatatype': - return 'datatype_test_callback::mappreparedatatype'; - } -} - -/** - * A test callback function to be used in the test class below for - * ensuring that custom nativetype to datatype mapping is handled - * correctly. - * - * @param MDB2 $db The MDB2 database reource object. - * @param array $aFields The standard array of fields produced from the - * MySQL command "SHOW COLUMNS". See - * {@link http://dev.mysql.com/doc/refman/5.0/en/describe.html} - * for more details on the format of the fields. - * "type" The nativetype column type - * "null" "YES" or "NO" - * "key" "PRI", "UNI", "MUL", or null - * "default" The default value of the column - * "extra" "auto_increment", or null - * @return array Returns an array of the following items: - * 0 => An array of possible MDB2 datatypes. As this is - * a custom type, always has one entry, "test". - * 1 => The length of the type, if defined by the nativetype, - * otherwise null. - * 2 => A boolean value indicating the "unsigned" nature of numeric - * fields. Always null in this case, as this custom test - * type is not numeric. - * 3 => A boolean value indicating the "fixed" nature of text - * fields. Always bull in this case, as this custom test - * type is not textual. - */ -function nativetype_test_callback(&$db, $aFields) -{ - // Prepare the type array - $aType = array(); - $aType[] = 'test'; - // Can the length of the field be found? - $length = null; - $start = strpos($aFields['type'], '('); - $end = strpos($aFields['type'], ')'); - if ($start && $end) { - $start++; - $chars = $end - $start; - $length = substr($aFields['type'], $start, $chars); - } - // No unsigned value needed - $unsigned = null; - // No fixed value needed - $fixed = null; - return array($aType, $length, $unsigned, $fixed); -} - -class MDB2_Datatype_TestCase extends MDB2_TestCase -{ - // Test table name (it is dynamically created/dropped) - var $table = 'datatypetable'; - - function setUp() { - parent::setUp(); - $this->db->loadModule('Manager', null, true); - $this->fields = array( - 'id' => array( - 'type' => 'integer', - 'unsigned' => true, - 'notnull' => true, - 'default' => 0, - ), - 'textfield' => array( - 'type' => 'text', - 'length' => 12, - ), - 'booleanfield' => array( - 'type' => 'boolean', - ), - 'decimalfield' => array( - 'type' => 'decimal', - ), - 'floatfield' => array( - 'type' => 'float', - ), - 'datefield' => array( - 'type' => 'date', - ), - 'timefield' => array( - 'type' => 'time', - ), - 'timestampfield' => array( - 'type' => 'timestamp', - ), - ); - if (!$this->tableExists($this->table)) { - $this->db->manager->createTable($this->table, $this->fields); - } - } - - /** - * The teardown method to clean up the testing environment. - */ - function tearDown() { - if ($this->tableExists($this->table)) { - $this->db->manager->dropTable($this->table); - } - $this->db->popExpect(); - unset($this->dsn); - if (!PEAR::isError($this->db->manager)) { - $this->db->disconnect(); - } - unset($this->db); - } - - /** - * Get the types of each field given its name - * - * @param array $names list of field names - * @return array $types list of matching field types - */ - function getFieldTypes($names) { - $types = array(); - foreach ($names as $name) { - foreach ($this->fields as $fieldname => $field) { - if ($name == $fieldname) { - $types[$name] = $field['type']; - } - } - } - return $types; - } - - /** - * Insert the values into the sample table - * - * @param array $values associative array (name => value) - */ - function insertValues($values) { - $types = $this->getFieldTypes(array_keys($values)); - - $result = $this->db->exec('DELETE FROM '.$this->table); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error emptying table: '.$result->getMessage()); - } - - $query = sprintf('INSERT INTO %s (%s) VALUES (%s)', - $this->table, - implode(', ', array_keys($values)), - implode(', ', array_fill(0, count($values), '?')) - ); - $stmt = $this->db->prepare($query, array_values($types), MDB2_PREPARE_MANIP); - if (PEAR::isError($stmt)) { - $this->assertTrue(false, 'Error creating prepared query: '.$stmt->getMessage()); - } - $result = $stmt->execute(array_values($values)); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - $stmt->free(); - } - - /** - * Select the inserted row from the db and check the inserted values - * @param array $values associative array (name => value) of inserted data - */ - function selectAndCheck($values) { - $types = $this->getFieldTypes(array_keys($values)); - - $query = 'SELECT '. implode (', ', array_keys($values)). ' FROM '.$this->table; - $result = $this->db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC); - foreach ($values as $name => $value) { - $this->assertEquals($result[$name], $values[$name], 'Error in '.$types[$name].' value: incorrect conversion'); - } - } - - /** - * Test the TEXT datatype for incorrect conversions - */ - function testTextDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'textfield' => 'test', - ); - $this->insertValues($data); - $this->selectAndCheck($data); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testTextDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Test the DECIMAL datatype for incorrect conversions - */ - function testDecimalDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'decimalfield' => 10.35, - ); - $this->insertValues($data); - $this->selectAndCheck($data); - - $old_locale = setlocale(LC_NUMERIC, 0); - if (OS_UNIX) { - setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'de', 'ge'); - } else { - setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'deu_deu'); - } - - $this->insertValues($data); - $this->selectAndCheck($data); - - setlocale(LC_NUMERIC, $old_locale); - - $expected = 10.35; - - $actual = $this->db->quote($expected, 'decimal'); - $this->assertEquals($expected, $actual); - - $non_us = number_format($expected, 2, ',', ''); - $actual = $this->db->quote($non_us, 'decimal'); - $this->assertEquals($expected, $actual); - - $expected = 1000.35; - - $non_us = '1,000.35'; - $actual = $this->db->quote($non_us, 'decimal'); - $this->assertEquals($expected, $actual); - - $non_us = '1000,35'; - $actual = $this->db->quote($non_us, 'decimal'); - $this->assertEquals($expected, $actual); - - $non_us = '1.000,35'; - $actual = $this->db->quote($non_us, 'decimal'); - $this->assertEquals($expected, $actual); - - // test quoting with invalid chars - $val = '100.3abc";d@a[\\'; - $this->assertEquals(100.3, $this->db->quote($val, 'decimal')); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testDecimalDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Test the FLOAT datatype for incorrect conversions - */ - function testFloatDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'floatfield' => 10.35, - ); - $this->insertValues($data); - $this->selectAndCheck($data); - - $old_locale = setlocale(LC_NUMERIC, 0); - if (OS_UNIX) { - setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'de', 'ge'); - } else { - setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'deu_deu'); - } - - - $this->insertValues($data); - $this->selectAndCheck($data); - - setlocale(LC_NUMERIC, $old_locale); - - $data['floatfield'] = '1.035e+1'; - $this->insertValues($data); - $this->selectAndCheck($data); - - $data['floatfield'] = '1.035E+01'; - $this->insertValues($data); - $this->selectAndCheck($data); - - $expected = '1.035E+01'; - $non_us = '1,035e+1'; - $actual = $this->db->quote($non_us, 'float'); - $this->assertEquals($expected, $actual); - - $expected = 10.35; - - $actual = $this->db->quote($expected, 'float'); - $this->assertEquals($expected, $actual); - - $non_us = number_format($expected, 2, ',', ''); - $actual = $this->db->quote($non_us, 'float'); - $this->assertEquals($expected, $actual); - - $expected = 1000.35; - - $non_us = '1,000.35'; - $actual = $this->db->quote($non_us, 'float'); - $this->assertEquals($expected, $actual); - - $non_us = '1000,35'; - $actual = $this->db->quote($non_us, 'float'); - $this->assertEquals($expected, $actual); - - $non_us = '1.000,35'; - $actual = $this->db->quote($non_us, 'float'); - $this->assertEquals($expected, $actual); - - // test quoting with invalid chars - $val = '100.3abc";d@a[\\'; - $this->assertEquals(100.3, $this->db->quote($val, 'float')); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testFloatDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Test the BOOLEAN datatype for incorrect conversions - */ - function testBooleanDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'booleanfield' => true, - ); - $this->insertValues($data); - $this->selectAndCheck($data); - - $data['booleanfield'] = false; - $this->insertValues($data); - $this->selectAndCheck($data); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testBooleanDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Test the DATE datatype for incorrect conversions - */ - function testDateDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'datefield' => date('Y-m-d'), - ); - $this->insertValues($data, 'date'); - $this->selectAndCheck($data); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testDateDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Test the TIME datatype for incorrect conversions - */ - function testTimeDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'timefield' => date('H:i:s'), - ); - $this->insertValues($data, 'time'); - $this->selectAndCheck($data); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testTimeDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Test the TIMESTAMP datatype for incorrect conversions - */ - function testTimestampDataType($emulate_prepared = false) { - if ($emulate_prepared) { - $this->db->setOption('emulate_prepared', true); - } - - $data = array( - 'id' => 1, - 'timestampfield' => date('Y-m-d H:i:s'), - ); - $this->insertValues($data, 'timestamp'); - $this->selectAndCheck($data); - - if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { - $this->testTimestampDataType(true); - } elseif($emulate_prepared) { - $this->db->setOption('emulate_prepared', false); - } - } - - /** - * Tests escaping of text values with special characters - */ - function testEscapeSequences() { - $test_strings = array( - "'", - "\"", - "\\", - "%", - "_", - "''", - "\"\"", - "\\\\", - "\\'\\'", - "\\\"\\\"" - ); - - $this->clearTables(); - foreach($test_strings as $key => $string) { - $value = $this->db->quote($string, 'text'); - $query = "INSERT INTO users (user_name,user_id) VALUES ($value, $key)"; - $result = $this->db->exec($query); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing insert query'.$result->getMessage()); - } - - $query = 'SELECT user_name FROM users WHERE user_id = '.$key; - $value = $this->db->queryOne($query, 'text'); - - if (PEAR::isError($value)) { - $this->assertTrue(false, 'Error executing select query'.$value->getMessage()); - } - - $this->assertEquals($string, $value, "the value retrieved for field \"user_name\" doesn't match what was stored"); - } - } - - /** - * Tests escaping of text pattern strings with special characters - */ - function testPatternSequences() { - $test_strings = array( - "Foo", - "FOO", - "foo", - ); - - $this->clearTables(); - foreach($test_strings as $key => $string) { - $value = $this->db->quote($string, 'text'); - $query = "INSERT INTO users (user_name,user_id) VALUES ($value, $key)"; - $result = $this->db->exec($query); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing insert query'.$result->getMessage()); - } - } - - $query = 'SELECT user_name FROM users WHERE '.$this->db->datatype->matchPattern(array('F', '%'), 'LIKE', 'user_name'); - $values = $this->db->queryCol($query, 'text'); - $this->assertEquals(2, count($values), "case sensitive search was expected to return 2 rows but returned: ".count($values)); - - $query = 'SELECT user_name FROM users WHERE '.$this->db->datatype->matchPattern(array('foo'), 'ILIKE', 'user_name'); - $values = $this->db->queryCol($query, 'text'); - $this->assertEquals(3, count($values), "case insensitive search was expected to return 3 rows but returned: ".count($values)); - } - - /** - * Tests escaping of text pattern strings with special characters - */ - function testEscapePatternSequences() { - if (!$this->supported('pattern_escaping')) { - return; - } - - $test_strings = array( - "%", - "_", - "%_", - "_%", - "%Foo%", - "%Foo_", - "Foo%123", - "Foo_123", - "_Foo%", - "_Foo_", - "%'", - "_'", - "'%", - "'_", - "'%'", - "'_'", - ); - - $this->clearTables(); - foreach($test_strings as $key => $string) { - $value = $this->db->quote($string, 'text'); - $query = "INSERT INTO users (user_name,user_id) VALUES ($value, $key)"; - $result = $this->db->exec($query); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing insert query'.$result->getMessage()); - } - - $query = 'SELECT user_name FROM users WHERE user_name LIKE '.$this->db->quote($string, 'text', true, true); - $value = $this->db->queryOne($query, 'text'); - if (PEAR::isError($value)) { - $this->assertTrue(false, 'Error executing select query'.$value->getMessage()); - } - - $this->assertEquals($string, $value, "the value retrieved for field \"user_name\" doesn't match what was stored"); - } - - $this->db->loadModule('Datatype', null, true); - $query = 'SELECT user_name FROM users WHERE user_name LIKE '.$this->db->datatype->matchPattern(array('Foo%', '_', '23')); - $value = $this->db->queryOne($query, 'text'); - $this->assertEquals('Foo%123', $value, "the value retrieved for field \"user_name\" doesn't match what was stored"); - - $query = 'SELECT user_name FROM users WHERE user_name LIKE '.$this->db->datatype->matchPattern(array(1 => '_', 'oo', '%')); - $value = $this->db->queryOne($query, 'text'); - $this->assertEquals('Foo', substr($value, 0, 3), "the value retrieved for field \"user_name\" doesn't match what was stored"); - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::getValidTypes() - * method returns the correct data array. - */ - function testGetValidTypes() - { - $this->db->loadModule('Datatype', null, true); - // Test with just the default MDB2 datatypes. - $aExpected = $this->db->datatype->valid_default_values; - $aResult = $this->db->datatype->getValidTypes(); - $this->assertEquals($aExpected, $aResult, 'getValidTypes'); - - // Test with a custom datatype - $this->db->setOption('datatype_map', array('test' => 'test')); - $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); - $aExpected = array_merge( - $this->db->datatype->valid_default_values, - array('test' => 'datatype_test_callback::getvalidtypes') - ); - $aResult = $this->db->datatype->getValidTypes(); - $this->assertEquals($aExpected, $aResult, 'getValidTypes'); - unset($this->db->options['datatype_map']); - unset($this->db->options['datatype_map_callback']); - - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::convertResult() - * method returns correctly converted column data. - */ - function testConvertResult() - { - $this->db->loadModule('Datatype', null, true); - // Test with an MDB2 datatype, eg. "text" - $value = 'text'; - $type = 'text'; - $result = $this->db->datatype->convertResult($value, $type); - $this->assertEquals($value, $result, 'convertResult'); - - // Test with a custom datatype - $this->db->setOption('datatype_map', array('test' => 'test')); - $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); - $value = 'text'; - $type = 'test'; - $result = $this->db->datatype->convertResult($value, $type); - $this->assertEquals('datatype_test_callback::convertresult', $result, 'mapPrepareDatatype'); - unset($this->db->options['datatype_map']); - unset($this->db->options['datatype_map_callback']); - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::getDeclaration() - * method returns correctly formatted SQL for declaring columns. - */ - function testGetDeclaration() - { - $this->db->loadModule('Datatype', null, true); - // Test with an MDB2 datatype, eg. "integer" - $name = 'column'; - $type = 'integer'; - $field = array('type' => 'integer'); - $result = $this->db->datatype->getDeclaration($type, $name, $field); - $actual_type = $this->db->phptype == 'sqlite' ? 'INTEGER' : 'INT'; - $this->assertEquals('column '.$actual_type.' DEFAULT NULL', $result, 'getDeclaration'); - - // Test with a custom datatype - $this->db->setOption('datatype_map', array('test' => 'test')); - $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); - $name = 'column'; - $type = 'test'; - $field = array('type' => 'test'); - $result = $this->db->datatype->getDeclaration($type, $name, $field); - $this->assertEquals('datatype_test_callback::getdeclaration', $result, 'getDeclaration'); - - // Test with a custom datatype without datatype_map_callback function - $name = 'address'; - $type = 'text'; - $field = array( - 'name' => 'company_addr', - 'type' => 'address', - ); - $this->db->setOption('datatype_map', array($name => $type)); - $result = $this->db->datatype->getDeclaration($field['type'], $field['name'], $field); - $expected = $field['name'].' '.$this->db->datatype->getTypeDeclaration(array('type' => $type)).' DEFAULT NULL'; - $this->assertEquals($expected, $result); - unset($this->db->options['datatype_map']); - unset($this->db->options['datatype_map_callback']); - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::compareDefinition() - * method - */ - function testCompareDefinition() - { - // Test with an MDB2 datatype, eg. "text" - $aPrevious = array( - 'type' => 'text', - 'length' => 4 - ); - $aCurrent = array( - 'type' => 'text', - 'length' => 5 - ); - $aResult = $this->db->datatype->compareDefinition($aCurrent, $aPrevious); - $this->assertTrue(is_array($aResult), 'compareDefinition'); - $this->assertEquals(1, count($aResult), 'compareDefinition'); - $this->assertTrue($aResult['length'], 'compareDefinition'); - - // Test with a custom datatype - $this->db->setOption('datatype_map', array('test' => 'test')); - $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); - $aPrevious = array( - 'type' => 'test' - ); - $aCurrent = array( - 'type' => 'test' - ); - $result = $this->db->datatype->compareDefinition($aCurrent, $aPrevious); - $this->assertEquals('datatype_test_callback::comparedefinition', $result, 'compareDefinition'); - unset($this->db->options['datatype_map']); - unset($this->db->options['datatype_map_callback']); - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::quote() - * method returns correctly quoted column data. - */ - function testQuote() - { - $this->db->loadModule('Datatype', null, true); - // Test with an MDB2 datatype, eg. "text" - $value = 'text'; - $type = 'text'; - $result = $this->db->datatype->quote($value, $type); - $this->assertEquals("'$value'", $result, 'quote'); - - // Test with a custom datatype - $this->db->setOption('datatype_map', array('test' => 'test')); - $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); - $value = 'text'; - $type = 'test'; - $result = $this->db->datatype->quote($value, $type); - $this->assertEquals('datatype_test_callback::quote', $result, 'quote'); - unset($this->db->options['datatype_map']); - unset($this->db->options['datatype_map_callback']); - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::mapPrepareDatatype() - * method returns the correct data type. - */ - function testMapPrepareDatatype() - { - $this->db->loadModule('Datatype', null, true); - // Test with an MDB2 datatype, eg. "text" - $type = 'text'; - $result = $this->db->datatype->mapPrepareDatatype($type); - if ($this->db->phptype == 'mysqli') { - $type = 's'; - } - $this->assertEquals($type, $result, 'mapPrepareDatatype'); - - // Test with a custom datatype - $this->db->setOption('datatype_map', array('test' => 'test')); - $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); - $type = 'test'; - $result = $this->db->datatype->mapPrepareDatatype($type); - $this->assertEquals('datatype_test_callback::mappreparedatatype', $result, 'mapPrepareDatatype'); - unset($this->db->options['datatype_map']); - unset($this->db->options['datatype_map_callback']); - } - - /** - * A method to test that the MDB2_Driver_Datatype_Common::mapNativeDatatype() - * method returns the correct MDB2 datatype from a given nativetype. - */ - function testMapNativeDatatype() - { - $this->db->loadModule('Datatype', null, true); - // Test with an common nativetype, eg. "text" - $field = array( - 'type' => 'int', - 'length' => 8 - ); - if (in_array($this->db->phptype, array('ibase', 'oci8'))) { - $field['type'] = 'integer'; - } - $expected_length = 8; - if (in_array($this->db->phptype, array('mysql', 'mysqli', 'pgsql', 'sqlite', 'mssql'))) { - $expected_length = 4; - } - $result = $this->db->datatype->mapNativeDatatype($field); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'mapNativeDatatype: '.$result->getUserInfo()); - } else { - $this->assertTrue(is_array($result), 'mapNativeDatatype'); - $this->assertEquals(4, count($result), 'mapNativeDatatype'); - $this->assertEquals('integer', $result[0][0], 'mapNativeDatatype'); - $this->assertEquals($expected_length, $result[1], 'mapNativeDatatype'); - } - - // Test with a custom nativetype mapping - $this->db->setOption('nativetype_map_callback', array('test' => 'nativetype_test_callback')); - $field = array( - 'type' => 'test' - ); - $result = $this->db->datatype->mapNativeDatatype($field); - $this->assertTrue(is_array($result), 'mapNativeDatatype'); - $this->assertEquals(4, count($result), 'mapNativeDatatype'); - $this->assertEquals('test', $result[0][0], 'mapNativeDatatype'); - $this->assertNull($result[1], 'mapNativeDatatype'); - $this->assertNull($result[2], 'mapNativeDatatype'); - $this->assertNull($result[3], 'mapNativeDatatype'); - $field = array( - 'type' => 'test(10)' - ); - $result = $this->db->datatype->mapNativeDatatype($field); - $this->assertTrue(is_array($result), 'mapNativeDatatype'); - $this->assertEquals(count($result), 4, 'mapNativeDatatype'); - $this->assertEquals($result[0][0], 'test', 'mapNativeDatatype'); - $this->assertEquals($result[1], 10, 'mapNativeDatatype'); - $this->assertNull($result[2], 'mapNativeDatatype'); - $this->assertNull($result[3], 'mapNativeDatatype'); - unset($this->db->options['nativetype_map_callback']); - } -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_extended_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_extended_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_extended_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_extended_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,580 +0,0 @@ - | -// | Lorenzo Alberton | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_extended_testcase.php,v 1.13 2007/02/28 12:15:26 quipo Exp $ - -require_once 'MDB2_testcase.php'; - -class MDB2_Extended_TestCase extends MDB2_TestCase -{ - /** - * - */ - function testAutoExecute() - { - $data = $this->getSampleData(); - $select_query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users'; - - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - $result = $this->db->extended->autoExecute('users', $data, MDB2_AUTOQUERY_INSERT, null, $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error auto executing insert: '.$result->getMessage()); - } - - $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); - $result =& $this->db->query($select_query, $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); - } else { - $this->verifyFetchedValues($result, null, $data); - $result->free(); - } - - $where = 'user_id = '.$this->db->quote($data['user_id'], 'integer'); - $result = $this->db->extended->autoExecute('users', null, MDB2_AUTOQUERY_SELECT, $where, null, true, $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error auto executing select: '.$result->getMessage()); - } else { - $this->verifyFetchedValues($result, null, $data); - $result->free(); - } - - $where = 'user_id = '.$this->db->quote($data['user_id'], 'integer'); - $result = $this->db->extended->autoExecute('users', null, MDB2_AUTOQUERY_SELECT, $where, null, true, MDB2_PREPARE_RESULT); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error auto executing select: '.$result->getMessage()); - } else { - $result->setResultTypes($this->fields); - $this->verifyFetchedValues($result, null, $data); - $result->free(); - } - - $update_data = array(); - $data['user_name'] = $update_data['user_name'] = 'foo'; - - $where = 'user_id = '.$this->db->quote($data['user_id'], 'integer'); - $result = $this->db->extended->autoExecute('users', $update_data, MDB2_AUTOQUERY_UPDATE, $where, $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error auto executing insert: '.$result->getMessage()); - } - - $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); - $result =& $this->db->query($select_query, $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); - } else { - $this->verifyFetchedValues($result, null, $data); - $result->free(); - } - - $where = array($where, 'user_name = '.$this->db->quote($data['user_name'], 'text')); - $result = $this->db->extended->autoExecute('users', null, MDB2_AUTOQUERY_DELETE, $where, null); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error auto executing insert: '.$result->getMessage()); - } - - $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); - $result =& $this->db->query($select_query, $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); - } else { - $this->assertEquals(0, $result->numRows(), 'No rows were expected to be returned'); - $result->free(); - } - } - - /** - * Test getAssoc() - * - * Test fetching two columns from a resultset. Return them as (key,value) pairs. - */ - function testGetAssoc() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = $this->getSampleData(1234); - - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - $stmt->free(); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - - //test getAssoc() with query parameters - $query = 'SELECT user_id, user_name FROM users WHERE user_id=?'; - $result = $this->db->extended->getAssoc($query, array('integer', 'text'), array(1234), array('integer')); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getAssoc(): '.$result->getMessage()); - } - $this->assertTrue(array_key_exists($data['user_id'], $result), 'Unexpected returned key'); - $this->assertEquals($data['user_name'], $result[$data['user_id']], 'Unexpected returned value'); - - //test getAssoc() without query parameters - $query = 'SELECT user_id, user_name FROM users WHERE user_id=1234'; - $result = $this->db->extended->getAssoc($query, array('integer', 'text')); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getAssoc(): '.$result->getMessage()); - } else { - $this->assertTrue(array_key_exists($data['user_id'], $result), 'Unexpected returned key'); - $this->assertEquals($data['user_name'], $result[$data['user_id']], 'Unexpected returned value'); - } - - //add another record to the db - $data2 = $this->getSampleData(4321); - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data2)); - $stmt->free(); - - //test getAssoc() with $force_array=true - $query = 'SELECT user_id, user_name FROM users ORDER BY user_id'; - $values = $this->db->extended->getAssoc($query, array('integer', 'text'), null, null, MDB2_FETCHMODE_ASSOC, true); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); - } else { - $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); - list($id, $value) = each($values); - $this->assertEquals($data['user_id'], $id, 'Unexpected returned value'); - $this->assertEquals($data['user_name'], $value['user_name'], 'Unexpected returned value'); - list($id, $value) = each($values); - $this->assertEquals($data2['user_id'], $id, 'Unexpected returned value'); - $this->assertEquals($data2['user_name'], $value['user_name'], 'Unexpected returned value'); - } - - - //test getAssoc() with $force_array=false and $group=true - $query = 'SELECT user_id, user_name FROM users ORDER BY user_id'; - $values = $this->db->extended->getAssoc($query, array('integer', 'text'), null, null, MDB2_FETCHMODE_ASSOC, false, true); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); - } else { - //@todo: check if MDB2_FETCHMODE_ASSOC is behaving correctly in this case - $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); - list($id, $value) = each($values); - $this->assertEquals($data['user_id'], $id, 'Unexpected returned value'); - $this->assertEquals($data['user_name'], $value[0], 'Unexpected returned value'); - list($id, $value) = each($values); - $this->assertEquals($data2['user_id'], $id, 'Unexpected returned value'); - $this->assertEquals($data2['user_name'], $value[0], 'Unexpected returned value'); - - } - - //test $group=true with 3 fields - $query = 'SELECT user_password, user_id, user_name FROM users ORDER BY user_id'; - $values = $this->db->extended->getAssoc($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC, false, true); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); - } else { - //the 2 values for user_password are equals, so they are collapsed in the same array - $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows'); - $values = $values[0]; - //there are 2 records - $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); - $value = array_shift($values); - $this->assertEquals($data['user_id'], $value['user_id'], 'Unexpected returned value'); - $this->assertEquals($data['user_name'], $value['user_name'], 'Unexpected returned value'); - $value = array_shift($values); - $this->assertEquals($data2['user_id'], $value['user_id'], 'Unexpected returned value'); - $this->assertEquals($data2['user_name'], $value['user_name'], 'Unexpected returned value'); - } - - //test $group=false with 3 fields - $values = $this->db->extended->getAssoc($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC, false, false); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); - } else { - //the 2 values for user_password are equals, so the first record is overwritten - $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows'); - $values = $values[0]; - $this->assertEquals($data2['user_id'], $value['user_id'], 'Unexpected returned value'); - $this->assertEquals($data2['user_name'], $value['user_name'], 'Unexpected returned value'); - } - } - - /** - * Test getOne() - * - * Test fetching a single value - */ - function testGetOne() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = $this->getSampleData(1234); - - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - $stmt->free(); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - - //test getOne() with query parameters - $query = 'SELECT user_name FROM users WHERE user_id=?'; - $result = $this->db->extended->getOne($query, 'text', array(1234), array('integer')); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getOne(): '.$result->getMessage()); - } - $this->assertEquals($data['user_name'], $result, 'Unexpected returned value'); - - //test getOne() without query parameters - $query = 'SELECT user_name FROM users WHERE user_id=1234'; - $result = $this->db->extended->getOne($query, 'text'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getOne(): '.$result->getMessage()); - } - $this->assertEquals($data['user_name'], $result, 'Unexpected returned value'); - - //test getOne() with column number (resultset: 0-based array) - $query = 'SELECT user_id, user_name, approved FROM users WHERE user_id=1234'; - $result = $this->db->extended->getOne($query, 'text', null, null, 1); //get the 2nd column - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getOne(): '.$result->getMessage()); - } - $this->assertEquals($data['user_name'], $result, 'Unexpected returned value'); - } - - /** - * Test getCol() - * - * Test fetching a column of result data. - */ - function testGetCol() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = array( - 0 => $this->getSampleData(1234), - 1 => $this->getSampleData(4321), - ); - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data[0])); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - $result = $stmt->execute(array_values($data[1])); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - $stmt->free(); - - //test getCol() with query parameters - $query = 'SELECT user_name FROM users WHERE user_id>?'; - $result = $this->db->extended->getCol($query, 'text', array(1), array('integer')); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getCol(): '.$result->getMessage()); - } - $expected = array( - $data[0]['user_name'], - $data[1]['user_name'], - ); - $this->assertEquals($expected, $result, 'Unexpected returned value'); - - //test getCol() without query parameters - $query = 'SELECT user_name FROM users'; - $result = $this->db->extended->getCol($query, 'text'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getCol(): '.$result->getMessage()); - } - $this->assertEquals($expected, $result, 'Unexpected returned value'); - - //test getCol() with column number (resultset: 0-based array) - $query = 'SELECT user_id, user_name, approved FROM users'; - $result = $this->db->extended->getCol($query, 'text', null, null, 1); //get the 2nd column - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getCol(): '.$result->getMessage()); - } - $this->assertEquals($expected, $result, 'Unexpected returned value'); - } - - /** - * Test getRow() - * - * Test fetching a row of result data. - */ - function testGetRow() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = $this->getSampleData(1234); - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - $result = $stmt->execute(array_values($data)); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - $stmt->free(); - - //test getRow() with query parameters - $query = 'SELECT user_id, user_name, user_password FROM users WHERE user_id=?'; - $result = $this->db->extended->getRow($query, array('integer', 'text', 'text'), array(1234), array('integer'), MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getRow(): '.$result->getMessage()); - } - $this->assertEquals($data['user_id'], $result['user_id'], 'Unexpected returned value'); - $this->assertEquals($data['user_name'], $result['user_name'], 'Unexpected returned value'); - $this->assertEquals($data['user_password'], $result['user_password'], 'Unexpected returned value'); - - //test getRow() without query parameters - $query = 'SELECT user_id, user_name, user_password FROM users'; - $result = $this->db->extended->getRow($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getRow(): '.$result->getMessage()); - } - $this->assertEquals($data['user_id'], $result['user_id'], 'Unexpected returned value'); - $this->assertEquals($data['user_name'], $result['user_name'], 'Unexpected returned value'); - $this->assertEquals($data['user_password'], $result['user_password'], 'Unexpected returned value'); - } - - /** - * Test getAll() - * - * Test fetching result data all at once. - */ - function testGetAll() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = array(); - $total_rows = 5; - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')', array_values($this->fields), MDB2_PREPARE_MANIP); - - for ($row = 0; $row < $total_rows; $row++) { - $data[$row] = $this->getSampleData($row); - $result = $stmt->execute(array_values($data[$row])); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - } - $stmt->free(); - - //test getAll() with query parameters - $query = 'SELECT user_id, user_name, user_password FROM users WHERE user_id > ? ORDER BY user_id'; - $values = $this->db->extended->getAll($query, array('integer', 'text', 'text'), array(2), array('integer'), MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error fetching the result set: '.$values->getMessage()); - } else { - $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); - for ($i=0; $i<2; $i++) { - $this->assertEquals($data[$i+3]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); - $this->assertEquals($data[$i+3]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); - $this->assertEquals($data[$i+3]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); - } - } - - //test getAll() without query parameters - $query = 'SELECT user_id, user_name, user_password FROM users ORDER BY user_id'; - $values = $this->db->extended->getAll($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error fetching the result set: '.$values->getMessage()); - } else { - $this->assertEquals($total_rows, count($values), 'Error: incorrect number of returned rows'); - for ($i=0; $i<$total_rows; $i++) { - $this->assertEquals($data[$i]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); - $this->assertEquals($data[$i]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); - $this->assertEquals($data[$i]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); - } - } - } - - /** - * Test limitQuery() - * - * Test fetching a limited resultset. - */ - function testLimitQuery() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = array(); - $total_rows = 5; - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')', array_values($this->fields), MDB2_PREPARE_MANIP); - - for ($row = 0; $row < $total_rows; $row++) { - $data[$row] = $this->getSampleData($row); - $result = $stmt->execute(array_values($data[$row])); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); - } - } - $stmt->free(); - - $query = 'SELECT user_id, user_name, user_password FROM users ORDER BY user_id'; - $types = array('integer', 'text', 'text'); - - //test limitQuery() with offset = 0 - $result = $this->db->extended->limitQuery($query, $types, 2); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing limitQuery(): '.$result->getMessage()); - } - $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error fetching the result set'); - } else { - $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); - for ($i=0; $i<2; $i++) { - $this->assertEquals($data[$i]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); - $this->assertEquals($data[$i]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); - $this->assertEquals($data[$i]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); - } - } - $result->free(); - - //test limitQuery() with offset > 0 - $result = $this->db->extended->limitQuery($query, $types, 3, 2); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing limitQuery(): '.$result->getMessage()); - } - $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($values)) { - $this->assertTrue(false, 'Error fetching the result set'); - } else { - $this->assertEquals(3, count($values), 'Error: incorrect number of returned rows'); - for ($i=0; $i<3; $i++) { - $this->assertEquals($data[$i+2]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); - $this->assertEquals($data[$i+2]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); - $this->assertEquals($data[$i+2]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); - } - } - $result->free(); - } - - /** - * Test execParam() - * - * Test executing a query with parameters - */ - function testExecParam() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = $this->getSampleData(1234); - - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - - $result = $this->db->extended->execParam($query, array_values($data), $this->fields); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing execParam(): '.$result->getMessage()); - } - - $query = 'SELECT user_id, user_name, user_password FROM users WHERE user_id=?'; - $result = $this->db->extended->getRow($query, array('integer', 'text', 'text'), array(1234), array('integer'), MDB2_FETCHMODE_ASSOC); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing getRow(): '.$result->getMessage()); - } - $this->assertEquals($data['user_id'], $result['user_id'], 'Unexpected returned value'); - $this->assertEquals($data['user_name'], $result['user_name'], 'Unexpected returned value'); - $this->assertEquals($data['user_password'], $result['user_password'], 'Unexpected returned value'); - } - - /** - * Test executeMultiple() - * - * Test executing multiple prepared queries - */ - function testExecuteMultiple() - { - $result = $this->db->loadModule('Extended'); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); - } - - $data = array(); - $total_rows = 5; - - for ($row = 0; $row < $total_rows; $row++) { - $data[$row] = array_values($this->getSampleData($row)); - } - - $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'); - $result = $this->db->extended->executeMultiple($stmt, $data); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing executeMultiple(): '.$result->getMessage()); - } - $stmt->free(); - - $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users'; - $values = $this->db->queryAll($query, $this->fields, MDB2_FETCHMODE_ORDERED); - - $n_fields = count($this->fields); - for ($i=0; $i<$total_rows; $i++) { - for ($field=0; $field<$n_fields; $field++) { - $this->assertEquals(strval($data[$i][$field]), strval($values[$i][$field]), 'Unexpected returned value'); - } - } - } -} -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_function_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_function_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_function_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_function_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,229 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_function_testcase.php,v 1.20 2006/08/07 20:15:57 lsmith Exp $ - -class MDB2_Function_TestCase extends MDB2_TestCase -{ - function setUp() { - parent::setUp(); - $this->db->loadModule('Function', null, true); - } - - /** - * Test functionTable() - */ - function testFunctionTable() - { - if (!$this->methodExists($this->db->function, 'functionTable')) { - return; - } - - $functionTable_clause = $this->db->function->functionTable(); - $query = 'SELECT 1 '.$functionTable_clause; - $result = $this->db->queryOne($query); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error fetching from function table'); - } else { - $this->assertEquals('1', $result, 'Error fetching value from function table'); - } - } - - /** - * Test now() - */ - function testNow() - { - if (!$this->methodExists($this->db->function, 'now')) { - return; - } - - $tests = array( - 'timestamp' => '/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', - 'date' => '/^\d{4}-\d{2}-\d{2}$/', - 'time' => '/^\d{2}:\d{2}:\d{2}$/', - ); - - foreach ($tests as $type => $regexp) { - $functionTable_clause = $this->db->function->functionTable(); - $now_clause = $this->db->function->now($type); - $query = 'SELECT '.$now_clause . $functionTable_clause; - $result = $this->db->queryOne($query, $type); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting '.$type); - } else { - $this->assertRegExp($regexp, $result, 'Error: not a proper '.$type); - } - } - } - - /** - * Test substring() - */ - function testSubstring() - { - if (!$this->methodExists($this->db->function, 'substring')) { - return; - } - $data = $this->getSampleData(1234); - - $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; - $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); - - $result = $stmt->execute(array_values($data)); - $stmt->free(); - - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage()); - } - - $substring_clause = $this->db->function->substring('user_name', 1, 4); - $query = 'SELECT '.$substring_clause .' FROM users'; - $result = $this->db->queryOne($query); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting substring'); - } else { - $this->assertEquals('user', $result, 'Error: substrings not equals'); - } - - $substring_clause = $this->db->function->substring('user_name', 5, 1); - $query = 'SELECT '.$substring_clause .' FROM users'; - $result = $this->db->queryOne($query); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting substring'); - } else { - $this->assertEquals('_', $result, 'Error: substrings not equals'); - } - - //test NULL 2nd parameter - $substring_clause = $this->db->function->substring('user_name', 6); - $query = 'SELECT '.$substring_clause .' FROM users'; - $result = $this->db->queryOne($query); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting substring'); - } else { - $this->assertEquals('1234', $result, 'Error: substrings not equals'); - } - } - - /** - * Test concat() - */ - function testConcat() - { - if (!$this->methodExists($this->db->function, 'concat')) { - return; - } - - $functionTable_clause = $this->db->function->functionTable(); - $concat_clause = $this->db->function->concat($this->db->quote('time', 'text'), $this->db->quote('stamp', 'text')); - $query = 'SELECT '.$concat_clause . $functionTable_clause; - $result = $this->db->queryOne($query); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting concat'); - } else { - $this->assertEquals('timestamp', $result, 'Error: could not concatenate "time+stamp"'); - } - } - - /** - * Test random() - */ - function testRandom() - { - if (!$this->methodExists($this->db->function, 'random')) { - return; - } - - $rand_clause = $this->db->function->random(); - $functionTable_clause = $this->db->function->functionTable(); - $query = 'SELECT '.$rand_clause . $functionTable_clause; - $result = $this->db->queryOne($query, 'float'); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting random value:'. $result->getMessage()); - } else { - $this->assertTrue(($result >= 0 && $result <= 1), 'Error: could not get random value between 0 and 1: '.$result); - } - } - - /** - * Test lower() - */ - function testLower() - { - if (!$this->methodExists($this->db->function, 'lower')) { - return; - } - $string = $this->db->quote('FoO'); - $lower_clause = $this->db->function->lower($string); - $functionTable_clause = $this->db->function->functionTable(); - $query = 'SELECT '.$lower_clause . $functionTable_clause; - $result = $this->db->queryOne($query, 'text'); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting lower case value:'. $result->getMessage()); - } else { - $this->assertTrue(($result === 'foo'), 'Error: could not lower case "FoO": '.$result); - } - } - - /** - * Test upper() - */ - function testUpper() - { - if (!$this->methodExists($this->db->function, 'upper')) { - return; - } - $string = $this->db->quote('FoO'); - $upper_clause = $this->db->function->upper($string); - $functionTable_clause = $this->db->function->functionTable(); - $query = 'SELECT '.$upper_clause . $functionTable_clause; - $result = $this->db->queryOne($query, 'text'); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error getting upper case value:'. $result->getMessage()); - } else { - $this->assertTrue(($result === 'FOO'), 'Error: could not upper case "FoO": '.$result); - } - } -} -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_internals_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_internals_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_internals_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_internals_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,548 +0,0 @@ - | -// | Andrew Hill | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_internals_testcase.php,v 1.1 2007/03/02 16:39:22 quipo Exp $ - -require_once 'MDB2_testcase.php'; - -class MDB2_Internals_TestCase extends MDB2_TestCase { - - var $clear_tables = false; - - /** - * Tests that the MDB2::apiVersion() method returns an API version number. - */ - function test_apiVersion() - { - $result = MDB2::apiVersion(); - $this->assertNotNull($result, 'apiVersion'); - $result = strtok($result, '.'); - $this->assertTrue(is_numeric($result), 'apiVersion'); - $result = strtok('.'); - $this->assertTrue(is_numeric($result), 'apiVersion'); - $result = strtok('.'); - $this->assertTrue(is_numeric($result), 'apiVersion'); - } - - /** - * Tests that the MDB2::classExists() method correctly tests for - * existence of a class. - */ - function test_classExists() - { - $this->assertFalse(MDB2::classExists('null'), 'classExists'); - $this->assertTrue(MDB2::classExists('MDB2'), 'classExists'); - } - - /** - * Tests that the MDB2::loadClass() method correctly loads classes. - */ - function test_loadClass() - { - $this->assertTrue(MDB2::loadClass('MDB2', false), 'loadClass'); - // Suppress handling of PEAR errors while testing next case - PEAR::pushErrorHandling(null); - $result = MDB2::loadClass('null', false); - $this->assertTrue(is_a($result, 'pear_error'), 'loadClass'); - PEAR::popErrorHandling(); - } - - /** - * Tests that the MDB2::factory() method correctly connects to a - * database. - */ - function test_factory() - { - $db =& MDB2::factory($this->dsn); - $this->assertTrue(MDB2::isConnection($db), 'factory'); - // Suppress handling of PEAR errors while preparing the - // next test case database connection - PEAR::pushErrorHandling(null); - $db =& MDB2::factory(null); - PEAR::popErrorHandling(); - $this->assertFalse(MDB2::isConnection($db), 'factory'); - } - - /** - * Tests that the MDB2::loadFile() method returns the expected - * filename. - */ - function test_loadFile() - { - $filename = 'Extended'; - $this->assertEquals('MDB2'.DIRECTORY_SEPARATOR.$filename.'.php', MDB2::loadFile($filename), 'loadFile'); - } - - /** - * Tests that the MDB2::isConnection() method correctly reports - * connections. - */ - function test_isConnection() - { - $this->assertTrue(MDB2::isConnection($this->db), 'isConnection'); - $this->assertFalse(MDB2::isConnection(null), 'isConnection'); - } - - /** - * Tests that the MDB2::isResult() method correctly identifies - * results. - */ - function test_isResult() - { - $obj = new MDB2_Result(); - $this->assertTrue(MDB2::isResult($obj), 'isResult'); - $obj = null; - $this->assertFalse(MDB2::isResult($obj), 'isResult'); - } - - /** - * Tests that the MDB2::isResultCommon() method correctly identifies - * common results. - */ - function test_isResultCommon() - { - $result = null; - $obj = new MDB2_Result_Common($this->db, $result); - $this->assertTrue(MDB2::isResultCommon($obj), 'isResultCommon'); - $obj = null; - $this->assertFalse(MDB2::isResultCommon($obj), 'isResultCommon'); - } - - /** - * Tests that the MDB2::parseDSN() method works. - */ - function test_parseDSN() - { - $dsn = $this->dsn; - $result = MDB2::parseDSN($dsn); - $this->assertEquals($dsn['phptype'],$result['dbsyntax'],'parseDSN'); - - $dsn = "mydbms://myname:mypassword@localhost"; - $result = MDB2::parseDSN($dsn); - $this->assertEquals('mydbms', $result['phptype'],'parseDSN'); - $this->assertEquals('mydbms',$result['dbsyntax'],'parseDSN'); - $this->assertEquals('tcp',$result['protocol'],'parseDSN'); - $this->assertEquals('localhost',$result['hostspec'],'parseDSN'); - $this->assertEquals(false,$result['port'],'parseDSN'); - $this->assertEquals(false,$result['socket'],'parseDSN'); - $this->assertEquals('myname',$result['username'],'parseDSN'); - $this->assertEquals('mypassword',$result['password'],'parseDSN'); - $this->assertEquals(false,$result['database'],'parseDSN'); - - $dsn = "somesql://myname:mypassword@localhost:1234/mydb"; - $result = MDB2::parseDSN($dsn); - $this->assertEquals('somesql',$result['phptype'],'parseDSN'); - $this->assertEquals('somesql',$result['dbsyntax'],'parseDSN'); - $this->assertEquals('tcp',$result['protocol'],'parseDSN'); - $this->assertEquals('localhost',$result['hostspec'],'parseDSN'); - $this->assertEquals('1234',$result['port'],'parseDSN'); - $this->assertEquals(false,$result['socket'],'parseDSN'); - $this->assertEquals('myname',$result['username'],'parseDSN'); - $this->assertEquals('mypassword',$result['password'],'parseDSN'); - $this->assertEquals('mydb',$result['database'],'parseDSN'); - - $dsn = "dbms1://myname@unix(opts)/mydb?param1=value1"; - $result = MDB2::parseDSN($dsn); - $this->assertEquals('dbms1',$result['phptype'],'parseDSN'); - $this->assertEquals('dbms1',$result['dbsyntax'],'parseDSN'); - $this->assertEquals('unix',$result['protocol'],'parseDSN'); - $this->assertEquals(false,$result['hostspec'],'parseDSN'); - $this->assertEquals(false,$result['port'],'parseDSN'); - $this->assertEquals('opts',$result['socket'],'parseDSN'); - $this->assertEquals('myname',$result['username'],'parseDSN'); - $this->assertEquals(false,$result['password'],'parseDSN'); - $this->assertEquals('mydb',$result['database'],'parseDSN'); - $this->assertEquals('value1',$result['param1'],'parseDSN'); - } - - /** - * Tests that the MDB2::fileExists() method correctly identifies - * existing/non-existing files. - */ - function test_fileExists() - { - $this->assertTrue(MDB2::fileExists('PEAR.php'), 'fileExists'); - $this->assertFalse(MDB2::fileExists('itIsHopedThatNoOneHasAFileWithThisName.php'), 'fileExists'); - } - - /** - * Tests that the MDB2::__toString() method returns the expected - * string result. - */ - function test__toString() - { - $expected = "MDB2_Driver_{$this->dsn['phptype']}: (phptype = {$this->dsn['phptype']}, dbsyntax = {$this->db->dbsyntax})"; - if (version_compare(PHP_VERSION, "5.0.0", "<")) { - $expected = strtolower($expected); - } - $this->assertEquals($expected ,$this->db->__toString(), '__toString'); - } - - /** - * Tests that the MDB2::setFetchMode() method correctly sets the - * fetch mode. - */ - function test_setFetchMode() - { - $tmp = $this->db->fetchmode; - $this->db->setFetchMode(MDB2_FETCHMODE_OBJECT); - $this->assertEquals('stdClass', $this->db->options['fetch_class'], 'setFetchMode'); - $this->db->setFetchMode(MDB2_FETCHMODE_ORDERED); - $this->assertEquals(MDB2_FETCHMODE_ORDERED, $this->db->fetchmode, 'setFetchMode'); - $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); - $this->assertEquals(MDB2_FETCHMODE_ASSOC, $this->db->fetchmode, 'setFetchMode'); - $this->db->fetchmode = $tmp; - } - - /** - * Tests that the MDB2::escape() method correctly escapes strings. - */ - function test_escape() - { - $tmp = $this->db->string_quoting; - $this->string_quoting['escape'] = '\\'; - $this->string_quoting['end'] = '"'; - $text = 'xxx"z"xxx'; - $this->assertEquals('xxx\"z\"xxx', MDB2_Driver_Common::escape($text), 'escape'); - $this->db->string_quoting = $tmp; - } - - /** - * Tests that the MDB2::quoteIdentifier() method correctly quotes strings. - */ - function test_quoteIdentifier() - { - if ($this->db->phptype == 'ibase') { - return; - } - $tmp = $this->db->identifier_quoting; - $this->db->identifier_quoting['start'] = '"'; - $this->db->identifier_quoting['end'] = '`'; - $this->db->identifier_quoting['escape'] = '/'; - $text = 'my`identifier'; - $this->assertEquals('"my/`identifier`', $this->db->quoteIdentifier($text), 'quoteIdentifier'); - $this->db->identifier_quoting = $tmp; - } - - /** - * Tests that the MDB2::getAsKeyword() method correctly returns - * the set "as" keyword. - */ - function test_getAsKeyword() - { - $tmp = $this->db->as_keyword; - $this->db->as_keyword = 'ALIAS'; - $this->assertEquals('ALIAS', $this->db->getAsKeyword(), 'getAsKeyword'); - $this->db->as_keyword = $tmp; - } - - /** - * Tests that the MDB2::getConnection() method correctly returns - * a database resource. - */ - function test_getConnection() - { - $result = $this->db->getConnection(); - $this->assertTrue(is_resource($result), 'getConnection'); - } - - /** - * A private method to return a defined "row" of data for use - * in the next set of tests. - * - * @access private - * @return array The array of "row" data. - */ - function _fetchRowData() - { - return array( - 0 => '', - 1 => 'notnull', - 2 => 'length7 ', - '1?2:3.4' => 'assoc' - ); - } - - /** - * A private method to test results from the MDB2::_fixResultArrayValues() - * method when the $mode parameter was set to MDB2_PORTABILITY_EMPTY_TO_NULL. - * - * @access private - * @param array $row The result of the call to MDB2::_fixResultArrayValues(). - */ - function _fixResultArrayValues_Test_EmptyToNull($row) - { - $this->assertNull($row[0], '_fixResultArrayValues'); - $this->assertNotNull($row[1], '_fixResultArrayValues'); - $this->assertNotNull($row[2], '_fixResultArrayValues'); - } - - /** - * A private method to test results from the MDB2::_fixResultArrayValues() - * method when the $mode parameter was set to MDB2_PORTABILITY_RTRIM. - * - * @access private - * @param array $row The result of the call to MDB2::_fixResultArrayValues(). - */ - function _fixResultArrayValues_Test_Rtrim($row) - { - $this->assertEquals(strlen($row[0]), 0, '_fixResultArrayValues'); - $this->assertEquals(strlen($row[1]), 7, '_fixResultArrayValues'); - $this->assertEquals(strlen($row[2]), 7, '_fixResultArrayValues'); - } - - /** - * A private method to test results from the MDB2::_fixResultArrayValues() - * method when the $mode parameter was set to MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES. - * - * @access private - * @param array $row The result of the call to MDB2::_fixResultArrayValues(). - */ - function _fixResultArrayValues_Test_FixAssocFieldNames($row) - { - $this->assertTrue(array_key_exists(4, $row), '_fixResultArrayValues'); - $this->assertTrue($row[4] == 'assoc', '_fixResultArrayValues'); - } - - /** - * Tests that the MDB2::_fixResultArrayValues() method fixes array - * values when used with various $mode parameters. - */ - function test__fixResultArrayValues() - { - $mode = MDB2_PORTABILITY_EMPTY_TO_NULL; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_EmptyToNull($row); - - $mode = MDB2_PORTABILITY_RTRIM; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_Rtrim($row); - - $mode = MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); - - $mode = MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_RTRIM; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_EmptyToNull($row); - $this->_fixResultArrayValues_Test_Rtrim($row); - - $mode = MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_EmptyToNull($row); - $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); - - $mode = MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_Rtrim($row); - $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); - - $mode = MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; - $row = $this->_fetchRowData(); - $this->db->_fixResultArrayValues($row, $mode); - $this->_fixResultArrayValues_Test_EmptyToNull($row); - $this->_fixResultArrayValues_Test_Rtrim($row); - $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); - } - - /** - * Tests that the MDB2::transaction() method returns expected values - * when starting or rolling back a transaction, and for testing if - * the connection is in a transaction. - */ - function test_transaction() - { - if (!$this->db->supports('transactions')) - { - $this->assertTrue($this->db->beginTransaction(), 'transaction'); - $this->assertTrue($this->db->in_transaction, 'transaction'); - $this->assertTrue($this->db->rollback(), 'transaction'); - $this->assertFalse($this->db->in_transaction, 'transaction'); - - $this->assertTrue($this->db->beginTransaction(), 'transaction'); - $this->assertTrue($this->db->in_transaction, 'transaction'); - $this->assertTrue($this->db->commit(), 'transaction'); - $this->assertFalse($this->db->in_transaction, 'transaction'); - } - } - - // Nested transactions are not yet tested, due to a MySQL 5 problem with - // savepoints causing netsted transactions to fail. - // - // See http://bugs.mysql.com/bug.php?id=26288 - - /** - * Tests that the MDB2::setDatabase() and MDB2::getDatabase() methods - * correctly set and get the database name. - */ - function test_setGetDatabase() - { - $old_name = $this->db->database_name; - $this->assertEquals($old_name, $this->db->setDatabase('test_database'), 'setDatabase'); - $this->assertEquals('test_database', $this->db->database_name, 'setDatabase'); - $this->assertEquals('test_database', $this->db->getDatabase(), 'getDatabase'); - $this->db->database_name = $old_name; - } - - /** - * Tests that the MDB2::setDSN() method correctly sets - * the DSN. - */ - function test_setDSN() - { - $dsn = "mydbms://myname:mypassword@localhost"; - $result = $this->db->setDSN($dsn); - $dsn_set = $this->db->dsn; - - $this->assertEquals('mydbms', $dsn_set['phptype'],'setDSN'); - $this->assertEquals('mydbms',$dsn_set['dbsyntax'],'setDSN'); - $this->assertEquals('tcp',$dsn_set['protocol'],'setDSN'); - $this->assertEquals('localhost',$dsn_set['hostspec'],'setDSN'); - $this->assertEquals(false,$dsn_set['port'],'setDSN'); - $this->assertEquals(false,$dsn_set['socket'],'setDSN'); - $this->assertEquals('myname',$dsn_set['username'],'setDSN'); - $this->assertEquals('mypassword',$dsn_set['password'],'setDSN'); - $this->assertEquals(false,$dsn_set['database'],'setDSN'); - } - - /** - * Tests that the MDB2::getDSN() method correctly gets - * the DSN. - */ - function test_getDSN() - { - $dsn_set = "mydbms://myname:mypassword@localhost"; - $result = $this->db->setDSN($dsn_set); - $dsn_get = $this->db->getDSN(); - $dsn_rex = "/(([\w]+)$mydbms$:\/\/myname:mypassword@localhost\/)/"; - //preg_match($dsn_rex, $dsn_get, $matches); - $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); - $dsn_rex = "/{$this->dsn['phptype']}[\w\W]+/"; - $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); - - $dsn_set = "mydbms://myname:mypassword@localhost"; - $result = $this->db->setDSN($dsn_set); - $dsn_get = $this->db->getDSN('string', true); - $dsn_rex = "/(([\w]+)$mydbms$:\/\/myname:1@localhost\/)/"; - $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); - $dsn_rex = "/{$this->dsn['phptype']}[\w\W]+/"; - $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); - - } - - /** - * Tests that the MDB2::setLimit() method correctly sets the limit - * and offset values. - */ - function test_setLimit() - { - if (!$this->db->supports('limit_queries')) - { - $this->db->limit = null; - $this->db->offset = null; - $this->db->setLimit(100, 50); - $this->assertEquals(100, $this->db->limit , 'setLimit'); - $this->assertEquals( 50, $this->db->offset, 'setLimit'); - } - } - - /** - * Tests that the MDB2::supports() method correctly finds keys - * in the "supports" array. - */ - function test_supports() - { - $this->db->supports['testkey'] = true; - $this->assertTrue($this->db->supports('testkey'), 'supports'); - unset($this->db->supports['testkey']); - } - - /** - * Tests that the MDB2::getSequenceName() method correctly gets - * sequence names. - */ - function test_getSequenceName() - { - $tmp = $this->db->options['seqname_format']; - $this->db->options['seqname_format'] = '%s_seq'; - $this->assertEquals('test_seq', strtolower($this->db->getSequenceName('test')), 'getSequenceName'); - $this->db->options['seqname_format'] = $tmp; - } - - /** - * Tests that the MDB2::getIndexName() method correctly gets - * index names. - */ - function test_getIndexName() - { - $tmp = $this->db->options['idxname_format']; - $this->db->options['idxname_format'] = 'idx_%s'; - $this->assertEquals('idx_test', $this->db->getIndexName('test'), 'getIndexName'); - $this->db->options['idxname_format'] = $tmp; - } - - /** - * Tests that the MDB2::disconnect() method correctly disconnects. - */ - function test_disconnect() - { - $this->assertTrue($this->db->disconnect(), 'disconnect'); - $this->assertEquals(0, $this->db->connection, 'disconnect'); - $this->assertEquals(array(), $this->db->connected_dsn, 'disconnect'); - $this->assertEquals('', $this->db->connected_database_name, 'disconnect'); - $this->assertNull($this->db->opened_persistent, 'disconnect'); - $this->assertEquals('', $this->db->connected_server_info, 'disconnect'); - $this->assertNull($this->db->in_transaction, 'disconnect'); - $this->assertNull($this->db->nested_transaction_counter, 'disconnect'); - } - -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_manager_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_manager_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_manager_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_manager_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,708 +0,0 @@ - | -// | Lorenzo Alberton | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_manager_testcase.php,v 1.55 2007/03/05 01:28:13 quipo Exp $ - -require_once 'MDB2_testcase.php'; - -class MDB2_Manager_TestCase extends MDB2_TestCase { - //test table name (it is dynamically created/dropped) - var $table = 'newtable'; - - function setUp() { - parent::setUp(); - $this->db->loadModule('Manager', null, true); - $this->fields = array( - 'id' => array( - 'type' => 'integer', - 'unsigned' => true, - 'notnull' => true, - 'default' => 0, - ), - 'somename' => array( - 'type' => 'text', - 'length' => 12, - ), - 'somedescription' => array( - 'type' => 'text', - 'length' => 12, - ), - 'sex' => array( - 'type' => 'text', - 'length' => 1, - 'default' => 'M', - ), - ); - if (!$this->tableExists($this->table)) { - $this->db->manager->createTable($this->table, $this->fields); - } - } - - function tearDown() { - if ($this->tableExists($this->table)) { - $this->db->manager->dropTable($this->table); - } - $this->db->popExpect(); - unset($this->dsn); - if (!PEAR::isError($this->db->manager)) { - $this->db->disconnect(); - } - unset($this->db); - } - - /** - * Create a sample table, test the new fields, and drop it. - */ - function testCreateTable() { - if (!$this->methodExists($this->db->manager, 'createTable')) { - return; - } - if ($this->tableExists($this->table)) { - $this->db->manager->dropTable($this->table); - } - - $result = $this->db->manager->createTable($this->table, $this->fields); - $this->assertFalse(PEAR::isError($result), 'Error creating table'); - } - - /** - * Create a sample table, test the new fields, and drop it. - */ - function testCreateAutoIncrementTable() { - if (!$this->methodExists($this->db->manager, 'createTable')) { - return; - } - if ($this->tableExists($this->table)) { - $this->db->manager->dropTable($this->table); - } - - $fields = $this->fields; - $fields['id']['autoincrement'] = true; - $result = $this->db->manager->createTable($this->table, $fields); - $this->assertFalse(PEAR::isError($result), 'Error creating table'); - $query = 'INSERT INTO '.$this->table; - $query.= ' (somename, somedescription)'; - $query.= ' VALUES (:somename, :somedescription)'; - $stmt =& $this->db->prepare($query, array('text', 'text'), MDB2_PREPARE_MANIP); - if (PEAR::isError($stmt)) { - $this->assertTrue(true, 'Preparing insert'); - return; - } - $values = array( - 'somename' => 'foo', - 'somedescription' => 'bar', - ); - $rows = 5; - for ($i =0; $i < $rows; ++$i) { - $result = $stmt->execute($values); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error executing autoincrementing insert number: '.$i); - return; - } - } - $stmt->free(); - $query = 'SELECT id FROM '.$this->table; - $data = $this->db->queryCol($query); - if (PEAR::isError($data)) { - $this->assertTrue(true, 'Error executing select'); - return; - } - for ($i =0; $i < $rows; ++$i) { - if (!isset($data[$i])) { - $this->assertTrue(true, 'Error in data returned by select'); - return; - } - if ($data[$i] === ($i+1)) { - $this->assertTrue(true, 'Error executing autoincrementing insert'); - return; - } - } - } - - /** - * - */ - function testListTableFields() { - if (!$this->methodExists($this->db->manager, 'listTableFields')) { - return; - } - $this->assertEquals( - array_keys($this->fields), - $this->db->manager->listTableFields($this->table), - 'Error creating table: incorrect fields' - ); - } - - /** - * - */ - function testCreateIndex() { - if (!$this->methodExists($this->db->manager, 'createIndex')) { - return; - } - $index = array( - 'fields' => array( - 'somename' => array( - 'sorting' => 'ascending', - ), - ), - ); - $name = 'simpleindex'; - $result = $this->db->manager->createIndex($this->table, $name, $index); - $this->assertFalse(PEAR::isError($result), 'Error creating index'); - } - - /** - * - */ - function testDropIndex() { - if (!$this->methodExists($this->db->manager, 'dropIndex')) { - return; - } - $index = array( - 'fields' => array( - 'somename' => array( - 'sorting' => 'ascending', - ), - ), - ); - $name = 'simpleindex'; - $result = $this->db->manager->createIndex($this->table, $name, $index); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error creating index'); - } else { - $result = $this->db->manager->dropIndex($this->table, $name); - $this->assertFalse(PEAR::isError($result), 'Error dropping index'); - $indices = $this->db->manager->listTableIndexes($this->table); - $this->assertFalse(PEAR::isError($indices), 'Error listing indices'); - $this->assertFalse(in_array($name, $indices), 'Error dropping index'); - } - } - - /** - * - */ - function testListIndexes() { - if (!$this->methodExists($this->db->manager, 'listTableIndexes')) { - return; - } - $index = array( - 'fields' => array( - 'somename' => array( - 'sorting' => 'ascending', - ), - ), - ); - $name = 'simpleindex'; - $result = $this->db->manager->createIndex($this->table, $name, $index); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error creating index'); - } else { - $indices = $this->db->manager->listTableIndexes($this->table); - $this->assertFalse(PEAR::isError($indices), 'Error listing indices'); - $this->assertTrue(in_array($name, $indices), 'Error listing indices'); - } - } - - /** - * - */ - function testCreatePrimaryKey() { - if (!$this->methodExists($this->db->manager, 'createConstraint')) { - return; - } - $index = array( - 'fields' => array( - 'id' => array( - 'sorting' => 'ascending', - ), - ), - 'primary' => true, - ); - $name = 'pkindex'; - $result = $this->db->manager->createConstraint($this->table, $name, $index); - $this->assertFalse(PEAR::isError($result), 'Error creating primary index'); - } - - /** - * - */ - function testCreateUniqueConstraint() { - if (!$this->methodExists($this->db->manager, 'createConstraint')) { - return; - } - $index = array( - 'fields' => array( - 'somename' => array( - 'sorting' => 'ascending', - ), - ), - 'unique' => true, - ); - $name = 'uniqueindex'; - $result = $this->db->manager->createConstraint($this->table, $name, $index); - $this->assertFalse(PEAR::isError($result), 'Error creating unique index'); - } - - /** - * - */ - function testDropPrimaryKey() { - if (!$this->methodExists($this->db->manager, 'dropConstraint')) { - return; - } - $index = array( - 'fields' => array( - 'id' => array( - 'sorting' => 'ascending', - ), - ), - 'primary' => true, - ); - $name = 'pkindex'; - $result = $this->db->manager->createConstraint($this->table, $name, $index); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error creating primary index'); - } else { - $result = $this->db->manager->dropConstraint($this->table, $name, true); - $this->assertFalse(PEAR::isError($result), 'Error dropping primary key index'); - } - } - - /** - * - */ - function testListConstraints() { - if (!$this->methodExists($this->db->manager, 'listTableConstraints')) { - return; - } - $index = array( - 'fields' => array( - 'id' => array( - 'sorting' => 'ascending', - ), - ), - 'unique' => true, - ); - $name = 'uniqueindex'; - $result = $this->db->manager->createConstraint($this->table, $name, $index); - if (PEAR::isError($result)) { - $this->assertFalse(true, 'Error creating unique constraint'); - } else { - $constraints = $this->db->manager->listTableConstraints($this->table); - $this->assertFalse(PEAR::isError($constraints), 'Error listing constraints'); - $this->assertTrue(in_array($name, $constraints), 'Error listing unique key index'); - } - } - - /** - * - */ - function testListTables() { - if (!$this->methodExists($this->db->manager, 'listTables')) { - return; - } - $this->assertTrue($this->tableExists($this->table), 'Error listing tables'); - } - - /** - * - */ - function testAlterTable() { - if (!$this->methodExists($this->db->manager, 'alterTable')) { - return; - } - $newer = 'newertable'; - if ($this->tableExists($newer)) { - $this->db->manager->dropTable($newer); - } - $changes = array( - 'add' => array( - 'quota' => array( - 'type' => 'integer', - 'unsigned' => 1, - ), - 'note' => array( - 'type' => 'text', - 'length' => '20', - ), - ), - 'rename' => array( - 'sex' => array( - 'name' => 'gender', - 'definition' => array( - 'type' => 'text', - 'length' => 1, - 'default' => 'M', - ), - ), - ), - 'change' => array( - 'id' => array( - 'unsigned' => false, - 'definition' => array( - 'type' => 'integer', - 'notnull' => false, - 'default' => 0, - ), - ), - 'somename' => array( - 'length' => '20', - 'definition' => array( - 'type' => 'text', - 'length' => 20, - ), - ) - ), - 'remove' => array( - 'somedescription' => array(), - ), - 'name' => $newer, - ); - - $this->db->expectError(MDB2_ERROR_CANNOT_ALTER); - $result = $this->db->manager->alterTable($this->table, $changes, true); - $this->db->popExpect(); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Cannot alter table'); - } else { - $result = $this->db->manager->alterTable($this->table, $changes, false); - if (PEAR::isError($result)) { - $this->assertTrue(true, 'Error altering table'); - } else { - $this->db->manager->dropTable($newer); - } - } - } - - /** - * - */ - function testAlterTable2() { - if (!$this->methodExists($this->db->manager, 'alterTable')) { - return; - } - $newer = 'newertable2'; - if ($this->tableExists($newer)) { - $this->db->manager->dropTable($newer); - } - $changes_all = array( - 'add' => array( - 'quota' => array( - 'type' => 'integer', - 'unsigned' => 1, - ), - ), - 'rename' => array( - 'sex' => array( - 'name' => 'gender', - 'definition' => array( - 'type' => 'text', - 'length' => 1, - 'default' => 'M', - ), - ), - ), - 'change' => array( - 'somename' => array( - 'length' => '20', - 'definition' => array( - 'type' => 'text', - 'length' => 20, - ), - ) - ), - 'remove' => array( - 'somedescription' => array(), - ), - 'name' => $newer, - ); - - foreach ($changes_all as $type => $change) { - $changes = array($type => $change); - $this->db->expectError(MDB2_ERROR_CANNOT_ALTER); - $result = $this->db->manager->alterTable($this->table, $changes, true); - $this->db->popExpect(); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Cannot alter table: '.$type); - } else { - $result = $this->db->manager->alterTable($this->table, $changes, false); - if (PEAR::isError($result)) { - $this->assertTrue(true, 'Error altering table: '.$type); - } else { - switch ($type) { - case 'add': - $altered_table_fields = $this->db->manager->listTableFields($this->table); - foreach ($change as $newfield => $dummy) { - $this->assertTrue(in_array($newfield, $altered_table_fields), 'Error: new field "'.$newfield.'" not added'); - } - break; - case 'rename': - $altered_table_fields = $this->db->manager->listTableFields($this->table); - foreach ($change as $oldfield => $newfield) { - $this->assertFalse(in_array($oldfield, $altered_table_fields), 'Error: field "'.$oldfield.'" not renamed'); - $this->assertTrue(in_array($newfield['name'], $altered_table_fields), 'Error: field "'.$oldfield.'" not renamed correctly'); - } - break; - case 'change': - break; - case 'remove': - $altered_table_fields = $this->db->manager->listTableFields($this->table); - foreach ($change as $newfield => $dummy) { - $this->assertFalse(in_array($newfield, $altered_table_fields), 'Error: field "'.$newfield.'" not removed'); - } - break; - case 'name': - if ($this->tableExists($newer)) { - $this->db->manager->dropTable($newer); - } else { - $this->assertTrue(true, 'Error: table "'.$this->table.'" not renamed'); - } - break; - } - } - } - } - } - - /** - * - */ - function testDropTable() { - if (!$this->methodExists($this->db->manager, 'dropTable')) { - return; - } - $result = $this->db->manager->dropTable($this->table); - $this->assertFalse(PEAR::isError($result), 'Error dropping table'); - } - - /** - * - */ - function testListTablesNoTable() { - if (!$this->methodExists($this->db->manager, 'listTables')) { - return; - } - $result = $this->db->manager->dropTable($this->table); - $this->assertFalse($this->tableExists($this->table), 'Error listing tables'); - } - - /** - * - */ - function testSequences() { - if (!$this->methodExists($this->db->manager, 'createSequence')) { - return; - } - $seq_name = 'testsequence'; - $result = $this->db->manager->createSequence($seq_name); - $this->assertFalse(PEAR::isError($result), 'Error creating a sequence'); - $this->assertTrue(in_array($seq_name, $this->db->manager->listSequences()), 'Error listing sequences'); - $result = $this->db->manager->dropSequence($seq_name); - $this->assertFalse(PEAR::isError($result), 'Error dropping a sequence'); - $this->assertFalse(in_array($seq_name, $this->db->manager->listSequences()), 'Error listing sequences'); - } - - /** - * Test listTableTriggers($table) - */ - function testListTableTriggers() { - //setup - $trigger_name = 'test_newtrigger'; - - include_once 'MDB2_nonstandard.php'; - $nonstd =& MDB2_nonstandard::factory($this->db, $this); - if (PEAR::isError($nonstd)) { - $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); - return; - } - - $result = $nonstd->createTrigger($trigger_name, $this->table); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Cannot create trigger: '.$result->getMessage()); - return; - } - - //test - $triggers = $this->db->manager->listTableTriggers($this->table); - if (PEAR::isError($triggers)) { - $this->assertTrue(false, 'Error listing the table triggers: '.$triggers->getMessage()); - } else { - $this->assertTrue(in_array($trigger_name, $triggers), 'Error: trigger not found'); - //check that only the triggers referencing the given table are returned - $triggers = $this->db->manager->listTableTriggers('fake_table'); - $this->assertFalse(in_array($trigger_name, $triggers), 'Error: trigger found'); - } - - - //cleanup - $result = $nonstd->dropTrigger($trigger_name, $this->table); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error dropping the trigger: '.$result->getMessage()); - } - } - - /** - * Test listTableViews($table) - */ - function testListTableViews() { - //setup - $view_name = 'test_newview'; - - include_once 'MDB2_nonstandard.php'; - $nonstd =& MDB2_nonstandard::factory($this->db, $this); - if (PEAR::isError($nonstd)) { - $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); - return; - } - - $result = $nonstd->createView($view_name, $this->table); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Cannot create view: '.$result->getMessage()); - return; - } - - //test - $views = $this->db->manager->listTableViews($this->table); - if (PEAR::isError($views)) { - $this->assertTrue(false, 'Error listing the table views: '.$views->getMessage()); - } else { - $this->assertTrue(in_array($view_name, $views), 'Error: view not found'); - //check that only the views referencing the given table are returned - $views = $this->db->manager->listTableViews('fake_table'); - $this->assertFalse(in_array($view_name, $views), 'Error: view found'); - } - - - //cleanup - $result = $nonstd->dropView($view_name); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error dropping the view: '.$result->getMessage()); - } - } - - /** - * Test listViews() - */ - function testListViews() { - //setup - $view_name = 'test_brandnewview'; - - include_once 'MDB2_nonstandard.php'; - $nonstd =& MDB2_nonstandard::factory($this->db, $this); - if (PEAR::isError($nonstd)) { - $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); - return; - } - - $result = $nonstd->createView($view_name, $this->table); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Cannot create view: '.$result->getMessage()); - return; - } - - //test - $views = $this->db->manager->listViews(); - if (PEAR::isError($views)) { - $this->assertTrue(false, 'Error listing the views: '.$views->getMessage()); - } else { - $this->assertTrue(in_array($view_name, $views), 'Error: view not found'); - } - - //cleanup - $result = $nonstd->dropView($view_name); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error dropping the view: '.$result->getMessage()); - } - } - - /** - * Test listUsers() - */ - function testListUsers() { - $users = $this->db->manager->listUsers(); - if (PEAR::isError($users)) { - $this->assertTrue(false, 'Error listing the users: '.$users->getMessage()); - } else { - $users = array_map('strtolower', $users); - $this->assertTrue(in_array(strtolower($this->db->dsn['username']), $users), 'Error: user not found'); - } - } - - /** - * Test listFunctions() - */ - function testListFunctions() { - //setup - $function_name = 'test_add'; - - include_once 'MDB2_nonstandard.php'; - $nonstd =& MDB2_nonstandard::factory($this->db, $this); - if (PEAR::isError($nonstd)) { - $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); - return; - } - - $result = $nonstd->createFunction($function_name); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Cannot create function: '.$result->getMessage().' :: '.$result->getUserInfo()); - return; - } - - //test - $functions = $this->db->manager->listFunctions(); - if (PEAR::isError($functions)) { - $this->assertTrue(false, 'Error listing the functions: '.$functions->getMessage()); - } else { - $this->assertTrue(in_array($function_name, $functions), 'Error: function not found'); - } - - //cleanup - $result = $nonstd->dropFunction($function_name); - if (PEAR::isError($result)) { - $this->assertTrue(false, 'Error dropping the function: '.$result->getMessage()); - } - } -} -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_native_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_native_testcase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_native_testcase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_native_testcase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,52 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_native_testcase.php,v 1.12 2006/03/01 12:15:38 lsmith Exp $ - -require_once 'MDB2_testcase.php'; - -class MDB2_Native_TestCase extends MDB2_TestCase -{ -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_ibase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_ibase.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_ibase.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_ibase.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,90 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_nonstandard_ibase.php,v 1.5 2007/03/04 21:32:31 quipo Exp $ - -class MDB2_nonstandard_ibase extends MDB2_nonstandard { - - var $trigger_body = 'AS -BEGIN - NEW.somedescription = OLD.somename; -END'; - - function createTrigger($trigger_name, $table_name) { - $query = 'CREATE OR ALTER TRIGGER '. $trigger_name .' FOR '. $table_name .' - AFTER UPDATE '. $this->trigger_body .';'; - return $this->db->exec($query); - } - - function checkTrigger($trigger_name, $table_name, $def) { - parent::checkTrigger($trigger_name, $table_name, $def); - $this->test->assertEquals($this->trigger_body, $def['trigger_body']); - } - - function dropTrigger($trigger_name, $table_name) { - return $this->db->exec('DROP TRIGGER '.$trigger_name); - } - - function createFunction($name) { - $query = 'CREATE PROCEDURE '.$name.'(N1 DECIMAL(6,2), N2 DECIMAL(6,2)) -RETURNS ( - res DECIMAL(6,2) -) -AS -BEGIN - FOR - SELECT (:N1 + :N2) FROM RDB$DATABASE INTO :res - DO - BEGIN - SUSPEND; - END -END'; - return $this->db->exec($query); - } - - function dropFunction($name) { - return $this->db->exec('DROP PROCEDURE '.$name); - } -} - -?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_mssql.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_mssql.php --- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_mssql.php 2007-05-03 19:58:15.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_mssql.php 1970-01-01 01:00:00.000000000 +0100 @@ -1,88 +0,0 @@ - | -// +----------------------------------------------------------------------+ -// -// $Id: MDB2_nonstandard_mssql.php,v 1.2 2007/03/04 21:27:44 quipo Exp $ - -class MDB2_nonstandard_mssql extends MDB2_nonstandard { - - var $trigger_body = ''; - - function createTrigger($trigger_name, $table_name) { - $this->trigger_body = 'CREATE TRIGGER '. $trigger_name .' ON '. $table_name .' -FOR UPDATE AS -DECLARE @oldName VARCHAR(100) -DECLARE @newId INTEGER -SELECT @oldName = (SELECT somename FROM Deleted) -SELECT @newId = (SELECT id FROM Inserted) -BEGIN - UPDATE '. $table_name .' SET somedescription = @oldName WHERE id = @newId; -END;'; - - return $this->db->exec($this->trigger_body); - } - - function checkTrigger($trigger_name, $table_name, $def) { - parent::checkTrigger($trigger_name, $table_name, $def); - $this->test->assertEquals($this->trigger_body, $def['trigger_body']); - echo '

';
-        var_dump($this->trigger_body);
-        var_dump($def['trigger_body']);
-    }
-
-    function dropTrigger($trigger_name, $table_name) {
-        return $this->db->exec('DROP TRIGGER '.$trigger_name);
-    }
-    
-    function createFunction($name) {
-        $query = 'CREATE FUNCTION '.$name.'(@Number1 Decimal(6,2), @Number2 Decimal(6,2))
-RETURNS Decimal(6,2)
-BEGIN
-    DECLARE @Result Decimal(6,2)
-    SET @Result = @Number1 + @Number2
-    RETURN @Result
-END';
-        return $this->db->exec($query);
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_mysqli.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_mysqli.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_mysqli.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_mysqli.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,52 +0,0 @@
-                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_nonstandard_mysqli.php,v 1.1 2006/12/09 14:31:54 quipo Exp $
-
-require_once 'MDB2_nonstandard_mysql.php';
-
-class MDB2_nonstandard_mysqli extends MDB2_nonstandard_mysql {
-
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_mysql.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_mysql.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_mysql.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_mysql.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_nonstandard_mysql.php,v 1.4 2007/03/04 22:51:06 quipo Exp $
-
-class MDB2_nonstandard_mysql extends MDB2_nonstandard {
-
-    var $trigger_body = '';
-
-    function createTrigger($trigger_name, $table_name) {
-        $this->trigger_body = 'BEGIN
-  UPDATE '. $table_name .' SET somedescription = OLD.somename WHERE id = NEW.id;
-END';
-        $query = 'CREATE TRIGGER '. $trigger_name .' AFTER UPDATE ON '. $table_name .'
-                  FOR EACH ROW '. $this->trigger_body .';';
-        return $this->db->exec($query);
-    }
-
-    function checkTrigger($trigger_name, $table_name, $def) {
-        parent::checkTrigger($trigger_name, $table_name, $def);
-        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
-    }
-
-    function dropTrigger($trigger_name, $table_name) {
-        return $this->db->exec('DROP TRIGGER '.$trigger_name);
-    }
-
-    function createFunction($name) {
-        $query = 'CREATE FUNCTION '.$name.'(a INT, b INT) RETURNS INT
-RETURN a + b;';
-        return $this->db->exec($query);
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_oci8.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_oci8.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_oci8.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_oci8.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,82 +0,0 @@
-                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_nonstandard_oci8.php,v 1.5 2007/03/04 22:28:23 quipo Exp $
-
-class MDB2_nonstandard_oci8 extends MDB2_nonstandard {
-
-    var $trigger_body = '';
-    var $when_clause = 'new.id > 0';
-
-    function createTrigger($trigger_name, $table_name) {
-        $this->trigger_body = 'BEGIN INSERT INTO '.$table_name
-            .' (id, somename, somedescription) VALUES'
-            .' (:new.id+1, :new.somename, :new.somedescription); END '. $trigger_name .';';
-        $query = 'CREATE OR REPLACE TRIGGER '. $trigger_name
-                .' AFTER UPDATE ON '. $table_name
-                .' FOR EACH ROW WHEN ('.$this->when_clause.') '
-                . $this->trigger_body;
-        return $this->db->exec($query);
-    }
-
-    function checkTrigger($trigger_name, $table_name, $def) {
-        parent::checkTrigger($trigger_name, $table_name, $def);
-        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
-        $this->test->assertEquals($this->when_clause, $def['when_clause']);
-    }
-
-    function dropTrigger($trigger_name, $table_name) {
-        return $this->db->exec('DROP TRIGGER '.$trigger_name);
-    }
-
-    function createFunction($name) {
-        $query = 'CREATE FUNCTION '.$name.'(a IN INT, b IN INT)
-RETURN INT AS
-BEGIN
-    RETURN a + b;
-END;';
-        return $this->db->exec($query);
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_pgsql.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_pgsql.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_pgsql.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_pgsql.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,94 +0,0 @@
-                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_nonstandard_pgsql.php,v 1.5 2007/03/04 21:36:08 quipo Exp $
-
-class MDB2_nonstandard_pgsql extends MDB2_nonstandard {
-
-    var $trigger_body = '';
-
-    function createTrigger($trigger_name, $table_name) {
-        $this->trigger_body = 'EXECUTE PROCEDURE '.$trigger_name.'_func();';
-        $table_name = $this->db->quoteIdentifier($table_name);
-        $sql = 'CREATE OR REPLACE FUNCTION '.$trigger_name.'_func() RETURNS trigger AS \'
-                DECLARE
-                    id_number INTEGER;
-                BEGIN
-                    SELECT INTO id_number id FROM '. $table_name .' WHERE id = NEW.id;
-                    RETURN NEW;
-                END;
-                \' LANGUAGE \'plpgsql\';';
-        $res = $this->db->exec($sql);
-        if (PEAR::isError($res)) {
-            return $res;
-        }
-    
-        $query = 'CREATE TRIGGER '. $trigger_name .' AFTER UPDATE ON '. $table_name .'
-                  FOR EACH ROW ' .$this->trigger_body;
-        return $this->db->exec($query);
-    }
-
-    function checkTrigger($trigger_name, $table_name, $def) {
-        parent::checkTrigger($trigger_name, $table_name, $def);
-        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
-    }
-
-    function dropTrigger($trigger_name, $table_name) {
-        return $this->db->exec('DROP TRIGGER '.$trigger_name .' ON '. $table_name);
-    }
-
-    function createFunction($name) {
-        $query = "CREATE FUNCTION $name (Decimal(6,2), Decimal(6,2)) RETURNS Decimal(6,2)
-AS 'select $1 + $2;'
-LANGUAGE SQL
-IMMUTABLE
-RETURNS NULL ON NULL INPUT";
-        return $this->db->exec($query);
-    }
-
-    function dropFunction($name) {
-        return $this->db->exec('DROP FUNCTION '.$name.' (Decimal(6,2), Decimal(6,2))');
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,130 +0,0 @@
-                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_nonstandard.php,v 1.5 2007/03/04 21:26:52 quipo Exp $
-
-class MDB2_nonstandard {
-    //contains the MDB2 object of the db once we have connected
-    var $db;
-    
-    //contains the PHPUnit_TestCase object
-    var $test;
-    
-    /**
-     * Returns a driver-specific object
-     */
-    function factory($db, $test) {
-        $classname = 'MDB2_nonstandard_'.$db->phptype;
-        include_once $classname.'.php';
-        if (class_exists($classname)) {
-            $obj =& new $classname();
-            $obj->db =& $db;
-            $obj->test =& $test;
-            return $obj;
-        }
-        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
-            'not capable', __FUNCTION__);
-    }
-    
-    /**
-     * Create a TRIGGER
-     */
-    function createTrigger($trigger_name, $table_name) {
-        return $this->db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
-            'not capable', __FUNCTION__);
-    }
-
-    /**
-     * Check if getTriggerDefinition() returns the correct definition for the trigger
-     */
-    function checkTrigger($trigger_name, $table_name, $def) {
-        $this->test->assertEquals(strtoupper($trigger_name), strtoupper($def['trigger_name']), 'Error getting trigger definition (name)');
-        $this->test->assertEquals(strtoupper($table_name),  strtoupper($def['table_name']),   'Error getting trigger definition (table)');
-        $this->test->assertEquals('AFTER',  $def['trigger_type'], 'Error getting trigger definition (type)');
-        $this->test->assertEquals('UPDATE', $def['trigger_event'], 'Error getting trigger definition (event)');
-        $this->test->assertTrue(is_string($def['trigger_body']), 'Error getting trigger definition (body)');
-        $this->test->assertTrue($def['trigger_enabled'], 'Error getting trigger definition (enabled)');
-        //$this->test->assertTrue(empty($def['trigger_comment']),  'Error getting trigger definition (comment)');
-    }
-
-    /**
-     * Drop a TRIGGER
-     */
-    function dropTrigger($trigger_name, $table_name) {
-        return $this->db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
-            'not capable', __FUNCTION__);
-    }
-    
-    /**
-     * Create a VIEW
-     */
-    function createView($view_name, $table_name) {
-        $query = 'CREATE VIEW '. $this->db->quoteIdentifier($view_name, true)
-                .' (id) AS SELECT id FROM '
-                . $this->db->quoteIdentifier($table_name, true) .' WHERE id > 1';
-        return $this->db->exec($query);
-    }
-
-    /**
-     * Drop a VIEW
-     */
-    function dropView($view_name) {
-        return $this->db->exec('DROP VIEW '.$view_name);
-    }
-
-    /**
-     * Create a FUNCTION
-     */
-    function createFunction($name) {
-        return $this->db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
-            'not capable', __FUNCTION__);
-    }
-
-    /**
-     * Drop a FUNCTION
-     */
-    function dropFunction($name) {
-        return $this->db->exec('DROP FUNCTION '.$name);
-    }
-}
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_sqlite.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_sqlite.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_nonstandard_sqlite.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_nonstandard_sqlite.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-                       |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_nonstandard_sqlite.php,v 1.5 2007/03/05 21:35:54 quipo Exp $
-
-class MDB2_nonstandard_sqlite extends MDB2_nonstandard {
-
-    var $trigger_body = '';
-
-    function createTrigger($trigger_name, $table_name) {
-        $this->trigger_body = 'CREATE TRIGGER '. $trigger_name .' AFTER UPDATE ON '. $table_name .'
-BEGIN
-    UPDATE '. $table_name .' SET somedescription = new.somename WHERE id = old.id;
-END';
-        return $this->db->standaloneQuery($this->trigger_body);
-    }
-
-    function checkTrigger($trigger_name, $table_name, $def) {
-        parent::checkTrigger($trigger_name, $table_name, $def);
-        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
-    }
-
-    function dropTrigger($trigger_name, $table_name) {
-        return $this->db->standaloneQuery('DROP TRIGGER '.$trigger_name);
-    }
-    
-    function createView($view_name, $table_name) {
-        $query = 'CREATE VIEW '. $this->db->quoteIdentifier($view_name, true)
-                .' AS SELECT id FROM '
-                . $this->db->quoteIdentifier($table_name, true) .' WHERE id > 1';
-        return $this->db->exec($query);
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_reverse_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_reverse_testcase.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_reverse_testcase.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_reverse_testcase.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,508 +0,0 @@
-            |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_reverse_testcase.php,v 1.46 2007/03/29 18:18:06 quipo Exp $
-
-require_once 'MDB2_testcase.php';
-
-class MDB2_Reverse_TestCase extends MDB2_TestCase
-{
-    //test table name (it is dynamically created/dropped)
-    var $table       = 'testtable';
-    var $fields      = array();
-    var $indices     = array();
-    var $constraints = array();
-
-    function setUp() {
-        parent::setUp();
-        $this->db->loadModule('Reverse', null, true);
-        $this->db->loadModule('Manager', null, true);
-
-        //Table structure
-        $this->fields = array(
-            'id' => array(  //PK
-                'type'     => 'integer',
-                'unsigned' => 1,
-                'notnull'  => 1,
-                'default'  => 0,
-                'length'  => 4,
-            ),
-            'id2' => array( //UNIQUE_MULTIFIELD(1/2)
-                'type'     => 'integer',
-                'unsigned' => 1,
-                'notnull'  => 1,
-                'default'  => 0,
-            ),
-            'id3' => array( //UNIQUE_MULTIFIELD(2/2)
-                'type'     => 'integer',
-                'unsigned' => 1,
-                'notnull'  => 1,
-                'default'  => 0,
-            ),
-            'id4' => array( //UNIQUE
-                'type'     => 'integer',
-                'unsigned' => 1,
-                'notnull'  => 1,
-                'default'  => 0,
-            ),
-            'somename' => array( //NORMAL INDEX
-                'type'   => 'text',
-                'length' => 12,
-            ),
-            'somedescription' => array( //INDEX_MULTIFIELD(1/2)
-                'type'   => 'text',
-                'length' => 12,
-            ),
-            'sex' => array( //INDEX_MULTIFIELD(2/2)
-                'type' => 'text',
-                'length' => 1,
-                'default' => 'M',
-            ),
-        );
-
-        if (!$this->tableExists($this->table)) {
-            $this->db->manager->createTable($this->table, $this->fields);
-        }
-    }
-
-    function tearDown() {
-        if ($this->tableExists($this->table)) {
-            $this->db->manager->dropTable($this->table);
-        }
-        $this->db->popExpect();
-        unset($this->dsn);
-        if (!PEAR::isError($this->db->manager)) {
-            $this->db->disconnect();
-        }
-        unset($this->db);
-    }
-
-    function setUpIndices()
-    {
-        //Indices definition
-        $this->indices = array(
-            'sometestindex' => array(
-                'fields' => array(
-                    'somename' => array(
-                        'sorting' => 'ascending',
-                    ),
-                ),
-                'unique' => false,
-            ),
-            'multipletestindex' => array(
-                'fields' => array(
-                    'somedescription' => array(
-                        'sorting' => 'ascending',
-                    ),
-                    'sex' => array(
-                        'sorting' => 'ascending',
-                    ),
-                ),
-            ),
-        );
-        foreach ($this->indices as $index_name => $index) {
-            $result = $this->db->manager->createIndex($this->table, $index_name, $index);
-            $this->assertFalse(PEAR::isError($result), 'Error creating index: '.$index_name);
-            if (PEAR::isError($result)) {
-                break;
-            }
-        }
-        return PEAR::isError($result);
-    }
-
-    function setUpConstraints()
-    {
-        //Constraints definition
-        $this->constraints = array(
-            'pkfield' => array(
-                'fields' => array(
-                    'id' => array(
-                        'sorting' => 'ascending',
-                    ),
-                ),
-                'primary' => true,
-            ),
-            'multipleunique' => array(
-                'fields' => array(
-                    'id2' => array(
-                        'sorting' => 'ascending',
-                    ),
-                    'id3' => array(
-                        'sorting' => 'ascending',
-                    ),
-                ),
-                'unique' => true,
-            ),
-            'singleunique' => array(
-                'fields' => array(
-                    'id4' => array(
-                        'sorting' => 'ascending',
-                    ),
-                ),
-                'unique' => true,
-            ),
-        );
-        foreach ($this->constraints as $constraint_name => $constraint) {
-            $result = $this->db->manager->createConstraint($this->table, $constraint_name, $constraint);
-            $this->assertFalse(PEAR::isError($result), 'Error creating constraint: '.$constraint_name);
-            if (PEAR::isError($result)) {
-                break;
-            }
-        }
-        return PEAR::isError($result);
-    }
-
-    /**
-     * Test tableInfo('table_name')
-     */
-    function testTableInfo()
-    {
-        if (!$this->methodExists($this->db->reverse, 'tableInfo')) {
-            return;
-        }
-
-        $table_info = $this->db->reverse->tableInfo($this->table);
-        if (PEAR::isError($table_info)) {
-            $this->assertTrue(false, 'Error in tableInfo(): '.$table_info->getMessage());
-        } else {
-            $this->assertEquals(count($this->fields), count($table_info), 'The number of fields retrieved is different from the expected one');
-            foreach ($table_info as $field_info) {
-                $this->assertEquals($this->table, $field_info['table'], "the table name is not correct");
-                if (!array_key_exists(strtolower($field_info['name']), $this->fields)) {
-                    $this->assertTrue(false, 'Field names do not match ('.$field_info['name'].' is unknown)');
-                }
-                //expand test, for instance adding a check on types...
-            }
-        }
-
-        if (!$this->supported('result_introspection')) {
-            return;
-        }
-
-        $result = $this->db->query('SELECT * FROM '.$this->table);
-        $table_info = $this->db->reverse->tableInfo($result);
-        if (PEAR::isError($table_info)) {
-            $this->assertTrue(false, 'Error in tableInfo(): '.$table_info->getMessage());
-        } else {
-            $this->assertEquals(count($this->fields), count($table_info), 'The number of fields retrieved is different from the expected one');
-            foreach ($table_info as $field_info) {
-                //not all the drivers are capable of returning the table name,
-                //and may return an empty value
-                if (!empty($field_info['table'])) {
-                    $this->assertEquals($this->table, $field_info['table'], "the table name is not correct");
-                }
-                if (!array_key_exists(strtolower($field_info['name']), $this->fields)) {
-                    $this->assertTrue(false, 'Field names do not match ('.$field_info['name'].' is unknown)');
-                }
-                //expand test, for instance adding a check on types...
-            }
-        }
-        $result->free();
-    }
-
-    /**
-     * Test getTableFieldDefinition($table, $field_name)
-     */
-    function testGetTableFieldDefinition()
-    {
-        if (!$this->methodExists($this->db->reverse, 'getTableFieldDefinition')) {
-            return;
-        }
-
-        //test integer not null
-        $field_info = $this->db->reverse->getTableFieldDefinition($this->table, 'id');
-        if (PEAR::isError($field_info)) {
-            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
-        } else {
-            $field_info = array_shift($field_info);
-            $this->assertEquals('integer', $field_info['type'], 'The field type is different from the expected one');
-            $expected_length = ($this->db->phptype == 'oci8') ? 10 : 4;
-            $this->assertEquals($expected_length, $field_info['length'], 'The field length is different from the expected one');
-            $this->assertTrue($field_info['notnull'], 'The field can be null unlike it was expected');
-            $this->assertEquals('0', $field_info['default'], 'The field default value is different from the expected one');
-        }
-
-        //test blob
-        $field_info = $this->db->reverse->getTableFieldDefinition('files', 'picture');
-        if (PEAR::isError($field_info)) {
-            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
-        } else {
-            $field_info = array_shift($field_info);
-            $this->assertEquals($field_info['type'], 'blob', 'The field type is different from the expected one');
-            $this->assertFalse($field_info['notnull'], 'The field cannot be null unlike it was expected');
-        }
-
-        //test varchar(100) not null
-        $field_info = $this->db->reverse->getTableFieldDefinition('users', 'user_name');
-        if (PEAR::isError($field_info)) {
-            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
-        } else {
-            $field_info = array_shift($field_info);
-            $this->assertEquals('text', $field_info['type'], 'The field type is different from the expected one');
-            $this->assertEquals(12, $field_info['length'], 'The field length is different from the expected one');
-            $this->assertFalse($field_info['notnull'], 'The field can be null unlike it was expected');
-            $this->assertNull($field_info['default'], 'The field default value is different from the expected one');
-            $this->assertFalse($field_info['fixed'], 'The field fixed value is different from the expected one');
-        }
-
-        //test decimal
-        $field_info = $this->db->reverse->getTableFieldDefinition('users', 'quota');
-        if (PEAR::isError($field_info)) {
-            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
-        } else {
-            $field_info = array_shift($field_info);
-            $this->assertEquals('decimal', $field_info['type'], 'The field type is different from the expected one');
-            $expected_length = ($this->db->phptype == 'oci8') ? '22,2' : '18,2';
-            $this->assertEquals($expected_length, $field_info['length'], 'The field length is different from the expected one');
-        }
-    }
-
-    /**
-     * Test getTableIndexDefinition($table, $index_name)
-     */
-    function testGetTableIndexDefinition()
-    {
-        if (!$this->methodExists($this->db->reverse, 'getTableIndexDefinition')) {
-            return;
-        }
-
-        $this->setUpIndices();
-
-        //test index names
-        foreach ($this->indices as $index_name => $index) {
-            $index_info = $this->db->reverse->getTableIndexDefinition($this->table, $index_name);
-            if (PEAR::isError($index_info)) {
-                $this->assertFalse(true, 'Error getting table index definition');
-            } else {
-                $field_names = array_keys($index['fields']);
-                $this->assertEquals($field_names, array_keys($index_info['fields']), 'Error listing index fields');
-            }
-        }
-
-        //test INDEX
-        $index_name = 'sometestindex';
-        $index_info = $this->db->reverse->getTableIndexDefinition($this->table, $index_name);
-        if (PEAR::isError($index_info)) {
-            $this->assertTrue(false, 'Error in getTableIndexDefinition(): '.$index_info->getMessage());
-        } else {
-            $this->assertEquals(1, count($index_info['fields']), 'The INDEX is not on one field unlike it was expected');
-            $expected_fields = array_keys($this->indices[$index_name]['fields']);
-            $actual_fields = array_keys($index_info['fields']);
-            $this->assertEquals($expected_fields, $actual_fields, 'The INDEX field names don\'t match');
-            $this->assertEquals(1, $index_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
-        }
-
-        //test INDEX on MULTIPLE FIELDS
-        $index_name = 'multipletestindex';
-        $index_info = $this->db->reverse->getTableIndexDefinition($this->table, $index_name);
-        if (PEAR::isError($index_info)) {
-            $this->assertTrue(false, 'Error in getTableIndexDefinition(): '.$index_info->getMessage());
-        } else {
-            $this->assertEquals(2, count($index_info['fields']), 'The INDEX is not on two fields unlike it was expected');
-            $expected_fields = array_keys($this->indices[$index_name]['fields']);
-            $actual_fields = array_keys($index_info['fields']);
-            $this->assertEquals($expected_fields, $actual_fields, 'The INDEX field names don\'t match');
-            $this->assertEquals(1, $index_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
-            $this->assertEquals(2, $index_info['fields'][$expected_fields[1]]['position'], 'The field position in the INDEX is not correct');
-        }
-
-        if (!$this->setUpConstraints()) {
-            return;
-        }
-        //constraints should NOT be listed
-        foreach (array_keys($this->constraints) as $constraint_name) {
-            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-            $result = $this->db->reverse->getTableIndexDefinition($this->table, $constraint_name);
-            $this->assertTrue(PEAR::isError($result), 'Error listing index definition, this is a CONSTRAINT');
-        }
-
-        //test index created WITHOUT using MDB2 (i.e. without the "_idx" suffix)
-        //NB: MDB2 > v.2.3.0 provides a fallback mechanism
-    }
-
-    /**
-     * Test testGetTableConstraintDefinition($table, $constraint_name)
-     */
-    function testGetTableConstraintDefinition()
-    {
-        if (!$this->methodExists($this->db->reverse, 'getTableConstraintDefinition')) {
-            return;
-        }
-
-        if (!$this->setUpConstraints()) {
-            return;
-        }
-
-        //test constraint names
-        foreach ($this->constraints as $constraint_name => $constraint) {
-            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-            $result = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
-            $this->db->popExpect();
-            if (PEAR::isError($result) && isset($constraint['primary']) && $constraint['primary']) {
-                echo 'Error reading primary constraint, trying with name "primary" instead .. ';
-                $constraint_name = 'primary';
-                $result = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
-            }
-            if (PEAR::isError($result)) {
-                $this->assertFalse(true, 'Error getting table constraint definition ('.$constraint_name.')');
-            } else {
-                $constraint_names = array_keys($constraint['fields']);
-                $this->assertEquals($constraint_names, array_keys($result['fields']), 'Error listing constraint fields');
-            }
-        }
-
-        $this->setUpIndices();
-        //indices should NOT be listed
-        foreach (array_keys($this->indices) as $index_name) {
-            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-            $result = $this->db->reverse->getTableConstraintDefinition($this->table, $index_name);
-            $this->db->popExpect();
-            $this->assertTrue(PEAR::isError($result), 'Error listing constraint definition, this is a normal INDEX');
-        }
-
-        //test PK
-        $this->db->expectError(MDB2_ERROR_NOT_FOUND);
-        $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, 'pkfield');
-        $this->db->popExpect();
-        if (PEAR::isError($constraint_info)) {
-            echo 'Error reading primary constraint, trying with name "primary" instead .. ';
-            $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, 'primary');
-        }
-        if (PEAR::isError($constraint_info)) {
-            $this->assertTrue(false, 'Error in getTableConstraintDefinition(): '.$constraint_info->getMessage());
-        } else {
-            $this->assertTrue($constraint_info['primary'], 'The field is not a PK unlike it was expected');
-        }
-
-        //test UNIQUE
-        $constraint_name = 'singleunique';
-        $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
-        if (PEAR::isError($constraint_info)) {
-            $this->assertTrue(false, 'Error in getTableConstraintDefinition(): '.$constraint_info->getMessage());
-        } else {
-            $this->assertTrue($constraint_info['unique'], 'The field is not a PK unlike it was expected');
-            $this->assertTrue(empty($constraint_info['primary']), 'The field is a PK unlike it was expected');
-            $this->assertEquals(1, count($constraint_info['fields']), 'The UNIQUE INDEX is not on one field unlike it was expected');
-            $expected_fields = array_keys($this->constraints[$constraint_name]['fields']);
-            $actual_fields = array_keys($constraint_info['fields']);
-            $this->assertEquals($expected_fields, $actual_fields, 'The UNIQUE INDEX field names don\'t match');
-            $this->assertEquals(1, $constraint_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
-        }
-
-        //test UNIQUE on MULTIPLE FIELDS
-        $constraint_name = 'multipleunique';
-        $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
-        if (PEAR::isError($constraint_info)) {
-            $this->assertTrue(false, 'Error in getTableConstraintDefinition(): '.$constraint_info->getMessage());
-        } else {
-            $this->assertTrue($constraint_info['unique'], 'The field is not a PK unlike it was expected');
-            $this->assertTrue(empty($constraint_info['primary']), 'The field is a PK unlike it was expected');
-            $this->assertEquals(2, count($constraint_info['fields']), 'The UNIQUE INDEX is not on two fields unlike it was expected');
-            $expected_fields = array_keys($this->constraints[$constraint_name]['fields']);
-            $actual_fields = array_keys($constraint_info['fields']);
-            $this->assertEquals($expected_fields, $actual_fields, 'The UNIQUE INDEX field names don\'t match');
-            $this->assertEquals(1, $constraint_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
-            $this->assertEquals(2, $constraint_info['fields'][$expected_fields[1]]['position'], 'The field position in the INDEX is not correct');
-        }
-    }
-
-    /**
-     * Test getSequenceDefinition($sequence)
-     */
-    function testGetSequenceDefinition() {
-        //setup
-        $this->db->loadModule('Manager', null, true);
-        $sequence = 'test_sequence';
-        $sequences = $this->db->manager->listSequences();
-        if (!in_array($sequence, $sequences)) {
-            $result = $this->db->manager->createSequence($sequence);
-            $this->assertFalse(PEAR::isError($result), 'Error creating a sequence');
-        }
-
-        //test
-        $start = $this->db->nextId($sequence);
-        $def = $this->db->reverse->getSequenceDefinition($sequence);
-        $this->assertEquals($start+1, (isset($def['start']) ? $def['start'] : 1), 'Error getting sequence definition');
-
-        //cleanup
-        $result = $this->db->manager->dropSequence($sequence);
-        $this->assertFalse(PEAR::isError($result), 'Error dropping a sequence');
-    }
-
-    /**
-     * Test getTriggerDefinition($trigger)
-     */
-    function testGetTriggerDefinition() {
-        //setup
-        $trigger_name = 'test_trigger';
-
-        include_once 'MDB2_nonstandard.php';
-        $nonstd =& MDB2_nonstandard::factory($this->db, $this);
-        if (PEAR::isError($nonstd)) {
-            $this->assertTrue(false, 'Cannot create trigger: '.$nonstd->getMessage());
-            return;
-        }
-
-        $result = $nonstd->createTrigger($trigger_name, $this->table);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Cannot create trigger: '.$result->getMessage());
-            return;
-        }
-
-        //test
-        $def = $this->db->reverse->getTriggerDefinition($trigger_name);
-        if (PEAR::isError($def)) {
-            $this->assertTrue(false, 'getTriggerDefinition: '.$def->getMessage());
-        } else {
-            $nonstd->checkTrigger($trigger_name, $this->table, $def);
-        }
-
-        //cleanup
-        $result = $nonstd->dropTrigger($trigger_name, $this->table);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error dropping the trigger: '.$result->getMessage());
-            return;
-        }
-    }
-}
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_testcase.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_testcase.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_testcase.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,168 +0,0 @@
-                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_testcase.php,v 1.18 2006/12/19 15:04:53 quipo Exp $
-
-class MDB2_TestCase extends PHPUnit_TestCase {
-    //contains the dsn of the database we are testing
-    var $dsn;
-    //contains the options that should be used during testing
-    var $options;
-    //contains the name of the database we are testing
-    var $database;
-    //contains the MDB2 object of the db once we have connected
-    var $db;
-    // contains field names from the test table
-    var $fields;
-    // if the tables should be cleared in the setUp() and tearDown() methods
-    var $clear_tables = true;
-
-    function MDB2_TestCase($name) {
-        $this->PHPUnit_TestCase($name);
-    }
-
-    function setUp() {
-        $this->dsn = $GLOBALS['dsn'];
-        $this->options  = $GLOBALS['options'];
-        $this->database = $GLOBALS['database'];
-        $this->db =& MDB2::factory($this->dsn, $this->options);
-        $this->db->setDatabase($this->database);
-        $this->db->expectError(MDB2_ERROR_UNSUPPORTED);
-        $this->fields = array(
-            'user_name' => 'text',
-            'user_password' => 'text',
-            'subscribed' => 'boolean',
-            'user_id' => 'integer',
-            'quota' => 'decimal',
-            'weight' => 'float',
-            'access_date' => 'date',
-            'access_time' => 'time',
-            'approved' => 'timestamp',
-        );
-        $this->clearTables();
-    }
-
-    function tearDown() {
-        $this->clearTables();
-        $this->db->popExpect();
-        unset($this->dsn);
-        if (!PEAR::isError($this->db)) {
-            $this->db->disconnect();
-        }
-        unset($this->db);
-    }
-
-    function clearTables() {
-        if (!$this->clear_tables) {
-            return;
-        }
-        if (PEAR::isError($this->db->exec('DELETE FROM users'))) {
-            $this->assertTrue(false, 'Error deleting from table users');
-        }
-        if (PEAR::isError($this->db->exec('DELETE FROM files'))) {
-            $this->assertTrue(false, 'Error deleting from table users');
-        }
-    }
-
-    function supported($feature) {
-        if (!$this->db->supports($feature)) {
-            $this->assertTrue(false, 'This database does not support '.$feature);
-            return false;
-        }
-        return true;
-    }
-
-    function verifyFetchedValues(&$result, $rownum, $data) {
-        //$row = $result->fetchRow(MDB2_FETCHMODE_DEFAULT, $rownum);
-        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC, $rownum);
-        if (!is_array($row)) {
-            $this->assertTrue(false, 'Error result row is not an array');
-            return;
-        }
-        //reset($row);
-        foreach ($this->fields as $field => $type) {
-            //$value = current($row);
-            $value = $row[$field];
-            if ($type == 'float') {
-                $delta = 0.0000000001;
-            } else {
-                $delta = 0;
-            }
-
-            $this->assertEquals($data[$field], $value, "the value retrieved for field \"$field\" doesn't match what was stored into the rownum $rownum", $delta);
-            //next($row);
-        }
-    }
-
-    function getSampleData($row = 1) {
-        $data = array();
-        $data['user_name']     = 'user_' . $row;
-        $data['user_password'] = 'somepass';
-        $data['subscribed']    = $row % 2 ? true : false;
-        $data['user_id']       = $row;
-        $data['quota']         = strval($row/100);
-        $data['weight']        = sqrt($row);
-        $data['access_date']   = MDB2_Date::mdbToday();
-        $data['access_time']   = MDB2_Date::mdbTime();
-        $data['approved']      = MDB2_Date::mdbNow();
-        return $data;
-    }
-
-    function methodExists(&$class, $name) {
-        if (is_object($class)
-            && in_array(strtolower($name), array_map('strtolower', get_class_methods($class)))
-        ) {
-            return true;
-        }
-        $this->assertTrue(false, 'method '. $name.' not implemented in '.get_class($class));
-        return false;
-    }
-
-    function tableExists($table) {
-        $this->db->loadModule('Manager', null, true);
-        $tables = $this->db->manager->listTables();
-        return in_array(strtolower($table), array_map('strtolower', $tables));
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_usage_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_usage_testcase.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/MDB2_usage_testcase.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/MDB2_usage_testcase.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,1827 +0,0 @@
-                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: MDB2_usage_testcase.php,v 1.100 2006/12/19 22:46:48 quipo Exp $
-
-require_once 'MDB2_testcase.php';
-
-class MDB2_Usage_TestCase extends MDB2_TestCase {
-    /**
-     * Test typed data storage and retrieval
-     *
-     * This tests typed data storage and retrieval by executing a single
-     * prepared query and then selecting the data back from the database
-     * and comparing the results
-     */
-    function testStorage() {
-        $data = $this->getSampleData(1234);
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-        $result = $stmt->execute(array_values($data));
-        $stmt->free();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query, $this->fields);
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-
-        $this->verifyFetchedValues($result, 0, $data);
-    }
-
-    /**
-     * Test fetchOne()
-     *
-     * This test bulk fetching of result data by using a prepared query to
-     * insert an number of rows of data and then retrieving the data columns
-     * one by one
-     */
-    function testFetchOne() {
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-
-        $stmt->free();
-
-        foreach ($this->fields as $field => $type) {
-            for ($row = 0; $row < $total_rows; $row++) {
-                $result =& $this->db->query('SELECT '.$field.' FROM users WHERE user_id='.$row, $type);
-                $value = $result->fetchOne();
-                if (PEAR::isError($value)) {
-                    $this->assertTrue(false, 'Error fetching row '.$row.' for field '.$field.' of type '.$type);
-                } else {
-                    $this->assertEquals(strval($data[$row][$field]), strval(trim($value)), 'the query field '.$field.' of type '.$type.' for row '.$row);
-                    $result->free();
-                }
-            }
-        }
-    }
-
-    /**
-     * Test fetchCol()
-     *
-     * Test fetching a column of result data. Two different columns are retrieved
-     */
-    function testFetchCol() {
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-
-        $stmt->free();
-
-        $first_col = array();
-        for ($row = 0; $row < $total_rows; $row++) {
-            $first_col[$row] = "user_$row";
-        }
-
-        $second_col = array();
-        for ($row = 0; $row < $total_rows; $row++) {
-            $second_col[$row] = $row;
-        }
-
-        $query = 'SELECT user_name, user_id FROM users ORDER BY user_name';
-        $result =& $this->db->query($query, array('text', 'integer'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchCol(0);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching first column');
-        } else {
-            $this->assertEquals($first_col, $values);
-        }
-        $result->free();
-
-        $query = 'SELECT user_name, user_id FROM users ORDER BY user_name';
-        $result =& $this->db->query($query, array('text', 'integer'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchCol(1);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching second column');
-        } else {
-            $this->assertEquals($second_col, $values);
-        }
-        $result->free();
-    }
-
-    /**
-     * Test fetchAll()
-     *
-     * Test fetching an entire result set in one shot.
-     */
-    function testFetchAll() {
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-        $fields = array_keys($data[0]);
-        $query = 'SELECT '. implode (', ', $fields). ' FROM users ORDER BY user_name';
-
-        $stmt->free();
-
-        $result =& $this->db->query($query, $this->fields);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching the result set');
-        } else {
-            for ($i=0; $i<$total_rows; $i++) {
-                foreach ($data[$i] as $key => $val) {
-                    $this->assertEquals(strval($val), strval($values[$i][$key]), 'Row #'.$i.' ['.$key.']');
-                }
-            }
-        }
-        $result->free();
-
-        //test $rekey=true
-        $result =& $this->db->query('SELECT user_id, user_name FROM users ORDER BY user_id', $this->fields);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching the result set');
-        } else {
-            for ($i=0; $i<$total_rows; $i++) {
-                list($id, $name) = each($values);
-                $this->assertEquals($data[$i]['user_id'],   $id,   'Row #'.$i.' ["user_id"]');
-                $this->assertEquals($data[$i]['user_name'], $name, 'Row #'.$i.' ["user_name"]');
-            }
-        }
-        $result->free();
-
-
-        //test $rekey=true, $force_array=true
-        $result =& $this->db->query('SELECT user_id, user_name FROM users ORDER BY user_id', $this->fields);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true, true);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching the result set');
-        } else {
-            for ($i=0; $i<$total_rows; $i++) {
-                list($id, $value) = each($values);
-                $this->assertEquals($data[$i]['user_id'],   $id,                 'Row #'.$i.' ["user_id"]');
-                $this->assertEquals($data[$i]['user_name'], $value['user_name'], 'Row #'.$i.' ["user_name"]');
-            }
-        }
-        $result->free();
-
-        //test $rekey=true, $force_array=true, $group=true
-        $result =& $this->db->query('SELECT user_password, user_name FROM users ORDER BY user_name', $this->fields);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true, true, true);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching the result set');
-        } else {
-            //all the records have the same user_password value
-            $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows');
-            $values = $values[$data[0]['user_password']];
-            for ($i=0; $i<$total_rows; $i++) {
-                $this->assertEquals($data[$i]['user_name'], $values[$i]['user_name'], 'Row #'.$i.' ["user_name"]');
-            }
-        }
-        $result->free();
-
-        //test $rekey=true, $force_array=true, $group=false (with non unique key)
-        $result =& $this->db->query('SELECT user_password, user_name FROM users ORDER BY user_name', $this->fields);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error during query');
-        }
-        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true, true, false);
-        if (PEAR::isError($values)) {
-            $this->assertTrue(false, 'Error fetching the result set');
-        } else {
-            //all the records have the same user_password value, they are overwritten
-            $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows');
-            $key = $data[0]['user_password'];
-            $this->assertEquals(1, count($values[$key]), 'Error: incorrect number of returned rows');
-            $this->assertEquals($data[4]['user_name'], $values[$key]['user_name']);
-        }
-        $result->free();
-    }
-
-    /**
-     * Test different fetch modes
-     *
-     * Test fetching results using different fetch modes
-     * NOTE: several tests still missing
-     */
-    function testFetchModes() {
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-
-        $stmt->free();
-
-        // test ASSOC
-        $query = 'SELECT A.user_name FROM users A, users B WHERE A.user_id = B.user_id';
-        $value = $this->db->queryRow($query, array($this->fields['user_name']), MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($value)) {
-            $this->assertTrue(false, 'Error fetching the result set');
-        } else {
-            $this->assertTrue(!empty($value['user_name']), 'Error fetching the associative result set from join');
-        }
-    }
-
-    /**
-     * Test multi_query option
-     *
-     * This test attempts to send multiple queries at once using the multi_query
-     * option and then retrieves each result.
-     */
-    function testMultiQuery() {
-        $multi_query_orig = $this->db->getOption('multi_query');
-        if (PEAR::isError($multi_query_orig)) {
-            $this->assertTrue(false, 'Error getting multi_query option value: '.$multi_query_orig->getMessage());
-            return;
-        }
-
-        $this->db->setOption('multi_query', true);
-
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-
-        $stmt->free();
-
-        $query = '';
-        for ($row = 0; $row < $total_rows; $row++) {
-            $query.= 'SELECT user_name FROM users WHERE user_id='.$row.';';
-        }
-        $result =& $this->db->query($query, 'text');
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $value = $result->fetchOne();
-            if (PEAR::isError($value)) {
-                $this->assertTrue(false, 'Error fetching row '.$row);
-            } else {
-                $this->assertEquals(strval($data[$row]['user_name']), strval(trim($value)), 'the query field username of type "text" for row '.$row);
-            }
-            if (PEAR::isError($result->nextResult())) {
-                $this->assertTrue(false, 'Error moving result pointer');
-            }
-        }
-
-        $result->free();
-        $this->db->setOption('multi_query', $multi_query_orig);
-    }
-
-    /**
-     * Test prepared queries
-     *
-     * Tests prepared queries, making sure they correctly deal with ?, !, and '
-     */
-    function testPreparedQueries() {
-        $data = array(
-            array(
-                'user_name' => 'Sure!',
-                'user_password' => 'Do work?',
-                'user_id' => 1,
-            ),
-            array(
-                'user_name' => 'For Sure!',
-                'user_password' => "Doesn't?",
-                'user_id' => 2,
-            ),
-        );
-
-        $query = "INSERT INTO users (user_name, user_password, user_id) VALUES (?, ?, ?)";
-        $stmt = $this->db->prepare($query, array('text', 'text', 'integer'), MDB2_PREPARE_MANIP);
-
-        $text = $data[0]['user_name'];
-        $question = $data[0]['user_password'];
-        $userid = $data[0]['user_id'];
-
-        // bind out of order
-        $stmt->bindParam(0, $text);
-        $stmt->bindParam(2, $userid);
-        $stmt->bindParam(1, $question);
-
-        $result = $stmt->execute();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(true, 'Could not execute prepared query with question mark placeholders. Error: '.$error);
-        }
-
-        $text = $data[1]['user_name'];
-        $question = $data[1]['user_password'];
-        $userid = $data[1]['user_id'];
-
-        $result = $stmt->execute();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(true, 'Could not execute prepared query with bound parameters. Error: '.$error);
-        }
-        $stmt->free();
-        $this->clearTables();
-
-        $query = "INSERT INTO users (user_name, user_password, user_id) VALUES (:text, :question, :userid)";
-        $stmt = $this->db->prepare($query, array('text', 'text', 'integer'), MDB2_PREPARE_MANIP);
-
-        $stmt->bindValue('text', $data[0]['user_name']);
-        $stmt->bindValue('question', $data[0]['user_password']);
-        $stmt->bindValue('userid', $data[0]['user_id']);
-
-        $result = $stmt->execute();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(true, 'Could not execute prepared query with named placeholders. Error: '.$error);
-        }
-        $stmt->free();
-
-        $query = "INSERT INTO users (user_name, user_password, user_id) VALUES (".$this->db->quote($data[1]['user_name'], 'text').", :question, :userid)";
-        $stmt = $this->db->prepare($query, array('text', 'integer'), MDB2_PREPARE_MANIP);
-
-        $stmt->bindValue('question', $data[1]['user_password']);
-        $stmt->bindValue('userid', $data[1]['user_id']);
-
-        $result = $stmt->execute();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(true, 'Could not execute prepared query with named placeholders and a quoted text value in front. Error: '.$error);
-        }
-        $stmt->free();
-
-        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_id=:user_id';
-        $stmt = $this->db->prepare($query, array('integer'), array('text', 'text', 'integer'));
-        foreach ($data as $row_data) {
-            $result =& $stmt->execute(array('user_id' => $row_data['user_id']));
-            if (PEAR::isError($result)) {
-                $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared. Error: '.$result->getUserinfo());
-                break;
-            }
-            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
-            if (!is_array($row)) {
-                $this->assertTrue(false, 'Prepared SELECT failed');
-            } else {
-                $diff = (array)array_diff($row, $row_data);
-                $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
-            }
-        }
-        $stmt->free();
-
-        $row_data = reset($data);
-        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_id='.$this->db->quote($row_data['user_id'], 'integer');
-        $stmt = $this->db->prepare($query, null, array('text', 'text', 'integer'));
-        $result =& $stmt->execute(array());
-        if (PEAR::isError($result)) {
-            $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared statement with no placeholders. Error: '.$result->getUserinfo());
-            break;
-        }
-        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
-        if (!is_array($row)) {
-            $this->assertTrue(false, 'Prepared SELECT failed');
-        } else {
-            $diff = (array)array_diff($row, $row_data);
-            $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
-        }
-        $stmt->free();
-
-        $row_data = reset($data);
-        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_name='.$this->db->quote($row_data['user_name'], 'text').' AND user_id = ? AND user_password='.$this->db->quote($row_data['user_password'], 'text');
-        $stmt = $this->db->prepare($query, array('integer'), array('text', 'text', 'integer'));
-        $result =& $stmt->execute(array($row_data['user_id']));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared with quoted text fields around a placeholder. Error: '.$result->getUserinfo());
-            break;
-        }
-        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
-        if (!is_array($row)) {
-            $this->assertTrue(false, 'Prepared SELECT failed');
-        } else {
-            $diff = (array)array_diff($row, $row_data);
-            $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
-        }
-        $stmt->free();
-
-        foreach ($this->db->sql_comments as $comment) {
-            $query = 'SELECT user_name, user_password, user_id FROM users WHERE '.$comment['start'].' maps to class::foo() '.$comment['end'].' user_name=:username';
-            $row_data = reset($data);
-            $stmt = $this->db->prepare($query, array('text'), array('text', 'text', 'integer'));
-            $result =& $stmt->execute(array('username' => $row_data['user_name']));
-            if (PEAR::isError($result)) {
-                $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared where a name parameter is contained in an SQL comment ('.$comment['start'].'). Error: '.$result->getUserinfo());
-                break;
-            }
-            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
-            if (!is_array($row)) {
-                $this->assertTrue(false, 'Prepared SELECT failed');
-            } else {
-                $diff = (array)array_diff($row, $row_data);
-                $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
-            }
-            $stmt->free();
-        }
-
-        $row_data = reset($data);
-        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_name=:username OR user_password=:username';
-        $stmt = $this->db->prepare($query, array('text'), array('text', 'text', 'integer'));
-        $result =& $stmt->execute(array('username' => $row_data['user_name']));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared where the same named parameter is used twice. Error: '.$result->getUserinfo());
-            break;
-        }
-        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
-        if (!is_array($row)) {
-            $this->assertTrue(false, 'Prepared SELECT failed');
-        } else {
-            $diff = (array)array_diff($row, $row_data);
-            $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
-        }
-        $stmt->free();
-    }
-
-    /**
-     * Test _skipDelimitedStrings(), used by prepare()
-     *
-     * If the placeholder is contained within a delimited string, it must be skipped,
-     * and the cursor position must be advanced
-     */
-    function testSkipDelimitedStrings() {
-        //test correct placeholder
-        $query = 'SELECT what FROM tbl WHERE x = ?';
-        $position = 0;
-        $p_position = strpos($query, '?');
-        $this->assertEquals($position, $this->db->_skipDelimitedStrings($query, $position, $p_position), 'Error: the cursor position has changed');
-
-        //test placeholder within a quoted string
-        $query = 'SELECT what FROM tbl WHERE x = '. $this->db->string_quoting['start'] .'blah?blah'. $this->db->string_quoting['end'] .' AND y = ?';
-        $position = 0;
-        $p_position = strpos($query, '?');
-        $new_pos = $this->db->_skipDelimitedStrings($query, $position, $p_position);
-        $this->assertTrue($position != $new_pos, 'Error: the cursor position was not advanced');
-
-        //test placeholder within a comment
-        foreach ($this->db->sql_comments as $comment) {
-            $query = 'SELECT what FROM tbl WHERE x = '. $comment['start'] .'blah?blah'. $comment['end'] .' AND y = ?';
-            $position = 0;
-            $p_position = strpos($query, '?');
-            $new_pos = $this->db->_skipDelimitedStrings($query, $position, $p_position);
-            $this->assertTrue($position != $new_pos, 'Error: the cursor position was not advanced');
-        }
-
-        //add some tests for named placeholders and for identifier_quoting
-    }
-
-    /**
-     * Test retrieval of result metadata
-     *
-     * This tests the result metadata by executing a prepared query and
-     * select the data, and checking the result contains the correct
-     * number of columns and that the column names are in the correct order
-     */
-    function testMetadata() {
-        $data = $this->getSampleData(1234);
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        $result = $stmt->execute(array_values($data));
-        $stmt->free();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query, $this->fields);
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-
-        $numcols = $result->numCols();
-
-        $this->assertEquals(count($this->fields), $numcols, "The query result returned an incorrect number of columns unlike expected");
-
-        $column_names = $result->getColumnNames();
-        $fields = array_keys($this->fields);
-        for ($column = 0; $column < $numcols; $column++) {
-            $this->assertEquals($column, $column_names[$fields[$column]], "The query result column \"".$fields[$column]."\" was returned in an incorrect position");
-        }
-
-    }
-
-    /**
-     * Test storage and retrieval of nulls
-     *
-     * This tests null storage and retrieval by successively inserting,
-     * selecting, and testing a number of null / not null values
-     */
-    function testNulls() {
-        $portability = $this->db->getOption('portability');
-        if ($portability & MDB2_PORTABILITY_EMPTY_TO_NULL) {
-            $nullisempty = true;
-        } else {
-            $nullisempty = false;
-        }
-        $test_values = array(
-            array('test', false),
-            array('NULL', false),
-            array('null', false),
-            array('', $nullisempty),
-            array(null, true)
-        );
-
-        for ($test_value = 0; $test_value <= count($test_values); $test_value++) {
-            if ($test_value == count($test_values)) {
-                $value = 'NULL';
-                $is_null = true;
-            } else {
-                $value = $this->db->quote($test_values[$test_value][0], 'text');
-                $is_null = $test_values[$test_value][1];
-            }
-
-            $this->clearTables();
-
-            $result = $this->db->exec("INSERT INTO users (user_name,user_password,user_id) VALUES ($value,$value,0)");
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing insert query'.$result->getMessage());
-            }
-
-            $result =& $this->db->query('SELECT user_name,user_password FROM users', array('text', 'text'));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing select query'.$result->getMessage());
-            }
-
-            if ($is_null) {
-                $error_message = 'A query result column is not NULL unlike what was expected';
-            } else {
-                $error_message = 'A query result column is NULL even though it was expected to be differnt';
-            }
-
-            $row = $result->fetchRow();
-            $this->assertTrue((is_null($row[0]) == $is_null), $error_message);
-            $this->assertTrue((is_null($row[1]) == $is_null), $error_message);
-
-            $result->free();
-        }
-
-        $methods = array('fetchOne', 'fetchRow');
-
-        foreach ($methods as $method) {
-            $result =& $this->db->query('SELECT user_name FROM users WHERE user_id=123', array('text'));
-            $value = $result->$method();
-            if (PEAR::isError($value)) {
-                $this->assertTrue(false, 'Error fetching non existant row');
-            } else {
-                $this->assertNull($value, 'selecting non existant row with "'.$method.'()" did not return NULL');
-                $result->free();
-            }
-        }
-
-        $methods = array('fetchCol', 'fetchAll');
-
-        foreach ($methods as $method) {
-            $result =& $this->db->query('SELECT user_name FROM users WHERE user_id=123', array('text'));
-            $value = $result->$method();
-            if (PEAR::isError($value)) {
-                $this->assertTrue(false, 'Error fetching non existant row');
-            } else {
-                $this->assertTrue((is_array($value) && empty($value)), 'selecting non existant row with "'.$method.'()" did not return empty array');
-                $result->free();
-            }
-        }
-
-        $methods = array('queryOne', 'queryRow');
-
-        foreach ($methods as $method) {
-            $value = $this->db->$method('SELECT user_name FROM users WHERE user_id=123', array('text'));
-            if (PEAR::isError($value)) {
-                $this->assertTrue(false, 'Error fetching non existant row');
-            } else {
-                $this->assertNull($value, 'selecting non existant row with "'.$method.'()" did not return NULL');
-                $result->free();
-            }
-        }
-
-        $methods = array('queryCol', 'queryAll');
-
-        foreach ($methods as $method) {
-            $value = $this->db->$method('SELECT user_name FROM users WHERE user_id=123', array('text'));
-            if (PEAR::isError($value)) {
-                $this->assertTrue(false, 'Error fetching non existant row');
-            } else {
-                $this->assertTrue((is_array($value) && empty($value)), 'selecting non existant row with "'.$method.'()" did not return empty array');
-                $result->free();
-            }
-        }
-    }
-
-    /**
-     * Test paged queries
-     *
-     * Test the use of setLimit to return paged queries
-     */
-    function testRanges() {
-        if (!$this->supported('limit_queries')) {
-            return;
-        }
-
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-
-        $stmt->free();
-
-        for ($rows = 2, $start_row = 0; $start_row < $total_rows; $start_row += $rows) {
-
-            $this->db->setLimit($rows, $start_row);
-
-            $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_name';
-            $result =& $this->db->query($query, $this->fields);
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing select query'.$result->getMessage());
-            }
-
-            for ($row = 0; $row < $rows && ($row + $start_row < $total_rows); $row++) {
-                $this->verifyFetchedValues($result, $row, $data[$row + $start_row]);
-            }
-        }
-
-        $this->assertTrue(!$result->valid(), "The query result did not seem to have reached the end of result as expected starting row $start_row after fetching upto row $row");
-
-        $result->free();
-
-        for ($rows = 2, $start_row = 0; $start_row < $total_rows; $start_row += $rows) {
-
-            $this->db->setLimit($rows, $start_row);
-
-            $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_name';
-            $result =& $this->db->query($query, $this->fields);
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing select query'.$result->getMessage());
-            }
-
-            $result_rows = $result->numRows();
-
-            $this->assertTrue(($result_rows <= $rows), 'expected a result of no more than '.$rows.' but the returned number of rows is '.$result_rows);
-
-            for ($row = 0; $row < $result_rows; $row++) {
-                $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result at row '.$row.' that is before '.$result_rows.' as expected');
-
-                $this->verifyFetchedValues($result, $row, $data[$row + $start_row]);
-            }
-        }
-
-        $this->assertTrue(!$result->valid(), "The query result did not seem to have reached the end of result as expected starting row $start_row after fetching upto row $row");
-
-        $result->free();
-    }
-
-    /**
-     * Test the handling of sequences
-     */
-    function testSequences() {
-        if (!$this->supported('sequences')) {
-           return;
-        }
-
-        $this->db->loadModule('Manager', null, true);
-
-        for ($start_value = 1; $start_value < 4; $start_value++) {
-            $sequence_name = "test_sequence_$start_value";
-
-            $result = $this->db->manager->createSequence($sequence_name, $start_value);
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, "Error creating sequence $sequence_name with start value $start_value: ".$result->getMessage());
-            } else {
-                for ($sequence_value = $start_value; $sequence_value < ($start_value + 4); $sequence_value++) {
-                    $value = $this->db->nextId($sequence_name, false);
-
-                    $this->assertEquals($sequence_value, $value, "The returned sequence value is not expected with sequence start value with $start_value");
-                }
-
-                $result = $this->db->manager->dropSequence($sequence_name);
-
-                if (PEAR::isError($result)) {
-                    $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
-                }
-            }
-        }
-
-        // Test ondemand creation of sequences
-        $sequence_name = 'test_ondemand';
-        $this->db->expectError(MDB2_ERROR_NOSUCHTABLE);
-        $this->db->manager->dropSequence($sequence_name);
-        $this->db->popExpect();
-
-        for ($sequence_value = 1; $sequence_value < 4; $sequence_value++) {
-            $value = $this->db->nextId($sequence_name);
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, "Error creating with ondemand sequence: ".$result->getMessage());
-            } else {
-                $this->assertEquals($sequence_value, $value, "Error in ondemand sequences. The returned sequence value is not expected value");
-            }
-        }
-
-        $result = $this->db->manager->dropSequence($sequence_name);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
-        }
-
-        // Test currId()
-        $sequence_name = 'test_currid';
-
-        $next = $this->db->nextId($sequence_name);
-        $curr = $this->db->currId($sequence_name);
-
-        if (PEAR::isError($curr)) {
-            $this->assertTrue(false, "Error getting the current value of sequence $sequence_name : ".$curr->getMessage());
-        } else {
-            if ($next != $curr) {
-                if ($next+1 == $curr) {
-                    $this->assertTrue(false, "Warning: currId() is using nextId() instead of a native implementation");
-                } else {
-                    $this->assertEquals($next, $curr, "return value if currId() does not match the previous call to nextId()");
-                }
-            }
-        }
-        $result = $this->db->manager->dropSequence($sequence_name);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
-        }
-
-        // Test lastInsertid()
-        if (!$this->supported('new_link')) {
-           return;
-        }
-
-        $sequence_name = 'test_lastinsertid';
-
-        $dsn = MDB2::parseDSN($this->dsn);
-        $dsn['new_link'] = true;
-        $dsn['database'] = $this->database;
-        $db =& MDB2::connect($dsn, $this->options);
-
-        $next = $this->db->nextId($sequence_name);
-        $next2 = $db->nextId($sequence_name);
-        $last = $this->db->lastInsertId($sequence_name);
-
-        if (PEAR::isError($last)) {
-            $this->assertTrue(false, "Error getting the last value of sequence $sequence_name : ".$last->getMessage());
-        } else {
-            $this->assertEquals($next, $last, "return value if lastInsertId() does not match the previous call to nextId()");
-        }
-        $result = $this->db->manager->dropSequence($sequence_name);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
-        }
-    }
-
-    /**
-     * Test replace query
-     *
-     * The replace method emulates the replace query of mysql
-     */
-    function testReplace() {
-        if (!$this->supported('replace')) {
-            return;
-        }
-
-        $row = 1234;
-        $data = $this->getSampleData($row);
-
-        $fields = array(
-            'user_name' => array(
-                'value' => "user_$row",
-                'type' => 'text'
-            ),
-            'user_password' => array(
-                'value' => $data['user_password'],
-                'type' => 'text'
-            ),
-            'subscribed' => array(
-                'value' => $data['subscribed'],
-                'type' => 'boolean'
-            ),
-            'user_id' => array(
-                'value' => $data['user_id'],
-                'type' => 'integer',
-                'key' => 1
-            ),
-            'quota' => array(
-                'value' => $data['quota'],
-                'type' => 'decimal'
-            ),
-            'weight' => array(
-                'value' => $data['weight'],
-                'type' => 'float'
-            ),
-            'access_date' => array(
-                'value' => $data['access_date'],
-                'type' => 'date'
-            ),
-            'access_time' => array(
-                'value' => $data['access_time'],
-                'type' => 'time'
-            ),
-            'approved' => array(
-                'value' => $data['approved'],
-                'type' => 'timestamp'
-            )
-        );
-
-        $result = $this->db->replace('users', $fields);
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Replace failed');
-        }
-
-        if ($this->db->supports('affected_rows')) {
-            $affected_rows = $result;
-
-            $this->assertEquals(1, $result, "replacing a row in an empty table returned incorrect value");
-        } else {
-            $this->assertTrue(false, '"affected_rows" is not supported');
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query, $this->fields);
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-
-        $this->verifyFetchedValues($result, 0, $data);
-
-        $row = 4321;
-        $fields['user_name']['value']     = $data['user_name']     = 'user_'.$row;
-        $fields['user_password']['value'] = $data['user_password'] = 'somepass';
-        $fields['subscribed']['value']    = $data['subscribed']    = $row % 2 ? true : false;
-        $fields['quota']['value']         = $data['quota']         = strval($row/100);
-        $fields['weight']['value']        = $data['weight']        = sqrt($row);
-        $fields['access_date']['value']   = $data['access_date']   = MDB2_Date::mdbToday();
-        $fields['access_time']['value']   = $data['access_time']   = MDB2_Date::mdbTime();
-        $fields['approved']['value']      = $data['approved']      = MDB2_Date::mdbNow();
-
-        $result = $this->db->replace('users', $fields);
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Replace failed');
-        }
-        if ($this->db->supports('affected_rows')) {
-            $this->assertEquals(2, $result, "replacing a row returned incorrect result");
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query, $this->fields);
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-
-        $this->verifyFetchedValues($result, 0, $data);
-
-        $this->assertTrue(!$result->valid(), 'the query result did not seem to have reached the end of result as expected');
-
-        $result->free();
-    }
-
-    /**
-     * Test affected rows methods
-     */
-    function testAffectedRows() {
-        if (!$this->supported('affected_rows')) {
-            return;
-        }
-
-        $data = array();
-        $total_rows = 7;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-
-            $this->assertEquals(1, $result, "Inserting the row $row returned incorrect affected row count");
-        }
-
-        $stmt->free();
-
-        $query = 'UPDATE users SET user_password=? WHERE user_id < ?';
-        $stmt = $this->db->prepare($query, array('text', 'integer'), MDB2_PREPARE_MANIP);
-
-        for ($row = 0; $row < $total_rows; $row++) {
-            $password = "pass_$row";
-            if ($row == 0) {
-                $stmt->bindParam(0, $password);
-                $stmt->bindParam(1, $row);
-            }
-
-            $result = $stmt->execute();
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-
-            $this->assertEquals($row, $result, "Updating the $row rows returned incorrect affected row count");
-        }
-
-        $stmt->free();
-
-        $query = 'DELETE FROM users WHERE user_id >= ?';
-        $stmt = $this->db->prepare($query, array('integer'), MDB2_PREPARE_MANIP);
-
-        $row = intval($total_rows / 2);
-        $stmt->bindParam(0, $row);
-        for ($row = $total_rows; $total_rows; $total_rows = $row) {
-            $row = intval($total_rows / 2);
-
-            $result = $stmt->execute();
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-
-            $this->assertEquals(($total_rows - $row), $result, 'Deleting rows returned incorrect affected row count');
-
-        }
-
-        $stmt->free();
-    }
-
-    /**
-     * Testing transaction support - Test ROLLBACK
-     */
-    function testTransactionsRollback() {
-        if (!$this->supported('transactions')) {
-            return;
-        }
-
-        $data = $this->getSampleData(0);
-
-        $this->db->beginTransaction();
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        $result = $stmt->execute(array_values($data));
-        $this->db->rollback();
-        $stmt->free();
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $this->assertTrue(!$result->valid(), 'Transaction rollback did not revert the row that was inserted');
-        $result->free();
-    }
-
-    /**
-     * Testing transaction support - Test COMMIT
-     */
-    function testTransactionsCommit() {
-        if (!$this->supported('transactions')) {
-            return;
-        }
-
-        $data = $this->getSampleData(1);
-
-        $this->db->beginTransaction();
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        $result = $stmt->execute(array_values($data));
-        $this->db->commit();
-        $stmt->free();
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $this->assertTrue($result->valid(), 'Transaction commit did not make permanent the row that was inserted');
-        $result->free();
-    }
-
-    /**
-     * Testing transaction support - Test COMMIT and ROLLBACK
-     */
-    function testTransactionsBoth()
-    {
-        if (!$this->supported('transactions')) {
-            return;
-        }
-
-        $data = $this->getSampleData(0);
-
-        $this->db->beginTransaction();
-        $result = $this->db->exec('DELETE FROM users');
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error deleting from users'.$result->getMessage());
-            $this->db->rollback();
-        } else {
-            $this->db->commit();
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-
-        $this->assertTrue(!$result->valid(), 'Transaction end with implicit commit when re-enabling auto-commit did not make permanent the rows that were deleted');
-        $result->free();
-    }
-
-    /**
-     * Testing emulated nested transaction support
-     */
-    function testNestedTransactions() {
-        if (!$this->supported('transactions')) {
-            return;
-        }
-
-        $data = array(
-            1 => $this->getSampleData(1234),
-            2 => $this->getSampleData(4321),
-        );
-
-        $this->db->beginNestedTransaction();
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        $result = $stmt->execute(array_values($data[1]));
-
-        $this->db->beginNestedTransaction();
-
-        $result = $stmt->execute(array_values($data[2]));
-        $stmt->free();
-
-        $result = $this->db->completeNestedTransaction();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Inner transaction was not committed: '.$result->getMessage());
-        }
-
-        $result = $this->db->completeNestedTransaction();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Outer transaction was not committed: '.$result->getMessage());
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->query($query);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $this->assertTrue($result->valid(), 'Transaction commit did not make permanent the row that was inserted');
-        $result->free();
-    }
-
-    /**
-     * Testing savepoints
-     */
-    function testSavepoint() {
-        if (!$this->supported('savepoints')) {
-            return;
-        }
-
-        $savepoint = 'test_savepoint';
-
-        $data = array(
-            1 => $this->getSampleData(1234),
-            2 => $this->getSampleData(4321),
-        );
-
-        $this->db->beginTransaction();
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-
-        $result = $stmt->execute(array_values($data[1]));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
-        }
-
-        $result = $this->db->beginTransaction($savepoint);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error setting savepoint: '.$result->getMessage());
-        }
-
-        $result = $stmt->execute(array_values($data[2]));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
-        }
-        $stmt->free();
-
-        $result = $this->db->rollback($savepoint);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error rolling back to savepoint: '.$result->getMessage());
-        }
-
-        $result = $this->db->commit();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Transaction not committed: '.$result->getMessage());
-        }
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result = $this->db->queryAll($query);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $rows_inserted = count($result);
-        $this->assertEquals(1, $rows_inserted, 'Error during transaction, invalid number of records inserted');
-
-        // test release savepoint
-        $this->db->beginTransaction();
-        $result = $this->db->beginTransaction($savepoint);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error setting savepoint: '.$result->getMessage());
-        }
-        $result = $this->db->commit($savepoint);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error setting savepoint: '.$result->getMessage());
-        }
-        $result = $this->db->commit();
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Transaction not committed: '.$result->getMessage());
-        }
-    }
-
-    /**
-     * Testing LOB storage
-     */
-    function testLOBStorage() {
-        if (!$this->supported('LOBs')) {
-            return;
-        }
-
-        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, ?, ?)';
-        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
-
-        $character_lob = '';
-        $binary_lob = '';
-
-        for ($i = 0; $i < 1000; $i++) {
-            for ($code = 32; $code <= 127; $code++) {
-                $character_lob.= chr($code);
-            }
-            for ($code = 0; $code <= 255; $code++) {
-                $binary_lob.= chr($code);
-            }
-        }
-
-        $stmt->bindParam(0, $character_lob);
-        $stmt->bindParam(1, $binary_lob);
-
-        $result = $stmt->execute();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
-        }
-
-        $stmt->free();
-
-        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
-        }
-
-        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
-
-        $row = $result->fetchRow();
-        $clob = $row[0];
-        if (!PEAR::isError($clob) && is_resource($clob)) {
-            $value = '';
-            while (!feof($clob)) {
-                $data = fread($clob, 8192);
-                $this->assertTrue(strlen($data) >= 0, 'Could not read CLOB');
-                $value.= $data;
-            }
-            $this->db->datatype->destroyLOB($clob);
-            $this->assertEquals($character_lob, $value, 'Retrieved character LOB value is different from what was stored');
-        } else {
-            $this->assertTrue(false, 'Error retrieving CLOB result');
-        }
-
-        $blob = $row[1];
-        if (!PEAR::isError($blob) && is_resource($blob)) {
-            $value = '';
-            while (!feof($blob)) {
-                $data = fread($blob, 8192);
-                $this->assertTrue(strlen($data) >= 0, 'Could not read BLOB');
-                $value.= $data;
-            }
-
-            $this->db->datatype->destroyLOB($blob);
-            $this->assertEquals($binary_lob, $value, 'Retrieved binary LOB value is different from what was stored');
-        } else {
-            $this->assertTrue(false, 'Error retrieving BLOB result');
-        }
-        $result->free();
-    }
-
-    /**
-     * Test LOB reading of multiple records both buffered and unbuffered. See bug #8793 for why this must be tested.
-     */
-    function testLOBRead() {
-        if (!$this->supported('LOBs')) {
-            return;
-        }
-
-        for ($i = 20; $i < 30; ++$i) {
-            $query = 'INSERT INTO files (ID, document, picture) VALUES (?, ?, ?)';
-            $stmt = $this->db->prepare($query, array('integer', 'clob', 'blob'), MDB2_PREPARE_MANIP, array(1 => 'document', 2 => 'picture'));
-            $character_lob = $binary_lob = $i;
-            $stmt->bindParam(1, $character_lob);
-            $stmt->bindParam(2, $binary_lob);
-
-            $result = $stmt->execute(array($i));
-
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
-            }
-            $stmt->free();
-        }
-
-        $oldBuffered = $this->db->getOption('result_buffering');
-        foreach (array(true, false) as $buffered) {
-            $this->db->setOption('result_buffering', $buffered);
-            $msgPost = ' with result_buffering = '.($buffered ? 'true' : 'false');
-            $result =& $this->db->query('SELECT id, document, picture FROM files WHERE id >= 20 and id <= 30 order by id asc', array('integer', 'clob', 'blob'));
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error selecting from files'.$msgPost.$result->getMessage());
-            } else {
-                if ($buffered) {
-                    $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon'.$msgPost);
-                }
-                for ($i = 1; $i <= ($buffered ? 2 : 1); ++$i) {
-                    $result->seek(0);
-                    while ($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
-                        foreach (array('document' => 'clob', 'picture' => 'blob') as $field => $type) {
-                            $lob = $row[$field];
-                            if (is_a($lob, 'oci-lob')) {
-                                $lob = $lob->load();
-                            } elseif (is_resource($lob)) {
-                                $lob = fread($lob, 1000);
-                            }
-                            $this->assertEquals($lob, $row['id'], 'LOB ('.$type.') field ('.$field.') not equal to expected value ('.$row['id'].')'.$msgPost.' on run-through '.$i);
-                        }
-                    }
-                }
-                $result->free();
-            }
-        }
-        $this->db->setOption('result_buffering', $oldBuffered);
-    }
-
-    /**
-     * Test for lob storage from and to files
-     */
-    function testLOBFiles() {
-        if (!$this->supported('LOBs')) {
-            return;
-        }
-
-        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, :document, :picture)';
-        $stmt = $this->db->prepare($query, array('document' => 'clob', 'picture' => 'blob'), MDB2_PREPARE_MANIP);
-
-        $character_data_file = 'character_data';
-        $file = fopen($character_data_file, 'w');
-        $this->assertTrue(((bool)$file), 'Error creating clob file to read from');
-        $character_data = '';
-        for ($i = 0; $i < 1000; $i++) {
-            for ($code = 32; $code <= 127; $code++) {
-                $character_data.= chr($code);
-            }
-        }
-        $this->assertTrue((fwrite($file, $character_data, strlen($character_data)) == strlen($character_data)), 'Error creating clob file to read from');
-        fclose($file);
-
-        $binary_data_file = 'binary_data';
-        $file = fopen($binary_data_file, 'wb');
-        $this->assertTrue(((bool)$file), 'Error creating blob file to read from');
-        $binary_data = '';
-        for ($i = 0; $i < 1000; $i++) {
-            for ($code = 0; $code <= 255; $code++) {
-                $binary_data.= chr($code);
-            }
-        }
-        $this->assertTrue((fwrite($file, $binary_data, strlen($binary_data)) == strlen($binary_data)), 'Error creating blob file to read from');
-        fclose($file);
-
-        $character_data_file_tmp = 'file://'.$character_data_file;
-        $stmt->bindParam('document', $character_data_file_tmp);
-        $binary_data_file_tmp = 'file://'.$binary_data_file;
-        $stmt->bindParam('picture', $binary_data_file_tmp);
-
-        $result = $stmt->execute();
-        $this->assertTrue(!PEAR::isError($result), 'Error executing prepared query - inserting LOB from files');
-
-        $stmt->free();
-
-        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
-        }
-
-        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
-
-        $row = $result->fetchRow();
-        $clob = $row[0];
-        if (!PEAR::isError($clob) && is_resource($clob)) {
-            unlink($character_data_file);
-            $res = $this->db->datatype->writeLOBToFile($clob, $character_data_file);
-            $this->db->datatype->destroyLOB($clob);
-
-            if (PEAR::isError($res)) {
-                $this->assertTrue(false, 'Error writing character LOB in a file');
-            } else {
-                $file = fopen($character_data_file, 'r');
-                $this->assertTrue($file, "Error opening character data file: $character_data_file");
-                $value = '';
-                while (!feof($file)) {
-                    $value.= fread($file, 8192);
-                }
-                $this->assertEquals('string', gettype($value), "Could not read from character LOB file: $character_data_file");
-                fclose($file);
-
-                $this->assertEquals($character_data, $value, "retrieved character LOB value is different from what was stored");
-            }
-        } else {
-            $this->assertTrue(false, 'Error creating character LOB in a file');
-        }
-
-        $blob = $row[1];
-        if (!PEAR::isError($blob) && is_resource($blob)) {
-            unlink($binary_data_file);
-            $res = $this->db->datatype->writeLOBToFile($blob, $binary_data_file);
-            $this->db->datatype->destroyLOB($blob);
-
-            if (PEAR::isError($res)) {
-                $this->assertTrue(false, 'Error writing binary LOB in a file');
-            } else {
-                $file = fopen($binary_data_file, 'rb');
-                $this->assertTrue($file, "Error opening binary data file: $binary_data_file");
-                $value = '';
-                while (!feof($file)) {
-                    $value.= fread($file, 8192);
-                }
-                $this->assertEquals('string', gettype($value), "Could not read from binary LOB file: $binary_data_file");
-                fclose($file);
-
-                $this->assertEquals($binary_data, $value, "retrieved binary LOB value is different from what was stored");
-            }
-        } else {
-            $this->assertTrue(false, 'Error creating binary LOB in a file');
-        }
-
-        $result->free();
-    }
-
-    /**
-     * Test handling of lob nulls
-     */
-    function testLOBNulls() {
-        if (!$this->supported('LOBs')) {
-            return;
-        }
-
-        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, :document, :picture)';
-        $stmt = $this->db->prepare($query, array('document' => 'clob', 'picture' => 'blob'), MDB2_PREPARE_MANIP);
-
-        $null = null;
-        $stmt->bindParam('document', $null);
-        $stmt->bindParam('picture', $null);
-
-        $result = $stmt->execute();
-        $this->assertTrue(!PEAR::isError($result), 'Error executing prepared query - inserting NULL lobs');
-
-        $stmt->free();
-
-        $result =& $this->db->query('SELECT document, picture FROM files', array('clob', 'blob'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
-        }
-
-        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
-
-        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
-        $this->assertTrue(is_null($row['document']), 'A query result large object column document is not NULL unlike what was expected');
-        $this->assertTrue(is_null($row['picture']), 'A query result large object column picture is not NULL unlike what was expected');
-
-        $result->free();
-    }
-
-    function testLOBUpdate() {
-        if (!$this->supported('LOBs')) {
-            return;
-        }
-
-        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, ?, ?)';
-        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
-
-        $character_lob = '';
-        $binary_lob = '';
-
-        for ($i = 0; $i < 1000; $i++) {
-            for ($code = 32; $code <= 127; ++$code) {
-                $character_lob .= chr($code);
-            }
-            for ($code = 0; $code <= 255; ++$code) {
-                $binary_lob .= chr($code);
-            }
-        }
-
-        $stmt->bindParam(0, $character_lob);
-        $stmt->bindParam(1, $binary_lob);
-
-        $result = $stmt->execute();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
-        }
-
-        $stmt->free();
-
-        $query = 'UPDATE files SET document = ?, picture = ? WHERE ID = 1';
-        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
-
-        $character_lob = '';
-        $binary_lob = '';
-
-        for ($i = 0; $i < 999; $i++) {
-            for ($code = 127; $code >= 32; --$code) {
-                $character_lob .= chr($code);
-            }
-            for ($code = 255; $code >= 0; --$code) {
-                $binary_lob .= chr($code);
-            }
-        }
-
-        $stmt->bindParam(0, $character_lob);
-        $stmt->bindParam(1, $binary_lob);
-
-        $result = $stmt->execute();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
-        }
-
-        $stmt->free();
-
-        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
-        }
-
-        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
-
-        $row = $result->fetchRow();
-        $clob = $row[0];
-        if (!PEAR::isError($clob) && is_resource($clob)) {
-            $value = '';
-            while (!feof($clob)) {
-                $data = fread($clob, 8192);
-                $this->assertTrue(strlen($data) >= 0, 'Could not read CLOB');
-                $value.= $data;
-            }
-            $this->db->datatype->destroyLOB($clob);
-            $this->assertEquals($character_lob, $value, 'Retrieved character LOB value is different from what was stored');
-        } else {
-            $this->assertTrue(false, 'Error retrieving CLOB result');
-        }
-
-        $blob = $row[1];
-        if (!PEAR::isError($blob) && is_resource($blob)) {
-            $value = '';
-            while (!feof($blob)) {
-                $data = fread($blob, 8192);
-                $this->assertTrue(strlen($data) >= 0, 'Could not read BLOB');
-                $value.= $data;
-            }
-
-            $this->db->datatype->destroyLOB($blob);
-            $this->assertEquals($binary_lob, $value, 'Retrieved binary LOB value is different from what was stored');
-        } else {
-            $this->assertTrue(false, 'Error retrieving BLOB result');
-        }
-        $result->free();
-    }
-
-    /**
-     * Test retrieval of result metadata
-     *
-     * This tests the result metadata by executing a prepared query and
-     * select the data, and checking the result contains the correct
-     * number of columns and that the column names are in the correct order
-     */
-    function testConvertEmpty2Null() {
-#$this->db->setOption('portability', MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
-
-        $data = $this->getSampleData(1234);
-        $data['user_password'] = '';
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-        $result = $stmt->execute(array_values($data));
-        $stmt->free();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-        }
-
-        $row = $this->db->queryRow('SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users WHERE user_password IS NULL', $this->fields);
-
-        if (PEAR::isError($row)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-
-        $this->assertEquals(count($this->fields), count($row), "The query result returned a number of columns unlike ".count($this->fields) .' as expected');
-    }
-
-    function testPortabilityOptions() {
-        // MDB2_PORTABILITY_DELETE_COUNT
-        $data = array();
-        $total_rows = 5;
-
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-        for ($row = 0; $row < $total_rows; $row++) {
-            $data[$row] = $this->getSampleData($row);
-            $result = $stmt->execute(array_values($data[$row]));
-            if (PEAR::isError($result)) {
-                $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-            }
-        }
-        $stmt->free();
-
-        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_DELETE_COUNT);
-        $affected_rows = $this->db->exec('DELETE FROM users');
-        if (PEAR::isError($affected_rows)) {
-            $this->assertTrue(false, 'Error executing query'.$affected_rows->getMessage());
-        }
-        $this->assertEquals($total_rows, $affected_rows, 'MDB2_PORTABILITY_DELETE_COUNT not working');
-
-        // MDB2_PORTABILITY_FIX_CASE
-        $fields = array_keys($this->fields);
-        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_FIX_CASE);
-        $this->db->setOption('field_case', CASE_UPPER);
-
-        $data = $this->getSampleData(1234);
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-        $result = $stmt->execute(array_values($data));
-        $stmt->free();
-
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->queryRow($query, $this->fields, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $field = reset($fields);
-        foreach (array_keys($result) as $fieldname) {
-            $this->assertEquals(strtoupper($field), $fieldname, 'MDB2_PORTABILITY_FIX_CASE CASE_UPPER not working');
-            $field = next($fields);
-        }
-
-        $this->db->setOption('field_case', CASE_LOWER);
-        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
-        $result =& $this->db->queryRow($query, $this->fields, MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $field = reset($fields);
-        foreach (array_keys($result) as $fieldname) {
-            $this->assertEquals(strtolower($field), $fieldname, 'MDB2_PORTABILITY_FIX_CASE CASE_LOWER not working');
-            $field = next($fields);
-        }
-
-        // MDB2_PORTABILITY_RTRIM
-        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_RTRIM);
-        $value = 'rtrim   ';
-        $query = 'INSERT INTO users (user_id, user_password) VALUES (1, ' . $this->db->quote($value, 'text') .')';
-        $res = $this->db->exec($query);
-        if (PEAR::isError($res)) {
-            $this->assertTrue(false, 'Error executing query'.$res->getMessage());
-        }
-        $query = 'SELECT user_password FROM users WHERE user_id = 1';
-        $result = $this->db->queryOne($query, array('text'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
-        }
-        $this->assertEquals(rtrim($value), $result, '"MDB2_PORTABILITY_RTRIM = on" not working');
-
-        if (!$this->supported('LOBs')) {
-            return;
-        }
-
-        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, ?, ?)';
-        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
-
-        $character_lob = '';
-        $binary_lob = '';
-
-        for ($i = 0; $i < 999; $i++) {
-            for ($code = 127; $code >= 32; --$code) {
-                $character_lob .= chr($code);
-            }
-            for ($code = 255; $code >= 0; --$code) {
-                $binary_lob .= chr($code);
-            }
-        }
-
-        $stmt->bindParam(0, $character_lob);
-        $stmt->bindParam(1, $binary_lob);
-
-        $result = $stmt->execute();
-
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
-        }
-
-        $stmt->free();
-
-        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
-        }
-
-        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
-
-        $row = $result->fetchRow();
-        $clob = $row[0];
-        if (!PEAR::isError($clob) && is_resource($clob)) {
-            $value = '';
-            while (!feof($clob)) {
-                $data = fread($clob, 8192);
-                $this->assertTrue(strlen($data) >= 0, 'Could not read CLOB');
-                $value.= $data;
-            }
-            $this->db->datatype->destroyLOB($clob);
-            $this->assertEquals($character_lob, $value, '"MDB2_PORTABILITY_RTRIM = on" Retrieved character LOB value is different from what was stored');
-        } else {
-            $this->assertTrue(false, 'Error retrieving CLOB result');
-        }
-
-        $blob = $row[1];
-        if (!PEAR::isError($blob) && is_resource($blob)) {
-            $value = '';
-            while (!feof($blob)) {
-                $data = fread($blob, 8192);
-                $this->assertTrue(strlen($data) >= 0, 'Could not read BLOB');
-                $value.= $data;
-            }
-
-            $this->db->datatype->destroyLOB($blob);
-            $this->assertEquals($binary_lob, $value, '"MDB2_PORTABILITY_RTRIM = on" Retrieved binary LOB value is different from what was stored');
-        } else {
-            $this->assertTrue(false, 'Error retrieving BLOB result');
-        }
-        $result->free();
-    }
-
-    /**
-     * Test getAsKeyword()
-     */
-    function testgetAsKeyword()
-    {
-        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
-        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
-        $data = $this->getSampleData(1);
-        $result = $stmt->execute(array_values($data));
-        if (PEAR::isError($result)) {
-            $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage());
-        }
-        $stmt->free();
-
-        $query = 'SELECT user_id'.$this->db->getAsKeyword().'foo FROM users';
-        $result = $this->db->queryRow($query, array('integer'), MDB2_FETCHMODE_ASSOC);
-        if (PEAR::isError($result)) {
-            $this->assertFalse(true, 'Error getting alias column:'. $result->getMessage());
-        } else {
-            $this->assertTrue((array_key_exists('foo', $result)), 'Error: could not alias "user_id" with "foo" :'.var_export($result, true));
-        }
-    }
-}
-
-?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/README /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/README
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/README	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/README	1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-This is a test framework for MDB2 built using PHPUnit.
-These tests directly access the MDB2 API - hopefully this framework
-should give better feedback as to where or what caused when error are encountered.
-
-Usage:
-In order for the tests to work they need to access a database called
-"driver_test". This database is created using the MDB2_Schema test or
-running the import.schema.php script (edit the db DSN information).
-If you have problems running these test or the driver you are using does not yet
-provide the necessary methods you may create the "driver_test" database manually:
-
-CREATE TABLE "files" (
-  "id" int(11) NOT NULL default '0',
-  "document" longtext,
-  "picture" longblob,
-  UNIQUE KEY "lob_id_index_idx" ("id")
-);
-
-CREATE TABLE "users" (
-  "user_name" varchar(12) default NULL,
-  "user_password" char(8) default NULL,
-  "subscribed" tinyint(1) default '1',
-  "user_id" int(11) NOT NULL default '0',
-  "quota" decimal(18,2) default '0.00',
-  "weight" double default '0',
-  "access_date" date default '1970-01-01',
-  "access_time" time default '00:00:00',
-  "approved" datetime default '1970-01-01 00:00:00',
-  UNIQUE KEY "users_id_index_idx" ("user_id")
-);
-
-To setup the tests
-
-* requires PHPUnit to be installed
-
-* requires MDB2 (with the given driver) to be installed
-  in a php include path.
-
-* copy the file test_setup.php.dist to test_setup.php
-
-* edit test_setup.php. The array $testarray specifies which testcases
-  to carry out. $dbarray is an array of databases to test.
-
-* point your browser at test.php or your CLI at clitest.php for the results,
-  and then fix the bugs!
-
-* by default test.php/clitest.php will use all tests in the testcases - if
-  you want to pick specific tests, use testchoose.php to pick just the
-  tests you want to run
-
-Writing tests:
-
-The tests are written using PHPUnit from pear so first make sure you
-have the latest stable release, and have read the docs,
-http://pear.php.net/manual/en/packages.phpunit.php
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/testchoose.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/testchoose.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/testchoose.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/testchoose.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,64 +0,0 @@
-'."\n";
-    $output.= ' TestCase : '.$testcase.''."\n";
-    $testmethods[$testcase] = getTests($testcase);
-    foreach ($testmethods[$testcase] as $method) {
-        $output.= testCheck($testcase, $method);
-    }
-    $output.= "
\n\n";
-    $output.= "
 
\n\n";
-}
-
-?>
-
-
-MDB2 Tests
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.4.1/tests/test.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.4.1/tests/test.php
--- php-mdb2-2.4.1/MDB2-2.4.1/tests/test.php	2007-05-03 19:58:15.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.4.1/tests/test.php	1970-01-01 01:00:00.000000000 +0100
@@ -1,131 +0,0 @@
-                                 |
-// +----------------------------------------------------------------------+
-//
-// $Id: test.php,v 1.18 2006/10/20 16:36:32 lsmith Exp $
-
-/*
- This is a small test suite for MDB2 using PHPUnit
- */
-
-require_once 'test_setup.php';
-require_once 'PHPUnit.php';
-require_once 'testUtils.php';
-require_once 'MDB2.php';
-require_once 'HTML_TestListener.php';
-
-function htmlErrorHandler($errno, $errstr, $errfile, $errline)
-{
-    if ((!$GLOBALS['_show_silenced'] && !error_reporting()) || $errno == 2048) {
-        return;
-    }
-    echo '';
-    errorHandler($errno, $errstr, $errfile, $errline);
-    echo '';
-}
-set_error_handler('htmlErrorHandler');
-
-function htmlErrorHandlerPEAR($error_obj)
-{
-    echo '';
-    errorHandlerPEAR($error_obj);
-    echo '';
-}
-PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'htmlErrorHandlerPEAR');
-
-MDB2::loadFile('Date');
-
-foreach ($testcases as $testcase) {
-    include_once $testcase.'.php';
-}
-
-$database = 'driver_test';
-
-$testmethods = !empty($_POST['testmethods']) ? $_POST['testmethods'] : null;
-
-if (!is_array($testmethods)) {
-    foreach ($testcases as $testcase) {
-        $testmethods[$testcase] = array_flip(getTests($testcase));
-    }
-}
-
-?>
-
-
-MDB2 Tests
-
-
-
-\n";
-    echo "Testing $display_dsn on ".PHP_VERSION."\n";
-
-    $suite = new PHPUnit_TestSuite();
-
-    foreach ($testcases as $testcase) {
-        if (isset($testmethods[$testcase]) && is_array($testmethods[$testcase])) {
-            $methods = array_keys($testmethods[$testcase]);
-            foreach ($methods as $method) {
-                $suite->addTest(new $testcase($method));
-            }
-        }
-    }
-
-    $result = new PHPUnit_TestResult;
-    $result->addListener(new HTML_TestListener);
-    $suite->run($result);
-    $count = $result->runCount();
-    $failed = $result->failureCount();
-
-    echo "Summary: $failed failed assertions in $count tests\n";
-    echo "\n

".get_class($test).' : Starting '.$test->getName().' ...'); + } +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/import.schema.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/import.schema.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/import.schema.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/import.schema.php 2009-01-14 16:28:08.000000000 +0000 @@ -0,0 +1,45 @@ + 'mysql', + 'username' => 'username', + 'password' => 'password', + 'hostspec' => 'host', +); +$db_options = array(); + + +$file = dirname(__FILE__).DIRECTORY_SEPARATOR.'driver_test.schema.xml'; +$variables = array( + 'name' => 'driver_test', + 'create' => true, +); + +$options = array( + 'log_line_break' => '
', + 'idxname_format' => '%s', + 'debug' => true, + 'quote_identifier' => true, + 'force_defaults' => false, + 'portability' => false +); +$options = array_merge($options, $db_options); + +$schema =& MDB2_Schema::factory($dsn, $options); +if (PEAR::isError($schema)) { + echo $schema->getMessage() . ' ' . $schema->getUserInfo(); + exit; +} + +$definition = $schema->parseDatabaseDefinitionFile($file, $variables, true, true); +if (PEAR::isError($definition)) { + echo $definition->getMessage() . ' - ' . $definition->getUserInfo(); +} else { + $operation = $schema->createDatabase($definition); + if (PEAR::isError($operation)) { + echo $operation->getMessage() . ' ' . $operation->getUserInfo(); + } +} +?> +DONE! \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_api_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_api_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_api_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_api_testcase.php 2009-01-14 16:28:08.000000000 +0000 @@ -0,0 +1,321 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_api_testcase.php,v 1.24 2007/10/15 21:57:42 quipo Exp $ + +require_once 'MDB2_testcase.php'; + +class MDB2_Api_TestCase extends MDB2_TestCase { + var $clear_tables = false; + + function testParseDSN() { + $expected = array ( + 'phptype' => 'phptype', + 'dbsyntax' => 'phptype', + 'username' => 'username', + 'password' => 'password', + 'protocol' => 'protocol', + 'hostspec' => false, + 'port' => '110', + 'socket' => false, + 'database' => '/usr/db_file.db', + 'mode' => false, + ); + $original = 'phptype://username:password@protocol+hostspec:110//usr/db_file.db?mode=0644'; + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + $original = 'phptype(dbsyntax)://username:password@hostspec/database_name'; + $expected = array ( + 'phptype' => 'phptype', + 'dbsyntax' => 'dbsyntax', + 'username' => 'username', + 'password' => 'password', + 'protocol' => 'tcp', + 'hostspec' => 'hostspec', + 'port' => false, + 'socket' => false, + 'database' => 'database_name', + 'mode' => false, + ); + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + $original = 'phptype://username:password@hostspec/database_name'; + $expected['dbsyntax'] = 'phptype'; + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + $original = 'phptype://username:password@hostspec'; + $expected['database'] = false; + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + $original = 'phptype://username@hostspec'; + $expected['password'] = false; + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + $original = 'phptype://hostspec/database'; + $expected['username'] = false; + $expected['database'] = 'database'; + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + $original = 'phptype(dbsyntax)'; + $expected['database'] = false; + $expected['hostspec'] = false; + $expected['protocol'] = false; + $expected['dbsyntax'] = 'dbsyntax'; + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + //oracle's "Easy Connect" syntax (Oracle 10g, @see Bug #4854) + $original = 'oci8://scott:tiger@//localhost/XE'; + $expected = array ( + 'phptype' => 'oci8', + 'dbsyntax' => 'oci8', + 'username' => 'scott', + 'password' => 'tiger', + 'protocol' => 'tcp', + 'hostspec' => '//localhost/XE', + 'port' => false, + 'socket' => false, + 'database' => false, + 'mode' => false, + ); + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + //ibase dbname+path on windows + $original = 'ibase://user:pwd@localhost/C:\\PATH_TO_DB\\TEST.FDB'; + $expected = array ( + 'phptype' => 'ibase', + 'dbsyntax' => 'ibase', + 'username' => 'user', + 'password' => 'pwd', + 'protocol' => 'tcp', + 'hostspec' => 'localhost', + 'port' => false, + 'socket' => false, + 'database' => 'C:\\PATH_TO_DB\\TEST.FDB', + 'mode' => false, + ); + $this->assertEquals($expected, MDB2::parseDSN($original)); + + // --------------------------------------------------------------------- + + //sqlite dbname+path on unix + $original = 'sqlite:////full/unix/path/to/file.db?mode=0666'; + $expected = array ( + 'phptype' => 'sqlite', + 'dbsyntax' => 'sqlite', + 'username' => false, + 'password' => false, + 'protocol' => 'tcp', + 'hostspec' => '', + 'port' => false, + 'socket' => false, + 'database' => '/full/unix/path/to/file.db', + 'mode' => false, + ); + $this->assertEquals($expected, MDB2::parseDSN($original)); + } + + //test stuff in common.php + function testConnect() { + $db =& MDB2::factory($this->dsn, $this->options); + if (PEAR::isError($db)) { + $this->assertTrue(false, 'Connect failed bailing out - ' .$db->getMessage() . ' - ' .$db->getUserInfo()); + } + if (PEAR::isError($this->db)) { + exit; + } + } + + function testGetOption() { + if (!$this->methodExists($this->db, 'getOption')) { + return; + } + $option = $this->db->getOption('persistent'); + $this->assertEquals($option, $this->db->options['persistent']); + } + + function testSetOption() { + if (!$this->methodExists($this->db, 'setOption')) { + return; + } + $option = $this->db->getOption('persistent'); + $this->db->setOption('persistent', !$option); + $this->assertEquals(!$option, $this->db->getOption('persistent')); + $this->db->setOption('persistent', $option); + } + + function testLoadModule() { + if (!$this->methodExists($this->db, 'loadModule')) { + return; + } + $this->assertTrue(!PEAR::isError($this->db->loadModule('Manager', null, true))); + } + + // test of the driver + // helper function so that we don't have to write out a query a million times + function standardQuery() { + $query = 'SELECT * FROM users'; + // run the query and get a result handler + if (!PEAR::isError($this->db)) { + return $this->db->query($query); + } + return false; + } + + function testQuery() { + if (!$this->methodExists($this->db, 'query')) { + return; + } + $result = $this->standardQuery(); + $this->assertTrue(MDB2::isResult($result), 'query: $result returned is not a resource'); + $this->assertTrue(MDB2::isResultCommon($result), 'query: $result returned is not a resource'); + } + + function testExec() { + if (!$this->methodExists($this->db, 'exec')) { + return; + } + $result = $this->db->exec('UPDATE users SET user_name = user_name WHERE user_id = user_id'); + $this->assertFalse(PEAR::isError($result), 'exec: $result returned is an error'); + $this->assertEquals(0, $result, 'exec: incorrect number of affected rows returned'); + } + + function testPrepare() { + if (!$this->methodExists($this->db, 'prepare')) { + return; + } + $stmt = $this->db->prepare('SELECT user_name FROM users WHERE user_id = ?', array('integer'), MDB2_PREPARE_RESULT); + $this->assertTrue(MDB2::isStatement($stmt)); + $stmt->free(); + } + + function testFetchRow() { + $result = $this->standardQuery(); + if (!$this->methodExists($result, 'fetchRow')) { + return; + } + $err = $result->fetchRow(); + $result->free(); + + if (PEAR::isError($err)) { + $this->assertTrue(false, 'Error testFetch: '.$err->getMessage().' - '.$err->getUserInfo()); + } + } + + function testNumRows() { + $result = $this->standardQuery(); + if (!$this->methodExists($result, 'numRows')) { + return; + } + $numrows = $result->numRows(); + $this->assertTrue(!PEAR::isError($numrows) && is_int($numrows)); + $result->free(); + } + + function testNumCols() { + $result = $this->standardQuery(); + if (!$this->methodExists($result, 'numCols')) { + return; + } + $numcols = $result->numCols(); + $this->assertTrue(!PEAR::isError($numcols) && $numcols > 0); + $result->free(); + } + + function testSingleton() { + $db =& MDB2::singleton(); + $this->assertTrue(MDB2::isConnection($db)); + + // should have a different database name set + $db =& MDB2::singleton($this->dsn, $this->options); + + $this->assertTrue($db->db_index != $this->db->db_index); + } + + function testGetServerVersion() { + $server_info = $this->db->getServerVersion(true); + if (PEAR::isError($server_info)) { + $this->assertTrue(false, 'Error: '.$server_info->getMessage().' - '.$server_info->getUserInfo()); + } else { + $this->assertTrue(is_string($server_info), 'Error: Server info is not returned as a string: '. serialize($server_info)); + } + $server_info = $this->db->getServerVersion(); + if (PEAR::isError($server_info)) { + $this->assertTrue(false, 'Error: '.$server_info->getMessage().' - '.$server_info->getUserInfo()); + } else { + $this->assertTrue(is_array($server_info), 'Error: Server info is not returned as an array: '. serialize($server_info)); + } + } + + function testQuoteIdentifier() { + if ($this->db->phptype != 'ibase') { + $start = $this->db->identifier_quoting['start']; + $end = $this->db->identifier_quoting['end']; + + $string = 'test'; + $expected = $start . $string . $end; + $this->assertEquals($expected, $this->db->quoteIdentifier($string, false), 'Error: identifier not quoted properly'); + + $string = 'test.test'; + $expected = $start . 'test' . $end . '.' . $start . 'test' . $end; + $this->assertEquals($expected, $this->db->quoteIdentifier($string, false), 'Error: identifier not quoted properly'); + } + } +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_bugs_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_bugs_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_bugs_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_bugs_testcase.php 2009-01-14 16:28:08.000000000 +0000 @@ -0,0 +1,291 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_bugs_testcase.php,v 1.31 2006/12/09 16:58:16 quipo Exp $ + +require_once 'MDB2_testcase.php'; + +class MDB2_Bugs_TestCase extends MDB2_TestCase { + /** + * + */ + function testFetchModeBug() { + $data = array(); + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); + + $data['user_name'] = 'user_='; + $data['user_password'] = 'somepass'; + $data['subscribed'] = true; + $data['user_id'] = 0; + $data['quota'] = sprintf("%.2f", strval(2/100)); + $data['weight'] = sqrt(0); + $data['access_date'] = MDB2_Date::mdbToday(); + $data['access_time'] = MDB2_Date::mdbTime(); + $data['approved'] = MDB2_Date::mdbNow(); + + $result = $stmt->execute(array_values($data)); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query '.$result->getMessage()); + } + + $stmt->free(); + + $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_name'; + $result =& $this->db->query($query); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); + } + + $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); + + $firstRow = $result->fetchRow(); + $this->assertEquals($firstRow['user_name'], $data['user_name'], 'The data returned does not match that expected'); + + $result =& $this->db->query('SELECT user_name, user_id, quota FROM users ORDER BY user_name'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); + } + $this->db->setFetchMode(MDB2_FETCHMODE_ORDERED); + + $value = $result->fetchOne(); + $this->assertEquals($data['user_name'], $value, 'The data returned does not match that expected'); + $result->free(); + } + + /** + * @see http://bugs.php.net/bug.php?id=22328 + */ + function testBug22328() { + $result =& $this->db->query('SELECT * FROM users'); + $this->db->pushErrorHandling(PEAR_ERROR_RETURN); + $result2 = $this->db->query('SELECT * FROM foo'); + + $data = $result->fetchRow(); + $this->db->popErrorHandling(); + $this->assertFalse(PEAR::isError($data), 'Error messages for a query affect result reading of other queries'); + } + + /** + * @see http://pear.php.net/bugs/bug.php?id=670 + */ + function testBug670() { + $data['user_name'] = null; + $data['user_password'] = 'somepass'; + $data['subscribed'] = true; + $data['user_id'] = 1; + $data['quota'] = sprintf("%.2f",strval(3/100)); + $data['weight'] = sqrt(1); + $data['access_date'] = MDB2_Date::mdbToday(); + $data['access_time'] = MDB2_Date::mdbTime(); + $data['approved'] = MDB2_Date::mdbNow(); + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + + $result =& $this->db->query('SELECT user_name FROM users'); + $col = $result->fetchCol('user_name'); + if (PEAR::isError($col)) { + $this->assertTrue(false, 'Error when fetching column first first row as NULL: '.$col->getMessage()); + } + + $data['user_name'] = "user_1"; + $data['user_id'] = 2; + + $result = $stmt->execute(array_values($data)); + + $result =& $this->db->query('SELECT user_name FROM users'); + $col = $result->fetchCol('user_name'); + if (PEAR::isError($col)) { + $this->assertTrue(false, 'Error when fetching column: '.$col->getMessage()); + } + + $data['user_name'] = null; + + $stmt->free(); + } + + /** + * @see http://pear.php.net/bugs/bug.php?id=681 + */ + function testBug681() { + $result =& $this->db->query('SELECT * FROM users WHERE 1=0'); + + $numrows = $result->numRows(); + $this->assertEquals(0, $numrows, 'Numrows is not returning 0 for empty result sets'); + + $data = $this->getSampleData(1); + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + + $result =& $this->db->query('SELECT * FROM users'); + $numrows = $result->numRows(); + $this->assertEquals(1, $numrows, 'Numrows is not returning proper value'); + + $stmt->free(); + } + + /** + * @see http://pear.php.net/bugs/bug.php?id=718 + */ + function testBug718() { + $data = $this->getSampleData(1); + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + + $row = $this->db->queryRow('SELECT a.user_id, b.user_id FROM users a, users b where a.user_id = b.user_id', array('integer', 'integer'), MDB2_FETCHMODE_ORDERED); + $this->assertEquals(2, count($row), "Columns with the same name get overwritten in ordered mode"); + + $stmt->free(); + } + + /** + * @see http://pear.php.net/bugs/bug.php?id=946 + */ + function testBug946() { + $data = array(); + $total_rows = 5; + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); + + for ($row = 0; $row < $total_rows; $row++) { + $data[$row] = $this->getSampleData($row); + + $result = $stmt->execute(array_values($data[$row])); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + } + $stmt->free(); + + $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users'; + + $this->db->setLimit(3, 1); + $result =& $this->db->query($query); + $numrows = $result->numRows(); + while ($row = $result->fetchRow()) { + if (PEAR::isError($row)) { + $this->assertTrue(false, 'Error fetching a row: '.$row->getMessage()); + } + } + $result->free(); + + $result =& $this->db->query($query); + $numrows = $result->numRows(); + while ($row = $result->fetchRow()) { + if (PEAR::isError($row)) { + $this->assertTrue(false, 'Error fetching a row: '.$row->getMessage()); + } + } + $result->free(); + } + + /** + * @see http://pear.php.net/bugs/bug.php?id=3146 + */ + function testBug3146() { + $data = array(); + $total_rows = 5; + + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + + for ($row = 0; $row < $total_rows; $row++) { + $data[$row] = $this->getSampleData($row); + + $result = $stmt->execute(array_values($data[$row])); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + } + $stmt->free(); + + $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_id'; + $result =& $this->db->query($query, $this->fields); + + $numrows = $result->numRows($result); + + $this->verifyFetchedValues($result, 0, $data[0]); + $this->verifyFetchedValues($result, 2, $data[2]); + $this->verifyFetchedValues($result, null, $data[3]); + $this->verifyFetchedValues($result, 1, $data[1]); + + $result->free(); + } + + /** + * Strong typing query result misbehaves when $n_columns > $n_types + * @see http://pear.php.net/bugs/bug.php?id=9502 + */ + function testBug9502() { + $row = 5; + $data = $this->getSampleData($row); + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)', array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + $stmt->free(); + + //provide an incomplete and scrambled types array + $types = array(); + $types['subscribed'] = $this->fields['subscribed']; + $types['user_name'] = $this->fields['user_name']; + $types['weight'] = $this->fields['weight']; + + $query = 'SELECT weight, user_name, user_id, quota, subscribed FROM users WHERE user_id = '.$row; + $result =& $this->db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing query: '.$result->getMessage() .' - '. $result->getUserInfo()); + } else { + $this->assertTrue(is_bool($result['subscribed'])); + $this->assertTrue(is_numeric($result['user_id'])); + $this->assertTrue(is_float($result['weight'])); + $this->assertFalse(is_bool($result['user_name'])); + } + } +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_Connect_Test.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_Connect_Test.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_Connect_Test.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_Connect_Test.php 2009-01-14 16:28:08.000000000 +0000 @@ -0,0 +1,52 @@ +_dsn = array( + 'phptype' => DSN_PHPTYPE, + 'username' => DSN_USERNAME, + 'password' => DSN_PASSWORD, + 'hostspec' => DSN_HOSTNAME, + 'database' => DSN_DATABASE, + ); + + } + // }}} + // {{{ PHP4 constructor.. + function MDB2_Connect_Test() + { + $this->__construct($connect); + } + // }}} + // {{{ connect + function connect() + { + // connect to database + $options = array( + 'portability' => (MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL), + ); + + $this->dbc =& MDB2::singleton($this->_dsn, $options); + if (PEAR::isError($this->dbc)) { + return $this->dbc; + } + } + // }}} +} +// }}} +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_datatype_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_datatype_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_datatype_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_datatype_testcase.php 2009-01-14 16:28:08.000000000 +0000 @@ -0,0 +1,885 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_datatype_testcase.php,v 1.22 2008/02/23 09:38:22 quipo Exp $ + +require_once 'MDB2_testcase.php'; + +/** + * A test callback function to be used in the test class below for + * ensuring that custom datatype callback features are handled + * correctly. + * + * @param MDB2 $db The MDB2 database resource object. + * @param string $method The name of the MDB2_Driver_Datatype_Common method + * the callback function was called from. One of + * "getValidTypes", "convertResult", "getDeclaration", + * "compareDefinition", "quote" and "mapPrepareDatatype". + * See {@link MDB2_Driver_Datatype_Common} for the + * details of what each method does. + * @param array $aParameters An array of parameters, being the parameters that + * were passed to the method calling the callback + * function. + * @return mixed Returns the appropriate value depending on the method that + * called the function. See {@link MDB2_Driver_Datatype_Common} + * for details of the expected return values of the five possible + * calling methods. + */ +function datatype_test_callback(&$db, $method, $aParameters) +{ + // Ensure the datatype module is loaded + if (is_null($db->datatype)) { + $db->loadModule('Datatype', null, true); + } + // Lowercase method names for PHP4/PHP5 compatibility + $method = strtolower($method); + switch($method) { + // For all cases, return a string that identifies that the + // callback method was able to call to the appropriate point + case 'getvalidtypes': + return 'datatype_test_callback::getvalidtypes'; + case 'convertresult': + return 'datatype_test_callback::convertresult'; + case 'getdeclaration': + return 'datatype_test_callback::getdeclaration'; + case 'comparedefinition': + return 'datatype_test_callback::comparedefinition'; + case 'quote': + return 'datatype_test_callback::quote'; + case 'mappreparedatatype': + return 'datatype_test_callback::mappreparedatatype'; + } +} + +/** + * A test callback function to be used in the test class below for + * ensuring that custom nativetype to datatype mapping is handled + * correctly. + * + * @param MDB2 $db The MDB2 database reource object. + * @param array $aFields The standard array of fields produced from the + * MySQL command "SHOW COLUMNS". See + * {@link http://dev.mysql.com/doc/refman/5.0/en/describe.html} + * for more details on the format of the fields. + * "type" The nativetype column type + * "null" "YES" or "NO" + * "key" "PRI", "UNI", "MUL", or null + * "default" The default value of the column + * "extra" "auto_increment", or null + * @return array Returns an array of the following items: + * 0 => An array of possible MDB2 datatypes. As this is + * a custom type, always has one entry, "test". + * 1 => The length of the type, if defined by the nativetype, + * otherwise null. + * 2 => A boolean value indicating the "unsigned" nature of numeric + * fields. Always null in this case, as this custom test + * type is not numeric. + * 3 => A boolean value indicating the "fixed" nature of text + * fields. Always bull in this case, as this custom test + * type is not textual. + */ +function nativetype_test_callback(&$db, $aFields) +{ + // Prepare the type array + $aType = array(); + $aType[] = 'test'; + // Can the length of the field be found? + $length = null; + $start = strpos($aFields['type'], '('); + $end = strpos($aFields['type'], ')'); + if ($start && $end) { + $start++; + $chars = $end - $start; + $length = substr($aFields['type'], $start, $chars); + } + // No unsigned value needed + $unsigned = null; + // No fixed value needed + $fixed = null; + return array($aType, $length, $unsigned, $fixed); +} + +class MDB2_Datatype_TestCase extends MDB2_TestCase +{ + // Test table name (it is dynamically created/dropped) + var $table = 'datatypetable'; + + function setUp() { + parent::setUp(); + $this->db->loadModule('Manager', null, true); + $this->fields = array( + 'id' => array( + 'type' => 'integer', + 'unsigned' => true, + 'notnull' => true, + 'default' => 0, + ), + 'textfield' => array( + 'type' => 'text', + 'length' => 12, + ), + 'booleanfield' => array( + 'type' => 'boolean', + ), + 'decimalfield' => array( + 'type' => 'decimal', + ), + 'floatfield' => array( + 'type' => 'float', + ), + 'datefield' => array( + 'type' => 'date', + ), + 'timefield' => array( + 'type' => 'time', + ), + 'timestampfield' => array( + 'type' => 'timestamp', + ), + ); + if (!$this->tableExists($this->table)) { + $this->db->manager->createTable($this->table, $this->fields); + } + } + + /** + * The teardown method to clean up the testing environment. + */ + function tearDown() { + if ($this->tableExists($this->table)) { + $this->db->manager->dropTable($this->table); + } + $this->db->popExpect(); + unset($this->dsn); + if (!PEAR::isError($this->db->manager)) { + $this->db->disconnect(); + } + unset($this->db); + } + + /** + * Get the types of each field given its name + * + * @param array $names list of field names + * @return array $types list of matching field types + */ + function getFieldTypes($names) { + $types = array(); + foreach ($names as $name) { + foreach ($this->fields as $fieldname => $field) { + if ($name == $fieldname) { + $types[$name] = $field['type']; + } + } + } + return $types; + } + + /** + * Insert the values into the sample table + * + * @param array $values associative array (name => value) + */ + function insertValues($values) { + $types = $this->getFieldTypes(array_keys($values)); + + $result = $this->db->exec('DELETE FROM '.$this->table); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error emptying table: '.$result->getMessage()); + } + + $query = sprintf('INSERT INTO %s (%s) VALUES (%s)', + $this->table, + implode(', ', array_keys($values)), + implode(', ', array_fill(0, count($values), '?')) + ); + $stmt = $this->db->prepare($query, array_values($types), MDB2_PREPARE_MANIP); + if (PEAR::isError($stmt)) { + $this->assertTrue(false, 'Error creating prepared query: '.$stmt->getMessage()); + } + $result = $stmt->execute(array_values($values)); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + $stmt->free(); + } + + /** + * Select the inserted row from the db and check the inserted values + * @param array $values associative array (name => value) of inserted data + */ + function selectAndCheck($values) { + $types = $this->getFieldTypes(array_keys($values)); + + $query = 'SELECT '. implode (', ', array_keys($values)). ' FROM '.$this->table; + $result = $this->db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC); + foreach ($values as $name => $value) { + $this->assertEquals($result[$name], $values[$name], 'Error in '.$types[$name].' value: incorrect conversion'); + } + } + + /** + * Test the TEXT datatype for incorrect conversions + */ + function testTextDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'textfield' => 'test', + ); + $this->insertValues($data); + $this->selectAndCheck($data); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testTextDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Test the DECIMAL datatype for incorrect conversions + */ + function testDecimalDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'decimalfield' => 10.35, + ); + $this->insertValues($data); + $this->selectAndCheck($data); + + $old_locale = setlocale(LC_NUMERIC, 0); + if (OS_UNIX) { + setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'de', 'ge'); + } else { + setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'deu_deu'); + } + + $this->insertValues($data); + $this->selectAndCheck($data); + + setlocale(LC_NUMERIC, $old_locale); + + $expected = 10.35; + + $actual = $this->db->quote($expected, 'decimal'); + $this->assertEquals($expected, $actual); + + $non_us = number_format($expected, 2, ',', ''); + $actual = $this->db->quote($non_us, 'decimal'); + $this->assertEquals($expected, $actual); + + $expected = 1000.35; + + $non_us = '1,000.35'; + $actual = $this->db->quote($non_us, 'decimal'); + $this->assertEquals($expected, $actual); + + $non_us = '1000,35'; + $actual = $this->db->quote($non_us, 'decimal'); + $this->assertEquals($expected, $actual); + + $non_us = '1.000,35'; + $actual = $this->db->quote($non_us, 'decimal'); + $this->assertEquals($expected, $actual); + + // test quoting with invalid chars + $val = '100.3abc";d@a[\\'; + $this->assertEquals(100.3, $this->db->quote($val, 'decimal')); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testDecimalDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Test the FLOAT datatype for incorrect conversions + */ + function testFloatDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'floatfield' => 10.35, + ); + $this->insertValues($data); + $this->selectAndCheck($data); + + $old_locale = setlocale(LC_NUMERIC, 0); + if (OS_UNIX) { + setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'de', 'ge'); + } else { + setlocale(LC_NUMERIC, 'de_DE@euro', 'de_DE', 'deu_deu'); + } + + + $this->insertValues($data); + $this->selectAndCheck($data); + + setlocale(LC_NUMERIC, $old_locale); + + $data['floatfield'] = '1.035e+1'; + $this->insertValues($data); + $this->selectAndCheck($data); + + $data['floatfield'] = '1.035E+01'; + $this->insertValues($data); + $this->selectAndCheck($data); + + $expected = '1.035E+01'; + $non_us = '1,035e+1'; + $actual = $this->db->quote($non_us, 'float'); + $this->assertEquals($expected, $actual); + + $expected = 10.35; + + $actual = $this->db->quote($expected, 'float'); + $this->assertEquals($expected, $actual); + + $non_us = number_format($expected, 2, ',', ''); + $actual = $this->db->quote($non_us, 'float'); + $this->assertEquals($expected, $actual); + + $expected = 1000.35; + + $non_us = '1,000.35'; + $actual = $this->db->quote($non_us, 'float'); + $this->assertEquals($expected, $actual); + + $non_us = '1000,35'; + $actual = $this->db->quote($non_us, 'float'); + $this->assertEquals($expected, $actual); + + $non_us = '1.000,35'; + $actual = $this->db->quote($non_us, 'float'); + $this->assertEquals($expected, $actual); + + // test quoting with invalid chars + $val = '100.3abc";d@a[\\'; + $this->assertEquals(100.3, $this->db->quote($val, 'float')); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testFloatDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Test the BOOLEAN datatype for incorrect conversions + */ + function testBooleanDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'booleanfield' => true, + ); + $this->insertValues($data); + $this->selectAndCheck($data); + + $data['booleanfield'] = false; + $this->insertValues($data); + $this->selectAndCheck($data); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testBooleanDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Test the DATE datatype for incorrect conversions + */ + function testDateDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'datefield' => date('Y-m-d'), + ); + $this->insertValues($data, 'date'); + $this->selectAndCheck($data); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testDateDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Test the TIME datatype for incorrect conversions + */ + function testTimeDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'timefield' => date('H:i:s'), + ); + $this->insertValues($data, 'time'); + $this->selectAndCheck($data); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testTimeDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Test the TIMESTAMP datatype for incorrect conversions + */ + function testTimestampDataType($emulate_prepared = false) { + if ($emulate_prepared) { + $this->db->setOption('emulate_prepared', true); + } + + $data = array( + 'id' => 1, + 'timestampfield' => date('Y-m-d H:i:s'), + ); + $this->insertValues($data, 'timestamp'); + $this->selectAndCheck($data); + + if (!$emulate_prepared && !$this->db->getOption('emulate_prepared')) { + $this->testTimestampDataType(true); + } elseif($emulate_prepared) { + $this->db->setOption('emulate_prepared', false); + } + } + + /** + * Tests escaping of text values with special characters + */ + function testEscapeSequences() { + $test_strings = array( + "'", + "\"", + "\\", + "%", + "_", + "''", + "\"\"", + "\\\\", + "\\'\\'", + "\\\"\\\"" + ); + + $this->clearTables(); + foreach($test_strings as $key => $string) { + $value = $this->db->quote($string, 'text'); + $query = "INSERT INTO users (user_name,user_id) VALUES ($value, $key)"; + $result = $this->db->exec($query); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing insert query'.$result->getMessage()); + } + + $query = 'SELECT user_name FROM users WHERE user_id = '.$key; + $value = $this->db->queryOne($query, 'text'); + + if (PEAR::isError($value)) { + $this->assertTrue(false, 'Error executing select query'.$value->getMessage()); + } + + $this->assertEquals($string, $value, "the value retrieved for field \"user_name\" doesn't match what was stored"); + } + } + + /** + * Tests escaping of text pattern strings with special characters + */ + function testPatternSequences() { + $test_strings = array( + "Foo", + "FOO", + "foo", + ); + + $this->clearTables(); + foreach($test_strings as $key => $string) { + $value = $this->db->quote($string, 'text'); + $query = "INSERT INTO users (user_name,user_id) VALUES ($value, $key)"; + $result = $this->db->exec($query); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing insert query'.$result->getMessage()); + } + } + + $query = 'SELECT user_name FROM users WHERE '.$this->db->datatype->matchPattern(array('F', '%'), 'LIKE', 'user_name'); + $values = $this->db->queryCol($query, 'text'); + $this->assertEquals(2, count($values), "case sensitive search was expected to return 2 rows but returned: ".count($values)); + + $query = 'SELECT user_name FROM users WHERE '.$this->db->datatype->matchPattern(array('foo'), 'ILIKE', 'user_name'); + $values = $this->db->queryCol($query, 'text'); + $this->assertEquals(3, count($values), "case insensitive search was expected to return 3 rows but returned: ".count($values)); + + $query = 'SELECT user_name FROM users WHERE '.$this->db->datatype->matchPattern(array(1 => '_', 'o', '%'), 'LIKE', 'user_name'); + $values = $this->db->queryCol($query, 'text'); + $this->assertEquals(2, count($values), "case sensitive search was expected to return 2 rows but returned: ".count($values)); + + $query = 'SELECT user_name FROM users WHERE '.$this->db->datatype->matchPattern(array(1 => '_', 'o', '%'), 'ILIKE', 'user_name'); + $values = $this->db->queryCol($query, 'text'); + $this->assertEquals(3, count($values), "case insensitive search was expected to return 3 rows but returned: ".count($values)); + } + + /** + * Tests escaping of text pattern strings with special characters + */ + function testEscapePatternSequences() { + if (!$this->supported('pattern_escaping')) { + return; + } + + $test_strings = array( + "%", + "_", + "%_", + "_%", + "%Foo%", + "%Foo_", + "Foo%123", + "Foo_123", + "_Foo%", + "_Foo_", + "%'", + "_'", + "'%", + "'_", + "'%'", + "'_'", + ); + + $this->clearTables(); + foreach($test_strings as $key => $string) { + $value = $this->db->quote($string, 'text'); + $query = "INSERT INTO users (user_name,user_id) VALUES ($value, $key)"; + $result = $this->db->exec($query); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing insert query'.$result->getMessage()); + } + + $query = 'SELECT user_name FROM users WHERE user_name LIKE '.$this->db->quote($string, 'text', true, true); + $value = $this->db->queryOne($query, 'text'); + if (PEAR::isError($value)) { + $this->assertTrue(false, 'Error executing select query'.$value->getMessage()); + } + + $this->assertEquals($string, $value, "the value retrieved for field \"user_name\" doesn't match what was stored"); + } + + $this->db->loadModule('Datatype', null, true); + $query = 'SELECT user_name FROM users WHERE user_name LIKE '.$this->db->datatype->matchPattern(array('Foo%', '_', '23')); + $value = $this->db->queryOne($query, 'text'); + $this->assertEquals('Foo%123', $value, "the value retrieved for field \"user_name\" doesn't match what was stored"); + + $query = 'SELECT user_name FROM users WHERE user_name LIKE '.$this->db->datatype->matchPattern(array(1 => '_', 'oo', '%')); + $value = $this->db->queryOne($query, 'text'); + $this->assertEquals('Foo', substr($value, 0, 3), "the value retrieved for field \"user_name\" doesn't match what was stored"); + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::getValidTypes() + * method returns the correct data array. + */ + function testGetValidTypes() + { + $this->db->loadModule('Datatype', null, true); + // Test with just the default MDB2 datatypes. + $aExpected = $this->db->datatype->valid_default_values; + $aResult = $this->db->datatype->getValidTypes(); + $this->assertEquals($aExpected, $aResult, 'getValidTypes'); + + // Test with a custom datatype + $this->db->setOption('datatype_map', array('test' => 'test')); + $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); + $aExpected = array_merge( + $this->db->datatype->valid_default_values, + array('test' => 'datatype_test_callback::getvalidtypes') + ); + $aResult = $this->db->datatype->getValidTypes(); + $this->assertEquals($aExpected, $aResult, 'getValidTypes'); + unset($this->db->options['datatype_map']); + unset($this->db->options['datatype_map_callback']); + + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::convertResult() + * method returns correctly converted column data. + */ + function testConvertResult() + { + $this->db->loadModule('Datatype', null, true); + // Test with an MDB2 datatype, eg. "text" + $value = 'text'; + $type = 'text'; + $result = $this->db->datatype->convertResult($value, $type); + $this->assertEquals($value, $result, 'convertResult'); + + // Test with a custom datatype + $this->db->setOption('datatype_map', array('test' => 'test')); + $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); + $value = 'text'; + $type = 'test'; + $result = $this->db->datatype->convertResult($value, $type); + $this->assertEquals('datatype_test_callback::convertresult', $result, 'mapPrepareDatatype'); + unset($this->db->options['datatype_map']); + unset($this->db->options['datatype_map_callback']); + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::getDeclaration() + * method returns correctly formatted SQL for declaring columns. + */ + function testGetDeclaration() + { + $this->db->loadModule('Datatype', null, true); + // Test with an MDB2 datatype, eg. "integer" + $name = 'column'; + $type = 'integer'; + $field = array('type' => 'integer'); + $result = $this->db->datatype->getDeclaration($type, $name, $field); + $actual_type = $this->db->phptype == 'sqlite' ? 'INTEGER' : 'INT'; + $default = $this->db->phptype == 'mssql' ? ' NULL' : ''; + $this->assertEquals('column '.$actual_type.$default, $result, 'getDeclaration'); + + // Test with a custom datatype + $this->db->setOption('datatype_map', array('test' => 'test')); + $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); + $name = 'column'; + $type = 'test'; + $field = array('type' => 'test'); + $result = $this->db->datatype->getDeclaration($type, $name, $field); + $this->assertEquals('datatype_test_callback::getdeclaration', $result, 'getDeclaration'); + + // Test with a custom datatype without datatype_map_callback function #1 + $name = 'address'; + $type = 'text'; + $field = array( + 'name' => 'company_addr', + 'type' => 'text', + 'notnull' => 'true' + ); + $this->db->setOption('datatype_map', array($name => $type)); + $result = $this->db->datatype->getDeclaration($field['type'], $field['name'], $field); + $notnull = ' NOT NULL'; + $expected = $field['name'].' '.$this->db->datatype->getTypeDeclaration(array('type' => $type)).$notnull; + $this->assertEquals($expected, $result); + + // Test with a custom datatype without datatype_map_callback function #2 + $name = 'address'; + $type = 'text'; + $field = array( + 'name' => 'company_addr', + 'type' => 'address', + ); + $this->db->setOption('datatype_map', array($name => $type)); + $result = $this->db->datatype->getDeclaration($field['type'], $field['name'], $field); + $default = $this->db->phptype == 'mssql' ? ' NULL' : ''; + $expected = $field['name'].' '.$this->db->datatype->getTypeDeclaration(array('type' => $type)).$default; + $this->assertEquals($expected, $result); + unset($this->db->options['datatype_map']); + unset($this->db->options['datatype_map_callback']); + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::compareDefinition() + * method + */ + function testCompareDefinition() + { + // Test with an MDB2 datatype, eg. "text" + $aPrevious = array( + 'type' => 'text', + 'length' => 4 + ); + $aCurrent = array( + 'type' => 'text', + 'length' => 5 + ); + $aResult = $this->db->datatype->compareDefinition($aCurrent, $aPrevious); + $this->assertTrue(is_array($aResult), 'compareDefinition'); + $this->assertEquals(1, count($aResult), 'compareDefinition'); + $this->assertTrue($aResult['length'], 'compareDefinition'); + + // Test with a custom datatype + $this->db->setOption('datatype_map', array('test' => 'test')); + $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); + $aPrevious = array( + 'type' => 'test' + ); + $aCurrent = array( + 'type' => 'test' + ); + $result = $this->db->datatype->compareDefinition($aCurrent, $aPrevious); + $this->assertEquals('datatype_test_callback::comparedefinition', $result, 'compareDefinition'); + unset($this->db->options['datatype_map']); + unset($this->db->options['datatype_map_callback']); + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::quote() + * method returns correctly quoted column data. + */ + function testQuote() + { + $this->db->loadModule('Datatype', null, true); + // Test with an MDB2 datatype, eg. "text" + $value = 'text'; + $type = 'text'; + $result = $this->db->datatype->quote($value, $type); + $this->assertEquals("'$value'", $result, 'quote'); + + // Test with a custom datatype + $this->db->setOption('datatype_map', array('test' => 'test')); + $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); + $value = 'text'; + $type = 'test'; + $result = $this->db->datatype->quote($value, $type); + $this->assertEquals('datatype_test_callback::quote', $result, 'quote'); + unset($this->db->options['datatype_map']); + unset($this->db->options['datatype_map_callback']); + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::mapPrepareDatatype() + * method returns the correct data type. + */ + function testMapPrepareDatatype() + { + $this->db->loadModule('Datatype', null, true); + // Test with an MDB2 datatype, eg. "text" + $type = 'text'; + $result = $this->db->datatype->mapPrepareDatatype($type); + if ($this->db->phptype == 'mysqli') { + $type = 's'; + } + $this->assertEquals($type, $result, 'mapPrepareDatatype'); + + // Test with a custom datatype + $this->db->setOption('datatype_map', array('test' => 'test')); + $this->db->setOption('datatype_map_callback', array('test' => 'datatype_test_callback')); + $type = 'test'; + $result = $this->db->datatype->mapPrepareDatatype($type); + $this->assertEquals('datatype_test_callback::mappreparedatatype', $result, 'mapPrepareDatatype'); + unset($this->db->options['datatype_map']); + unset($this->db->options['datatype_map_callback']); + } + + /** + * A method to test that the MDB2_Driver_Datatype_Common::mapNativeDatatype() + * method returns the correct MDB2 datatype from a given nativetype. + */ + function testMapNativeDatatype() + { + $this->db->loadModule('Datatype', null, true); + // Test with an common nativetype, eg. "text" + $field = array( + 'type' => 'int', + 'length' => 8 + ); + if (in_array($this->db->phptype, array('ibase', 'oci8'))) { + $field['type'] = 'integer'; + } + $expected_length = 8; + if (in_array($this->db->phptype, array('mysql', 'mysqli', 'pgsql', 'sqlite', 'mssql'))) { + $expected_length = 4; + } + $result = $this->db->datatype->mapNativeDatatype($field); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'mapNativeDatatype: '.$result->getUserInfo()); + } else { + $this->assertTrue(is_array($result), 'mapNativeDatatype'); + $this->assertEquals(4, count($result), 'mapNativeDatatype'); + $this->assertEquals('integer', $result[0][0], 'mapNativeDatatype'); + $this->assertEquals($expected_length, $result[1], 'mapNativeDatatype'); + } + + // Test with a custom nativetype mapping + $this->db->setOption('nativetype_map_callback', array('test' => 'nativetype_test_callback')); + $field = array( + 'type' => 'test' + ); + $result = $this->db->datatype->mapNativeDatatype($field); + $this->assertTrue(is_array($result), 'mapNativeDatatype'); + $this->assertEquals(4, count($result), 'mapNativeDatatype'); + $this->assertEquals('test', $result[0][0], 'mapNativeDatatype'); + $this->assertNull($result[1], 'mapNativeDatatype'); + $this->assertNull($result[2], 'mapNativeDatatype'); + $this->assertNull($result[3], 'mapNativeDatatype'); + $field = array( + 'type' => 'test(10)' + ); + $result = $this->db->datatype->mapNativeDatatype($field); + $this->assertTrue(is_array($result), 'mapNativeDatatype'); + $this->assertEquals(count($result), 4, 'mapNativeDatatype'); + $this->assertEquals($result[0][0], 'test', 'mapNativeDatatype'); + $this->assertEquals($result[1], 10, 'mapNativeDatatype'); + $this->assertNull($result[2], 'mapNativeDatatype'); + $this->assertNull($result[3], 'mapNativeDatatype'); + unset($this->db->options['nativetype_map_callback']); + } +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_extended_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_extended_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_extended_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_extended_testcase.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,580 @@ + | +// | Lorenzo Alberton | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_extended_testcase.php,v 1.13 2007/02/28 12:15:26 quipo Exp $ + +require_once 'MDB2_testcase.php'; + +class MDB2_Extended_TestCase extends MDB2_TestCase +{ + /** + * + */ + function testAutoExecute() + { + $data = $this->getSampleData(); + $select_query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users'; + + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + $result = $this->db->extended->autoExecute('users', $data, MDB2_AUTOQUERY_INSERT, null, $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error auto executing insert: '.$result->getMessage()); + } + + $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); + $result =& $this->db->query($select_query, $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); + } else { + $this->verifyFetchedValues($result, null, $data); + $result->free(); + } + + $where = 'user_id = '.$this->db->quote($data['user_id'], 'integer'); + $result = $this->db->extended->autoExecute('users', null, MDB2_AUTOQUERY_SELECT, $where, null, true, $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error auto executing select: '.$result->getMessage()); + } else { + $this->verifyFetchedValues($result, null, $data); + $result->free(); + } + + $where = 'user_id = '.$this->db->quote($data['user_id'], 'integer'); + $result = $this->db->extended->autoExecute('users', null, MDB2_AUTOQUERY_SELECT, $where, null, true, MDB2_PREPARE_RESULT); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error auto executing select: '.$result->getMessage()); + } else { + $result->setResultTypes($this->fields); + $this->verifyFetchedValues($result, null, $data); + $result->free(); + } + + $update_data = array(); + $data['user_name'] = $update_data['user_name'] = 'foo'; + + $where = 'user_id = '.$this->db->quote($data['user_id'], 'integer'); + $result = $this->db->extended->autoExecute('users', $update_data, MDB2_AUTOQUERY_UPDATE, $where, $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error auto executing insert: '.$result->getMessage()); + } + + $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); + $result =& $this->db->query($select_query, $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); + } else { + $this->verifyFetchedValues($result, null, $data); + $result->free(); + } + + $where = array($where, 'user_name = '.$this->db->quote($data['user_name'], 'text')); + $result = $this->db->extended->autoExecute('users', null, MDB2_AUTOQUERY_DELETE, $where, null); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error auto executing insert: '.$result->getMessage()); + } + + $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); + $result =& $this->db->query($select_query, $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage()); + } else { + $this->assertEquals(0, $result->numRows(), 'No rows were expected to be returned'); + $result->free(); + } + } + + /** + * Test getAssoc() + * + * Test fetching two columns from a resultset. Return them as (key,value) pairs. + */ + function testGetAssoc() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = $this->getSampleData(1234); + + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + $stmt->free(); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + + //test getAssoc() with query parameters + $query = 'SELECT user_id, user_name FROM users WHERE user_id=?'; + $result = $this->db->extended->getAssoc($query, array('integer', 'text'), array(1234), array('integer')); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getAssoc(): '.$result->getMessage()); + } + $this->assertTrue(array_key_exists($data['user_id'], $result), 'Unexpected returned key'); + $this->assertEquals($data['user_name'], $result[$data['user_id']], 'Unexpected returned value'); + + //test getAssoc() without query parameters + $query = 'SELECT user_id, user_name FROM users WHERE user_id=1234'; + $result = $this->db->extended->getAssoc($query, array('integer', 'text')); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getAssoc(): '.$result->getMessage()); + } else { + $this->assertTrue(array_key_exists($data['user_id'], $result), 'Unexpected returned key'); + $this->assertEquals($data['user_name'], $result[$data['user_id']], 'Unexpected returned value'); + } + + //add another record to the db + $data2 = $this->getSampleData(4321); + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data2)); + $stmt->free(); + + //test getAssoc() with $force_array=true + $query = 'SELECT user_id, user_name FROM users ORDER BY user_id'; + $values = $this->db->extended->getAssoc($query, array('integer', 'text'), null, null, MDB2_FETCHMODE_ASSOC, true); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); + } else { + $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); + list($id, $value) = each($values); + $this->assertEquals($data['user_id'], $id, 'Unexpected returned value'); + $this->assertEquals($data['user_name'], $value['user_name'], 'Unexpected returned value'); + list($id, $value) = each($values); + $this->assertEquals($data2['user_id'], $id, 'Unexpected returned value'); + $this->assertEquals($data2['user_name'], $value['user_name'], 'Unexpected returned value'); + } + + + //test getAssoc() with $force_array=false and $group=true + $query = 'SELECT user_id, user_name FROM users ORDER BY user_id'; + $values = $this->db->extended->getAssoc($query, array('integer', 'text'), null, null, MDB2_FETCHMODE_ASSOC, false, true); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); + } else { + //@todo: check if MDB2_FETCHMODE_ASSOC is behaving correctly in this case + $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); + list($id, $value) = each($values); + $this->assertEquals($data['user_id'], $id, 'Unexpected returned value'); + $this->assertEquals($data['user_name'], $value[0], 'Unexpected returned value'); + list($id, $value) = each($values); + $this->assertEquals($data2['user_id'], $id, 'Unexpected returned value'); + $this->assertEquals($data2['user_name'], $value[0], 'Unexpected returned value'); + + } + + //test $group=true with 3 fields + $query = 'SELECT user_password, user_id, user_name FROM users ORDER BY user_id'; + $values = $this->db->extended->getAssoc($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC, false, true); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); + } else { + //the 2 values for user_password are equals, so they are collapsed in the same array + $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows'); + $values = $values[0]; + //there are 2 records + $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); + $value = array_shift($values); + $this->assertEquals($data['user_id'], $value['user_id'], 'Unexpected returned value'); + $this->assertEquals($data['user_name'], $value['user_name'], 'Unexpected returned value'); + $value = array_shift($values); + $this->assertEquals($data2['user_id'], $value['user_id'], 'Unexpected returned value'); + $this->assertEquals($data2['user_name'], $value['user_name'], 'Unexpected returned value'); + } + + //test $group=false with 3 fields + $values = $this->db->extended->getAssoc($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC, false, false); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error executing getAssoc(): '.$values->getMessage()); + } else { + //the 2 values for user_password are equals, so the first record is overwritten + $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows'); + $values = $values[0]; + $this->assertEquals($data2['user_id'], $value['user_id'], 'Unexpected returned value'); + $this->assertEquals($data2['user_name'], $value['user_name'], 'Unexpected returned value'); + } + } + + /** + * Test getOne() + * + * Test fetching a single value + */ + function testGetOne() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = $this->getSampleData(1234); + + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + $stmt->free(); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + + //test getOne() with query parameters + $query = 'SELECT user_name FROM users WHERE user_id=?'; + $result = $this->db->extended->getOne($query, 'text', array(1234), array('integer')); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getOne(): '.$result->getMessage()); + } + $this->assertEquals($data['user_name'], $result, 'Unexpected returned value'); + + //test getOne() without query parameters + $query = 'SELECT user_name FROM users WHERE user_id=1234'; + $result = $this->db->extended->getOne($query, 'text'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getOne(): '.$result->getMessage()); + } + $this->assertEquals($data['user_name'], $result, 'Unexpected returned value'); + + //test getOne() with column number (resultset: 0-based array) + $query = 'SELECT user_id, user_name, approved FROM users WHERE user_id=1234'; + $result = $this->db->extended->getOne($query, 'text', null, null, 1); //get the 2nd column + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getOne(): '.$result->getMessage()); + } + $this->assertEquals($data['user_name'], $result, 'Unexpected returned value'); + } + + /** + * Test getCol() + * + * Test fetching a column of result data. + */ + function testGetCol() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = array( + 0 => $this->getSampleData(1234), + 1 => $this->getSampleData(4321), + ); + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data[0])); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + $result = $stmt->execute(array_values($data[1])); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + $stmt->free(); + + //test getCol() with query parameters + $query = 'SELECT user_name FROM users WHERE user_id>?'; + $result = $this->db->extended->getCol($query, 'text', array(1), array('integer')); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getCol(): '.$result->getMessage()); + } + $expected = array( + $data[0]['user_name'], + $data[1]['user_name'], + ); + $this->assertEquals($expected, $result, 'Unexpected returned value'); + + //test getCol() without query parameters + $query = 'SELECT user_name FROM users'; + $result = $this->db->extended->getCol($query, 'text'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getCol(): '.$result->getMessage()); + } + $this->assertEquals($expected, $result, 'Unexpected returned value'); + + //test getCol() with column number (resultset: 0-based array) + $query = 'SELECT user_id, user_name, approved FROM users'; + $result = $this->db->extended->getCol($query, 'text', null, null, 1); //get the 2nd column + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getCol(): '.$result->getMessage()); + } + $this->assertEquals($expected, $result, 'Unexpected returned value'); + } + + /** + * Test getRow() + * + * Test fetching a row of result data. + */ + function testGetRow() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = $this->getSampleData(1234); + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + $result = $stmt->execute(array_values($data)); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + $stmt->free(); + + //test getRow() with query parameters + $query = 'SELECT user_id, user_name, user_password FROM users WHERE user_id=?'; + $result = $this->db->extended->getRow($query, array('integer', 'text', 'text'), array(1234), array('integer'), MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getRow(): '.$result->getMessage()); + } + $this->assertEquals($data['user_id'], $result['user_id'], 'Unexpected returned value'); + $this->assertEquals($data['user_name'], $result['user_name'], 'Unexpected returned value'); + $this->assertEquals($data['user_password'], $result['user_password'], 'Unexpected returned value'); + + //test getRow() without query parameters + $query = 'SELECT user_id, user_name, user_password FROM users'; + $result = $this->db->extended->getRow($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getRow(): '.$result->getMessage()); + } + $this->assertEquals($data['user_id'], $result['user_id'], 'Unexpected returned value'); + $this->assertEquals($data['user_name'], $result['user_name'], 'Unexpected returned value'); + $this->assertEquals($data['user_password'], $result['user_password'], 'Unexpected returned value'); + } + + /** + * Test getAll() + * + * Test fetching result data all at once. + */ + function testGetAll() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = array(); + $total_rows = 5; + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')', array_values($this->fields), MDB2_PREPARE_MANIP); + + for ($row = 0; $row < $total_rows; $row++) { + $data[$row] = $this->getSampleData($row); + $result = $stmt->execute(array_values($data[$row])); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + } + $stmt->free(); + + //test getAll() with query parameters + $query = 'SELECT user_id, user_name, user_password FROM users WHERE user_id > ? ORDER BY user_id'; + $values = $this->db->extended->getAll($query, array('integer', 'text', 'text'), array(2), array('integer'), MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error fetching the result set: '.$values->getMessage()); + } else { + $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); + for ($i=0; $i<2; $i++) { + $this->assertEquals($data[$i+3]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); + $this->assertEquals($data[$i+3]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); + $this->assertEquals($data[$i+3]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); + } + } + + //test getAll() without query parameters + $query = 'SELECT user_id, user_name, user_password FROM users ORDER BY user_id'; + $values = $this->db->extended->getAll($query, array('integer', 'text', 'text'), null, null, MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error fetching the result set: '.$values->getMessage()); + } else { + $this->assertEquals($total_rows, count($values), 'Error: incorrect number of returned rows'); + for ($i=0; $i<$total_rows; $i++) { + $this->assertEquals($data[$i]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); + $this->assertEquals($data[$i]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); + $this->assertEquals($data[$i]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); + } + } + } + + /** + * Test limitQuery() + * + * Test fetching a limited resultset. + */ + function testLimitQuery() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = array(); + $total_rows = 5; + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')', array_values($this->fields), MDB2_PREPARE_MANIP); + + for ($row = 0; $row < $total_rows; $row++) { + $data[$row] = $this->getSampleData($row); + $result = $stmt->execute(array_values($data[$row])); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage()); + } + } + $stmt->free(); + + $query = 'SELECT user_id, user_name, user_password FROM users ORDER BY user_id'; + $types = array('integer', 'text', 'text'); + + //test limitQuery() with offset = 0 + $result = $this->db->extended->limitQuery($query, $types, 2); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing limitQuery(): '.$result->getMessage()); + } + $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error fetching the result set'); + } else { + $this->assertEquals(2, count($values), 'Error: incorrect number of returned rows'); + for ($i=0; $i<2; $i++) { + $this->assertEquals($data[$i]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); + $this->assertEquals($data[$i]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); + $this->assertEquals($data[$i]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); + } + } + $result->free(); + + //test limitQuery() with offset > 0 + $result = $this->db->extended->limitQuery($query, $types, 3, 2); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing limitQuery(): '.$result->getMessage()); + } + $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($values)) { + $this->assertTrue(false, 'Error fetching the result set'); + } else { + $this->assertEquals(3, count($values), 'Error: incorrect number of returned rows'); + for ($i=0; $i<3; $i++) { + $this->assertEquals($data[$i+2]['user_id'], $values[$i]['user_id'], 'Unexpected returned value'); + $this->assertEquals($data[$i+2]['user_name'], $values[$i]['user_name'], 'Unexpected returned value'); + $this->assertEquals($data[$i+2]['user_password'], $values[$i]['user_password'], 'Unexpected returned value'); + } + } + $result->free(); + } + + /** + * Test execParam() + * + * Test executing a query with parameters + */ + function testExecParam() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = $this->getSampleData(1234); + + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + + $result = $this->db->extended->execParam($query, array_values($data), $this->fields); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing execParam(): '.$result->getMessage()); + } + + $query = 'SELECT user_id, user_name, user_password FROM users WHERE user_id=?'; + $result = $this->db->extended->getRow($query, array('integer', 'text', 'text'), array(1234), array('integer'), MDB2_FETCHMODE_ASSOC); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing getRow(): '.$result->getMessage()); + } + $this->assertEquals($data['user_id'], $result['user_id'], 'Unexpected returned value'); + $this->assertEquals($data['user_name'], $result['user_name'], 'Unexpected returned value'); + $this->assertEquals($data['user_password'], $result['user_password'], 'Unexpected returned value'); + } + + /** + * Test executeMultiple() + * + * Test executing multiple prepared queries + */ + function testExecuteMultiple() + { + $result = $this->db->loadModule('Extended'); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error loading "Extended" module: '.$result->getMessage()); + } + + $data = array(); + $total_rows = 5; + + for ($row = 0; $row < $total_rows; $row++) { + $data[$row] = array_values($this->getSampleData($row)); + } + + $stmt = $this->db->prepare('INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'); + $result = $this->db->extended->executeMultiple($stmt, $data); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing executeMultiple(): '.$result->getMessage()); + } + $stmt->free(); + + $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users'; + $values = $this->db->queryAll($query, $this->fields, MDB2_FETCHMODE_ORDERED); + + $n_fields = count($this->fields); + for ($i=0; $i<$total_rows; $i++) { + for ($field=0; $field<$n_fields; $field++) { + $this->assertEquals(strval($data[$i][$field]), strval($values[$i][$field]), 'Unexpected returned value'); + } + } + } +} +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_function_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_function_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_function_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_function_testcase.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,313 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_function_testcase.php,v 1.24 2008/02/17 18:54:08 quipo Exp $ + +class MDB2_Function_TestCase extends MDB2_TestCase +{ + function setUp() { + parent::setUp(); + $this->db->loadModule('Function', null, true); + } + + /** + * Test functionTable() + */ + function testFunctionTable() + { + if (!$this->methodExists($this->db->function, 'functionTable')) { + return; + } + + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT 1 '.$functionTable_clause; + $result = $this->db->queryOne($query); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error fetching from function table'); + } else { + $this->assertEquals('1', $result, 'Error fetching value from function table'); + } + } + + /** + * Test now() + */ + function testNow() + { + if (!$this->methodExists($this->db->function, 'now')) { + return; + } + + $tests = array( + 'timestamp' => '/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', + 'date' => '/^\d{4}-\d{2}-\d{2}$/', + 'time' => '/^\d{2}:\d{2}:\d{2}$/', + ); + + foreach ($tests as $type => $regexp) { + $functionTable_clause = $this->db->function->functionTable(); + $now_clause = $this->db->function->now($type); + $query = 'SELECT '.$now_clause . $functionTable_clause; + $result = $this->db->queryOne($query, $type); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting '.$type); + } else { + $this->assertRegExp($regexp, $result, 'Error: not a proper '.$type); + } + } + } + + /** + * Test substring() + */ + function testSubstring() + { + if (!$this->methodExists($this->db->function, 'substring')) { + return; + } + $data = $this->getSampleData(1234); + + $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')'; + $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP); + + $result = $stmt->execute(array_values($data)); + $stmt->free(); + + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error executing prepared query'.$result->getMessage()); + } + + $substring_clause = $this->db->function->substring('user_name', 1, 4); + $query = 'SELECT '.$substring_clause .' FROM users'; + $result = $this->db->queryOne($query); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting substring'); + } else { + $this->assertEquals('user', $result, 'Error: substrings not equals'); + } + + $substring_clause = $this->db->function->substring('user_name', 5, 1); + $query = 'SELECT '.$substring_clause .' FROM users'; + $result = $this->db->queryOne($query); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting substring'); + } else { + $this->assertEquals('_', $result, 'Error: substrings not equals'); + } + + //test NULL 2nd parameter + $substring_clause = $this->db->function->substring('user_name', 6); + $query = 'SELECT '.$substring_clause .' FROM users'; + $result = $this->db->queryOne($query); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting substring'); + } else { + $this->assertEquals('1234', $result, 'Error: substrings not equals'); + } + } + + /** + * Test concat() + */ + function testConcat() + { + if (!$this->methodExists($this->db->function, 'concat')) { + return; + } + + $functionTable_clause = $this->db->function->functionTable(); + $concat_clause = $this->db->function->concat($this->db->quote('time', 'text'), $this->db->quote('stamp', 'text')); + $query = 'SELECT '.$concat_clause . $functionTable_clause; + $result = $this->db->queryOne($query); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting concat'); + } else { + $this->assertEquals('timestamp', $result, 'Error: could not concatenate "time+stamp"'); + } + } + + /** + * Test random() + */ + function testRandom() + { + if (!$this->methodExists($this->db->function, 'random')) { + return; + } + + $rand_clause = $this->db->function->random(); + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT '.$rand_clause . $functionTable_clause; + $result = $this->db->queryOne($query, 'float'); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting random value:'. $result->getMessage()); + } else { + $this->assertTrue(($result >= 0 && $result <= 1), 'Error: could not get random value between 0 and 1: '.$result); + } + } + + /** + * Test lower() + */ + function testLower() + { + if (!$this->methodExists($this->db->function, 'lower')) { + return; + } + $string = $this->db->quote('FoO'); + $lower_clause = $this->db->function->lower($string); + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT '.$lower_clause . $functionTable_clause; + $result = $this->db->queryOne($query, 'text'); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting lower case value:'. $result->getMessage()); + } else { + $this->assertTrue(($result === 'foo'), 'Error: could not lower case "FoO": '.$result); + } + } + + /** + * Test upper() + */ + function testUpper() + { + if (!$this->methodExists($this->db->function, 'upper')) { + return; + } + $string = $this->db->quote('FoO'); + $upper_clause = $this->db->function->upper($string); + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT '.$upper_clause . $functionTable_clause; + $result = $this->db->queryOne($query, 'text'); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting upper case value:'. $result->getMessage()); + } else { + $this->assertTrue(($result === 'FOO'), 'Error: could not upper case "FoO": '.$result); + } + } + + /** + * Test length() + */ + function testLenght() + { + if (!$this->methodExists($this->db->function, 'length')) { + return; + } + $string = $this->db->quote('foo'); + $length_clause = $this->db->function->length($string); + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT '.$length_clause . $functionTable_clause; + $len = $this->db->queryOne($query, 'integer'); + if (PEAR::isError($len)) { + $this->assertFalse(true, 'Error getting upper case value:'. $len->getMessage()); + } else { + $this->assertEquals(3, $len, 'Error: incorrect length for "foo" string: '.$len); + } + } + + /** + * Test replace() + */ + function testReplace() + { + if (!$this->methodExists($this->db->function, 'replace')) { + return; + } + + $string = $this->db->quote('so what'); + $search = $this->db->quote('o'); + $replace = $this->db->quote('ay'); + $replace_clause = $this->db->function->replace($string, $search, $replace); + $this->db->pushErrorHandling(PEAR_ERROR_RETURN); + $this->db->expectError(MDB2_ERROR_UNSUPPORTED); + $replace_clause = $this->db->function->replace($string, $search, $replace); + $this->db->popExpect(); + $this->db->popErrorHandling(); + if (PEAR::isError($replace_clause) && $replace_clause->getCode() == MDB2_ERROR_UNSUPPORTED) { + return; + } + + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT '.$replace_clause . $functionTable_clause; + $result = $this->db->queryOne($query, 'text'); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting replaced value:'. $result->getMessage()); + } else { + $this->assertEquals('say what', $result, 'Error: could not get replace string: '.$result); + } + } + + /** + * Test unixtimestamp() + */ + function testUnixtimestamp() + { + if (!$this->methodExists($this->db->function, 'unixtimestamp')) { + return; + } + + $datetime = '2008-01-01 00:00:00'; + $quoted_dt = $this->db->quote($datetime, 'timestamp'); + $this->db->pushErrorHandling(PEAR_ERROR_RETURN); + $this->db->expectError(MDB2_ERROR_UNSUPPORTED); + $unixts_clause = $this->db->function->unixtimestamp($quoted_dt); + $this->db->popExpect(); + $this->db->popErrorHandling(); + if (PEAR::isError($unixts_clause) && $unixts_clause->getCode() == MDB2_ERROR_UNSUPPORTED) { + return; + } + + $expected = strtotime($datetime); + + $functionTable_clause = $this->db->function->functionTable(); + $query = 'SELECT '.$unixts_clause . $functionTable_clause; + $result = $this->db->queryOne($query, 'text'); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error getting UNIX timestamp:'. $result->getMessage() . ' :: ' . $result->getUserInfo()); + } else { + $this->assertEquals($expected, $result, 'Error: could not get correct UNIX timestamp: '.$result); + } + } +} +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_internals_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_internals_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_internals_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_internals_testcase.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,628 @@ + | +// | Andrew Hill | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_internals_testcase.php,v 1.4 2008/06/12 11:10:43 quipo Exp $ + +require_once 'MDB2_testcase.php'; + +class MDB2_Internals_TestCase extends MDB2_TestCase { + + var $clear_tables = false; + + /** + * Tests that the MDB2::apiVersion() method returns an API version number. + */ + function test_apiVersion() + { + $result = MDB2::apiVersion(); + $this->assertNotNull($result, 'apiVersion'); + $result = strtok($result, '.'); + $this->assertTrue(is_numeric($result), 'apiVersion'); + $result = strtok('.'); + $this->assertTrue(is_numeric($result), 'apiVersion'); + $result = strtok('.'); + $this->assertTrue(is_numeric($result), 'apiVersion'); + } + + /** + * Tests that the MDB2::classExists() method correctly tests for + * existence of a class. + */ + function test_classExists() + { + $this->assertFalse(MDB2::classExists('null'), 'classExists'); + $this->assertTrue(MDB2::classExists('MDB2'), 'classExists'); + } + + /** + * Tests that the MDB2::loadClass() method correctly loads classes. + */ + function test_loadClass() + { + $this->assertTrue(MDB2::loadClass('MDB2', false), 'loadClass'); + // Suppress handling of PEAR errors while testing next case + PEAR::pushErrorHandling(null); + $result = MDB2::loadClass('null', false); + $this->assertTrue(is_a($result, 'pear_error'), 'loadClass'); + PEAR::popErrorHandling(); + } + + /** + * Tests that the MDB2::factory() method correctly connects to a + * database. + */ + function test_factory() + { + $db =& MDB2::factory($this->dsn); + $this->assertTrue(MDB2::isConnection($db), 'factory'); + // Suppress handling of PEAR errors while preparing the + // next test case database connection + PEAR::pushErrorHandling(null); + $db =& MDB2::factory(null); + PEAR::popErrorHandling(); + $this->assertFalse(MDB2::isConnection($db), 'factory'); + } + + /** + * Tests that the MDB2::loadFile() method returns the expected + * filename. + */ + function test_loadFile() + { + $filename = 'Extended'; + $this->assertEquals('MDB2'.DIRECTORY_SEPARATOR.$filename.'.php', MDB2::loadFile($filename), 'loadFile'); + } + + /** + * Tests that the MDB2::isConnection() method correctly reports + * connections. + */ + function test_isConnection() + { + $this->assertTrue(MDB2::isConnection($this->db), 'isConnection'); + $this->assertFalse(MDB2::isConnection(null), 'isConnection'); + } + + /** + * Tests that the MDB2::isResult() method correctly identifies + * results. + */ + function test_isResult() + { + $obj = new MDB2_Result(); + $this->assertTrue(MDB2::isResult($obj), 'isResult'); + $obj = null; + $this->assertFalse(MDB2::isResult($obj), 'isResult'); + } + + /** + * Tests that the MDB2::isResultCommon() method correctly identifies + * common results. + */ + function test_isResultCommon() + { + $result = null; + $obj = new MDB2_Result_Common($this->db, $result); + $this->assertTrue(MDB2::isResultCommon($obj), 'isResultCommon'); + $obj = null; + $this->assertFalse(MDB2::isResultCommon($obj), 'isResultCommon'); + } + + /** + * Tests that the MDB2::parseDSN() method works. + */ + function test_parseDSN() + { + $dsn = $this->dsn; + $result = MDB2::parseDSN($dsn); + $this->assertEquals($dsn['phptype'],$result['dbsyntax'],'parseDSN'); + + $dsn = "mydbms://myname:mypassword@localhost"; + $result = MDB2::parseDSN($dsn); + $this->assertEquals('mydbms', $result['phptype'],'parseDSN'); + $this->assertEquals('mydbms',$result['dbsyntax'],'parseDSN'); + $this->assertEquals('tcp',$result['protocol'],'parseDSN'); + $this->assertEquals('localhost',$result['hostspec'],'parseDSN'); + $this->assertEquals(false,$result['port'],'parseDSN'); + $this->assertEquals(false,$result['socket'],'parseDSN'); + $this->assertEquals('myname',$result['username'],'parseDSN'); + $this->assertEquals('mypassword',$result['password'],'parseDSN'); + $this->assertEquals(false,$result['database'],'parseDSN'); + + $dsn = "somesql://myname:mypassword@localhost:1234/mydb"; + $result = MDB2::parseDSN($dsn); + $this->assertEquals('somesql',$result['phptype'],'parseDSN'); + $this->assertEquals('somesql',$result['dbsyntax'],'parseDSN'); + $this->assertEquals('tcp',$result['protocol'],'parseDSN'); + $this->assertEquals('localhost',$result['hostspec'],'parseDSN'); + $this->assertEquals('1234',$result['port'],'parseDSN'); + $this->assertEquals(false,$result['socket'],'parseDSN'); + $this->assertEquals('myname',$result['username'],'parseDSN'); + $this->assertEquals('mypassword',$result['password'],'parseDSN'); + $this->assertEquals('mydb',$result['database'],'parseDSN'); + + $dsn = "dbms1://myname@unix(opts)/mydb?param1=value1"; + $result = MDB2::parseDSN($dsn); + $this->assertEquals('dbms1',$result['phptype'],'parseDSN'); + $this->assertEquals('dbms1',$result['dbsyntax'],'parseDSN'); + $this->assertEquals('unix',$result['protocol'],'parseDSN'); + $this->assertEquals(false,$result['hostspec'],'parseDSN'); + $this->assertEquals(false,$result['port'],'parseDSN'); + $this->assertEquals('opts',$result['socket'],'parseDSN'); + $this->assertEquals('myname',$result['username'],'parseDSN'); + $this->assertEquals(false,$result['password'],'parseDSN'); + $this->assertEquals('mydb',$result['database'],'parseDSN'); + $this->assertEquals('value1',$result['param1'],'parseDSN'); + } + + /** + * Tests that the MDB2::fileExists() method correctly identifies + * existing/non-existing files. + */ + function test_fileExists() + { + $this->assertTrue(MDB2::fileExists('PEAR.php'), 'fileExists'); + $this->assertFalse(MDB2::fileExists('itIsHopedThatNoOneHasAFileWithThisName.php'), 'fileExists'); + } + + /** + * Tests that the MDB2::__toString() method returns the expected + * string result. + */ + function test__toString() + { + $expected = "MDB2_Driver_{$this->dsn['phptype']}: (phptype = {$this->dsn['phptype']}, dbsyntax = {$this->db->dbsyntax})"; + if (version_compare(PHP_VERSION, "5.0.0", "<")) { + $expected = strtolower($expected); + } + $this->assertEquals($expected ,$this->db->__toString(), '__toString'); + } + + /** + * Tests that the MDB2::setFetchMode() method correctly sets the + * fetch mode. + */ + function test_setFetchMode() + { + $tmp = $this->db->fetchmode; + $this->db->setFetchMode(MDB2_FETCHMODE_OBJECT); + $this->assertEquals('stdClass', $this->db->options['fetch_class'], 'setFetchMode'); + $this->db->setFetchMode(MDB2_FETCHMODE_ORDERED); + $this->assertEquals(MDB2_FETCHMODE_ORDERED, $this->db->fetchmode, 'setFetchMode'); + $this->db->setFetchMode(MDB2_FETCHMODE_ASSOC); + $this->assertEquals(MDB2_FETCHMODE_ASSOC, $this->db->fetchmode, 'setFetchMode'); + $this->db->fetchmode = $tmp; + } + + /** + * Tests that the MDB2::escape() method correctly escapes strings. + */ + function test_escape() + { + $tmp = $this->db->string_quoting; + $this->string_quoting['escape'] = '\\'; + $this->string_quoting['end'] = '"'; + $text = 'xxx"z"xxx'; + $this->assertEquals('xxx\"z\"xxx', MDB2_Driver_Common::escape($text), 'escape'); + $this->db->string_quoting = $tmp; + } + + /** + * Tests that the MDB2::quoteIdentifier() method correctly quotes strings. + */ + function test_quoteIdentifier() + { + if ($this->db->phptype == 'ibase') { + return; + } + $tmp = $this->db->identifier_quoting; + $this->db->identifier_quoting['start'] = '"'; + $this->db->identifier_quoting['end'] = '`'; + $this->db->identifier_quoting['escape'] = '/'; + $text = 'my`identifier'; + $this->assertEquals('"my/`identifier`', $this->db->quoteIdentifier($text), 'quoteIdentifier'); + $this->db->identifier_quoting = $tmp; + } + + /** + * Tests that the MDB2::getAsKeyword() method correctly returns + * the set "as" keyword. + */ + function test_getAsKeyword() + { + $tmp = $this->db->as_keyword; + $this->db->as_keyword = 'ALIAS'; + $this->assertEquals('ALIAS', $this->db->getAsKeyword(), 'getAsKeyword'); + $this->db->as_keyword = $tmp; + } + + /** + * Tests that the MDB2::getConnection() method correctly returns + * a database resource. + */ + function test_getConnection() + { + $result = $this->db->getConnection(); + $this->assertTrue(is_resource($result), 'getConnection'); + } + + /** + * A private method to return a defined "row" of data for use + * in the next set of tests. + * + * @access private + * @return array The array of "row" data. + */ + function _fetchRowData() + { + return array( + 0 => '', + 1 => 'notnull', + 2 => 'length7 ', + '1?2:3.4' => 'assoc' + ); + } + + /** + * A private method to test results from the MDB2::_fixResultArrayValues() + * method when the $mode parameter was set to MDB2_PORTABILITY_EMPTY_TO_NULL. + * + * @access private + * @param array $row The result of the call to MDB2::_fixResultArrayValues(). + */ + function _fixResultArrayValues_Test_EmptyToNull($row) + { + $this->assertNull($row[0], '_fixResultArrayValues'); + $this->assertNotNull($row[1], '_fixResultArrayValues'); + $this->assertNotNull($row[2], '_fixResultArrayValues'); + } + + /** + * A private method to test results from the MDB2::_fixResultArrayValues() + * method when the $mode parameter was set to MDB2_PORTABILITY_RTRIM. + * + * @access private + * @param array $row The result of the call to MDB2::_fixResultArrayValues(). + */ + function _fixResultArrayValues_Test_Rtrim($row) + { + $this->assertEquals(strlen($row[0]), 0, '_fixResultArrayValues'); + $this->assertEquals(strlen($row[1]), 7, '_fixResultArrayValues'); + $this->assertEquals(strlen($row[2]), 7, '_fixResultArrayValues'); + } + + /** + * A private method to test results from the MDB2::_fixResultArrayValues() + * method when the $mode parameter was set to MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES. + * + * @access private + * @param array $row The result of the call to MDB2::_fixResultArrayValues(). + */ + function _fixResultArrayValues_Test_FixAssocFieldNames($row) + { + $this->assertTrue(array_key_exists(4, $row), '_fixResultArrayValues'); + $this->assertTrue($row[4] == 'assoc', '_fixResultArrayValues'); + } + + /** + * Tests that the MDB2::_fixResultArrayValues() method fixes array + * values when used with various $mode parameters. + */ + function test__fixResultArrayValues() + { + $mode = MDB2_PORTABILITY_EMPTY_TO_NULL; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_EmptyToNull($row); + + $mode = MDB2_PORTABILITY_RTRIM; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_Rtrim($row); + + $mode = MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); + + $mode = MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_RTRIM; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_EmptyToNull($row); + $this->_fixResultArrayValues_Test_Rtrim($row); + + $mode = MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_EmptyToNull($row); + $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); + + $mode = MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_Rtrim($row); + $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); + + $mode = MDB2_PORTABILITY_EMPTY_TO_NULL + MDB2_PORTABILITY_RTRIM + MDB2_PORTABILITY_FIX_ASSOC_FIELD_NAMES; + $row = $this->_fetchRowData(); + $this->db->_fixResultArrayValues($row, $mode); + $this->_fixResultArrayValues_Test_EmptyToNull($row); + $this->_fixResultArrayValues_Test_Rtrim($row); + $this->_fixResultArrayValues_Test_FixAssocFieldNames($row); + } + + /** + * Tests that the MDB2::transaction() method returns expected values + * when starting or rolling back a transaction, and for testing if + * the connection is in a transaction. + */ + function test_transaction() + { + if (!$this->db->supports('transactions')) + { + $this->assertTrue($this->db->beginTransaction(), 'transaction'); + $this->assertTrue($this->db->in_transaction, 'transaction'); + $this->assertTrue($this->db->rollback(), 'transaction'); + $this->assertFalse($this->db->in_transaction, 'transaction'); + + $this->assertTrue($this->db->beginTransaction(), 'transaction'); + $this->assertTrue($this->db->in_transaction, 'transaction'); + $this->assertTrue($this->db->commit(), 'transaction'); + $this->assertFalse($this->db->in_transaction, 'transaction'); + } + } + + // Nested transactions are not yet tested, due to a MySQL 5 problem with + // savepoints causing netsted transactions to fail. + // + // See http://bugs.mysql.com/bug.php?id=26288 + + /** + * Tests that the MDB2::setDatabase() and MDB2::getDatabase() methods + * correctly set and get the database name. + */ + function test_setGetDatabase() + { + $old_name = $this->db->database_name; + $this->assertEquals($old_name, $this->db->setDatabase('test_database'), 'setDatabase'); + $this->assertEquals('test_database', $this->db->database_name, 'setDatabase'); + $this->assertEquals('test_database', $this->db->getDatabase(), 'getDatabase'); + $this->db->database_name = $old_name; + } + + /** + * Tests that the MDB2::setDSN() method correctly sets the DSN. + */ + function test_setDSN() + { + $dsn = "mydbms://myname:mypassword@localhost"; + $result = $this->db->setDSN($dsn); + $dsn_set = $this->db->dsn; + + $this->assertEquals('mydbms', $dsn_set['phptype'],'setDSN'); + $this->assertEquals('mydbms',$dsn_set['dbsyntax'],'setDSN'); + $this->assertEquals('tcp',$dsn_set['protocol'],'setDSN'); + $this->assertEquals('localhost',$dsn_set['hostspec'],'setDSN'); + $this->assertEquals(false,$dsn_set['port'],'setDSN'); + $this->assertEquals(false,$dsn_set['socket'],'setDSN'); + $this->assertEquals('myname',$dsn_set['username'],'setDSN'); + $this->assertEquals('mypassword',$dsn_set['password'],'setDSN'); + $this->assertEquals(false,$dsn_set['database'],'setDSN'); + } + + /** + * Tests that the MDB2::getDSN() method correctly gets the DSN. + */ + function test_getDSN() + { + $dsn_set = "mydbms://myname:mypassword@localhost"; + $result = $this->db->setDSN($dsn_set); + $dsn_get = $this->db->getDSN(); + $dsn_rex = "/(([\w]+)$mydbms$:\/\/myname:mypassword@localhost\/)/"; + //preg_match($dsn_rex, $dsn_get, $matches); + $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); + $dsn_rex = "/{$this->dsn['phptype']}[\w\W]+/"; + $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); + + $dsn_set = "mydbms://myname:mypassword@localhost"; + $result = $this->db->setDSN($dsn_set); + $dsn_get = $this->db->getDSN('string', true); + $dsn_rex = "/(([\w]+)$mydbms$:\/\/myname:1@localhost\/)/"; + $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); + $dsn_rex = "/{$this->dsn['phptype']}[\w\W]+/"; + $this->assertRegExp($dsn_rex, $dsn_get, 'testGetDSN'); + } + + /** + * Tests that the 'new_link' DSN option is read correctly + */ + function test_isNewLinkSet() + { + $dsn = array( + 'phptype' => 'mydbms', + 'host' => 'localhost', + 'database' => 'dbname', + 'username' => 'myname', + 'password' => 'mypassword', + ); + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = true; + $this->db->setDSN($dsn); + $this->assertTrue($this->db->_isNewLinkSet()); + $dsn['new_link'] = false; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = 'true'; + $this->db->setDSN($dsn); + $this->assertTrue($this->db->_isNewLinkSet()); + $dsn['new_link'] = 'false'; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = 1; + $this->db->setDSN($dsn); + $this->assertTrue($this->db->_isNewLinkSet()); + $dsn['new_link'] = 0; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = '1'; + $this->db->setDSN($dsn); + $this->assertTrue($this->db->_isNewLinkSet()); + $dsn['new_link'] = '0'; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = 'True'; + $this->db->setDSN($dsn); + $this->assertTrue($this->db->_isNewLinkSet()); + $dsn['new_link'] = 'TRUE'; + $this->db->setDSN($dsn); + $this->assertTrue($this->db->_isNewLinkSet()); + //now test some invalid values... + $dsn['new_link'] = new StdClass; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = ''; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + $dsn['new_link'] = 'blah'; + $this->db->setDSN($dsn); + $this->assertFalse($this->db->_isNewLinkSet()); + } + + /** + * Tests that the MDB2::setLimit() method correctly sets the limit + * and offset values. + */ + function test_setLimit() + { + if (!$this->db->supports('limit_queries')) + { + $this->db->limit = null; + $this->db->offset = null; + $this->db->setLimit(100, 50); + $this->assertEquals(100, $this->db->limit , 'setLimit'); + $this->assertEquals( 50, $this->db->offset, 'setLimit'); + } + } + + /** + * Tests that the MDB2::supports() method correctly finds keys + * in the "supports" array. + */ + function test_supports() + { + $this->db->supports['testkey'] = true; + $this->assertTrue($this->db->supports('testkey'), 'supports'); + unset($this->db->supports['testkey']); + } + + /** + * Tests that the MDB2::getSequenceName() method correctly gets + * sequence names. + */ + function test_getSequenceName() + { + $tmp = $this->db->options['seqname_format']; + $this->db->options['seqname_format'] = '%s_seq'; + $this->assertEquals('test_seq', strtolower($this->db->getSequenceName('test')), 'getSequenceName'); + $this->db->options['seqname_format'] = $tmp; + } + + /** + * Tests that the MDB2::getIndexName() method correctly gets index names. + */ + function test_getIndexName() + { + $tmp = $this->db->options['idxname_format']; + $this->db->options['idxname_format'] = 'idx_%s'; + $this->assertEquals('idx_test', $this->db->getIndexName('test'), 'getIndexName'); + $this->db->options['idxname_format'] = $tmp; + } + + /** + * Tests that the MDB2::disconnect() method correctly disconnects. + */ + function test_disconnect() + { + $this->assertTrue($this->db->disconnect(), 'disconnect'); + $this->assertEquals(0, $this->db->connection, 'disconnect'); + $this->assertEquals(array(), $this->db->connected_dsn, 'disconnect'); + $this->assertEquals('', $this->db->connected_database_name, 'disconnect'); + $this->assertNull($this->db->opened_persistent, 'disconnect'); + $this->assertEquals('', $this->db->connected_server_info, 'disconnect'); + $this->assertNull($this->db->in_transaction, 'disconnect'); + $this->assertNull($this->db->nested_transaction_counter, 'disconnect'); + } + + /** + * Test that the MDB2::_skipDelimitedStrings() method correctly recognizes + * parameter placeholders from quoted strings + */ + function test_skipDelimitedStrings() { + $query = "UPDATE tbl SET fld='' WHERE fld2=:param AND fld3=':fakeparam' AND fld3=:param2"; + $this->assertEquals(0, $this->db->_skipDelimitedStrings($query, 0, 0)); + $this->assertEquals(18, $this->db->_skipDelimitedStrings($query, 18, 19)); + $this->assertEquals(20, $this->db->_skipDelimitedStrings($query, 20, 20)); + $this->assertEquals(21, $this->db->_skipDelimitedStrings($query, 19, 21)); + $this->assertEquals(30, $this->db->_skipDelimitedStrings($query, 30, 33)); + $this->assertEquals(30, $this->db->_skipDelimitedStrings($query, 30, 34)); + $this->assertEquals(33, $this->db->_skipDelimitedStrings($query, 33, 33)); + $this->assertEquals(50, $this->db->_skipDelimitedStrings($query, 50, 50)); + $this->assertEquals(61, $this->db->_skipDelimitedStrings($query, 49, 51)); + $this->assertEquals(52, $this->db->_skipDelimitedStrings($query, 52, 52)); + $this->assertEquals(70, $this->db->_skipDelimitedStrings($query, 70, 72)); + $this->assertEquals(71, $this->db->_skipDelimitedStrings($query, 71, 72)); + $this->assertEquals(72, $this->db->_skipDelimitedStrings($query, 72, 72)); + + //be careful about SQL comments that are not comments (because within quotes) + $query = "UPDATE tbl SET fld='--some text' WHERE col2=?"; + $this->assertEquals(0, $this->db->_skipDelimitedStrings($query, 0, 0)); + $this->assertEquals(18, $this->db->_skipDelimitedStrings($query, 18, 19)); + $this->assertEquals(20, $this->db->_skipDelimitedStrings($query, 20, 20)); + $this->assertEquals(32, $this->db->_skipDelimitedStrings($query, 19, 21)); + } + +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_manager_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_manager_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_manager_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_manager_testcase.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,919 @@ + | +// | Lorenzo Alberton | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_manager_testcase.php,v 1.65 2008/03/08 14:04:15 quipo Exp $ + +require_once 'MDB2_testcase.php'; + +class MDB2_Manager_TestCase extends MDB2_TestCase { + //test table name (it is dynamically created/dropped) + var $table = 'newtable'; + + function setUp() { + parent::setUp(); + $this->db->loadModule('Manager', null, true); + $this->fields = array( + 'id' => array( + 'type' => 'integer', + 'unsigned' => true, + 'notnull' => true, + 'default' => 0, + ), + 'somename' => array( + 'type' => 'text', + 'length' => 12, + ), + 'somedescription' => array( + 'type' => 'text', + 'length' => 12, + ), + 'sex' => array( + 'type' => 'text', + 'length' => 1, + 'default' => 'M', + ), + ); + $options = array(); + if ('mysql' == substr($this->db->phptype, 0, 5)) { + $options['type'] = 'innodb'; + } + if (!$this->tableExists($this->table)) { + $result = $this->db->manager->createTable($this->table, $this->fields, $options); + $this->assertFalse(PEAR::isError($result), 'Error creating table'); + $this->assertEquals(MDB2_OK, $result, 'Invalid return value for createTable()'); + } + } + + function tearDown() { + if ($this->tableExists($this->table)) { + $result = $this->db->manager->dropTable($this->table); + $this->assertFalse(PEAR::isError($result), 'Error dropping table'); + } + $this->db->popExpect(); + unset($this->dsn); + if (!PEAR::isError($this->db->manager)) { + $this->db->disconnect(); + } + unset($this->db); + } + + /** + * Create a sample table, test the new fields, and drop it. + */ + function testCreateTable() { + if (!$this->methodExists($this->db->manager, 'createTable')) { + return; + } + if ($this->tableExists($this->table)) { + $this->db->manager->dropTable($this->table); + } + + $result = $this->db->manager->createTable($this->table, $this->fields); + $this->assertFalse(PEAR::isError($result), 'Error creating table'); + } + + /** + * Create a sample table, test the new fields, and drop it. + */ + function testCreateAutoIncrementTable() { + if (!$this->methodExists($this->db->manager, 'createTable')) { + return; + } + if ($this->tableExists($this->table)) { + $this->db->manager->dropTable($this->table); + } + $seq_name = $this->table; + if ('ibase' == $this->db->phptype) { + $seq_name .= '_id'; + } + //remove existing PK sequence + $sequences = $this->db->manager->listSequences(); + if (in_array($seq_name, $sequences)) { + $this->db->manager->dropSequence($seq_name); + } + + $fields = $this->fields; + $fields['id']['autoincrement'] = true; + $result = $this->db->manager->createTable($this->table, $fields); + $this->assertFalse(PEAR::isError($result), 'Error creating table'); + $this->assertEquals(MDB2_OK, $result, 'Error creating table: unexpected return value'); + $query = 'INSERT INTO '.$this->db->quoteIdentifier($this->table, true); + $query.= ' (somename, somedescription)'; + $query.= ' VALUES (:somename, :somedescription)'; + $stmt =& $this->db->prepare($query, array('text', 'text'), MDB2_PREPARE_MANIP); + if (PEAR::isError($stmt)) { + $this->assertFalse(true, 'Preparing insert'); + return; + } + $values = array( + 'somename' => 'foo', + 'somedescription' => 'bar', + ); + $rows = 5; + for ($i =0; $i < $rows; ++$i) { + $result = $stmt->execute($values); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error executing autoincrementing insert number: '.$i); + return; + } + } + $stmt->free(); + $query = 'SELECT id FROM '.$this->table; + $data = $this->db->queryCol($query, 'integer'); + if (PEAR::isError($data)) { + $this->assertFalse(true, 'Error executing select: ' . $data->getMessage()); + return; + } + for ($i =0; $i < $rows; ++$i) { + if (!isset($data[$i])) { + $this->assertFalse(true, 'Error in data returned by select'); + return; + } + if ($data[$i] !== ($i+1)) { + $this->assertFalse(true, 'Error executing autoincrementing insert'); + return; + } + } + } + + /** + * + */ + function testListTableFields() { + if (!$this->methodExists($this->db->manager, 'listTableFields')) { + return; + } + $this->assertEquals( + array_keys($this->fields), + $this->db->manager->listTableFields($this->table), + 'Error creating table: incorrect fields' + ); + } + + /** + * + */ + function testCreateIndex() { + if (!$this->methodExists($this->db->manager, 'createIndex')) { + return; + } + $index = array( + 'fields' => array( + 'somename' => array( + 'sorting' => 'ascending', + ), + ), + ); + $name = 'simpleindex'; + $result = $this->db->manager->createIndex($this->table, $name, $index); + $this->assertFalse(PEAR::isError($result), 'Error creating index'); + } + + /** + * + */ + function testDropIndex() { + if (!$this->methodExists($this->db->manager, 'dropIndex')) { + return; + } + $index = array( + 'fields' => array( + 'somename' => array( + 'sorting' => 'ascending', + ), + ), + ); + $name = 'simpleindex'; + $result = $this->db->manager->createIndex($this->table, $name, $index); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error creating index'); + } else { + $result = $this->db->manager->dropIndex($this->table, $name); + $this->assertFalse(PEAR::isError($result), 'Error dropping index'); + $indices = $this->db->manager->listTableIndexes($this->table); + $this->assertFalse(PEAR::isError($indices), 'Error listing indices'); + $this->assertFalse(in_array($name, $indices), 'Error dropping index'); + } + } + + /** + * + */ + function testListIndexes() { + if (!$this->methodExists($this->db->manager, 'listTableIndexes')) { + return; + } + $index = array( + 'fields' => array( + 'somename' => array( + 'sorting' => 'ascending', + ), + ), + ); + $name = 'simpleindex'; + $result = $this->db->manager->createIndex($this->table, $name, $index); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error creating index'); + } else { + $indices = $this->db->manager->listTableIndexes($this->table); + $this->assertFalse(PEAR::isError($indices), 'Error listing indices'); + $this->assertTrue(in_array($name, $indices), 'Error listing indices'); + } + } + + /** + * + */ + function testCreatePrimaryKey() { + if (!$this->methodExists($this->db->manager, 'createConstraint')) { + return; + } + $constraint = array( + 'fields' => array( + 'id' => array( + 'sorting' => 'ascending', + ), + ), + 'primary' => true, + ); + $name = 'pkindex'; + $result = $this->db->manager->createConstraint($this->table, $name, $constraint); + $this->assertFalse(PEAR::isError($result), 'Error creating primary key constraint'); + } + + /** + * + */ + function testCreateUniqueConstraint() { + if (!$this->methodExists($this->db->manager, 'createConstraint')) { + return; + } + $constraint = array( + 'fields' => array( + 'somename' => array( + 'sorting' => 'ascending', + ), + ), + 'unique' => true, + ); + $name = 'uniqueindex'; + $result = $this->db->manager->createConstraint($this->table, $name, $constraint); + $this->assertFalse(PEAR::isError($result), 'Error creating unique constraint'); + } + + /** + * + */ + function testCreateForeignKeyConstraint() { + if (!$this->methodExists($this->db->manager, 'createConstraint')) { + return; + } + $constraint = array( + 'fields' => array( + 'id' => array( + 'sorting' => 'ascending', + ), + ), + 'foreign' => true, + 'references' => array( + 'table' => 'users', + 'fields' => array( + 'user_id' => array( + 'position' => 1, + ), + ), + ), + 'initiallydeferred' => false, + 'deferrable' => false, + 'match' => 'SIMPLE', + 'onupdate' => 'CASCADE', + 'ondelete' => 'CASCADE', + ); + $constraint_name = 'fkconstraint'; + $result = $this->db->manager->createConstraint($this->table, $constraint_name, $constraint); + $this->assertFalse(PEAR::isError($result), 'Error creating FOREIGN KEY constraint'); + + //see if it was created successfully + $constraints = $this->db->manager->listTableConstraints($this->table); + $this->assertTrue(!PEAR::isError($constraints), 'Error listing table constraints'); + $constraint_name_idx = $this->db->getIndexName($constraint_name); + $this->assertTrue(in_array($constraint_name_idx, $constraints) || in_array($constraint_name, $constraints), 'Error, FK constraint not found'); + + //now check that it is enforced... + + //insert a row in the primary table + $result = $this->db->exec('INSERT INTO users (user_id) VALUES (1)'); + $this->assertTrue(!PEAR::isError($result), 'Insert failed'); + + //insert a row in the FK table with an id that references + //the newly inserted row on the primary table: should not fail + $query = 'INSERT INTO '.$this->db->quoteIdentifier($this->table, true) + .' ('.$this->db->quoteIdentifier('id', true).') VALUES (1)'; + $result = $this->db->exec($query); + $this->assertTrue(!PEAR::isError($result), 'Insert failed'); + + //try to insert a row into the FK table with an id that does not + //exist in the primary table: should fail + $query = 'INSERT INTO '.$this->db->quoteIdentifier($this->table, true) + .' ('.$this->db->quoteIdentifier('id', true).') VALUES (123456)'; + $this->db->pushErrorHandling(PEAR_ERROR_RETURN); + $this->db->expectError('*'); + $result = $this->db->exec($query); + $this->db->popExpect(); + $this->db->popErrorHandling(); + $this->assertTrue(PEAR::isError($result), 'Foreign Key constraint is not enforced for INSERT query'); + + //try to update the first row of the FK table with an id that does not + //exist in the primary table: should fail + $query = 'UPDATE '.$this->db->quoteIdentifier($this->table, true) + .' SET '.$this->db->quoteIdentifier('id', true).' = 123456 ' + .' WHERE '.$this->db->quoteIdentifier('id', true).' = 1'; + $this->db->expectError('*'); + $result = $this->db->exec($query); + $this->db->popExpect(); + $this->assertTrue(PEAR::isError($result), 'Foreign Key constraint is not enforced for UPDATE query'); + + $numrows_query = 'SELECT COUNT(*) FROM '. $this->db->quoteIdentifier($this->table, true); + $numrows = $this->db->queryOne($numrows_query, 'integer'); + $this->assertEquals(1, $numrows, 'Invalid number of rows in the FK table'); + + //update the PK value of the primary table: the new value should be + //propagated to the FK table (ON UPDATE CASCADE) + $result = $this->db->exec('UPDATE users SET user_id = 2'); + $this->assertTrue(!PEAR::isError($result), 'Update failed'); + + $numrows = $this->db->queryOne($numrows_query, 'integer'); + $this->assertEquals(1, $numrows, 'Invalid number of rows in the FK table'); + + $query = 'SELECT id FROM '.$this->db->quoteIdentifier($this->table, true); + $newvalue = $this->db->queryOne($query, 'integer'); + $this->assertEquals(2, $newvalue, 'The value of the FK field was not updated (CASCADE failed)'); + + //delete the row of the primary table: the row in the FK table should be + //deleted automatically (ON DELETE CASCADE) + $result = $this->db->exec('DELETE FROM users'); + $this->assertTrue(!PEAR::isError($result), 'Delete failed'); + + $numrows = $this->db->queryOne($numrows_query, 'integer'); + $this->assertEquals(0, $numrows, 'Invalid number of rows in the FK table (CASCADE failed)'); + + //cleanup + $result = $this->db->manager->dropConstraint($this->table, $constraint_name); + $this->assertTrue(!PEAR::isError($result), 'Error dropping the constraint'); + } + + /** + * + */ + function testDropPrimaryKey() { + if (!$this->methodExists($this->db->manager, 'dropConstraint')) { + return; + } + $index = array( + 'fields' => array( + 'id' => array( + 'sorting' => 'ascending', + ), + ), + 'primary' => true, + ); + $name = 'pkindex'; + $result = $this->db->manager->createConstraint($this->table, $name, $index); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error creating primary index'); + } else { + $result = $this->db->manager->dropConstraint($this->table, $name, true); + $this->assertFalse(PEAR::isError($result), 'Error dropping primary key index'); + } + } + + /** + * + */ + function testListDatabases() { + if (!$this->methodExists($this->db->manager, 'listDatabases')) { + return; + } + $result = $this->db->manager->listDatabases(); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error listing databases ('.$result->getMessage().')'); + } else { + $this->assertTrue(in_array(strtolower($this->database), $result), 'Error listing databases'); + } + } + + /** + * + */ + function testListConstraints() { + if (!$this->methodExists($this->db->manager, 'listTableConstraints')) { + return; + } + $index = array( + 'fields' => array( + 'id' => array( + 'sorting' => 'ascending', + ), + ), + 'unique' => true, + ); + $name = 'uniqueindex'; + $result = $this->db->manager->createConstraint($this->table, $name, $index); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error creating unique constraint'); + } else { + $constraints = $this->db->manager->listTableConstraints($this->table); + $this->assertFalse(PEAR::isError($constraints), 'Error listing constraints'); + $this->assertTrue(in_array($name, $constraints), 'Error listing unique key index'); + } + } + + /** + * + */ + function testListTables() { + if (!$this->methodExists($this->db->manager, 'listTables')) { + return; + } + $this->assertTrue($this->tableExists($this->table), 'Error listing tables'); + } + + /** + * + */ + function testAlterTable() { + if (!$this->methodExists($this->db->manager, 'alterTable')) { + return; + } + $newer = 'newertable'; + if ($this->tableExists($newer)) { + $this->db->manager->dropTable($newer); + } + $changes = array( + 'add' => array( + 'quota' => array( + 'type' => 'integer', + 'unsigned' => 1, + ), + 'note' => array( + 'type' => 'text', + 'length' => '20', + ), + ), + 'rename' => array( + 'sex' => array( + 'name' => 'gender', + 'definition' => array( + 'type' => 'text', + 'length' => 1, + 'default' => 'M', + ), + ), + ), + 'change' => array( + 'id' => array( + 'unsigned' => false, + 'definition' => array( + 'type' => 'integer', + 'notnull' => false, + 'default' => 0, + ), + ), + 'somename' => array( + 'length' => '20', + 'definition' => array( + 'type' => 'text', + 'length' => 20, + ), + ) + ), + 'remove' => array( + 'somedescription' => array(), + ), + 'name' => $newer, + ); + + $this->db->expectError(MDB2_ERROR_CANNOT_ALTER); + $result = $this->db->manager->alterTable($this->table, $changes, true); + $this->db->popExpect(); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Cannot alter table'); + } else { + $result = $this->db->manager->alterTable($this->table, $changes, false); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error altering table'); + } else { + $this->db->manager->dropTable($newer); + } + } + } + + /** + * + */ + function testAlterTable2() { + if (!$this->methodExists($this->db->manager, 'alterTable')) { + return; + } + $newer = 'newertable2'; + if ($this->tableExists($newer)) { + $this->db->manager->dropTable($newer); + } + $changes_all = array( + 'add' => array( + 'quota' => array( + 'type' => 'integer', + 'unsigned' => 1, + ), + ), + 'rename' => array( + 'sex' => array( + 'name' => 'gender', + 'definition' => array( + 'type' => 'text', + 'length' => 1, + 'default' => 'M', + ), + ), + ), + 'change' => array( + 'somename' => array( + 'length' => '20', + 'definition' => array( + 'type' => 'text', + 'length' => 20, + ), + ) + ), + 'remove' => array( + 'somedescription' => array(), + ), + 'name' => $newer, + ); + + foreach ($changes_all as $type => $change) { + $changes = array($type => $change); + $this->db->expectError(MDB2_ERROR_CANNOT_ALTER); + $result = $this->db->manager->alterTable($this->table, $changes, true); + $this->db->popExpect(); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Cannot alter table: '.$type); + return; + } + $result = $this->db->manager->alterTable($this->table, $changes, false); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error altering table: '.$type); + } else { + switch ($type) { + case 'add': + $altered_table_fields = $this->db->manager->listTableFields($this->table); + foreach ($change as $newfield => $dummy) { + $this->assertTrue(in_array($newfield, $altered_table_fields), 'Error: new field "'.$newfield.'" not added'); + } + break; + case 'rename': + $altered_table_fields = $this->db->manager->listTableFields($this->table); + foreach ($change as $oldfield => $newfield) { + $this->assertFalse(in_array($oldfield, $altered_table_fields), 'Error: field "'.$oldfield.'" not renamed'); + $this->assertTrue(in_array($newfield['name'], $altered_table_fields), 'Error: field "'.$oldfield.'" not renamed correctly'); + } + break; + case 'change': + break; + case 'remove': + $altered_table_fields = $this->db->manager->listTableFields($this->table); + foreach ($change as $newfield => $dummy) { + $this->assertFalse(in_array($newfield, $altered_table_fields), 'Error: field "'.$newfield.'" not removed'); + } + break; + case 'name': + if ($this->tableExists($newer)) { + $this->db->manager->dropTable($newer); + } else { + $this->assertFalse(true, 'Error: table "'.$this->table.'" not renamed'); + } + break; + } + } + } + } + + /** + * + */ + function testTruncateTable() { + if (!$this->methodExists($this->db->manager, 'truncateTable')) { + return; + } + + $query = 'INSERT INTO '.$this->table; + $query.= ' (id, somename, somedescription)'; + $query.= ' VALUES (:id, :somename, :somedescription)'; + $stmt =& $this->db->prepare($query, array('integer', 'text', 'text'), MDB2_PREPARE_MANIP); + if (PEAR::isError($stmt)) { + $this->assertFalse(true, 'Error preparing INSERT'); + return; + } + $rows = 5; + for ($i=1; $i<=$rows; ++$i) { + $values = array( + 'id' => $i, + 'somename' => 'foo'.$i, + 'somedescription' => 'bar'.$i, + ); + $result = $stmt->execute($values); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error executing insert number: '.$i); + return; + } + } + $stmt->free(); + $count = $this->db->queryOne('SELECT COUNT(*) FROM '.$this->table, 'integer'); + if (PEAR::isError($count)) { + $this->assertFalse(true, 'Error executing SELECT'); + return; + } + $this->assertEquals($rows, $count, 'Error: invalid number of rows returned'); + + $result = $this->db->manager->truncateTable($this->table); + if (PEAR::isError($result)) { + $this->assertFalse(true, 'Error truncating table'); + } + + $count = $this->db->queryOne('SELECT COUNT(*) FROM '.$this->table, 'integer'); + if (PEAR::isError($count)) { + $this->assertFalse(true, 'Error executing SELECT'); + return; + } + $this->assertEquals(0, $count, 'Error: invalid number of rows returned'); + } + + /** + * + */ + function testDropTable() { + if (!$this->methodExists($this->db->manager, 'dropTable')) { + return; + } + $result = $this->db->manager->dropTable($this->table); + $this->assertFalse(PEAR::isError($result), 'Error dropping table'); + } + + /** + * + */ + function testListTablesNoTable() { + if (!$this->methodExists($this->db->manager, 'listTables')) { + return; + } + $result = $this->db->manager->dropTable($this->table); + $this->assertFalse($this->tableExists($this->table), 'Error listing tables'); + } + + /** + * + */ + function testSequences() { + if (!$this->methodExists($this->db->manager, 'createSequence')) { + return; + } + $seq_name = 'testsequence'; + $result = $this->db->manager->createSequence($seq_name); + $this->assertFalse(PEAR::isError($result), 'Error creating a sequence'); + $this->assertTrue(in_array($seq_name, $this->db->manager->listSequences()), 'Error listing sequences'); + $result = $this->db->manager->dropSequence($seq_name); + $this->assertFalse(PEAR::isError($result), 'Error dropping a sequence'); + $this->assertFalse(in_array($seq_name, $this->db->manager->listSequences()), 'Error listing sequences'); + } + + /** + * Test listTableTriggers($table) + */ + function testListTableTriggers() { + //setup + $trigger_name = 'test_newtrigger'; + + include_once 'MDB2_nonstandard.php'; + $nonstd =& MDB2_nonstandard::factory($this->db, $this); + if (PEAR::isError($nonstd)) { + $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); + return; + } + + $result = $nonstd->createTrigger($trigger_name, $this->table); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Cannot create trigger: '.$result->getMessage()); + return; + } + + //test + $triggers = $this->db->manager->listTableTriggers($this->table); + if (PEAR::isError($triggers)) { + $this->assertTrue(false, 'Error listing the table triggers: '.$triggers->getMessage()); + } else { + $this->assertTrue(in_array($trigger_name, $triggers), 'Error: trigger not found'); + //check that only the triggers referencing the given table are returned + $triggers = $this->db->manager->listTableTriggers('fake_table'); + $this->assertFalse(in_array($trigger_name, $triggers), 'Error: trigger found'); + } + + + //cleanup + $result = $nonstd->dropTrigger($trigger_name, $this->table); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error dropping the trigger: '.$result->getMessage()); + } + } + + /** + * Test listTableViews($table) + */ + function testListTableViews() { + //setup + $view_name = 'test_newview'; + + include_once 'MDB2_nonstandard.php'; + $nonstd =& MDB2_nonstandard::factory($this->db, $this); + if (PEAR::isError($nonstd)) { + $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); + return; + } + + $result = $nonstd->createView($view_name, $this->table); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Cannot create view: '.$result->getMessage()); + return; + } + + //test + $views = $this->db->manager->listTableViews($this->table); + if (PEAR::isError($views)) { + $this->assertTrue(false, 'Error listing the table views: '.$views->getMessage()); + } else { + $this->assertTrue(in_array($view_name, $views), 'Error: view not found'); + //check that only the views referencing the given table are returned + $views = $this->db->manager->listTableViews('fake_table'); + $this->assertFalse(in_array($view_name, $views), 'Error: view found'); + } + + + //cleanup + $result = $nonstd->dropView($view_name); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error dropping the view: '.$result->getMessage()); + } + } + + /** + * Test listViews() + */ + function testListViews() { + //setup + $view_name = 'test_brandnewview'; + + include_once 'MDB2_nonstandard.php'; + $nonstd =& MDB2_nonstandard::factory($this->db, $this); + if (PEAR::isError($nonstd)) { + $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); + return; + } + + $result = $nonstd->createView($view_name, $this->table); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Cannot create view: '.$result->getMessage()); + return; + } + + //test + $views = $this->db->manager->listViews(); + if (PEAR::isError($views)) { + $this->assertTrue(false, 'Error listing the views: '.$views->getMessage()); + } else { + $this->assertTrue(in_array($view_name, $views), 'Error: view not found'); + } + + //cleanup + $result = $nonstd->dropView($view_name); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error dropping the view: '.$result->getMessage()); + } + } + + /** + * Test listUsers() + */ + function testListUsers() { + $users = $this->db->manager->listUsers(); + if (PEAR::isError($users)) { + $this->assertTrue(false, 'Error listing the users: '.$users->getMessage()); + } else { + $users = array_map('strtolower', $users); + $this->assertTrue(in_array(strtolower($this->db->dsn['username']), $users), 'Error: user not found'); + } + } + + /** + * Test listFunctions() + */ + function testListFunctions() { + //setup + $function_name = 'test_add'; + + include_once 'MDB2_nonstandard.php'; + $nonstd =& MDB2_nonstandard::factory($this->db, $this); + if (PEAR::isError($nonstd)) { + $this->assertTrue(false, 'Cannot instanciate MDB2_nonstandard object: '.$nonstd->getMessage()); + return; + } + + $result = $nonstd->createFunction($function_name); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Cannot create function: '.$result->getMessage().' :: '.$result->getUserInfo()); + return; + } + + //test + $functions = $this->db->manager->listFunctions(); + if (PEAR::isError($functions)) { + $this->assertTrue(false, 'Error listing the functions: '.$functions->getMessage()); + } else { + $this->assertTrue(in_array($function_name, $functions), 'Error: function not found'); + } + + //cleanup + $result = $nonstd->dropFunction($function_name); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error dropping the function: '.$result->getMessage()); + } + } + + /** + * Test vacuum + */ + function testVacuum() { + //vacuum table + $result = $this->db->manager->vacuum($this->table); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error: cannot vacuum table: ' . $result->getMessage()); + } + + //vacuum and analyze table + $options = array( + 'analyze' => true, + 'full' => true, + 'freeze' => true, + ); + $result = $this->db->manager->vacuum($this->table, $options); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error: cannot vacuum table: ' . $result->getMessage()); + } + + //vacuum all tables + $result = $this->db->manager->vacuum(); + if (PEAR::isError($result)) { + $this->assertTrue(false, 'Error: cannot vacuum table: ' . $result->getMessage()); + } + } +} +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_native_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_native_testcase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_native_testcase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_native_testcase.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,52 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_native_testcase.php,v 1.12 2006/03/01 12:15:38 lsmith Exp $ + +require_once 'MDB2_testcase.php'; + +class MDB2_Native_TestCase extends MDB2_TestCase +{ +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_ibase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_ibase.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_ibase.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_ibase.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,90 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_nonstandard_ibase.php,v 1.5 2007/03/04 21:32:31 quipo Exp $ + +class MDB2_nonstandard_ibase extends MDB2_nonstandard { + + var $trigger_body = 'AS +BEGIN + NEW.somedescription = OLD.somename; +END'; + + function createTrigger($trigger_name, $table_name) { + $query = 'CREATE OR ALTER TRIGGER '. $trigger_name .' FOR '. $table_name .' + AFTER UPDATE '. $this->trigger_body .';'; + return $this->db->exec($query); + } + + function checkTrigger($trigger_name, $table_name, $def) { + parent::checkTrigger($trigger_name, $table_name, $def); + $this->test->assertEquals($this->trigger_body, $def['trigger_body']); + } + + function dropTrigger($trigger_name, $table_name) { + return $this->db->exec('DROP TRIGGER '.$trigger_name); + } + + function createFunction($name) { + $query = 'CREATE PROCEDURE '.$name.'(N1 DECIMAL(6,2), N2 DECIMAL(6,2)) +RETURNS ( + res DECIMAL(6,2) +) +AS +BEGIN + FOR + SELECT (:N1 + :N2) FROM RDB$DATABASE INTO :res + DO + BEGIN + SUSPEND; + END +END'; + return $this->db->exec($query); + } + + function dropFunction($name) { + return $this->db->exec('DROP PROCEDURE '.$name); + } +} + +?> \ No newline at end of file diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_mssql.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_mssql.php --- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_mssql.php 1970-01-01 01:00:00.000000000 +0100 +++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_mssql.php 2009-01-14 16:28:09.000000000 +0000 @@ -0,0 +1,88 @@ + | +// +----------------------------------------------------------------------+ +// +// $Id: MDB2_nonstandard_mssql.php,v 1.2 2007/03/04 21:27:44 quipo Exp $ + +class MDB2_nonstandard_mssql extends MDB2_nonstandard { + + var $trigger_body = ''; + + function createTrigger($trigger_name, $table_name) { + $this->trigger_body = 'CREATE TRIGGER '. $trigger_name .' ON '. $table_name .' +FOR UPDATE AS +DECLARE @oldName VARCHAR(100) +DECLARE @newId INTEGER +SELECT @oldName = (SELECT somename FROM Deleted) +SELECT @newId = (SELECT id FROM Inserted) +BEGIN + UPDATE '. $table_name .' SET somedescription = @oldName WHERE id = @newId; +END;'; + + return $this->db->exec($this->trigger_body); + } + + function checkTrigger($trigger_name, $table_name, $def) { + parent::checkTrigger($trigger_name, $table_name, $def); + $this->test->assertEquals($this->trigger_body, $def['trigger_body']); + echo '

';
+        var_dump($this->trigger_body);
+        var_dump($def['trigger_body']);
+    }
+
+    function dropTrigger($trigger_name, $table_name) {
+        return $this->db->exec('DROP TRIGGER '.$trigger_name);
+    }
+    
+    function createFunction($name) {
+        $query = 'CREATE FUNCTION '.$name.'(@Number1 Decimal(6,2), @Number2 Decimal(6,2))
+RETURNS Decimal(6,2)
+BEGIN
+    DECLARE @Result Decimal(6,2)
+    SET @Result = @Number1 + @Number2
+    RETURN @Result
+END';
+        return $this->db->exec($query);
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysqli.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysqli.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysqli.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysqli.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,52 @@
+                       |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_nonstandard_mysqli.php,v 1.1 2006/12/09 14:31:54 quipo Exp $
+
+require_once 'MDB2_nonstandard_mysql.php';
+
+class MDB2_nonstandard_mysqli extends MDB2_nonstandard_mysql {
+
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysql.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysql.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysql.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_mysql.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,75 @@
+                       |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_nonstandard_mysql.php,v 1.4 2007/03/04 22:51:06 quipo Exp $
+
+class MDB2_nonstandard_mysql extends MDB2_nonstandard {
+
+    var $trigger_body = '';
+
+    function createTrigger($trigger_name, $table_name) {
+        $this->trigger_body = 'BEGIN
+  UPDATE '. $table_name .' SET somedescription = OLD.somename WHERE id = NEW.id;
+END';
+        $query = 'CREATE TRIGGER '. $trigger_name .' AFTER UPDATE ON '. $table_name .'
+                  FOR EACH ROW '. $this->trigger_body .';';
+        return $this->db->exec($query);
+    }
+
+    function checkTrigger($trigger_name, $table_name, $def) {
+        parent::checkTrigger($trigger_name, $table_name, $def);
+        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
+    }
+
+    function dropTrigger($trigger_name, $table_name) {
+        return $this->db->exec('DROP TRIGGER '.$trigger_name);
+    }
+
+    function createFunction($name) {
+        $query = 'CREATE FUNCTION '.$name.'(a INT, b INT) RETURNS INT
+RETURN a + b;';
+        return $this->db->exec($query);
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_oci8.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_oci8.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_oci8.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_oci8.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,82 @@
+                       |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_nonstandard_oci8.php,v 1.5 2007/03/04 22:28:23 quipo Exp $
+
+class MDB2_nonstandard_oci8 extends MDB2_nonstandard {
+
+    var $trigger_body = '';
+    var $when_clause = 'new.id > 0';
+
+    function createTrigger($trigger_name, $table_name) {
+        $this->trigger_body = 'BEGIN INSERT INTO '.$table_name
+            .' (id, somename, somedescription) VALUES'
+            .' (:new.id+1, :new.somename, :new.somedescription); END '. $trigger_name .';';
+        $query = 'CREATE OR REPLACE TRIGGER '. $trigger_name
+                .' AFTER UPDATE ON '. $table_name
+                .' FOR EACH ROW WHEN ('.$this->when_clause.') '
+                . $this->trigger_body;
+        return $this->db->exec($query);
+    }
+
+    function checkTrigger($trigger_name, $table_name, $def) {
+        parent::checkTrigger($trigger_name, $table_name, $def);
+        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
+        $this->test->assertEquals($this->when_clause, $def['when_clause']);
+    }
+
+    function dropTrigger($trigger_name, $table_name) {
+        return $this->db->exec('DROP TRIGGER '.$trigger_name);
+    }
+
+    function createFunction($name) {
+        $query = 'CREATE FUNCTION '.$name.'(a IN INT, b IN INT)
+RETURN INT AS
+BEGIN
+    RETURN a + b;
+END;';
+        return $this->db->exec($query);
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_pgsql.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_pgsql.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_pgsql.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_pgsql.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,94 @@
+                       |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_nonstandard_pgsql.php,v 1.5 2007/03/04 21:36:08 quipo Exp $
+
+class MDB2_nonstandard_pgsql extends MDB2_nonstandard {
+
+    var $trigger_body = '';
+
+    function createTrigger($trigger_name, $table_name) {
+        $this->trigger_body = 'EXECUTE PROCEDURE '.$trigger_name.'_func();';
+        $table_name = $this->db->quoteIdentifier($table_name);
+        $sql = 'CREATE OR REPLACE FUNCTION '.$trigger_name.'_func() RETURNS trigger AS \'
+                DECLARE
+                    id_number INTEGER;
+                BEGIN
+                    SELECT INTO id_number id FROM '. $table_name .' WHERE id = NEW.id;
+                    RETURN NEW;
+                END;
+                \' LANGUAGE \'plpgsql\';';
+        $res = $this->db->exec($sql);
+        if (PEAR::isError($res)) {
+            return $res;
+        }
+    
+        $query = 'CREATE TRIGGER '. $trigger_name .' AFTER UPDATE ON '. $table_name .'
+                  FOR EACH ROW ' .$this->trigger_body;
+        return $this->db->exec($query);
+    }
+
+    function checkTrigger($trigger_name, $table_name, $def) {
+        parent::checkTrigger($trigger_name, $table_name, $def);
+        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
+    }
+
+    function dropTrigger($trigger_name, $table_name) {
+        return $this->db->exec('DROP TRIGGER '.$trigger_name .' ON '. $table_name);
+    }
+
+    function createFunction($name) {
+        $query = "CREATE FUNCTION $name (Decimal(6,2), Decimal(6,2)) RETURNS Decimal(6,2)
+AS 'select $1 + $2;'
+LANGUAGE SQL
+IMMUTABLE
+RETURNS NULL ON NULL INPUT";
+        return $this->db->exec($query);
+    }
+
+    function dropFunction($name) {
+        return $this->db->exec('DROP FUNCTION '.$name.' (Decimal(6,2), Decimal(6,2))');
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,130 @@
+                       |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_nonstandard.php,v 1.5 2007/03/04 21:26:52 quipo Exp $
+
+class MDB2_nonstandard {
+    //contains the MDB2 object of the db once we have connected
+    var $db;
+    
+    //contains the PHPUnit_TestCase object
+    var $test;
+    
+    /**
+     * Returns a driver-specific object
+     */
+    function factory($db, $test) {
+        $classname = 'MDB2_nonstandard_'.$db->phptype;
+        include_once $classname.'.php';
+        if (class_exists($classname)) {
+            $obj =& new $classname();
+            $obj->db =& $db;
+            $obj->test =& $test;
+            return $obj;
+        }
+        return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+            'not capable', __FUNCTION__);
+    }
+    
+    /**
+     * Create a TRIGGER
+     */
+    function createTrigger($trigger_name, $table_name) {
+        return $this->db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
+            'not capable', __FUNCTION__);
+    }
+
+    /**
+     * Check if getTriggerDefinition() returns the correct definition for the trigger
+     */
+    function checkTrigger($trigger_name, $table_name, $def) {
+        $this->test->assertEquals(strtoupper($trigger_name), strtoupper($def['trigger_name']), 'Error getting trigger definition (name)');
+        $this->test->assertEquals(strtoupper($table_name),  strtoupper($def['table_name']),   'Error getting trigger definition (table)');
+        $this->test->assertEquals('AFTER',  $def['trigger_type'], 'Error getting trigger definition (type)');
+        $this->test->assertEquals('UPDATE', $def['trigger_event'], 'Error getting trigger definition (event)');
+        $this->test->assertTrue(is_string($def['trigger_body']), 'Error getting trigger definition (body)');
+        $this->test->assertTrue($def['trigger_enabled'], 'Error getting trigger definition (enabled)');
+        //$this->test->assertTrue(empty($def['trigger_comment']),  'Error getting trigger definition (comment)');
+    }
+
+    /**
+     * Drop a TRIGGER
+     */
+    function dropTrigger($trigger_name, $table_name) {
+        return $this->db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
+            'not capable', __FUNCTION__);
+    }
+    
+    /**
+     * Create a VIEW
+     */
+    function createView($view_name, $table_name) {
+        $query = 'CREATE VIEW '. $this->db->quoteIdentifier($view_name, true)
+                .' (id) AS SELECT id FROM '
+                . $this->db->quoteIdentifier($table_name, true) .' WHERE id > 1';
+        return $this->db->exec($query);
+    }
+
+    /**
+     * Drop a VIEW
+     */
+    function dropView($view_name) {
+        return $this->db->exec('DROP VIEW '.$view_name);
+    }
+
+    /**
+     * Create a FUNCTION
+     */
+    function createFunction($name) {
+        return $this->db->raiseError(MDB2_ERROR_NOT_CAPABLE, null, null,
+            'not capable', __FUNCTION__);
+    }
+
+    /**
+     * Drop a FUNCTION
+     */
+    function dropFunction($name) {
+        return $this->db->exec('DROP FUNCTION '.$name);
+    }
+}
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_sqlite.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_sqlite.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_nonstandard_sqlite.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_nonstandard_sqlite.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,75 @@
+                       |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_nonstandard_sqlite.php,v 1.5 2007/03/05 21:35:54 quipo Exp $
+
+class MDB2_nonstandard_sqlite extends MDB2_nonstandard {
+
+    var $trigger_body = '';
+
+    function createTrigger($trigger_name, $table_name) {
+        $this->trigger_body = 'CREATE TRIGGER '. $trigger_name .' AFTER UPDATE ON '. $table_name .'
+BEGIN
+    UPDATE '. $table_name .' SET somedescription = new.somename WHERE id = old.id;
+END';
+        return $this->db->standaloneQuery($this->trigger_body);
+    }
+
+    function checkTrigger($trigger_name, $table_name, $def) {
+        parent::checkTrigger($trigger_name, $table_name, $def);
+        $this->test->assertEquals($this->trigger_body, $def['trigger_body']);
+    }
+
+    function dropTrigger($trigger_name, $table_name) {
+        return $this->db->standaloneQuery('DROP TRIGGER '.$trigger_name);
+    }
+    
+    function createView($view_name, $table_name) {
+        $query = 'CREATE VIEW '. $this->db->quoteIdentifier($view_name, true)
+                .' AS SELECT id FROM '
+                . $this->db->quoteIdentifier($table_name, true) .' WHERE id > 1';
+        return $this->db->exec($query);
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_reverse_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_reverse_testcase.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_reverse_testcase.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_reverse_testcase.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,671 @@
+            |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_reverse_testcase.php,v 1.50 2008/02/17 15:44:05 quipo Exp $
+
+require_once 'MDB2_testcase.php';
+
+class MDB2_Reverse_TestCase extends MDB2_TestCase
+{
+    //test table name (it is dynamically created/dropped)
+    var $table       = 'testtable';
+    var $fields      = array();
+    var $indices     = array();
+    var $constraints = array();
+
+    var $table2      = 'testtable2';
+    var $fields2      = array();
+    var $indices2     = array();
+    var $constraints2 = array();
+
+    function setUp() {
+        parent::setUp();
+        $this->db->loadModule('Reverse', null, true);
+        $this->db->loadModule('Manager', null, true);
+
+        //Table structure
+        $this->fields = array(
+            'id' => array(  //PK
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+                'length'  => 4,
+            ),
+            'id2' => array( //UNIQUE_MULTIFIELD(1/2)
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+            ),
+            'id3' => array( //UNIQUE_MULTIFIELD(2/2)
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+            ),
+            'id4' => array( //UNIQUE
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+            ),
+            'somename' => array( //NORMAL INDEX
+                'type'   => 'text',
+                'length' => 12,
+            ),
+            'somedescription' => array( //INDEX_MULTIFIELD(1/2)
+                'type'   => 'text',
+                'length' => 12,
+            ),
+            'sex' => array( //INDEX_MULTIFIELD(2/2)
+                'type' => 'text',
+                'length' => 1,
+                'default' => 'M',
+            ),
+        );
+
+        $options = array();
+        if ('mysql' == substr($this->db->phptype, 0, 5)) {
+            $options['type'] = 'innodb';
+        }
+
+        if (!$this->tableExists($this->table)) {
+            $this->db->manager->createTable($this->table, $this->fields, $options);
+        }
+
+        //Table2 structure
+        $this->fields2 = array(
+            'ext_id' => array(  //SINGLE_FK
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+            ),
+            'ext_id2' => array( //MULTI_FK(1/2)
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+            ),
+            'ext_id3' => array( //MULTI_FK(2/2)
+                'type'     => 'integer',
+                'unsigned' => 1,
+                'notnull'  => 1,
+                'default'  => 0,
+            ),
+        );
+
+        if (!$this->tableExists($this->table2)) {
+            $this->db->manager->createTable($this->table2, $this->fields2, $options);
+        }
+    }
+
+    function tearDown() {
+        if ($this->tableExists($this->table2)) {
+            $this->db->manager->dropTable($this->table2);
+        }
+        if ($this->tableExists($this->table)) {
+            $this->db->manager->dropTable($this->table);
+        }
+        $this->db->popExpect();
+        unset($this->dsn);
+        if (!PEAR::isError($this->db->manager)) {
+            $this->db->disconnect();
+        }
+        unset($this->db);
+    }
+
+    function setUpIndices()
+    {
+        //Indices definition
+        $this->indices = array(
+            'sometestindex' => array(
+                'fields' => array(
+                    'somename' => array(
+                        'sorting' => 'ascending',
+                    ),
+                ),
+                'unique' => false,
+            ),
+            'multipletestindex' => array(
+                'fields' => array(
+                    'somedescription' => array(
+                        'sorting' => 'ascending',
+                    ),
+                    'sex' => array(
+                        'sorting' => 'ascending',
+                    ),
+                ),
+            ),
+        );
+        foreach ($this->indices as $index_name => $index) {
+            $result = $this->db->manager->createIndex($this->table, $index_name, $index);
+            $this->assertFalse(PEAR::isError($result), 'Error creating index: '.$index_name);
+            if (PEAR::isError($result)) {
+                break;
+            }
+        }
+        return PEAR::isError($result);
+    }
+
+    function setUpConstraints()
+    {
+        //Constraints definition
+        $this->constraints = array(
+            'pkfield' => array(
+                'fields' => array(
+                    'id' => array(
+                        'sorting' => 'ascending',
+                    ),
+                ),
+                'primary' => true,
+            ),
+            'multipleunique' => array(
+                'fields' => array(
+                    'id2' => array(
+                        'sorting' => 'ascending',
+                    ),
+                    'id3' => array(
+                        'sorting' => 'ascending',
+                    ),
+                ),
+                'unique' => true,
+            ),
+            'singleunique' => array(
+                'fields' => array(
+                    'id4' => array(
+                        'sorting' => 'ascending',
+                    ),
+                ),
+                'unique' => true,
+            ),
+        );
+        $failed1 = false;
+        foreach ($this->constraints as $constraint_name => $constraint) {
+            //$this->db->manager->dropConstraint($this->table, $constraint_name);
+            $result = $this->db->manager->createConstraint($this->table, $constraint_name, $constraint);
+            $this->assertFalse(PEAR::isError($result), 'Error creating constraint: '.$constraint_name);
+            if (PEAR::isError($result)) {
+                $failed1 = true;
+                break;
+            }
+        }
+
+        $this->fk_constraint1_name = $this->table2.'_fk_'.$this->table.'_id';
+        //$this->fk_constraint2_name = $this->table2.'_fk_'.$this->table.'_id2_id3';
+        $this->fk_constraint2_name = $this->table2.'_fk_'.$this->table.'_2f';
+        $this->constraints2 = array(
+            $this->fk_constraint1_name => array(
+                'primary' => false,
+                'unique'  => false,
+                'foreign' => true,
+                'check'   => false,
+                'fields' => array(
+                    'ext_id' => array(
+                        'position' => 1,
+                        'sorting' => 'ascending',
+                    ),
+                ),
+                'references' => array(
+                    'table'  => $this->table,
+                    'fields' => array(
+                        'id' => array(
+                            'position' => 1,
+                        ),
+                    ),
+                ),
+                'onupdate' => 'CASCADE',
+                'ondelete' => 'CASCADE',
+                'match'    => 'FULL',
+                'deferrable'        => false,
+                'initiallydeferred' => false,
+            ),
+            $this->fk_constraint2_name => array(
+                'primary' => false,
+                'unique'  => false,
+                'foreign' => true,
+                'check'   => false,
+                'fields' => array(
+                    'ext_id2' => array(
+                        'position' => 1,
+                        'sorting'  => 'ascending',
+                    ),
+                    'ext_id3' => array(
+                        'position' => 2,
+                        'sorting'  => 'ascending',
+                    ),
+                ),
+                'references' => array(
+                    'table'  => $this->table,
+                    'fields' => array(
+                        'id2' => array(
+                            'position' => 1,
+                        ),
+                        'id3' => array(
+                            'position' => 2,
+                        ),
+                    ),
+                ),
+                'onupdate' => 'NO ACTION',
+                'ondelete' => 'NO ACTION',
+                'match'    => 'FULL',
+                'deferrable'        => false,
+                'initiallydeferred' => false,
+            ),
+        );
+        $failed2 = false;
+        foreach ($this->constraints2 as $constraint_name => $constraint) {
+            //$this->db->manager->dropConstraint($this->table, $constraint_name);
+            $result = $this->db->manager->createConstraint($this->table2, $constraint_name, $constraint);
+            $this->assertFalse(PEAR::isError($result), 'Error creating constraint: '.$constraint_name);
+            if (PEAR::isError($result)) {
+                $failed2 = true;
+                break;
+            }
+        }
+
+        return !($failed1 || $failed2);
+    }
+
+    /**
+     * Test tableInfo('table_name')
+     */
+    function testTableInfo()
+    {
+        if (!$this->methodExists($this->db->reverse, 'tableInfo')) {
+            return;
+        }
+
+        $table_info = $this->db->reverse->tableInfo($this->table);
+        if (PEAR::isError($table_info)) {
+            $this->assertTrue(false, 'Error in tableInfo(): '.$table_info->getMessage().' :: '.$table_info->getUserInfo());
+        } else {
+            $this->assertEquals(count($this->fields), count($table_info), 'The number of fields retrieved is different from the expected one');
+            foreach ($table_info as $field_info) {
+                $this->assertEquals($this->table, $field_info['table'], 'the table name is not correct');
+                if (!array_key_exists(strtolower($field_info['name']), $this->fields)) {
+                    $this->assertTrue(false, 'Field names do not match ('.$field_info['name'].' is unknown)');
+                }
+                //expand test, for instance adding a check on types...
+            }
+        }
+
+        if (!$this->supported('result_introspection')) {
+            return;
+        }
+
+        $result = $this->db->query('SELECT * FROM '.$this->table);
+        $table_info = $this->db->reverse->tableInfo($result);
+        if (PEAR::isError($table_info)) {
+            $this->assertTrue(false, 'Error in tableInfo(): '.$table_info->getMessage().' :: '.$table_info->getUserInfo());
+        } else {
+            $this->assertEquals(count($this->fields), count($table_info), 'The number of fields retrieved is different from the expected one');
+            foreach ($table_info as $field_info) {
+                //not all the drivers are capable of returning the table name,
+                //and may return an empty value
+                if (!empty($field_info['table'])) {
+                    $this->assertEquals($this->table, $field_info['table'], 'the table name is not correct');
+                }
+                if (!array_key_exists(strtolower($field_info['name']), $this->fields)) {
+                    $this->assertTrue(false, 'Field names do not match ('.$field_info['name'].' is unknown)');
+                }
+                //expand test, for instance adding a check on types...
+            }
+        }
+        $result->free();
+    }
+
+    /**
+     * Test getTableFieldDefinition($table, $field_name)
+     */
+    function testGetTableFieldDefinition()
+    {
+        if (!$this->methodExists($this->db->reverse, 'getTableFieldDefinition')) {
+            return;
+        }
+
+        //test integer not null
+        $field_info = $this->db->reverse->getTableFieldDefinition($this->table, 'id');
+        if (PEAR::isError($field_info)) {
+            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
+        } else {
+            $field_info = array_shift($field_info);
+            $this->assertEquals('integer', $field_info['type'], 'The field type is different from the expected one');
+            $expected_length = ($this->db->phptype == 'oci8') ? 10 : 4;
+            $this->assertEquals($expected_length, $field_info['length'], 'The field length is different from the expected one');
+            $this->assertTrue($field_info['notnull'], 'The field can be null unlike it was expected');
+            $this->assertEquals('0', $field_info['default'], 'The field default value is different from the expected one');
+        }
+
+        //test blob
+        $field_info = $this->db->reverse->getTableFieldDefinition('files', 'picture');
+        if (PEAR::isError($field_info)) {
+            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage().' :: '.$field_info->getUserInfo());
+        } else {
+            $field_info = array_shift($field_info);
+            $this->assertEquals($field_info['type'], 'blob', 'The field type is different from the expected one');
+            $this->assertFalse($field_info['notnull'], 'The field cannot be null unlike it was expected');
+        }
+
+        //test varchar(100) not null
+        $field_info = $this->db->reverse->getTableFieldDefinition('users', 'user_name');
+        if (PEAR::isError($field_info)) {
+            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
+        } else {
+            $field_info = array_shift($field_info);
+            $this->assertEquals('text', $field_info['type'], 'The field type is different from the expected one');
+            $this->assertEquals(12, $field_info['length'], 'The field length is different from the expected one');
+            $this->assertFalse($field_info['notnull'], 'The field can be null unlike it was expected');
+            $this->assertNull($field_info['default'], 'The field default value is different from the expected one');
+            $this->assertFalse($field_info['fixed'], 'The field fixed value is different from the expected one');
+        }
+
+        //test decimal
+        $field_info = $this->db->reverse->getTableFieldDefinition('users', 'quota');
+        if (PEAR::isError($field_info)) {
+            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
+        } else {
+            $field_info = array_shift($field_info);
+            $this->assertEquals('decimal', $field_info['type'], 'The field type is different from the expected one');
+            $expected_length = ($this->db->phptype == 'oci8') ? '22,2' : '18,2';
+            $this->assertEquals($expected_length, $field_info['length'], 'The field length is different from the expected one');
+        }
+
+        $field_info = $this->db->reverse->getTableFieldDefinition('users', 'user_name');
+        if (PEAR::isError($field_info)) {
+            $this->assertTrue(false, 'Error in getTableFieldDefinition(): '.$field_info->getMessage());
+        } else {
+            $field_info = array_shift($field_info);
+            $this->assertEquals('text', $field_info['type'], 'The field type is different from the expected one');
+            $this->assertEquals(12, $field_info['length'], 'The field length is different from the expected one');
+            $this->assertFalse($field_info['notnull'], 'The field can be null unlike it was expected');
+            $this->assertNull($field_info['default'], 'The field default value is different from the expected one');
+            $this->assertFalse($field_info['fixed'], 'The field fixed value is different from the expected one');
+        }
+    }
+
+    /**
+     * Test getTableIndexDefinition($table, $index_name)
+     */
+    function testGetTableIndexDefinition()
+    {
+        if (!$this->methodExists($this->db->reverse, 'getTableIndexDefinition')) {
+            return;
+        }
+
+        $this->setUpIndices();
+
+        //test index names
+        foreach ($this->indices as $index_name => $index) {
+            $index_info = $this->db->reverse->getTableIndexDefinition($this->table, $index_name);
+            if (PEAR::isError($index_info)) {
+                $this->assertFalse(true, 'Error getting table index definition');
+            } else {
+                $field_names = array_keys($index['fields']);
+                $this->assertEquals($field_names, array_keys($index_info['fields']), 'Error listing index fields');
+            }
+        }
+
+        //test INDEX
+        $index_name = 'sometestindex';
+        $index_info = $this->db->reverse->getTableIndexDefinition($this->table, $index_name);
+        if (PEAR::isError($index_info)) {
+            $this->assertTrue(false, 'Error in getTableIndexDefinition(): '.$index_info->getMessage());
+        } else {
+            $this->assertEquals(1, count($index_info['fields']), 'The INDEX is not on one field unlike it was expected');
+            $expected_fields = array_keys($this->indices[$index_name]['fields']);
+            $actual_fields = array_keys($index_info['fields']);
+            $this->assertEquals($expected_fields, $actual_fields, 'The INDEX field names don\'t match');
+            $this->assertEquals(1, $index_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
+        }
+
+        //test INDEX on MULTIPLE FIELDS
+        $index_name = 'multipletestindex';
+        $index_info = $this->db->reverse->getTableIndexDefinition($this->table, $index_name);
+        if (PEAR::isError($index_info)) {
+            $this->assertTrue(false, 'Error in getTableIndexDefinition(): '.$index_info->getMessage());
+        } else {
+            $this->assertEquals(2, count($index_info['fields']), 'The INDEX is not on two fields unlike it was expected');
+            $expected_fields = array_keys($this->indices[$index_name]['fields']);
+            $actual_fields = array_keys($index_info['fields']);
+            $this->assertEquals($expected_fields, $actual_fields, 'The INDEX field names don\'t match');
+            $this->assertEquals(1, $index_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
+            $this->assertEquals(2, $index_info['fields'][$expected_fields[1]]['position'], 'The field position in the INDEX is not correct');
+        }
+
+        if (!$this->setUpConstraints()) {
+            return;
+        }
+        //constraints should NOT be listed
+        foreach (array_keys($this->constraints) as $constraint_name) {
+            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+            $result = $this->db->reverse->getTableIndexDefinition($this->table, $constraint_name);
+            $this->assertTrue(PEAR::isError($result), 'Error listing index definition, this is a CONSTRAINT');
+        }
+
+        //test index created WITHOUT using MDB2 (i.e. without the "_idx" suffix)
+        //NB: MDB2 > v.2.3.0 provides a fallback mechanism
+    }
+
+    /**
+     * Test testGetTableConstraintDefinition($table, $constraint_name)
+     */
+    function testGetTableConstraintDefinition()
+    {
+        if (!$this->methodExists($this->db->reverse, 'getTableConstraintDefinition')) {
+            return;
+        }
+
+        if (!$this->setUpConstraints()) {
+            return;
+        }
+
+        //test constraint names
+        foreach ($this->constraints as $constraint_name => $constraint) {
+            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+            $result = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
+            $this->db->popExpect();
+            if (PEAR::isError($result) && isset($constraint['primary']) && $constraint['primary']) {
+                echo 'Error reading primary constraint, trying with name "primary" instead .. ';
+                $constraint_name = 'primary';
+                $result = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
+            }
+            if (PEAR::isError($result)) {
+                $this->assertFalse(true, 'Error getting table constraint definition ('.$constraint_name.')');
+            } else {
+                $constraint_names = array_keys($constraint['fields']);
+                $this->assertEquals($constraint_names, array_keys($result['fields']), 'Error listing constraint fields');
+            }
+        }
+
+        $this->setUpIndices();
+        //indices should NOT be listed
+        foreach (array_keys($this->indices) as $index_name) {
+            $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+            $result = $this->db->reverse->getTableConstraintDefinition($this->table, $index_name);
+            $this->db->popExpect();
+            $this->assertTrue(PEAR::isError($result), 'Error listing constraint definition, this is a normal INDEX');
+        }
+
+        //test PK
+        $this->db->expectError(MDB2_ERROR_NOT_FOUND);
+        $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, 'pkfield');
+        $this->db->popExpect();
+        if (PEAR::isError($constraint_info)) {
+            echo 'Error reading primary constraint, trying with name "primary" instead .. ';
+            $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, 'primary');
+        }
+        if (PEAR::isError($constraint_info)) {
+            $this->assertTrue(false, 'Error in getTableConstraintDefinition(): '.$constraint_info->getMessage());
+        } else {
+            $this->assertTrue($constraint_info['primary'], 'The field is not a PK unlike it was expected');
+        }
+
+        //test UNIQUE
+        $constraint_name = 'singleunique';
+        $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
+        if (PEAR::isError($constraint_info)) {
+            $this->assertTrue(false, 'Error in getTableConstraintDefinition(): '.$constraint_info->getMessage());
+        } else {
+            $this->assertTrue($constraint_info['unique'], 'The field is not a PK unlike it was expected');
+            $this->assertTrue(empty($constraint_info['primary']), 'The field is a PK unlike it was expected');
+            $this->assertEquals(1, count($constraint_info['fields']), 'The UNIQUE INDEX is not on one field unlike it was expected');
+            $expected_fields = array_keys($this->constraints[$constraint_name]['fields']);
+            $actual_fields = array_keys($constraint_info['fields']);
+            $this->assertEquals($expected_fields, $actual_fields, 'The UNIQUE INDEX field names don\'t match');
+            $this->assertEquals(1, $constraint_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
+        }
+
+        //test UNIQUE on MULTIPLE FIELDS
+        $constraint_name = 'multipleunique';
+        $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table, $constraint_name);
+        if (PEAR::isError($constraint_info)) {
+            $this->assertTrue(false, 'Error in getTableConstraintDefinition(): '.$constraint_info->getMessage());
+        } else {
+            $this->assertTrue($constraint_info['unique'], 'The field is not a PK unlike it was expected');
+            $this->assertTrue(empty($constraint_info['primary']), 'The field is a PK unlike it was expected');
+            $this->assertEquals(2, count($constraint_info['fields']), 'The UNIQUE INDEX is not on two fields unlike it was expected');
+            $expected_fields = array_keys($this->constraints[$constraint_name]['fields']);
+            $actual_fields = array_keys($constraint_info['fields']);
+            $this->assertEquals($expected_fields, $actual_fields, 'The UNIQUE INDEX field names don\'t match');
+            $this->assertEquals(1, $constraint_info['fields'][$expected_fields[0]]['position'], 'The field position in the INDEX is not correct');
+            $this->assertEquals(2, $constraint_info['fields'][$expected_fields[1]]['position'], 'The field position in the INDEX is not correct');
+        }
+
+        //test FOREIGN KEYs
+        foreach (array_keys($this->constraints2) as $constraint_name) {
+            $constraint_info = $this->db->reverse->getTableConstraintDefinition($this->table2, $constraint_name);
+            if (PEAR::isError($constraint_info)) {
+                $this->assertTrue(false, 'Error in getTableConstraintDefinition():'. $constraint_info->getMessage());
+            } else {
+                $this->_compareFKdefinitions($this->constraints2[$constraint_name], $constraint_info);
+            }
+        }
+    }
+
+    /**
+     * Check the original FK constraint definition against the reverse engineered one.
+     *
+     * Ideally, the retrieved FK constraint definition should be equal to the
+     * one used to create the constraint, but not all the DBMS support all the
+     * parameters, so check the common base and do some generic checks for the
+     * other patameters.
+     */
+    function _compareFKdefinitions($expected, $actual) {
+        //ideal case: all the parameters are supported by all the DBMS:
+        //$this->assertEquals($expected, $actual);
+
+        $this->assertEquals($expected['primary'], $actual['primary']);
+        $this->assertEquals($expected['unique'],  $actual['unique']);
+        $this->assertEquals($expected['foreign'], $actual['foreign']);
+        $this->assertEquals($expected['check'],   $actual['check']);
+        $this->assertEquals(array_keys($expected['fields']), array_keys($actual['fields']));
+        $this->assertEquals($expected['references'],   $actual['references']);
+        $this->assertEquals($expected['deferrable'],   $actual['deferrable']);
+        $this->assertEquals($expected['initiallydeferred'],   $actual['initiallydeferred']);
+        $this->assertTrue(!empty($actual['match']));
+        $this->assertTrue(!empty($actual['onupdate']));
+        $this->assertTrue(!empty($actual['ondelete']));
+    }
+
+    /**
+     * Test getSequenceDefinition($sequence)
+     */
+    function testGetSequenceDefinition() {
+        //setup
+        $this->db->loadModule('Manager', null, true);
+        $sequence = 'test_sequence';
+        $sequences = $this->db->manager->listSequences();
+        if (!in_array($sequence, $sequences)) {
+            $result = $this->db->manager->createSequence($sequence);
+            $this->assertFalse(PEAR::isError($result), 'Error creating a sequence');
+        }
+
+        //test
+        $start = $this->db->nextId($sequence);
+        $def = $this->db->reverse->getSequenceDefinition($sequence);
+        $this->assertEquals($start+1, (isset($def['start']) ? $def['start'] : 1), 'Error getting sequence definition');
+
+        //cleanup
+        $result = $this->db->manager->dropSequence($sequence);
+        $this->assertFalse(PEAR::isError($result), 'Error dropping a sequence');
+    }
+
+    /**
+     * Test getTriggerDefinition($trigger)
+     */
+    function testGetTriggerDefinition() {
+        //setup
+        $trigger_name = 'test_trigger';
+
+        include_once 'MDB2_nonstandard.php';
+        $nonstd =& MDB2_nonstandard::factory($this->db, $this);
+        if (PEAR::isError($nonstd)) {
+            $this->assertTrue(false, 'Cannot create trigger: '.$nonstd->getMessage());
+            return;
+        }
+
+        $result = $nonstd->createTrigger($trigger_name, $this->table);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Cannot create trigger: '.$result->getMessage());
+            return;
+        }
+
+        //test
+        $def = $this->db->reverse->getTriggerDefinition($trigger_name);
+        if (PEAR::isError($def)) {
+            $this->assertTrue(false, 'getTriggerDefinition: '.$def->getMessage());
+        } else {
+            $nonstd->checkTrigger($trigger_name, $this->table, $def);
+        }
+
+        //cleanup
+        $result = $nonstd->dropTrigger($trigger_name, $this->table);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error dropping the trigger: '.$result->getMessage());
+            return;
+        }
+    }
+}
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_testcase.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_testcase.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_testcase.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,168 @@
+                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_testcase.php,v 1.18 2006/12/19 15:04:53 quipo Exp $
+
+class MDB2_TestCase extends PHPUnit_TestCase {
+    //contains the dsn of the database we are testing
+    var $dsn;
+    //contains the options that should be used during testing
+    var $options;
+    //contains the name of the database we are testing
+    var $database;
+    //contains the MDB2 object of the db once we have connected
+    var $db;
+    // contains field names from the test table
+    var $fields;
+    // if the tables should be cleared in the setUp() and tearDown() methods
+    var $clear_tables = true;
+
+    function MDB2_TestCase($name) {
+        $this->PHPUnit_TestCase($name);
+    }
+
+    function setUp() {
+        $this->dsn = $GLOBALS['dsn'];
+        $this->options  = $GLOBALS['options'];
+        $this->database = $GLOBALS['database'];
+        $this->db =& MDB2::factory($this->dsn, $this->options);
+        $this->db->setDatabase($this->database);
+        $this->db->expectError(MDB2_ERROR_UNSUPPORTED);
+        $this->fields = array(
+            'user_name' => 'text',
+            'user_password' => 'text',
+            'subscribed' => 'boolean',
+            'user_id' => 'integer',
+            'quota' => 'decimal',
+            'weight' => 'float',
+            'access_date' => 'date',
+            'access_time' => 'time',
+            'approved' => 'timestamp',
+        );
+        $this->clearTables();
+    }
+
+    function tearDown() {
+        $this->clearTables();
+        $this->db->popExpect();
+        unset($this->dsn);
+        if (!PEAR::isError($this->db)) {
+            $this->db->disconnect();
+        }
+        unset($this->db);
+    }
+
+    function clearTables() {
+        if (!$this->clear_tables) {
+            return;
+        }
+        if (PEAR::isError($this->db->exec('DELETE FROM users'))) {
+            $this->assertTrue(false, 'Error deleting from table users');
+        }
+        if (PEAR::isError($this->db->exec('DELETE FROM files'))) {
+            $this->assertTrue(false, 'Error deleting from table users');
+        }
+    }
+
+    function supported($feature) {
+        if (!$this->db->supports($feature)) {
+            $this->assertTrue(false, 'This database does not support '.$feature);
+            return false;
+        }
+        return true;
+    }
+
+    function verifyFetchedValues(&$result, $rownum, $data) {
+        //$row = $result->fetchRow(MDB2_FETCHMODE_DEFAULT, $rownum);
+        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC, $rownum);
+        if (!is_array($row)) {
+            $this->assertTrue(false, 'Error result row is not an array');
+            return;
+        }
+        //reset($row);
+        foreach ($this->fields as $field => $type) {
+            //$value = current($row);
+            $value = $row[$field];
+            if ($type == 'float') {
+                $delta = 0.0000000001;
+            } else {
+                $delta = 0;
+            }
+
+            $this->assertEquals($data[$field], $value, "the value retrieved for field \"$field\" doesn't match what was stored into the rownum $rownum", $delta);
+            //next($row);
+        }
+    }
+
+    function getSampleData($row = 1) {
+        $data = array();
+        $data['user_name']     = 'user_' . $row;
+        $data['user_password'] = 'somepass';
+        $data['subscribed']    = $row % 2 ? true : false;
+        $data['user_id']       = $row;
+        $data['quota']         = strval($row/100);
+        $data['weight']        = sqrt($row);
+        $data['access_date']   = MDB2_Date::mdbToday();
+        $data['access_time']   = MDB2_Date::mdbTime();
+        $data['approved']      = MDB2_Date::mdbNow();
+        return $data;
+    }
+
+    function methodExists(&$class, $name) {
+        if (is_object($class)
+            && in_array(strtolower($name), array_map('strtolower', get_class_methods($class)))
+        ) {
+            return true;
+        }
+        $this->assertTrue(false, 'method '. $name.' not implemented in '.get_class($class));
+        return false;
+    }
+
+    function tableExists($table) {
+        $this->db->loadModule('Manager', null, true);
+        $tables = $this->db->manager->listTables();
+        return in_array(strtolower($table), array_map('strtolower', $tables));
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_usage_testcase.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_usage_testcase.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/MDB2_usage_testcase.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/MDB2_usage_testcase.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,1853 @@
+                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: MDB2_usage_testcase.php,v 1.108 2008/03/01 14:02:29 quipo Exp $
+
+require_once 'MDB2_testcase.php';
+
+class MDB2_Usage_TestCase extends MDB2_TestCase {
+    /**
+     * Test typed data storage and retrieval
+     *
+     * This tests typed data storage and retrieval by executing a single
+     * prepared query and then selecting the data back from the database
+     * and comparing the results
+     */
+    function testStorage() {
+        $data = $this->getSampleData(1234);
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+        $result = $stmt->execute(array_values($data));
+        $stmt->free();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query, $this->fields);
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+
+        $this->verifyFetchedValues($result, 0, $data);
+    }
+
+    /**
+     * Test fetchOne()
+     *
+     * This test bulk fetching of result data by using a prepared query to
+     * insert an number of rows of data and then retrieving the data columns
+     * one by one
+     */
+    function testFetchOne() {
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+
+        $stmt->free();
+
+        foreach ($this->fields as $field => $type) {
+            for ($row = 0; $row < $total_rows; $row++) {
+                $result =& $this->db->query('SELECT '.$field.' FROM users WHERE user_id='.$row, $type);
+                $value = $result->fetchOne();
+                if (PEAR::isError($value)) {
+                    $this->assertTrue(false, 'Error fetching row '.$row.' for field '.$field.' of type '.$type);
+                } else {
+                    $this->assertEquals(strval($data[$row][$field]), strval(trim($value)), 'the query field '.$field.' of type '.$type.' for row '.$row);
+                    $result->free();
+                }
+            }
+        }
+    }
+
+    /**
+     * Test fetchCol()
+     *
+     * Test fetching a column of result data. Two different columns are retrieved
+     */
+    function testFetchCol() {
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+
+        $stmt->free();
+
+        $first_col = array();
+        for ($row = 0; $row < $total_rows; $row++) {
+            $first_col[$row] = "user_$row";
+        }
+
+        $second_col = array();
+        for ($row = 0; $row < $total_rows; $row++) {
+            $second_col[$row] = $row;
+        }
+
+        $query = 'SELECT user_name, user_id FROM users ORDER BY user_name';
+        $result =& $this->db->query($query, array('text', 'integer'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: '.$result->getMessage());
+        }
+        $values = $result->fetchCol(0);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching first column');
+        } else {
+            $this->assertEquals($first_col, $values);
+        }
+        $result->free();
+
+        $query = 'SELECT user_name, user_id FROM users ORDER BY user_name';
+        $result =& $this->db->query($query, array('text', 'integer'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: '.$result->getMessage());
+        }
+        $values = $result->fetchCol(1);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching second column');
+        } else {
+            $this->assertEquals($second_col, $values);
+        }
+        $result->free();
+    }
+
+    /**
+     * Test fetchAll()
+     *
+     * Test fetching an entire result set in one shot.
+     */
+    function testFetchAll() {
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+        $fields = array_keys($data[0]);
+        $query = 'SELECT '. implode (', ', $fields). ' FROM users ORDER BY user_name';
+
+        $stmt->free();
+
+        $result =& $this->db->query($query, $this->fields);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: ' .$result->getMessage());
+        }
+        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching the result set');
+        } else {
+            for ($i=0; $i<$total_rows; $i++) {
+                foreach ($data[$i] as $key => $val) {
+                    $this->assertEquals(strval($val), strval($values[$i][$key]), 'Row #'.$i.' ['.$key.']');
+                }
+            }
+        }
+        $result->free();
+        
+        //test $rekey=true
+        $result =& $this->db->query('SELECT user_id, user_name FROM users ORDER BY user_id', $this->fields);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: '.$result->getMessage());
+        }
+        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching the result set');
+        } else {
+            for ($i=0; $i<$total_rows; $i++) {
+                list($id, $name) = each($values);
+                $this->assertEquals($data[$i]['user_id'],   $id,   'Row #'.$i.' ["user_id"]');
+                $this->assertEquals($data[$i]['user_name'], $name, 'Row #'.$i.' ["user_name"]');
+            }
+        }
+        $result->free();
+
+
+        //test $rekey=true, $force_array=true
+        $result =& $this->db->query('SELECT user_id, user_name FROM users ORDER BY user_id', $this->fields);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: '.$result->getMessage());
+        }
+        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true, true);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching the result set');
+        } else {
+            for ($i=0; $i<$total_rows; $i++) {
+                list($id, $value) = each($values);
+                $this->assertEquals($data[$i]['user_id'],   $id,                 'Row #'.$i.' ["user_id"]');
+                $this->assertEquals($data[$i]['user_name'], $value['user_name'], 'Row #'.$i.' ["user_name"]');
+            }
+        }
+        $result->free();
+
+        //test $rekey=true, $force_array=true, $group=true
+        $result =& $this->db->query('SELECT user_password, user_name FROM users ORDER BY user_name', $this->fields);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: '.$result->getMessage());
+        }
+        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true, true, true);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching the result set');
+        } else {
+            //all the records have the same user_password value
+            $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows');
+            $values = $values[$data[0]['user_password']];
+            for ($i=0; $i<$total_rows; $i++) {
+                $this->assertEquals($data[$i]['user_name'], $values[$i]['user_name'], 'Row #'.$i.' ["user_name"]');
+            }
+        }
+        $result->free();
+
+        //test $rekey=true, $force_array=true, $group=false (with non unique key)
+        $result =& $this->db->query('SELECT user_password, user_name FROM users ORDER BY user_name', $this->fields);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error during query: '.$result->getMessage());
+        }
+        $values = $result->fetchAll(MDB2_FETCHMODE_ASSOC, true, true, false);
+        if (PEAR::isError($values)) {
+            $this->assertTrue(false, 'Error fetching the result set');
+        } else {
+            //all the records have the same user_password value, they are overwritten
+            $this->assertEquals(1, count($values), 'Error: incorrect number of returned rows');
+            $key = $data[0]['user_password'];
+            $this->assertEquals(1, count($values[$key]), 'Error: incorrect number of returned rows');
+            $this->assertEquals($data[4]['user_name'], $values[$key]['user_name']);
+        }
+        $result->free();
+    }
+
+    /**
+     * Test different fetch modes
+     *
+     * Test fetching results using different fetch modes
+     * NOTE: several tests still missing
+     */
+    function testFetchModes() {
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+
+        $stmt->free();
+
+        // test ASSOC
+        $query = 'SELECT A.user_name FROM users A, users B WHERE A.user_id = B.user_id';
+        $value = $this->db->queryRow($query, array($this->fields['user_name']), MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($value)) {
+            $this->assertTrue(false, 'Error fetching the result set');
+        } else {
+            $this->assertTrue(!empty($value['user_name']), 'Error fetching the associative result set from join');
+        }
+    }
+
+    /**
+     * Test multi_query option
+     *
+     * This test attempts to send multiple queries at once using the multi_query
+     * option and then retrieves each result.
+     */
+    function testMultiQuery() {
+        $multi_query_orig = $this->db->getOption('multi_query');
+        if (PEAR::isError($multi_query_orig)) {
+            $this->assertTrue(false, 'Error getting multi_query option value: '.$multi_query_orig->getMessage());
+            return;
+        }
+
+        $this->db->setOption('multi_query', true);
+
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+
+        $stmt->free();
+
+        $query = '';
+        for ($row = 0; $row < $total_rows; $row++) {
+            $query.= 'SELECT user_name FROM users WHERE user_id='.$row.';';
+        }
+        $result =& $this->db->query($query, 'text');
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $value = $result->fetchOne();
+            if (PEAR::isError($value)) {
+                $this->assertTrue(false, 'Error fetching row '.$row);
+            } else {
+                $this->assertEquals(strval($data[$row]['user_name']), strval(trim($value)), 'the query field username of type "text" for row '.$row);
+            }
+            if (PEAR::isError($result->nextResult())) {
+                $this->assertTrue(false, 'Error moving result pointer');
+            }
+        }
+
+        $result->free();
+        $this->db->setOption('multi_query', $multi_query_orig);
+    }
+
+    /**
+     * Test prepared queries
+     *
+     * Tests prepared queries, making sure they correctly deal with ?, !, and '
+     */
+    function testPreparedQueries() {
+        $data = array(
+            array(
+                'user_name' => 'Sure!',
+                'user_password' => 'Do work?',
+                'user_id' => 1,
+            ),
+            array(
+                'user_name' => 'For Sure!',
+                'user_password' => "Doesn't?",
+                'user_id' => 2,
+            ),
+        );
+
+        $query = "INSERT INTO users (user_name, user_password, user_id) VALUES (?, ?, ?)";
+        $stmt = $this->db->prepare($query, array('text', 'text', 'integer'), MDB2_PREPARE_MANIP);
+
+        $text = $data[0]['user_name'];
+        $question = $data[0]['user_password'];
+        $userid = $data[0]['user_id'];
+
+        // bind out of order
+        $stmt->bindParam(0, $text);
+        $stmt->bindParam(2, $userid);
+        $stmt->bindParam(1, $question);
+
+        $result = $stmt->execute();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(true, 'Could not execute prepared query with question mark placeholders. Error: '.$error);
+        }
+
+        $text = $data[1]['user_name'];
+        $question = $data[1]['user_password'];
+        $userid = $data[1]['user_id'];
+
+        $result = $stmt->execute();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(true, 'Could not execute prepared query with bound parameters. Error: '.$error);
+        }
+        $stmt->free();
+        $this->clearTables();
+
+        $query = "INSERT INTO users (user_name, user_password, user_id) VALUES (:text, :question, :userid)";
+        $stmt = $this->db->prepare($query, array('text', 'text', 'integer'), MDB2_PREPARE_MANIP);
+        if (PEAR::isError($stmt)) {
+            $this->assertTrue(false, 'Error preparing query: ' . $stmt->getMessage. ' :: '.$stmt->getUserInfo());
+        }
+
+        $stmt->bindValue('text', $data[0]['user_name']);
+        $stmt->bindValue('question', $data[0]['user_password']);
+        $stmt->bindValue('userid', $data[0]['user_id']);
+
+        $result = $stmt->execute();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(true, 'Could not execute prepared query with named placeholders. Error: '.$error);
+        }
+        $stmt->free();
+
+        $query = "INSERT INTO users (user_name, user_password, user_id) VALUES (".$this->db->quote($data[1]['user_name'], 'text').", :question, :userid)";
+        $stmt = $this->db->prepare($query, array('text', 'integer'), MDB2_PREPARE_MANIP);
+
+        $stmt->bindValue('question', $data[1]['user_password']);
+        $stmt->bindValue('userid', $data[1]['user_id']);
+
+        $result = $stmt->execute();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(true, 'Could not execute prepared query with named placeholders and a quoted text value in front. Error: '.$result->getMessage());
+        }
+        $stmt->free();
+
+        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_id=:user_id';
+        $stmt = $this->db->prepare($query, array('integer'), array('text', 'text', 'integer'));
+        foreach ($data as $row_data) {
+            $result =& $stmt->execute(array('user_id' => $row_data['user_id']));
+            if (PEAR::isError($result)) {
+                $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared. Error: '.$result->getUserinfo());
+                break;
+            }
+            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+            if (!is_array($row)) {
+                $this->assertTrue(false, 'Prepared SELECT failed');
+            } else {
+                $diff = (array)array_diff($row, $row_data);
+                $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
+            }
+        }
+        $stmt->free();
+
+        $row_data = reset($data);
+        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_id='.$this->db->quote($row_data['user_id'], 'integer');
+        $stmt = $this->db->prepare($query, null, array('text', 'text', 'integer'));
+        $result =& $stmt->execute(array());
+        if (PEAR::isError($result)) {
+            $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared statement with no placeholders. Error: '.$result->getUserinfo());
+            break;
+        }
+        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        if (!is_array($row)) {
+            $this->assertTrue(false, 'Prepared SELECT failed');
+        } else {
+            $diff = (array)array_diff($row, $row_data);
+            $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
+        }
+        $stmt->free();
+
+        $row_data = reset($data);
+        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_name='.$this->db->quote($row_data['user_name'], 'text').' AND user_id = ? AND user_password='.$this->db->quote($row_data['user_password'], 'text');
+        $stmt = $this->db->prepare($query, array('integer'), array('text', 'text', 'integer'));
+        $result =& $stmt->execute(array($row_data['user_id']));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared with quoted text fields around a placeholder. Error: '.$result->getUserinfo());
+            break;
+        }
+        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        if (!is_array($row)) {
+            $this->assertTrue(false, 'Prepared SELECT failed');
+        } else {
+            $diff = (array)array_diff($row, $row_data);
+            $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
+        }
+        $stmt->free();
+
+        foreach ($this->db->sql_comments as $comment) {
+            $query = 'SELECT user_name, user_password, user_id FROM users WHERE '.$comment['start'].' maps to class::foo() '.$comment['end'].' user_name=:username';
+            $row_data = reset($data);
+            $stmt = $this->db->prepare($query, array('text'), array('text', 'text', 'integer'));
+            $result =& $stmt->execute(array('username' => $row_data['user_name']));
+            if (PEAR::isError($result)) {
+                $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared where a name parameter is contained in an SQL comment ('.$comment['start'].'). Error: '.$result->getUserinfo());
+                break;
+            }
+            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+            if (!is_array($row)) {
+                $this->assertTrue(false, 'Prepared SELECT failed');
+            } else {
+                $diff = (array)array_diff($row, $row_data);
+                $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
+            }
+            $stmt->free();
+        }
+        
+        $row_data = reset($data);
+        $query = 'SELECT user_name, user_password, user_id FROM users WHERE user_name=:username OR user_password=:username';
+        $stmt = $this->db->prepare($query, array('text'), array('text', 'text', 'integer'));
+        $result =& $stmt->execute(array('username' => $row_data['user_name']));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(!PEAR::isError($result), 'Could not execute prepared where the same named parameter is used twice. Error: '.$result->getUserinfo());
+            break;
+        }
+        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        if (!is_array($row)) {
+            $this->assertTrue(false, 'Prepared SELECT failed');
+        } else {
+            $diff = (array)array_diff($row, $row_data);
+            $this->assertTrue(empty($diff), 'Prepared SELECT failed for fields: '.implode(', ', array_keys($diff)));
+        }
+        $stmt->free();
+    }
+
+    /**
+     * Test _skipDelimitedStrings(), used by prepare()
+     *
+     * If the placeholder is contained within a delimited string, it must be skipped,
+     * and the cursor position must be advanced
+     */
+    function testSkipDelimitedStrings() {
+        //test correct placeholder
+        $query = 'SELECT what FROM tbl WHERE x = ?';
+        $position = 0;
+        $p_position = strpos($query, '?');
+        $this->assertEquals($position, $this->db->_skipDelimitedStrings($query, $position, $p_position), 'Error: the cursor position has changed');
+
+        //test placeholder within a quoted string
+        $query = 'SELECT what FROM tbl WHERE x = '. $this->db->string_quoting['start'] .'blah?blah'. $this->db->string_quoting['end'] .' AND y = ?';
+        $position = 0;
+        $p_position = strpos($query, '?');
+        $new_pos = $this->db->_skipDelimitedStrings($query, $position, $p_position);
+        $this->assertTrue($position !=$new_pos, 'Error: the cursor position was not advanced');
+
+        //test placeholder within a comment
+        foreach ($this->db->sql_comments as $comment) {
+            $query = 'SELECT what FROM tbl WHERE x = '. $comment['start'] .'blah?blah'. $comment['end'] .' AND y = ?';
+            $position = 0;
+            $p_position = strpos($query, '?');
+            $new_pos = $this->db->_skipDelimitedStrings($query, $position, $p_position);
+            $this->assertTrue($position != $new_pos, 'Error: the cursor position was not advanced');
+        }
+
+        //add some tests for named placeholders and for identifier_quoting
+    }
+
+    /**
+     * Test retrieval of result metadata
+     *
+     * This tests the result metadata by executing a prepared query and
+     * select the data, and checking the result contains the correct
+     * number of columns and that the column names are in the correct order
+     */
+    function testMetadata() {
+        $data = $this->getSampleData(1234);
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        $result = $stmt->execute(array_values($data));
+        $stmt->free();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query, $this->fields);
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+
+        $numcols = $result->numCols();
+
+        $this->assertEquals(count($this->fields), $numcols, "The query result returned an incorrect number of columns unlike expected");
+
+        $column_names = $result->getColumnNames();
+        $fields = array_keys($this->fields);
+        for ($column = 0; $column < $numcols; $column++) {
+            $this->assertEquals($column, $column_names[$fields[$column]], "The query result column \"".$fields[$column]."\" was returned in an incorrect position");
+        }
+
+    }
+
+    /**
+     * Test storage and retrieval of nulls
+     *
+     * This tests null storage and retrieval by successively inserting,
+     * selecting, and testing a number of null / not null values
+     */
+    function testNulls() {
+        $portability = $this->db->getOption('portability');
+        if ($portability & MDB2_PORTABILITY_EMPTY_TO_NULL) {
+            $nullisempty = true;
+        } else {
+            $nullisempty = false;
+        }
+        $test_values = array(
+            array('test', false),
+            array('NULL', false),
+            array('null', false),
+            array('', $nullisempty),
+            array(null, true)
+        );
+
+        for ($test_value = 0; $test_value <= count($test_values); $test_value++) {
+            if ($test_value == count($test_values)) {
+                $value = 'NULL';
+                $is_null = true;
+            } else {
+                $value = $this->db->quote($test_values[$test_value][0], 'text');
+                $is_null = $test_values[$test_value][1];
+            }
+
+            $this->clearTables();
+
+            $result = $this->db->exec("INSERT INTO users (user_name,user_password,user_id) VALUES ($value,$value,0)");
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing insert query: '.$result->getMessage());
+            }
+
+            $result =& $this->db->query('SELECT user_name,user_password FROM users', array('text', 'text'));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing select query: '.$result->getMessage());
+            }
+
+            if ($is_null) {
+                $error_message = 'A query result column is not NULL unlike what was expected';
+            } else {
+                $error_message = 'A query result column is NULL even though it was expected to be different';
+            }
+
+            $row = $result->fetchRow();
+            $this->assertTrue((is_null($row[0]) == $is_null), $error_message);
+            $this->assertTrue((is_null($row[1]) == $is_null), $error_message);
+
+            $result->free();
+        }
+
+        $methods = array('fetchOne', 'fetchRow');
+
+        foreach ($methods as $method) {
+            $result =& $this->db->query('SELECT user_name FROM users WHERE user_id=123', array('text'));
+            $value = $result->$method();
+            if (PEAR::isError($value)) {
+                $this->assertTrue(false, 'Error fetching non existent row');
+            } else {
+                $this->assertNull($value, 'selecting non existent row with "'.$method.'()" did not return NULL');
+                $result->free();
+            }
+        }
+
+        $methods = array('fetchCol', 'fetchAll');
+
+        foreach ($methods as $method) {
+            $result =& $this->db->query('SELECT user_name FROM users WHERE user_id=123', array('text'));
+            $value = $result->$method();
+            if (PEAR::isError($value)) {
+                $this->assertTrue(false, 'Error fetching non existent row');
+            } else {
+                $this->assertTrue((is_array($value) && empty($value)), 'selecting non existent row with "'.$method.'()" did not return empty array');
+                $result->free();
+            }
+        }
+
+        $methods = array('queryOne', 'queryRow');
+
+        foreach ($methods as $method) {
+            $value = $this->db->$method('SELECT user_name FROM users WHERE user_id=123', array('text'));
+            if (PEAR::isError($value)) {
+                $this->assertTrue(false, 'Error fetching non existent row');
+            } else {
+                $this->assertNull($value, 'selecting non existent row with "'.$method.'()" did not return NULL');
+                $result->free();
+            }
+        }
+
+        $methods = array('queryCol', 'queryAll');
+
+        foreach ($methods as $method) {
+            $value = $this->db->$method('SELECT user_name FROM users WHERE user_id=123', array('text'));
+            if (PEAR::isError($value)) {
+                $this->assertTrue(false, 'Error fetching non existent row');
+            } else {
+                $this->assertTrue((is_array($value) && empty($value)), 'selecting non existent row with "'.$method.'()" did not return empty array');
+                $result->free();
+            }
+        }
+    }
+
+    /**
+     * Test paged queries
+     *
+     * Test the use of setLimit to return paged queries
+     */
+    function testRanges() {
+        if (!$this->supported('limit_queries')) {
+            return;
+        }
+
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+
+        $stmt->free();
+
+        for ($rows = 2, $start_row = 0; $start_row < $total_rows; $start_row += $rows) {
+
+            $this->db->setLimit($rows, $start_row);
+
+            $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_name';
+            $result =& $this->db->query($query, $this->fields);
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing select query: '.$result->getMessage());
+            }
+
+            for ($row = 0; $row < $rows && ($row + $start_row < $total_rows); $row++) {
+                $this->verifyFetchedValues($result, $row, $data[$row + $start_row]);
+            }
+        }
+
+        $this->assertFalse($result->valid(), "The query result did not seem to have reached the end of result as expected starting row $start_row after fetching upto row $row");
+
+        $result->free();
+
+        for ($rows = 2, $start_row = 0; $start_row < $total_rows; $start_row += $rows) {
+
+            $this->db->setLimit($rows, $start_row);
+
+            $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users ORDER BY user_name';
+            $result =& $this->db->query($query, $this->fields);
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing select query: '.$result->getMessage());
+            }
+
+            $result_rows = $result->numRows();
+
+            $expected = ($start_row == ($total_rows-1)) ? 1 : $rows;
+            $this->assertEquals($expected, $result_rows, 'invalid number of rows returned');
+            $this->assertTrue(($result_rows <= $rows), 'expected a result of no more than '.$rows.' but the returned number of rows is '.$result_rows);
+
+            for ($row = 0; $row < $result_rows; $row++) {
+                $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result at row '.$row.' that is before '.$result_rows.' as expected');
+                $this->verifyFetchedValues($result, $row, $data[$row + $start_row]);
+            }
+        }
+
+        $this->assertTrue(!$result->valid(), "The query result did not seem to have reached the end of result as expected starting row $start_row after fetching upto row $row");
+
+        $result->free();
+    }
+
+    /**
+     * Test the handling of sequences
+     */
+    function testSequences() {
+        if (!$this->supported('sequences')) {
+           return;
+        }
+
+        $this->db->loadModule('Manager', null, true);
+
+        for ($start_value = 1; $start_value < 4; $start_value++) {
+            $sequence_name = "test_sequence_$start_value";
+
+            $result = $this->db->manager->createSequence($sequence_name, $start_value);
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, "Error creating sequence $sequence_name with start value $start_value: ".$result->getMessage());
+            } else {
+                for ($sequence_value = $start_value; $sequence_value < ($start_value + 4); $sequence_value++) {
+                    $value = $this->db->nextID($sequence_name, false);
+
+                    $this->assertEquals($sequence_value, $value, "The returned sequence value for $sequence_name is not expected with sequence start value with $start_value");
+                }
+
+                $result = $this->db->manager->dropSequence($sequence_name);
+
+                if (PEAR::isError($result)) {
+                    $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
+                }
+            }
+        }
+
+        // Test ondemand creation of sequences
+        $sequence_name = 'test_ondemand';
+        $this->db->expectError(MDB2_ERROR_NOSUCHTABLE);
+        $this->db->manager->dropSequence($sequence_name);
+        $this->db->popExpect();
+
+        for ($sequence_value = 1; $sequence_value < 4; $sequence_value++) {
+            $value = $this->db->nextID($sequence_name);
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, "Error creating with ondemand sequence: ".$result->getMessage());
+            } else {
+                $this->assertEquals($sequence_value, $value, "Error in ondemand sequences. The returned sequence value is not expected value");
+            }
+        }
+
+        $result = $this->db->manager->dropSequence($sequence_name);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
+        }
+
+        // Test currId()
+        $sequence_name = 'test_currid';
+
+        $next = $this->db->nextID($sequence_name);
+        $curr = $this->db->currID($sequence_name);
+
+        if (PEAR::isError($curr)) {
+            $this->assertTrue(false, "Error getting the current value of sequence $sequence_name : ".$curr->getMessage());
+        } else {
+            if ($next != $curr) {
+                if ($next+1 == $curr) {
+                    $this->assertTrue(false, "Warning: currID() is using nextID() instead of a native implementation");
+                } else {
+                    $this->assertEquals($next, $curr, "return value if currID() does not match the previous call to nextID()");
+                }
+            }
+        }
+        $result = $this->db->manager->dropSequence($sequence_name);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
+        }
+
+        // Test lastInsertid()
+        if (!$this->db->supports('new_link')) {
+           return;
+        }
+
+        $sequence_name = 'test_lastinsertid';
+
+        $dsn = MDB2::parseDSN($this->dsn);
+        $dsn['new_link'] = true;
+        $dsn['database'] = $this->database;
+        $db =& MDB2::connect($dsn, $this->options);
+
+        $next = $this->db->nextID($sequence_name);
+        $next2 = $db->nextID($sequence_name);
+        $last = $this->db->lastInsertID($sequence_name);
+
+        if (PEAR::isError($last)) {
+            $this->assertTrue(false, "Error getting the last value of sequence $sequence_name : ".$last->getMessage());
+        } else {
+            $this->assertEquals($next, $last, "return value if lastInsertID() does not match the previous call to nextID()");
+        }
+        $result = $this->db->manager->dropSequence($sequence_name);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, "Error dropping sequence $sequence_name : ".$result->getMessage());
+        }
+    }
+
+    /**
+     * Test replace query
+     *
+     * The replace method emulates the replace query of mysql
+     */
+    function testReplace() {
+        if (!$this->supported('replace')) {
+            return;
+        }
+
+        $row = 1234;
+        $data = $this->getSampleData($row);
+
+        $fields = array(
+            'user_name' => array(
+                'value' => "user_$row",
+                'type' => 'text'
+            ),
+            'user_password' => array(
+                'value' => $data['user_password'],
+                'type' => 'text'
+            ),
+            'subscribed' => array(
+                'value' => $data['subscribed'],
+                'type' => 'boolean'
+            ),
+            'user_id' => array(
+                'value' => $data['user_id'],
+                'type' => 'integer',
+                'key' => 1
+            ),
+            'quota' => array(
+                'value' => $data['quota'],
+                'type' => 'decimal'
+            ),
+            'weight' => array(
+                'value' => $data['weight'],
+                'type' => 'float'
+            ),
+            'access_date' => array(
+                'value' => $data['access_date'],
+                'type' => 'date'
+            ),
+            'access_time' => array(
+                'value' => $data['access_time'],
+                'type' => 'time'
+            ),
+            'approved' => array(
+                'value' => $data['approved'],
+                'type' => 'timestamp'
+            )
+        );
+
+        $result = $this->db->replace('users', $fields);
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Replace failed');
+        }
+
+        if ($this->db->supports('affected_rows')) {
+            $affected_rows = $result;
+            $this->assertEquals(1, $result, "replacing a row in an empty table returned incorrect value");
+        } else {
+            $this->assertTrue(false, '"affected_rows" is not supported');
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query, $this->fields);
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+
+        $this->verifyFetchedValues($result, 0, $data);
+
+        $row = 4321;
+        $fields['user_name']['value']     = $data['user_name']     = 'user_'.$row;
+        $fields['user_password']['value'] = $data['user_password'] = 'somepass';
+        $fields['subscribed']['value']    = $data['subscribed']    = $row % 2 ? true : false;
+        $fields['quota']['value']         = $data['quota']         = strval($row/100);
+        $fields['weight']['value']        = $data['weight']        = sqrt($row);
+        $fields['access_date']['value']   = $data['access_date']   = MDB2_Date::mdbToday();
+        $fields['access_time']['value']   = $data['access_time']   = MDB2_Date::mdbTime();
+        $fields['approved']['value']      = $data['approved']      = MDB2_Date::mdbNow();
+
+        $result = $this->db->replace('users', $fields);
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Replace failed');
+        }
+        if ($this->db->supports('affected_rows')) {
+            $this->assertEquals(2, $result, "replacing a row returned incorrect result");
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query, $this->fields);
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+
+        $this->verifyFetchedValues($result, 0, $data);
+
+        $this->assertTrue(!$result->valid(), 'the query result did not seem to have reached the end of result as expected');
+
+        $result->free();
+    }
+
+    /**
+     * Test affected rows methods
+     */
+    function testAffectedRows() {
+        if (!$this->supported('affected_rows')) {
+            return;
+        }
+
+        $data = array();
+        $total_rows = 7;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+
+            $this->assertEquals(1, $result, "Inserting the row $row returned incorrect affected row count");
+        }
+
+        $stmt->free();
+
+        $query = 'UPDATE users SET user_password=? WHERE user_id < ?';
+        $stmt = $this->db->prepare($query, array('text', 'integer'), MDB2_PREPARE_MANIP);
+
+        for ($row = 0; $row < $total_rows; $row++) {
+            $password = "pass_$row";
+            if ($row == 0) {
+                $stmt->bindParam(0, $password);
+                $stmt->bindParam(1, $row);
+            }
+
+            $result = $stmt->execute();
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+
+            $this->assertEquals($row, $result, "Updating the $row rows returned incorrect affected row count");
+        }
+
+        $stmt->free();
+
+        $query = 'DELETE FROM users WHERE user_id >= ?';
+        $stmt = $this->db->prepare($query, array('integer'), MDB2_PREPARE_MANIP);
+
+        $row = intval($total_rows / 2);
+        $stmt->bindParam(0, $row);
+        for ($row = $total_rows; $total_rows; $total_rows = $row) {
+            $row = intval($total_rows / 2);
+
+            $result = $stmt->execute();
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+
+            $this->assertEquals(($total_rows - $row), $result, 'Deleting rows returned incorrect affected row count');
+
+        }
+
+        $stmt->free();
+    }
+
+    /**
+     * Testing transaction support - Test ROLLBACK
+     */
+    function testTransactionsRollback() {
+        if (!$this->supported('transactions')) {
+            return;
+        }
+
+        $data = $this->getSampleData(0);
+
+        $this->db->beginTransaction();
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        $result = $stmt->execute(array_values($data));
+        $this->db->rollback();
+        $stmt->free();
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+        $this->assertTrue(!$result->valid(), 'Transaction rollback did not revert the row that was inserted');
+        $result->free();
+    }
+
+    /**
+     * Testing transaction support - Test COMMIT
+     */
+    function testTransactionsCommit() {
+        if (!$this->supported('transactions')) {
+            return;
+        }
+
+        $data = $this->getSampleData(1);
+
+        $this->db->beginTransaction();
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        $result = $stmt->execute(array_values($data));
+        $this->db->commit();
+        $stmt->free();
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+        $this->assertTrue($result->valid(), 'Transaction commit did not make permanent the row that was inserted');
+        $result->free();
+    }
+
+    /**
+     * Testing transaction support - Test COMMIT and ROLLBACK
+     */
+    function testTransactionsBoth()
+    {
+        if (!$this->supported('transactions')) {
+            return;
+        }
+
+        $data = $this->getSampleData(0);
+
+        $this->db->beginTransaction();
+        $result = $this->db->exec('DELETE FROM users');
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error deleting from users'.$result->getMessage());
+            $this->db->rollback();
+        } else {
+            $this->db->commit();
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+
+        $this->assertTrue(!$result->valid(), 'Transaction end with implicit commit when re-enabling auto-commit did not make permanent the rows that were deleted');
+        $result->free();
+    }
+
+    /**
+     * Testing emulated nested transaction support
+     */
+    function testNestedTransactions() {
+        if (!$this->supported('transactions')) {
+            return;
+        }
+
+        $data = array(
+            1 => $this->getSampleData(1234),
+            2 => $this->getSampleData(4321),
+        );
+
+        $this->db->beginNestedTransaction();
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        $result = $stmt->execute(array_values($data[1]));
+
+        $this->db->beginNestedTransaction();
+
+        $result = $stmt->execute(array_values($data[2]));
+        $stmt->free();
+
+        $result = $this->db->completeNestedTransaction();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Inner transaction was not committed: '.$result->getMessage());
+        }
+
+        $result = $this->db->completeNestedTransaction();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Outer transaction was not committed: '.$result->getMessage());
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->query($query);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+        $this->assertTrue($result->valid(), 'Transaction commit did not make permanent the row that was inserted');
+        $result->free();
+    }
+
+    /**
+     * Testing savepoints
+     */
+    function testSavepoint() {
+        if (!$this->supported('savepoints')) {
+            return;
+        }
+
+        $savepoint = 'test_savepoint';
+
+        $data = array(
+            1 => $this->getSampleData(1234),
+            2 => $this->getSampleData(4321),
+        );
+
+        $this->db->beginTransaction();
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+
+        $result = $stmt->execute(array_values($data[1]));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+        }
+
+        $result = $this->db->beginTransaction($savepoint);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error setting savepoint: '.$result->getMessage());
+        }
+
+        $result = $stmt->execute(array_values($data[2]));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+        }
+        $stmt->free();
+
+        $result = $this->db->rollback($savepoint);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error rolling back to savepoint: '.$result->getMessage());
+        }
+
+        $result = $this->db->commit();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Transaction not committed: '.$result->getMessage());
+        }
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result = $this->db->queryAll($query);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+        $rows_inserted = count($result);
+        $this->assertEquals(1, $rows_inserted, 'Error during transaction, invalid number of records inserted');
+
+        // test release savepoint
+        $this->db->beginTransaction();
+        $result = $this->db->beginTransaction($savepoint);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error setting savepoint: '.$result->getMessage());
+        }
+        $result = $this->db->commit($savepoint);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error setting savepoint: '.$result->getMessage());
+        }
+        $result = $this->db->commit();
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Transaction not committed: '.$result->getMessage());
+        }
+    }
+
+    /**
+     * Testing LOB storage
+     *
+     * N.B. for the mssql driver: if this test fails, use an higher limit in these
+     * two php.ini settings: "mssql.textlimit" and "mssql.textsize"
+     */
+    function testLOBStorage() {
+        if (!$this->supported('LOBs')) {
+            return;
+        }
+
+        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, ?, ?)';
+        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
+        if (PEAR::isError($stmt)) {
+            $this->assertTrue(false, 'Failed prepared statement to insert LOB values: '.$stmt->getUserInfo());
+        }
+
+        $character_lob = '';
+        $binary_lob = '';
+
+        for ($i = 0; $i < 1000; $i++) {
+            for ($code = 32; $code <= 127; $code++) {
+                $character_lob.= chr($code);
+            }
+            for ($code = 0; $code <= 255; $code++) {
+                $binary_lob.= chr($code);
+            }
+        }
+
+        $stmt->bindValue(0, $character_lob);
+        $stmt->bindValue(1, $binary_lob);
+
+        $result = $stmt->execute();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
+        }
+
+        $stmt->free();
+
+        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
+        }
+
+        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
+
+        $row = $result->fetchRow();
+        $clob = $row[0];
+        if (!PEAR::isError($clob) && is_resource($clob)) {
+            $value = '';
+            while (!feof($clob)) {
+                $data = fread($clob, 8192);
+                $this->assertTrue(strlen($data) >= 0, 'Could not read CLOB');
+                $value.= $data;
+            }
+            $this->db->datatype->destroyLOB($clob);
+            $this->assertEquals($character_lob, $value, 'Retrieved character LOB value is different from what was stored');
+        } else {
+            $this->assertTrue(false, 'Error retrieving CLOB result');
+        }
+
+        $blob = $row[1];
+        if (!PEAR::isError($blob) && is_resource($blob)) {
+            $value = '';
+            while (!feof($blob)) {
+                $data = fread($blob, 8192);
+                $this->assertTrue(strlen($data) >= 0, 'Could not read BLOB');
+                $value.= $data;
+            }
+
+            $this->db->datatype->destroyLOB($blob);
+            $this->assertEquals($binary_lob, $value, 'Retrieved binary LOB value is different from what was stored');
+        } else {
+            $this->assertTrue(false, 'Error retrieving BLOB result');
+        }
+        $result->free();
+    }
+
+    /**
+     * Test LOB reading of multiple records both buffered and unbuffered. See bug #8793 for why this must be tested.
+     */
+    function testLOBRead() {
+        if (!$this->supported('LOBs')) {
+            return;
+        }
+
+        for ($i = 20; $i < 30; ++$i) {
+            $query = 'INSERT INTO files (ID, document, picture) VALUES (?, ?, ?)';
+            $stmt = $this->db->prepare($query, array('integer', 'clob', 'blob'), MDB2_PREPARE_MANIP, array(1 => 'document', 2 => 'picture'));
+            $character_lob = $binary_lob = $i;
+            $stmt->bindValue(1, $character_lob);
+            $stmt->bindValue(2, $binary_lob);
+
+            $result = $stmt->execute(array($i));
+
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
+            }
+            $stmt->free();
+        }
+
+        $oldBuffered = $this->db->getOption('result_buffering');
+        foreach (array(true, false) as $buffered) {
+            $this->db->setOption('result_buffering', $buffered);
+            $msgPost = ' with result_buffering = '.($buffered ? 'true' : 'false');
+            $result =& $this->db->query('SELECT id, document, picture FROM files WHERE id >= 20 AND id <= 30 ORDER BY id ASC', array('integer', 'clob', 'blob'));
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error selecting from files'.$msgPost.$result->getMessage());
+            } else {
+                if ($buffered) {
+                    $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon'.$msgPost);
+                    $this->assertEquals('mdb2_bufferedresult_', strtolower(substr(get_class($result), 0, 20)), 'Error: not a buffered result');
+                } else {
+                    $this->assertEquals('mdb2_result_', strtolower(substr(get_class($result), 0, 12)), 'Error: an unbuffered result was expected');
+                }
+                for ($i = 1; $i <= ($buffered ? 2 : 1); ++$i) {
+                    $result->seek(0);
+                    while ($row = $result->fetchRow(MDB2_FETCHMODE_ASSOC)) {
+                        foreach (array('document' => 'clob', 'picture' => 'blob') as $field => $type) {
+                            $lob = $row[$field];
+                            if (is_a($lob, 'oci-lob')) {
+                                $lob = $lob->load();
+                            } elseif (is_resource($lob)) {
+                                $lob = fread($lob, 1000);
+                            }
+                            $this->assertEquals($lob, $row['id'], 'LOB ('.$type.') field ('.$field.') not equal to expected value ('.$row['id'].')'.$msgPost.' on run-through '.$i);
+                        }
+                    }
+                }
+                $result->free();
+            }
+        }
+        $this->db->setOption('result_buffering', $oldBuffered);
+    }
+
+    /**
+     * Test for lob storage from and to files
+     */
+    function testLOBFiles() {
+        if (!$this->supported('LOBs')) {
+            return;
+        }
+
+        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, :document, :picture)';
+        $stmt = $this->db->prepare($query, array('document' => 'clob', 'picture' => 'blob'), MDB2_PREPARE_MANIP);
+
+        $character_data_file = 'character_data';
+        $file = fopen($character_data_file, 'w');
+        $this->assertTrue(((bool)$file), 'Error creating clob file to read from');
+        $character_data = '';
+        for ($i = 0; $i < 1000; $i++) {
+            for ($code = 32; $code <= 127; $code++) {
+                $character_data.= chr($code);
+            }
+        }
+        $this->assertTrue((fwrite($file, $character_data, strlen($character_data)) == strlen($character_data)), 'Error creating clob file to read from');
+        fclose($file);
+
+        $binary_data_file = 'binary_data';
+        $file = fopen($binary_data_file, 'wb');
+        $this->assertTrue(((bool)$file), 'Error creating blob file to read from');
+        $binary_data = '';
+        for ($i = 0; $i < 1000; $i++) {
+            for ($code = 0; $code <= 255; $code++) {
+                $binary_data.= chr($code);
+            }
+        }
+        $this->assertTrue((fwrite($file, $binary_data, strlen($binary_data)) == strlen($binary_data)), 'Error creating blob file to read from');
+        fclose($file);
+
+        $character_data_file_tmp = 'file://'.$character_data_file;
+        $stmt->bindParam('document', $character_data_file_tmp);
+        $binary_data_file_tmp = 'file://'.$binary_data_file;
+        $stmt->bindParam('picture', $binary_data_file_tmp);
+
+        $result = $stmt->execute();
+        $this->assertTrue(!PEAR::isError($result), 'Error executing prepared query - inserting LOB from files');
+
+        $stmt->free();
+
+        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
+        }
+
+        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
+
+        $row = $result->fetchRow();
+        $clob = $row[0];
+        if (!PEAR::isError($clob) && is_resource($clob)) {
+            unlink($character_data_file);
+            $res = $this->db->datatype->writeLOBToFile($clob, $character_data_file);
+            $this->db->datatype->destroyLOB($clob);
+
+            if (PEAR::isError($res)) {
+                $this->assertTrue(false, 'Error writing character LOB in a file');
+            } else {
+                $file = fopen($character_data_file, 'r');
+                $this->assertTrue($file, "Error opening character data file: $character_data_file");
+                $value = '';
+                while (!feof($file)) {
+                    $value.= fread($file, 8192);
+                }
+                $this->assertEquals('string', gettype($value), "Could not read from character LOB file: $character_data_file");
+                fclose($file);
+
+                $this->assertEquals($character_data, $value, "retrieved character LOB value is different from what was stored");
+            }
+        } else {
+            $this->assertTrue(false, 'Error creating character LOB in a file');
+        }
+
+        $blob = $row[1];
+        if (!PEAR::isError($blob) && is_resource($blob)) {
+            unlink($binary_data_file);
+            $res = $this->db->datatype->writeLOBToFile($blob, $binary_data_file);
+            $this->db->datatype->destroyLOB($blob);
+
+            if (PEAR::isError($res)) {
+                $this->assertTrue(false, 'Error writing binary LOB in a file');
+            } else {
+                $file = fopen($binary_data_file, 'rb');
+                $this->assertTrue($file, "Error opening binary data file: $binary_data_file");
+                $value = '';
+                while (!feof($file)) {
+                    $value.= fread($file, 8192);
+                }
+                $this->assertEquals('string', gettype($value), "Could not read from binary LOB file: $binary_data_file");
+                fclose($file);
+
+                $this->assertEquals($binary_data, $value, "retrieved binary LOB value is different from what was stored");
+            }
+        } else {
+            $this->assertTrue(false, 'Error creating binary LOB in a file');
+        }
+
+        $result->free();
+    }
+
+    /**
+     * Test handling of lob nulls
+     */
+    function testLOBNulls() {
+        if (!$this->supported('LOBs')) {
+            return;
+        }
+
+        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, :document, :picture)';
+        $stmt = $this->db->prepare($query, array('document' => 'clob', 'picture' => 'blob'), MDB2_PREPARE_MANIP);
+
+        $null = null;
+        $stmt->bindParam('document', $null);
+        $stmt->bindParam('picture', $null);
+
+        $result = $stmt->execute();
+        $this->assertTrue(!PEAR::isError($result), 'Error executing prepared query - inserting NULL lobs');
+
+        $stmt->free();
+
+        $result =& $this->db->query('SELECT document, picture FROM files', array('clob', 'blob'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
+        }
+
+        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
+
+        $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        $this->assertTrue(is_null($row['document']), 'A query result large object column document is not NULL unlike what was expected');
+        $this->assertTrue(is_null($row['picture']), 'A query result large object column picture is not NULL unlike what was expected');
+
+        $result->free();
+    }
+
+    function testLOBUpdate() {
+        if (!$this->supported('LOBs')) {
+            return;
+        }
+
+        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, ?, ?)';
+        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
+
+        $character_lob = '';
+        $binary_lob = '';
+
+        for ($i = 0; $i < 1000; $i++) {
+            for ($code = 32; $code <= 127; ++$code) {
+                $character_lob .= chr($code);
+            }
+            for ($code = 0; $code <= 255; ++$code) {
+                $binary_lob .= chr($code);
+            }
+        }
+
+        $stmt->bindValue(0, $character_lob);
+        $stmt->bindValue(1, $binary_lob);
+
+        $result = $stmt->execute();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
+        }
+
+        $stmt->free();
+
+        $query = 'UPDATE files SET document = ?, picture = ? WHERE ID = 1';
+        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
+
+        $character_lob = '';
+        $binary_lob = '';
+
+        for ($i = 0; $i < 999; $i++) {
+            for ($code = 127; $code >= 32; --$code) {
+                $character_lob .= chr($code);
+            }
+            for ($code = 255; $code >= 0; --$code) {
+                $binary_lob .= chr($code);
+            }
+        }
+
+        $stmt->bindValue(0, $character_lob);
+        $stmt->bindValue(1, $binary_lob);
+
+        $result = $stmt->execute();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
+        }
+
+        $stmt->free();
+
+        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
+        }
+
+        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
+
+        $row = $result->fetchRow();
+        $clob = $row[0];
+        if (!PEAR::isError($clob) && is_resource($clob)) {
+            $value = '';
+            while (!feof($clob)) {
+                $data = fread($clob, 8192);
+                $this->assertTrue(strlen($data) >= 0, 'Could not read CLOB');
+                $value.= $data;
+            }
+            $this->db->datatype->destroyLOB($clob);
+            $this->assertEquals($character_lob, $value, 'Retrieved character LOB value is different from what was stored');
+        } else {
+            $this->assertTrue(false, 'Error retrieving CLOB result');
+        }
+
+        $blob = $row[1];
+        if (!PEAR::isError($blob) && is_resource($blob)) {
+            $value = '';
+            while (!feof($blob)) {
+                $data = fread($blob, 8192);
+                $this->assertTrue(strlen($data) >= 0, 'Could not read BLOB');
+                $value.= $data;
+            }
+
+            $this->db->datatype->destroyLOB($blob);
+            $this->assertEquals($binary_lob, $value, 'Retrieved binary LOB value is different from what was stored');
+        } else {
+            $this->assertTrue(false, 'Error retrieving BLOB result');
+        }
+        $result->free();
+    }
+
+    /**
+     * Test retrieval of result metadata
+     *
+     * This tests the result metadata by executing a prepared query and
+     * select the data, and checking the result contains the correct
+     * number of columns and that the column names are in the correct order
+     */
+    function testConvertEmpty2Null() {
+#$this->db->setOption('portability', MDB2_PORTABILITY_ALL ^ MDB2_PORTABILITY_EMPTY_TO_NULL);
+
+        $data = $this->getSampleData(1234);
+        $data['user_password'] = '';
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+        $result = $stmt->execute(array_values($data));
+        $stmt->free();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+        }
+
+        $row = $this->db->queryRow('SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users WHERE user_password IS NULL', $this->fields);
+
+        if (PEAR::isError($row)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+
+        $this->assertEquals(count($this->fields), count($row), "The query result returned a number of columns unlike ".count($this->fields) .' as expected');
+    }
+
+    function testPortabilityOptions() {
+        // MDB2_PORTABILITY_DELETE_COUNT
+        $data = array();
+        $total_rows = 5;
+
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+        for ($row = 0; $row < $total_rows; $row++) {
+            $data[$row] = $this->getSampleData($row);
+            $result = $stmt->execute(array_values($data[$row]));
+            if (PEAR::isError($result)) {
+                $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+            }
+        }
+        $stmt->free();
+
+        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_DELETE_COUNT);
+        $affected_rows = $this->db->exec('DELETE FROM users');
+        if (PEAR::isError($affected_rows)) {
+            $this->assertTrue(false, 'Error executing query: '.$affected_rows->getMessage());
+        }
+        $this->assertEquals($total_rows, $affected_rows, 'MDB2_PORTABILITY_DELETE_COUNT not working');
+
+        // MDB2_PORTABILITY_FIX_CASE
+        $fields = array_keys($this->fields);
+        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_FIX_CASE);
+        $this->db->setOption('field_case', CASE_UPPER);
+
+        $data = $this->getSampleData(1234);
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+        $result = $stmt->execute(array_values($data));
+        $stmt->free();
+
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->queryRow($query, $this->fields, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+        $field = reset($fields);
+        foreach (array_keys($result) as $fieldname) {
+            $this->assertEquals(strtoupper($field), $fieldname, 'MDB2_PORTABILITY_FIX_CASE CASE_UPPER not working');
+            $field = next($fields);
+        }
+
+        $this->db->setOption('field_case', CASE_LOWER);
+        $query = 'SELECT ' . implode(', ', array_keys($this->fields)) . ' FROM users';
+        $result =& $this->db->queryRow($query, $this->fields, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users'.$result->getMessage());
+        }
+        $field = reset($fields);
+        foreach (array_keys($result) as $fieldname) {
+            $this->assertEquals(strtolower($field), $fieldname, 'MDB2_PORTABILITY_FIX_CASE CASE_LOWER not working');
+            $field = next($fields);
+        }
+
+        // MDB2_PORTABILITY_RTRIM
+        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_RTRIM);
+        $value = 'rtrim   ';
+        $query = 'INSERT INTO users (user_id, user_password) VALUES (1, ' . $this->db->quote($value, 'text') .')';
+        $res = $this->db->exec($query);
+        if (PEAR::isError($res)) {
+            $this->assertTrue(false, 'Error executing query: '.$res->getMessage());
+        }
+        $query = 'SELECT user_password FROM users WHERE user_id = 1';
+        $result = $this->db->queryOne($query, array('text'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage());
+        }
+        $this->assertEquals(rtrim($value), $result, '"MDB2_PORTABILITY_RTRIM = on" not working');
+
+        $this->db->setOption('portability', MDB2_PORTABILITY_NONE | MDB2_PORTABILITY_RTRIM);
+        $value = ' ';
+        $query = 'INSERT INTO users (user_id, user_name) VALUES (2, ' . $this->db->quote($value, 'text') .')';
+        $res = $this->db->exec($query);
+        if (PEAR::isError($res)) {
+            $this->assertTrue(false, 'Error executing query: '.$res->getMessage());
+        }
+        $query = 'SELECT user_name FROM users WHERE user_id = 2';
+        $result = $this->db->queryOne($query, array('text'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from users: '.$result->getMessage());
+        }
+        $this->assertEquals(0, strlen($result), '"MDB2_PORTABILITY_RTRIM = on" not working');
+
+        if (!$this->supported('LOBs')) {
+            return;
+        }
+
+        $query = 'INSERT INTO files (ID, document, picture) VALUES (1, ?, ?)';
+        $stmt = $this->db->prepare($query, array('clob', 'blob'), MDB2_PREPARE_MANIP, array('document', 'picture'));
+
+        $character_lob = '';
+        $binary_lob = '';
+
+        for ($i = 0; $i < 999; $i++) {
+            for ($code = 127; $code >= 32; --$code) {
+                $character_lob .= chr($code);
+            }
+            for ($code = 255; $code >= 0; --$code) {
+                $binary_lob .= chr($code);
+            }
+        }
+
+        $stmt->bindValue(0, $character_lob);
+        $stmt->bindValue(1, $binary_lob);
+
+        $result = $stmt->execute();
+
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getUserInfo());
+        }
+
+        $stmt->free();
+
+        $result =& $this->db->query('SELECT document, picture FROM files WHERE id = 1', array('clob', 'blob'));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error selecting from files'.$result->getMessage());
+        }
+
+        $this->assertTrue($result->valid(), 'The query result seem to have reached the end of result too soon.');
+
+        $row = $result->fetchRow();
+        $clob = $row[0];
+        if (!PEAR::isError($clob) && is_resource($clob)) {
+            $value = '';
+            while (!feof($clob)) {
+                $data = fread($clob, 8192);
+                $this->assertTrue(strlen($data) >= 0, 'Could not read CLOB');
+                $value.= $data;
+            }
+            $this->db->datatype->destroyLOB($clob);
+            $this->assertEquals($character_lob, $value, '"MDB2_PORTABILITY_RTRIM = on" Retrieved character LOB value is different from what was stored');
+        } else {
+            $this->assertTrue(false, 'Error retrieving CLOB result');
+        }
+
+        $blob = $row[1];
+        if (!PEAR::isError($blob) && is_resource($blob)) {
+            $value = '';
+            while (!feof($blob)) {
+                $data = fread($blob, 8192);
+                $this->assertTrue(strlen($data) >= 0, 'Could not read BLOB');
+                $value.= $data;
+            }
+
+            $this->db->datatype->destroyLOB($blob);
+            $this->assertEquals($binary_lob, $value, '"MDB2_PORTABILITY_RTRIM = on" Retrieved binary LOB value is different from what was stored');
+        } else {
+            $this->assertTrue(false, 'Error retrieving BLOB result');
+        }
+        $result->free();
+    }
+
+    /**
+     * Test getAsKeyword()
+     */
+    function testgetAsKeyword()
+    {
+        $query = 'INSERT INTO users (' . implode(', ', array_keys($this->fields)) . ') VALUES ('.implode(', ', array_fill(0, count($this->fields), '?')).')';
+        $stmt = $this->db->prepare($query, array_values($this->fields), MDB2_PREPARE_MANIP);
+        $data = $this->getSampleData(1);
+        $result = $stmt->execute(array_values($data));
+        if (PEAR::isError($result)) {
+            $this->assertTrue(false, 'Error executing prepared query: '.$result->getMessage());
+        }
+        $stmt->free();
+
+        $query = 'SELECT user_id'.$this->db->getAsKeyword().'foo FROM users';
+        $result = $this->db->queryRow($query, array('integer'), MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($result)) {
+            $this->assertFalse(true, 'Error getting alias column: '. $result->getMessage());
+        } else {
+            $this->assertTrue((array_key_exists('foo', $result)), 'Error: could not alias "user_id" with "foo" : '.var_export($result, true));
+        }
+    }
+}
+
+?>
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/README /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/README
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/README	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/README	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,55 @@
+This is a test framework for MDB2 built using PHPUnit.
+These tests directly access the MDB2 API - hopefully this framework
+should give better feedback as to where or what caused when error are encountered.
+
+Usage:
+In order for the tests to work they need to access a database called
+"driver_test". This database is created using the MDB2_Schema test or
+running the import.schema.php script (edit the db DSN information).
+If you have problems running these test or the driver you are using does not yet
+provide the necessary methods you may create the "driver_test" database manually:
+
+CREATE TABLE "files" (
+  "id" int(11) NOT NULL default '0',
+  "document" longtext,
+  "picture" longblob,
+  UNIQUE KEY "lob_id_index_idx" ("id")
+);
+
+CREATE TABLE "users" (
+  "user_name" varchar(12) default NULL,
+  "user_password" char(8) default NULL,
+  "subscribed" tinyint(1) default '1',
+  "user_id" int(11) NOT NULL default '0',
+  "quota" decimal(18,2) default '0.00',
+  "weight" double default '0',
+  "access_date" date default '1970-01-01',
+  "access_time" time default '00:00:00',
+  "approved" datetime default '1970-01-01 00:00:00',
+  UNIQUE KEY "users_id_index_idx" ("user_id")
+);
+
+To setup the tests
+
+* requires PHPUnit to be installed
+
+* requires MDB2 (with the given driver) to be installed
+  in a php include path.
+
+* copy the file test_setup.php.dist to test_setup.php
+
+* edit test_setup.php. The array $testarray specifies which testcases
+  to carry out. $dbarray is an array of databases to test.
+
+* point your browser at test.php or your CLI at clitest.php for the results,
+  and then fix the bugs!
+
+* by default test.php/clitest.php will use all tests in the testcases - if
+  you want to pick specific tests, use testchoose.php to pick just the
+  tests you want to run
+
+Writing tests:
+
+The tests are written using PHPUnit from pear so first make sure you
+have the latest stable release, and have read the docs,
+http://pear.php.net/manual/en/packages.phpunit.php
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/testchoose.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/testchoose.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/testchoose.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/testchoose.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,64 @@
+'."\n";
+    $output.= ' TestCase : '.$testcase.''."\n";
+    $testmethods[$testcase] = getTests($testcase);
+    foreach ($testmethods[$testcase] as $method) {
+        $output.= testCheck($testcase, $method);
+    }
+    $output.= "
\n\n";
+    $output.= "
 
\n\n";
+}
+
+?>
+
+
+MDB2 Tests
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff -Nru /tmp/pISzB1q5JQ/php-mdb2-2.4.1/MDB2-2.5.0b2/tests/test.php /tmp/XCLlDwJ82A/php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/test.php
--- php-mdb2-2.4.1/MDB2-2.5.0b2/tests/test.php	1970-01-01 01:00:00.000000000 +0100
+++ php-mdb2-2.5.0b2/MDB2-2.5.0b2/tests/test.php	2009-01-14 16:28:09.000000000 +0000
@@ -0,0 +1,131 @@
+                                 |
+// +----------------------------------------------------------------------+
+//
+// $Id: test.php,v 1.18 2006/10/20 16:36:32 lsmith Exp $
+
+/*
+ This is a small test suite for MDB2 using PHPUnit
+ */
+
+require_once 'test_setup.php';
+require_once 'PHPUnit.php';
+require_once 'testUtils.php';
+require_once 'MDB2.php';
+require_once 'HTML_TestListener.php';
+
+function htmlErrorHandler($errno, $errstr, $errfile, $errline)
+{
+    if ((!$GLOBALS['_show_silenced'] && !error_reporting()) || $errno == 2048) {
+        return;
+    }
+    echo '';
+    errorHandler($errno, $errstr, $errfile, $errline);
+    echo '';
+}
+set_error_handler('htmlErrorHandler');
+
+function htmlErrorHandlerPEAR($error_obj)
+{
+    echo '';
+    errorHandlerPEAR($error_obj);
+    echo '';
+}
+PEAR::setErrorHandling(PEAR_ERROR_CALLBACK, 'htmlErrorHandlerPEAR');
+
+MDB2::loadFile('Date');
+
+foreach ($testcases as $testcase) {
+    include_once $testcase.'.php';
+}
+
+$database = 'driver_test';
+
+$testmethods = !empty($_POST['testmethods']) ? $_POST['testmethods'] : null;
+
+if (!is_array($testmethods)) {
+    foreach ($testcases as $testcase) {
+        $testmethods[$testcase] = array_flip(getTests($testcase));
+    }
+}
+
+?>
+
+
+MDB2 Tests
+
+
+
+\n";
+    echo "Testing $display_dsn on ".PHP_VERSION."\n";
+
+    $suite = new PHPUnit_TestSuite();
+
+    foreach ($testcases as $testcase) {
+        if (isset($testmethods[$testcase]) && is_array($testmethods[$testcase])) {
+            $methods = array_keys($testmethods[$testcase]);
+            foreach ($methods as $method) {
+                $suite->addTest(new $testcase($method));
+            }
+        }
+    }
+
+    $result = new PHPUnit_TestResult;
+    $result->addListener(new HTML_TestListener);
+    $suite->run($result);
+    $count = $result->runCount();
+    $failed = $result->failureCount();
+
+    echo "Summary: $failed failed assertions in $count tests\n";
+    echo "\n

MDB2 data types

Contents

Introduction

Text data type

Boolean data type

Integer data type

Decimal data type

Float data type

Date data type

Time data type

Time stamp data type

Large object (file) data types

MDB2 data types

Contents

Introduction

Text data type

Boolean data type

Integer data type

Decimal data type

Float data type

Date data type

Time data type

Time stamp data type

Large object (file) data types