#1485504: fix _skipDelimitedStrings()

release-0.6
alecpl 16 years ago
parent 59ed6f1645
commit 1ad39efbf4

@ -2915,9 +2915,7 @@ class MDB2_Driver_Common extends PEAR
$colon = ':'; $colon = ':';
$positions = array(); $positions = array();
$position = 0; $position = 0;
$ignores = $this->string_quoting;
$ignores[] = $this->identifier_quoting;
$ignores[] = $this->sql_comments;
while ($position < strlen($query)) { while ($position < strlen($query)) {
$q_position = strpos($query, $question, $position); $q_position = strpos($query, $question, $position);
$c_position = strpos($query, $colon, $position); $c_position = strpos($query, $colon, $position);
@ -3008,9 +3006,9 @@ class MDB2_Driver_Common extends PEAR
*/ */
function _skipDelimitedStrings($query, $position, $p_position) function _skipDelimitedStrings($query, $position, $p_position)
{ {
$ignores = $this->string_quoting; $ignores[] = $this->string_quoting;
$ignores[] = $this->identifier_quoting; $ignores[] = $this->identifier_quoting;
$ignores[] = $this->sql_comments; $ignores = array_merge($ignores, $this->sql_comments);
foreach ($ignores as $ignore) { foreach ($ignores as $ignore) {
if (!empty($ignore['start'])) { if (!empty($ignore['start'])) {

Loading…
Cancel
Save