cvs: pear /DB_DataObject/DataObject Generator.php

alan_k Mon Feb 26 02:17:08 2007 UTC Modified files: /pear/DB_DataObject/DataObject Generator.php Log: fix bug #10175 - MDB2 does not return length value AFAIK http://cvs.php.net/viewvc.cgi/pear/DB_DataObject/DataObject/Generator.php?r1=1.129&r2=1.130&diff_format=u Index: pear/DB_DataObject/DataObject/Generator.php diff -u pear/DB_DataObject/DataObject/Generator.php:1.129 pear/DB_DataObject/DataObject/Generator.php:1.130 --- pear/DB_DataObject/DataObject/Generator.php:1.129 Mon Feb 26 02:14:06 2007 +++ pear/DB_DataObject/DataObject/Generator.php Mon Feb 26 02:17:07 2007 @@ -15,7 +15,7 @@ * @author Alan Knowles <alan@akbkhome.com> * @copyright 1997-2006 The PHP Group * @license http://www.php.net/license/3_0.txt PHP License 3.0 - * @version CVS: $Id: Generator.php,v 1.129 2007/02/26 02:14:06 alan_k Exp $ + * @version CVS: $Id: Generator.php,v 1.130 2007/02/26 02:17:07 alan_k Exp $ * @link http://pear.php.net/package/DB_DataObject */ @@ -266,6 +266,9 @@ $defs = $__DB->reverse->tableInfo($quotedTable); // rename the length value, so it matches db's return. foreach ($defs as $k => $v) { + if (!isset($defs[$k]['length'])) { + continue; + } $defs[$k]['len'] = $defs[$k]['length']; } } @@ -1139,13 +1142,18 @@ $__DB->loadModule('Manager'); $__DB->loadModule('Reverse'); } - + $quotedTable = !empty($options['quote_identifiers']) ? + $__DB->quoteIdentifier($table) : $table; + if (!$is_MDB2) { - $defs = $__DB->tableInfo($table); + $defs = $__DB->tableInfo($quotedTable); } else { - $defs = $__DB->reverse->tableInfo($table); + $defs = $__DB->reverse->tableInfo($quotedTable); foreach ($defs as $k => $v) { - $defs[$k]['len'] = &$defs[$k]['length']; + if (!isset($defs[$k]['length'])) { + continue; + } + $defs[$k]['len'] = $defs[$k]['length']; } }