From db8dbe0d71278ce756b0de57aff9c743aef5f415 Mon Sep 17 00:00:00 2001
From: Denis Chenu <shnoulle@users.sourceforge.net>
Date: Fri, 12 Aug 2011 14:03:25 +0000
Subject: [PATCH] Fixed issue : #05392 column "SID" of relation "lime_surveys"
 does not exist with posgresql Dev	: remove $ADODB_QUOTE_FIELDNAMES=true;
 Dev : new patch for 05367, make the sqlQuery and use Execute. Maybe use a new
 function for insert/update everywher.

git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey_dev@10704 b72ed6b6-b9f8-46b5-92b4-906544132732
---
 admin/importoldresponses.php | 14 ++------------
 common.php                   |  1 -
 2 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/admin/importoldresponses.php b/admin/importoldresponses.php
index cd9b796d9a3..33a8d92cd25 100644
--- a/admin/importoldresponses.php
+++ b/admin/importoldresponses.php
@@ -82,15 +82,6 @@
 }
 elseif (isset($surveyid) && $surveyid && isset($oldtable))
 {
-    /*
-     * TODO:
-     * - mysql fit machen
-     * -- quotes für mysql beachten --> ` 
-     * - warnmeldung mehrsprachig
-     * - testen
-     */
-    //	if($databasetype=="postgres")
-    //	{
     $activetable = "{$dbprefix}survey_$surveyid";
 
     //Fields we don't want to import
@@ -118,9 +109,9 @@
         $iOldID=$row['id'];
         unset($row['id']);
 
-        $sInsertSQL=$connect->GetInsertSQL($activetable,$row);
+        $sInsertSQL="INSERT into {$activetable} (".implode(",",array_map("db_quote_id",array_keys($row))).") VALUES (".implode(",",array_map("db_quoteall",array_values($row))).")";
         $result = $connect->Execute($sInsertSQL) or safe_die("Error:<br />$sInsertSQL<br />".$connect->ErrorMsg());
-        $aSRIDConversions[$iOldID]=$connect->Insert_ID();
+        $aSRIDConversions[$iOldID]=$connect->Insert_Id($activetable,"id");
         }
 
     $_SESSION['flashmessage'] = sprintf($clang->gT("%s old response(s) were successfully imported."),$iRecordCount);               
@@ -144,7 +135,6 @@
         {
                 $row['id']=$aSRIDConversions[$row['id']];   
             }
-            else continue;
             $sInsertSQL=$connect->GetInsertSQL($sNewTimingsTable,$row);
             $result = $connect->Execute($sInsertSQL) or safe_die("Error:<br />$sInsertSQL<br />".$connect->ErrorMsg());
         }
diff --git a/common.php b/common.php
index e4af55c6dce..ad6448c4205 100644
--- a/common.php
+++ b/common.php
@@ -61,7 +61,6 @@
 define('FIREBUG' , $use_firebug_lite);
 
 define('ADODB_ASSOC_CASE', 2); // needed to set proper upper/lower casing for mssql
-if (!isset($ADODB_QUOTE_FIELDNAMES)){$ADODB_QUOTE_FIELDNAMES=true;} // needed to select/insert the FieldNames with #
 
 ##################################################################################