From 8e2a5a76d187d813a48a754df3c0bf30f60f16c8 Mon Sep 17 00:00:00 2001 From: alecpl Date: Sat, 18 Oct 2008 21:17:36 +0000 Subject: #1485504: applied two patches from MDB2's repository --- program/lib/MDB2.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'program') diff --git a/program/lib/MDB2.php b/program/lib/MDB2.php index 7e4732266..776554182 100644 --- a/program/lib/MDB2.php +++ b/program/lib/MDB2.php @@ -2915,9 +2915,9 @@ class MDB2_Driver_Common extends PEAR $colon = ':'; $positions = array(); $position = 0; - $ignores = $this->sql_comments; - $ignores[] = $this->string_quoting; + $ignores = $this->string_quoting; $ignores[] = $this->identifier_quoting; + $ignores[] = $this->sql_comments; while ($position < strlen($query)) { $q_position = strpos($query, $question, $position); $c_position = strpos($query, $colon, $position); @@ -3148,7 +3148,7 @@ class MDB2_Driver_Common extends PEAR function getSequenceName($sqn) { return sprintf($this->options['seqname_format'], - preg_replace('/[^a-z0-9_\$.]/i', '_', $sqn)); + preg_replace('/[^a-z0-9_\-\$.]/i', '_', $sqn)); } // }}} -- cgit v1.2.3