Conflicts:

	lib/Doctrine/Connection/Mssql.php

Author: jwage

lib/Doctrine/Connection/Mssql.php

@@ -346,20 +346,16 @@ public function exec($query, array $params = array())
      */
     protected function replaceBoundParamsWithInlineValuesInQuery($query, array $params) {
 
-        foreach($params as $key => $value) {
-            if(is_null($value)) {
-                $value = 'NULL';
-            }
-            else {
-                $value = $this->quote($value);
-            }
+        foreach ($params as $key => $value) {
+            $value = is_null($value) ? 'NULL' : $this->quote($value);
 
-            $re = '/([=><,\(][^\\\']*)(\?)/iU';
+            // Supported:
+            // * all variations of =, <, >
+            // * LIKE
+            $re = '/(?<=WHERE)(\s+.+?\s+([=<>]+|LIKE)\s+)(\?)/';
 
             $query = preg_replace($re, "\\1 {$value}", $query, 1);
-
         }
-
         return $query;
 
     }

tests/Ticket/DC841TestCase.php

@@ -0,0 +1,79 @@
+<?php
+/*
+ *  $Id$
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * This software consists of voluntary contributions made by many individuals
+ * and is licensed under the LGPL. For more information, see
+ * <http://www.doctrine-project.org>.
+ */
+
+/**
+ * Doctrine_Ticket_DC841_TestCase
+ *
+ * @package     Doctrine
+ * @author      Enrico Stahn <[email protected]>
+ * @license     http://www.opensource.org/licenses/lgpl-license.php LGPL
+ * @category    Object Relational Mapping
+ * @link        www.doctrine-project.org
+ * @since       1.0
+ * @version     $Revision$
+ */
+class Doctrine_Ticket_DC841_TestCase extends Doctrine_UnitTestCase 
+{
+    private $sqlStackCounter = 0;
+    
+    public function prepareTables()
+    {
+        $this->tables[] = 'Ticket_DC841_Model';
+        parent::prepareTables();
+    }
+
+    public function testInit()
+    {
+        $this->dbh = new Doctrine_Adapter_Mock('mssql');
+        $this->conn = Doctrine_Manager::getInstance()->openConnection($this->dbh, 'DC841');
+    }
+    
+    public function testQuery()
+    {
+        Doctrine::getTable('Ticket_DC841_Model')
+            ->createQuery('t')
+            ->where('t.username <> ?', 'foo')
+            ->andWhere('t.foo <> ?', 'bar')
+            ->andWhere('t.foo LIKE ?', 'foo')
+            ->execute();
+
+        $expected = "SELECT [t].[model_id] AS [t__model_id], [t].[username] AS [t__username], [t].[password] AS [t__password], [t].[foo] AS [t__foo] FROM [ticket__d_c841__model] [t] WHERE ([t].[username] <>  'foo' AND [t].[foo] <>  'bar' AND [t].[foo] LIKE  'foo')";
+        $sql = current(array_slice($this->dbh->getAll(), $this->sqlStackCounter++, 1));
+
+        $this->assertEqual($expected, $sql);
+    }
+}
+
+class Ticket_DC841_Model extends Doctrine_Record
+{
+    public function setTableDefinition()
+    {
+        $this->hasColumn('model_id as id', 'integer', null, array(
+            'type' => 'integer',
+            'unsigned' => false,
+            'primary' => true,
+            'autoincrement' => true,
+        ));
+        $this->hasColumn('username', 'string', 255);
+        $this->hasColumn('password', 'string', 255);
+        $this->hasColumn('foo', 'string', 255);
+    }
+}