From 96ee60654c5b34676b10c5f0e857ea3887a2189b Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@users.sourceforge.net>
Date: Wed, 18 Aug 2010 13:59:28 +0000
Subject: [PATCH] Postgresql compatibility

---
 htdocs/install/etape2.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/htdocs/install/etape2.php b/htdocs/install/etape2.php
index f0775cb2902..c0caa20c7a7 100644
--- a/htdocs/install/etape2.php
+++ b/htdocs/install/etape2.php
@@ -116,6 +116,11 @@ if ($_POST["action"] == "set")
 	$createfunctions=1;
 	$createdata=1;
 
+
+	// To say sql requests are escaped for mysql so we need to unescape them
+	$db->unescapeslashquot=1;
+
+
 	/**************************************************************************************
 	 *
 	 * Chargement fichiers tables/*.sql (non *.key.sql)
@@ -194,7 +199,7 @@ if ($_POST["action"] == "set")
 						print "<tr><td>".$langs->trans("CreateTableAndPrimaryKey",$name);
 						print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
 						print "\n</td>";
-						print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>";
+						print "<td>".$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error()."</td></tr>";
 						$error++;
 					}
 				}
@@ -336,7 +341,7 @@ if ($_POST["action"] == "set")
 								print "<tr><td>".$langs->trans("CreateOtherKeysForTable",$name);
 								print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$db->lastqueryerror();
 								print "\n</td>";
-								print "<td>".$langs->trans("Error")." ".$db->errno()." ".$db->error()."</td></tr>";
+								print "<td>".$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error()."</td></tr>";
 								$error++;
 							}
 						}
@@ -420,7 +425,12 @@ if ($_POST["action"] == "set")
 						else
 						{
 							$ok = 0;
-							print $langs->trans("ErrorSQL")." : ".$db->errno()." - '".$buffer."'<br>\n";
+
+                            print "<tr><td>".$langs->trans("FunctionsCreation");
+                            print "<br>\n".$langs->trans("Request").' '.$requestnb.' : '.$buffer;
+                            print "\n</td>";
+                            print "<td>".$langs->trans("ErrorSQL")." ".$db->errno()." ".$db->error()."</td></tr>";
+                            $error++;
 						}
 					}
 				}