From 777539fbf3ab5f11e5c7c8a31007f2c7ee6c2740 Mon Sep 17 00:00:00 2001
From: jackbravo <jackbravo@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 25 Aug 2007 00:34:25 +0000
Subject: [PATCH] Fixed bug on columns not being quoted on INSERT statements,
 reported by email by Gavin Mogan

---
 lib/Doctrine/Connection.php | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/Doctrine/Connection.php b/lib/Doctrine/Connection.php
index a5e5042b2..3dc0705a7 100644
--- a/lib/Doctrine/Connection.php
+++ b/lib/Doctrine/Connection.php
@@ -468,25 +468,26 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
         if (empty($values)) {
             return false;
         }
+
         // column names are specified as array keys
-        $cols = array_keys($values);
+        $cols = array();
+        // the query VALUES will contain either expresions (eg 'NOW()') or ?
+        $a = array();
+        foreach ($values as $k => $value) {
+            $cols[] = $this->quoteIdentifier($k);
+            if ($value instanceof Doctrine_Expression) {
+                $a[] = $value->getSql();
+                unset($values[$k]);
+            } else {
+                $a[] = '?';
+            }
+        }
 
         // build the statement
         $query = 'INSERT INTO ' . $this->quoteIdentifier($table) 
                . ' (' . implode(', ', $cols) . ') '
                . 'VALUES (';
-        
-        $a = array();
-        foreach ($values as $k => $value) {
-            if ($value instanceof Doctrine_Expression) {
-                $value = $value->getSql();
-                unset($values[$k]);
-            } else {
-                $value = '?';      	
-            }
-            $a[] = $value;
 
-        }
         $query .= implode(', ', $a) . ')';
         // prepare and execute the statement