From 70c699e0a6c91d1838d85c86597313f64ce5b72c Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Fri, 18 Jan 2008 21:41:11 +0000
Subject: [PATCH] =?UTF-8?q?Nuls,=20ces=20serveurs=20SQL:=20{{{=20T1=20JOIN?=
 =?UTF-8?q?=20T2=20USING=20x=20JOIN=20T3=20USING=20x=20}}}=20leur=20fait?=
 =?UTF-8?q?=20dire=20qu'il=20y=20a=20une=20ambiguit=C3=A9=20sur=20x=20alor?=
 =?UTF-8?q?s=20qu'ils=20ont=20bien=20vu=20que=20les=20colonnes=20nomm?=
 =?UTF-8?q?=C3=A9es=20x=20=C3=A9taient=20=C3=A9gales...=20Retour=20au=20ON?=
 =?UTF-8?q?.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ecrire/public/composer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ecrire/public/composer.php b/ecrire/public/composer.php
index 65a7a18ec2..9ec7cdd1b4 100644
--- a/ecrire/public/composer.php
+++ b/ecrire/public/composer.php
@@ -505,7 +505,7 @@ function calculer_select ($select = array(), $from = array(),
 		OR calculer_jointnul($cle, $join)
 		OR calculer_jointnul($cle, $having)
 		OR calculer_jointnul($cle, $where)) {
-			$sfrom = "\n\t".(isset($from_type[$cle])?$from_type[$cle]:"INNER")." JOIN " . $from[$cle] . " AS $cle USING ($c)" . $sfrom;
+			$sfrom = "\n\t".(isset($from_type[$cle])?$from_type[$cle]:"INNER")." JOIN " . $from[$cle] . " AS $cle ON ($t.$c=$cle.$c)" . $sfrom;
 			$equiv[]= $c;
 		} else { unset($join[$k]);}
 		unset($from[$cle]);
-- 
GitLab