From e9379bd0444d768b2a36f4fbd4b41f5e2d094569 Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Mon, 11 Jul 2005 13:13:15 +0000
Subject: [PATCH] messages d'erreur de MySQL dans le fichier idoine
---
ecrire/inc_db_mysql.php3 | 16 +++++++++-------
ecrire/inc_debug_sql.php3 | 5 +----
2 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/ecrire/inc_db_mysql.php3 b/ecrire/inc_db_mysql.php3
index 5e26258102..0bd5586b07 100644
--- a/ecrire/inc_db_mysql.php3
+++ b/ecrire/inc_db_mysql.php3
@@ -74,12 +74,12 @@ function spip_mysql_select($select, $from, $where,
$sousrequete, $having,
$table, $id, $serveur) {
- $q = "\nFROM " . join(",\n\t", $from)
- . ($where ? ("\nWHERE " . join("\n\tAND ", $where)) : '')
- . ($groupby ? "\nGROUP BY $groupby" : '')
- . ($having ? "\nHAVING $having" : '')
- . ($orderby ? ("\nORDER BY " . join(", ", $orderby)) : '')
- . ($limit ? "\nLIMIT $limit" : '');
+ $q = ($from ?("\nFROM " . join(",\n\t", $from)) : '')
+ . ($where ? ("\nWHERE " . join("\n\tAND ", $where)) : '')
+ . ($groupby ? "\nGROUP BY $groupby" : '')
+ . ($having ? "\nHAVING $having" : '')
+ . ($orderby ? ("\nORDER BY " . join(", ", $orderby)) : '')
+ . ($limit ? "\nLIMIT $limit" : '');
if (!$sousrequete)
$q = " SELECT ". join(", ", $select) . $q;
@@ -97,7 +97,9 @@ function spip_mysql_select($select, $from, $where,
if (!($res = @spip_query($q))) {
include_ecrire('inc_debug_sql.php3');
- echo erreur_requete_boucle($q, $id, $table);
+ erreur_requete_boucle($q, $id, $table,
+ spip_sql_errno(),
+ spip_sql_error());
}
# spip_log($serveur . spip_num_rows($res) . $q);
return $res;
diff --git a/ecrire/inc_debug_sql.php3 b/ecrire/inc_debug_sql.php3
index 8138dcab1c..f0561c888a 100644
--- a/ecrire/inc_debug_sql.php3
+++ b/ecrire/inc_debug_sql.php3
@@ -67,13 +67,10 @@ function affiche_erreurs_page($tableau_des_erreurs) {
// Si une boucle cree des soucis, on peut afficher la requete fautive
// avec son code d'erreur
//
-function erreur_requete_boucle($query, $id_boucle, $type) {
+function erreur_requete_boucle($query, $id_boucle, $type, $erreur, $errno) {
$GLOBALS['bouton_admin_debug'] = true;
- // Recuperer le numero d'erreur
- $errno = spip_sql_errno();
- $erreur = spip_sql_error();
if (eregi('err(no|code):?[[:space:]]*([0-9]+)', $erreur, $regs))
$errno = $regs[2];
else if (($errno == 1030 OR $errno <= 1026)
--
GitLab