From 6b2cacdd3015e4fbd9b2c6569dbf3e9615dbe3ca Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 14 Aug 2007 22:50:39 +0000
Subject: [PATCH] =?UTF-8?q?#209=20les=20traces=20syst=C3=A9matiques=20de?=
=?UTF-8?q?=20[9935]=20avaient=20cass=C3=A9=20l'insertion=20en=20PG.=20Mai?=
=?UTF-8?q?s=20la=20raison=20n'est=20pas=20clair,=20il=20faudra=20y=20reve?=
=?UTF-8?q?nir.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/base/db_pg.php | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/ecrire/base/db_pg.php b/ecrire/base/db_pg.php
index 4b1b5a09cd..d8e51cfe86 100644
--- a/ecrire/base/db_pg.php
+++ b/ecrire/base/db_pg.php
@@ -146,7 +146,6 @@ function spip_pg_orderby($order, $select)
$res[] = $m[1];
} else $res[]=$v;
}
- spip_log("orde $res");
return spip_pg_frommysql(join(',',$res));
}
@@ -172,11 +171,10 @@ function spip_pg_groupby($groupby, $from, $select)
// Conversion des operateurs MySQL en PG
// IMPORTANT: "0+X" est vu comme conversion numerique du debut de X
-// Manque la traduction de Field
// Les expressions de date ne sont pas gerees au-dela de 3 ()
// Le 'as' du 'CAST' est en minuscule pour echapper au dernier preg_replace
-// de spip_pg_groupby
-// Bref, a revoir.
+// de spip_pg_groupby.
+// A ameliorer.
// http://doc.spip.org/@spip_pg_frommysql
function spip_pg_frommysql($arg)
@@ -233,7 +231,6 @@ function spip_pg_fromfield($arg)
spip_log($v);
$res .= "\nwhen $index=$v then $n";
}
- spip_log("---- " . substr($arg,strlen($m[0])+1));
$arg = $m[1] . "case $res else 0 end "
. substr($arg,strlen($m[0]));
}
@@ -286,7 +283,6 @@ function spip_pg_countsel($from = array(), $where = array(),
$r = spip_pg_select('COUNT(*)', $from, $where,
$groupby, '', $limit, $sousrequete, $having);
if ($r) list($r) = pg_fetch_array($r, NULL, PGSQL_NUM);
-# spip_log("$r pg_mysql_countsel($from $where $limit");
return $r;
}
@@ -314,7 +310,7 @@ function spip_pg_insert($table, $champs, $valeurs, $ignore='') {
$table = preg_replace('/^spip/',
$GLOBALS['table_prefix'],
$table);
- $r = spip_pg_trace_query("INSERT INTO $table $champs VALUES $valeurs $ret");
+ $r = pg_query("INSERT INTO $table $champs VALUES $valeurs $ret");
if (!$r) return 0;
if (!$ret) return -1;
$r = pg_fetch_array($r, NULL, PGSQL_NUM);
--
GitLab