gaffe aux cles multiples dans les jointures automatiques (Pierre Bourgeois)

ecrire/inc_db_mysql.php3

@@ -164,26 +164,31 @@ function spip_mysql_showtable($nom_table)
   if (!a) return "";
   if (!spip_fetch_array($a)) return "";
   list(,$a) = spip_fetch_array(spip_query("SHOW CREATE TABLE $nom_table"));
-  if (!ereg("^[^()]*\(([^()]*(\([^()]*\)[^()]*)*)\)", $a, $r))
+
+  if (!preg_match("/^[^(),]*\((([^()]*\([^()]*\)[^()]*)*)\)[^()]*$/", $a, $r))
     return "";
   else {
+    $dec = $r[1];
+    if (preg_match("/^(.*),(.*KEY.*)$/s", $dec, $r)) {
+      $namedkeys = $r[2];
+      $dec = $r[1];
+    }
+    else 
+      $namedkeys = "";
 
-    $a = preg_split("/,\s*`/",$r[1]);
-    $n = count($a)-1;
-    ereg("^([^(),]*([^(),]*(\([^()]*\)[^(),]*)*)),(.*)", $a[$n], $r);
-    $a[$n]= $r[1];
-    $namedkeys = $r[count($r)-1];
     $fields = array();
-    foreach($a as $v) {
+    foreach(preg_split("/,\s*`/",$dec) as $v) {
       preg_match("/^\s*`?([^`]*)`\s*(.*)$/",$v,$r);
       $fields[strtolower($r[1])] = $r[2];
     }
     $keys = array();
-    foreach(split(",",$namedkeys) as $v) {
-      preg_match("/^([^(]*)\((.*)\)\s*$/",$v,$r);
-      $k = str_replace("`", '', $r[1]);
-      $t = strtolower(str_replace("`", '', $r[2]));
-      $keys[$k] = $t;
+
+    foreach(split(")",$namedkeys) as $v) {
+	      if (preg_match("/^\s*([^(]*)\((.*)$/",$v,$r)) {
+		$k = str_replace("`", '', trim($r[1]));
+		$t = strtolower(str_replace("`", '', $r[2]));
+		if ($k && !isset($keys[$k])) $keys[$k] = $t; else $keys[] = $t;
+	    }
     }
     return array('field' => $fields,	'key' => $keys);
   }

inc-criteres.php3

@@ -569,7 +569,8 @@ function calculer_chaine_jointures(&$boucle, $depart, $arrivee, $vu=array())
   list($dnom,$ddesc) = $depart;
   list($anom,$adesc) = $arrivee;
   $prim = $ddesc['key']['PRIMARY KEY'];
-  $v = array_intersect($prim ? array($prim): $ddesc['key'], $adesc['key']);
+#  spip_log("ccj $dnom $prim");
+  $v = array_intersect($prim ? split(',',$prim): $ddesc['key'], $adesc['key']);
   if ($v)
     return array(array($dnom, $anom, array_shift($v)));
    else    {
@@ -578,6 +579,7 @@ function calculer_chaine_jointures(&$boucle, $depart, $arrivee, $vu=array())
 	if ($v && (!in_array($v,$vu)) && 
 	    ($j = trouver_def_table($v, $boucle))) {
 	  list($table,$join) = $j;
+#	  spip_log(" trouver $table " . join(",",$join['key']));
 	  $milieu = array_intersect($ddesc['key'], trouver_cles_table($join['key']));
 	  foreach ($milieu as $k)
 	    {
@@ -604,8 +606,9 @@ function trouver_cles_table($keys)
     if (!strpos($v,","))
       $res[$v]=1; 
     else {
-      foreach (split(" *, *", $v) as $k)
+      foreach (split(" *, *", $v) as $k) {
 	$res[$k]=1;
+      }
     }
   }
   return array_keys($res);