Changeset 18609 for tmp/version-2_5-test/data/module/DB/ifx.php
- Timestamp:
- 2010/03/11 10:35:11 (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tmp/version-2_5-test/data/module/DB/ifx.php
r15532 r18609 19 19 * @author Tomas V.V.Cox <cox@idecnet.com> 20 20 * @author Daniel Convissor <danielc@php.net> 21 * @copyright 1997-200 5The PHP Group21 * @copyright 1997-2007 The PHP Group 22 22 * @license http://www.php.net/license/3_0.txt PHP License 3.0 23 23 * @version CVS: $Id$ … … 47 47 * @author Tomas V.V.Cox <cox@idecnet.com> 48 48 * @author Daniel Convissor <danielc@php.net> 49 * @copyright 1997-200 5The PHP Group49 * @copyright 1997-2007 The PHP Group 50 50 * @license http://www.php.net/license/3_0.txt PHP License 3.0 51 * @version Release: @package_version@51 * @version Release: 1.7.14RC1 52 52 * @link http://pear.php.net/package/DB 53 53 */ … … 102 102 '-239' => DB_ERROR_CONSTRAINT, 103 103 '-253' => DB_ERROR_SYNTAX, 104 '-268' => DB_ERROR_CONSTRAINT, 104 105 '-292' => DB_ERROR_CONSTRAINT_NOT_NULL, 105 106 '-310' => DB_ERROR_ALREADY_EXISTS, … … 114 115 '-692' => DB_ERROR_CONSTRAINT, 115 116 '-703' => DB_ERROR_CONSTRAINT_NOT_NULL, 117 '-1202' => DB_ERROR_DIVZERO, 116 118 '-1204' => DB_ERROR_INVALID_DATE, 117 119 '-1205' => DB_ERROR_INVALID_DATE, … … 244 246 function simpleQuery($query) 245 247 { 246 $ismanip = DB::isManip($query);248 $ismanip = $this->_checkManip($query); 247 249 $this->last_query = $query; 248 250 $this->affected = null; 249 if (preg_match('/(SELECT )/i', $query)) { //TESTME: Use !DB::isManip()?251 if (preg_match('/(SELECT|EXECUTE)/i', $query)) { //TESTME: Use !DB::isManip()? 250 252 // the scroll is needed for fetching absolute row numbers 251 253 // in a select query result … … 269 271 // Determine which queries should return data, and which 270 272 // should return an error code only. 271 if (preg_match('/(SELECT )/i', $query)) {273 if (preg_match('/(SELECT|EXECUTE)/i', $query)) { 272 274 return $result; 273 275 } … … 310 312 function affectedRows() 311 313 { 312 if ( DB::isManip($this->last_query)) {314 if ($this->_last_query_manip) { 313 315 return $this->affected; 314 316 } else { … … 421 423 function freeResult($result) 422 424 { 423 return @ifx_free_result($result);425 return is_resource($result) ? ifx_free_result($result) : false; 424 426 } 425 427
Note: See TracChangeset
for help on using the changeset viewer.