cvs: pear /MDB2/MDB2/Driver/Reverse fbsql.php ibase.php mssql.php mysql.php mysqli.php pgsql.php

lsmith Mon Sep 25 23:39:35 2006 UTC Modified files: /pear/MDB2/MDB2/Driver/Reverse fbsql.php ibase.php mssql.php mysql.php mysqli.php pgsql.php Log: - cosmetic fixes s/ressource/resource s/id/resource

http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Reverse/fbsql.php?r1=1.19&r2=1.20&diff_format=u Index: pear/MDB2/MDB2/Driver/Reverse/fbsql.php diff -u pear/MDB2/MDB2/Driver/Reverse/fbsql.php:1.19 pear/MDB2/MDB2/Driver/Reverse/fbsql.php:1.20 --- pear/MDB2/MDB2/Driver/Reverse/fbsql.php:1.19 Mon Jul 17 16:12:31 2006 +++ pear/MDB2/MDB2/Driver/Reverse/fbsql.php Mon Sep 25 23:39:35 2006 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@pooteeweet.org> | // +----------------------------------------------------------------------+ // -// $Id: fbsql.php,v 1.19 2006/07/17 16:12:31 lsmith Exp $ +// $Id: fbsql.php,v 1.20 2006/09/25 23:39:35 lsmith Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -85,10 +85,10 @@ return $db; } - $id = MDB2::isResultCommon($result) ? $result->getResource() : $result; - if (!is_resource($id)) { + $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result; + if (!is_resource($resource)) { return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null, - 'Could not generate result ressource', __FUNCTION__); + 'Could not generate result resource', __FUNCTION__); } if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) { @@ -101,7 +101,7 @@ $case_func = 'strval'; } - $count = @fbsql_num_fields($id); + $count = @fbsql_num_fields($resource); $res = array(); if ($mode) { @@ -110,11 +110,11 @@ for ($i = 0; $i < $count; $i++) { $res[$i] = array( - 'table' => $case_func(@fbsql_field_table($id, $i)), - 'name' => $case_func(@fbsql_field_name($id, $i)), - 'type' => @fbsql_field_type($id, $i), - 'length' => @fbsql_field_len($id, $i), - 'flags' => @fbsql_field_flags($id, $i), + 'table' => $case_func(@fbsql_field_table($resource, $i)), + 'name' => $case_func(@fbsql_field_name($resource, $i)), + 'type' => @fbsql_field_type($resource, $i), + 'length' => @fbsql_field_len($resource, $i), + 'flags' => @fbsql_field_flags($resource, $i), ); // todo: implement $db->datatype->mapNativeDatatype(); $res[$i]['mdb2type'] = $res[$i]['type']; http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Reverse/ibase.php?r1=1.57&r2=1.58&diff_format=u Index: pear/MDB2/MDB2/Driver/Reverse/ibase.php diff -u pear/MDB2/MDB2/Driver/Reverse/ibase.php:1.57 pear/MDB2/MDB2/Driver/Reverse/ibase.php:1.58 --- pear/MDB2/MDB2/Driver/Reverse/ibase.php:1.57 Wed Aug 23 06:55:06 2006 +++ pear/MDB2/MDB2/Driver/Reverse/ibase.php Mon Sep 25 23:39:35 2006 @@ -42,7 +42,7 @@ // | Author: Lorenzo Alberton <l.alberton@quipo.it> | // +----------------------------------------------------------------------+ // -// $Id: ibase.php,v 1.57 2006/08/23 06:55:06 lsmith Exp $ +// $Id: ibase.php,v 1.58 2006/09/25 23:39:35 lsmith Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -413,10 +413,10 @@ return $db; } - $id = MDB2::isResultCommon($result) ? $result->getResource() : $result; - if (!is_resource($id)) { + $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result; + if (!is_resource($resource)) { return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null, - 'Could not generate result ressource', __FUNCTION__); + 'Could not generate result resource', __FUNCTION__); } if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) { @@ -429,7 +429,7 @@ $case_func = 'strval'; } - $count = @ibase_num_fields($id); + $count = @ibase_num_fields($resource); $res = array(); if ($mode) { @@ -438,7 +438,7 @@ $db->loadModule('Datatype', null, true); for ($i = 0; $i < $count; $i++) { - $info = @ibase_field_info($id, $i); + $info = @ibase_field_info($resource, $i); if (($pos = strpos($info['type'], '(')) !== false) { $info['type'] = substr($info['type'], 0, $pos); } http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Reverse/mssql.php?r1=1.27&r2=1.28&diff_format=u Index: pear/MDB2/MDB2/Driver/Reverse/mssql.php diff -u pear/MDB2/MDB2/Driver/Reverse/mssql.php:1.27 pear/MDB2/MDB2/Driver/Reverse/mssql.php:1.28 --- pear/MDB2/MDB2/Driver/Reverse/mssql.php:1.27 Mon Jul 17 16:12:31 2006 +++ pear/MDB2/MDB2/Driver/Reverse/mssql.php Mon Sep 25 23:39:35 2006 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@pooteeweet.org> | // +----------------------------------------------------------------------+ // -// $Id: mssql.php,v 1.27 2006/07/17 16:12:31 lsmith Exp $ +// $Id: mssql.php,v 1.28 2006/09/25 23:39:35 lsmith Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -88,10 +88,10 @@ return $db; } - $id = MDB2::isResultCommon($result) ? $result->getResource() : $result; - if (!is_resource($id)) { + $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result; + if (!is_resource($resource)) { return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null, - 'Could not generate result ressource', __FUNCTION__); + 'Could not generate result resource', __FUNCTION__); } if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) { @@ -104,7 +104,7 @@ $case_func = 'strval'; } - $count = @mssql_num_fields($id); + $count = @mssql_num_fields($resource); $res = array(); if ($mode) { @@ -115,9 +115,9 @@ for ($i = 0; $i < $count; $i++) { $res[$i] = array( 'table' => '', - 'name' => $case_func(@mssql_field_name($id, $i)), - 'type' => @mssql_field_type($id, $i), - 'length' => @mssql_field_length($id, $i), + 'name' => $case_func(@mssql_field_name($resource, $i)), + 'type' => @mssql_field_type($resource, $i), + 'length' => @mssql_field_length($resource, $i), 'flags' => '', ); $mdb2type_info = $db->datatype->mapNativeDatatype($res[$i]); http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Reverse/mysql.php?r1=1.59&r2=1.60&diff_format=u Index: pear/MDB2/MDB2/Driver/Reverse/mysql.php diff -u pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.59 pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.60 --- pear/MDB2/MDB2/Driver/Reverse/mysql.php:1.59 Sat Aug 12 15:44:03 2006 +++ pear/MDB2/MDB2/Driver/Reverse/mysql.php Mon Sep 25 23:39:35 2006 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@pooteeweet.org> | // +----------------------------------------------------------------------+ // -// $Id: mysql.php,v 1.59 2006/08/12 15:44:03 lsmith Exp $ +// $Id: mysql.php,v 1.60 2006/09/25 23:39:35 lsmith Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -313,10 +313,10 @@ return $db; } - $id = MDB2::isResultCommon($result) ? $result->getResource() : $result; - if (!is_resource($id)) { + $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result; + if (!is_resource($resource)) { return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null, - 'Could not generate result ressource', __FUNCTION__); + 'Could not generate result resource', __FUNCTION__); } if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) { @@ -329,7 +329,7 @@ $case_func = 'strval'; } - $count = @mysql_num_fields($id); + $count = @mysql_num_fields($resource); $res = array(); if ($mode) { @@ -339,11 +339,11 @@ $db->loadModule('Datatype', null, true); for ($i = 0; $i < $count; $i++) { $res[$i] = array( - 'table' => $case_func(@mysql_field_table($id, $i)), - 'name' => $case_func(@mysql_field_name($id, $i)), - 'type' => @mysql_field_type($id, $i), - 'length' => @mysql_field_len($id, $i), - 'flags' => @mysql_field_flags($id, $i), + 'table' => $case_func(@mysql_field_table($resource, $i)), + 'name' => $case_func(@mysql_field_name($resource, $i)), + 'type' => @mysql_field_type($resource, $i), + 'length' => @mysql_field_len($resource, $i), + 'flags' => @mysql_field_flags($resource, $i), ); if ($res[$i]['type'] == 'string') { $res[$i]['type'] = 'char'; http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Reverse/mysqli.php?r1=1.49&r2=1.50&diff_format=u Index: pear/MDB2/MDB2/Driver/Reverse/mysqli.php diff -u pear/MDB2/MDB2/Driver/Reverse/mysqli.php:1.49 pear/MDB2/MDB2/Driver/Reverse/mysqli.php:1.50 --- pear/MDB2/MDB2/Driver/Reverse/mysqli.php:1.49 Sat Aug 12 15:44:03 2006 +++ pear/MDB2/MDB2/Driver/Reverse/mysqli.php Mon Sep 25 23:39:35 2006 @@ -42,7 +42,7 @@ // | Author: Lukas Smith <smith@pooteeweet.org> | // +----------------------------------------------------------------------+ // -// $Id: mysqli.php,v 1.49 2006/08/12 15:44:03 lsmith Exp $ +// $Id: mysqli.php,v 1.50 2006/09/25 23:39:35 lsmith Exp $ // require_once 'MDB2/Driver/Reverse/Common.php'; @@ -367,10 +367,10 @@ return $db; } - $id = MDB2::isResultCommon($result) ? $result->getResource() : $result; - if (!is_resource($id)) { + $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result; + if (!is_resource($resource)) { return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null, - 'Could not generate result ressource', __FUNCTION__); + 'Could not generate result resource', __FUNCTION__); } if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) { @@ -383,7 +383,7 @@ $case_func = 'strval'; } - $count = @mysqli_num_fields($id); + $count = @mysqli_num_fields($resource); $res = array(); if ($mode) { @@ -392,7 +392,7 @@ $db->loadModule('Datatype', null, true); for ($i = 0; $i < $count; $i++) { - $tmp = @mysqli_fetch_field($id); + $tmp = @mysqli_fetch_field($resource); $flags = ''; foreach ($this->flags as $const => $means) { http://cvs.php.net/viewvc.cgi/pear/MDB2/MDB2/Driver/Reverse/pgsql.php?r1=1.49&r2=1.50&diff_format=u Index: pear/MDB2/MDB2/Driver/Reverse/pgsql.php diff -u pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.49 pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.50 --- pear/MDB2/MDB2/Driver/Reverse/pgsql.php:1.49 Sat Aug 12 15:44:03 2006 +++ pear/MDB2/MDB2/Driver/Reverse/pgsql.php Mon Sep 25 23:39:35 2006 @@ -42,7 +42,7 @@ // | Author: Paul Cooper <pgc@ucecom.com> | // +----------------------------------------------------------------------+ // -// $Id: pgsql.php,v 1.49 2006/08/12 15:44:03 lsmith Exp $ +// $Id: pgsql.php,v 1.50 2006/09/25 23:39:35 lsmith Exp $ require_once 'MDB2/Driver/Reverse/Common.php'; @@ -278,10 +278,10 @@ return $db; } - $id = MDB2::isResultCommon($result) ? $result->getResource() : $result; - if (!is_resource($id)) { + $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result; + if (!is_resource($resource)) { return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null, - 'Could not generate result ressource', __FUNCTION__); + 'Could not generate result resource', __FUNCTION__); } if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) { @@ -294,7 +294,7 @@ $case_func = 'strval'; } - $count = @pg_num_fields($id); + $count = @pg_num_fields($resource); $res = array(); if ($mode) { @@ -305,9 +305,9 @@ for ($i = 0; $i < $count; $i++) { $res[$i] = array( 'table' => '', - 'name' => $case_func(@pg_field_name($id, $i)), - 'type' => @pg_field_type($id, $i), - 'length' => @pg_field_size($id, $i), + 'name' => $case_func(@pg_field_name($resource, $i)), + 'type' => @pg_field_type($resource, $i), + 'length' => @pg_field_size($resource, $i), 'flags' => '', ); $mdb2type_info = $db->datatype->mapNativeDatatype($res[$i]);