From fca2cfca448c5959f5324027a4be1fca8de3648c Mon Sep 17 00:00:00 2001
From: "Committo,Ergo:sum" <esj@rezo.net>
Date: Tue, 23 Oct 2007 14:45:59 +0000
Subject: [PATCH] =?UTF-8?q?La=20fonction=20Rand,=20utilis=C3=A9e=20pour=20?=
=?UTF-8?q?le=20crit=C3=A8re=20''{par=20hasard}''=20est=20inconnue=20de=20?=
=?UTF-8?q?PG.=20Le=20code=20pour=20les=20version=20de=20MySQL=20ne=20l'ay?=
=?UTF-8?q?ant=20pas=20non=20plus=20ne=20marchait=20en=20fait=20plus,=20ca?=
=?UTF-8?q?r=20il=20supposait=20que=20les=20cl=C3=A9s=20primaires=20de=20t?=
=?UTF-8?q?outes=20les=20tables=20sont=20num=C3=A9riques=20ce=20qui=20n'es?=
=?UTF-8?q?t=20plus=20le=20cas.=20Rem=C3=A8de=20express:=20=20hasard=20=3D?=
=?UTF-8?q?=20l'heure=20qu'il=20est.=20Il=20y=20aurait=20mieux=20=C3=A0=20?=
=?UTF-8?q?trouver,=20mais=20il=20y=20a=20plus=20urgent=20(et=20qui=20util?=
=?UTF-8?q?ise=20ce=20crit=C3=A8re=20=3F).=20On=20en=20profite=20pour=20ab?=
=?UTF-8?q?straire=20un=20peu=20mieux=20les=20fonctions=20autour=20des=20d?=
=?UTF-8?q?ates.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/base/abstract_sql.php | 13 +++++++++----
ecrire/public/criteres.php | 17 ++++-------------
ecrire/req/mysql.php | 3 +--
ecrire/req/pg.php | 5 ++++-
4 files changed, 18 insertions(+), 20 deletions(-)
diff --git a/ecrire/base/abstract_sql.php b/ecrire/base/abstract_sql.php
index 5ddc2ee18d..10a53798fe 100644
--- a/ecrire/base/abstract_sql.php
+++ b/ecrire/base/abstract_sql.php
@@ -352,13 +352,18 @@ function calcul_mysql_in($val, $valeurs, $not='') {
// http://doc.spip.org/@test_sql_int
function test_sql_int($type)
{
- return (strpos($type, 'bigint') === 0
- OR strpos($type, 'int') === 0
- OR strpos($type, 'tinyint') === 0);
+ return (preg_match('/^bigint/i',$type)
+ OR preg_match('/^int/i',$type)
+ OR preg_match('/^tinyint/i',$type));
}
+function test_sql_date($type)
+{
+ return (preg_match('/^datetime/i',$type)
+ OR preg_match('/^timestamp/i',$type));
+}
-// Cette fonction est vouee a disparaitre
+// Cette fonction devrait disparaitre
// http://doc.spip.org/@description_table
function description_table($nom){
diff --git a/ecrire/public/criteres.php b/ecrire/public/criteres.php
index 1034176c36..b9af45d2c5 100644
--- a/ecrire/public/criteres.php
+++ b/ecrire/public/criteres.php
@@ -344,12 +344,9 @@ function critere_parinverse($idb, &$boucles, $crit, $sens='') {
if ($tri[0]->type != 'texte') {
// calculer le order dynamique qui verifie les champs
$order = calculer_critere_arg_dynamique($idb, $boucles, $tri, $sens);
- // et ajouter un champ hasard dans le select pour supporter 'hasard' comme tri dynamique
- if (sql_select(array("RAND()")))
- $par = "RAND()";
- else
- $par = "MOD(".$boucle->id_table.'.'.$boucle->primary
- ." * UNIX_TIMESTAMP(),32767) & UNIX_TIMESTAMP()";
+ // et ajouter un champ hasard dans le select
+ //pour supporter 'hasard' comme tri dynamique
+ $par = "UNIX_TIMESTAMP()";
$boucle->select[]= $par . " AS hasard";
} else {
$par = array_shift($tri);
@@ -375,13 +372,7 @@ function critere_parinverse($idb, &$boucles, $crit, $sens='') {
if (count($match)>2) { $par = substr($match[2],1,-1); $fct = $match[1]; }
// par hasard
if ($par == 'hasard') {
- // tester si cette version de MySQL accepte la commande RAND()
- // sinon faire un gloubi-boulga maison avec de la mayonnaise.
- if (sql_select(array("RAND()")))
- $par = "RAND()";
- else
- $par = "MOD(".$boucle->id_table.'.'.$boucle->primary
- ." * UNIX_TIMESTAMP(),32767) & UNIX_TIMESTAMP()";
+ $par = "UNIX_TIMESTAMP()";
$boucle->select[]= $par . " AS alea";
$order = "'alea'";
}
diff --git a/ecrire/req/mysql.php b/ecrire/req/mysql.php
index 6ce297d910..a7c04a8b4e 100644
--- a/ecrire/req/mysql.php
+++ b/ecrire/req/mysql.php
@@ -553,8 +553,7 @@ function spip_release_lock($nom) {
// http://doc.spip.org/@spip_mysql_cite
function spip_mysql_cite($val, $type) {
- if(((strpos($type, 'datetime')===0) OR strpos($type, 'TIMESTAMP')===0)
- AND preg_match('/^\w+\(/', $val))
+ if (test_sql_date($type) AND preg_match('/^\w+\(/', $val))
return $val;
return _q($val);
}
diff --git a/ecrire/req/pg.php b/ecrire/req/pg.php
index abe5bf5119..d87fd70137 100644
--- a/ecrire/req/pg.php
+++ b/ecrire/req/pg.php
@@ -340,6 +340,9 @@ function spip_pg_frommysql($arg)
$res = preg_replace('/\b0[+]([^, ]+)\s*/',
'CAST(substring(\1, \'^ *[0-9]+\') as int)',
$res);
+ $res = preg_replace('/UNIX_TIMESTAMP\s*[(]\s*[)]/',
+ 'EXTRACT(\'epoch\' FROM NOW())', $res);
+
$res = preg_replace('/UNIX_TIMESTAMP\s*[(]([^)]*)[)]/',
'EXTRACT(\'epoch\' FROM \1)', $res);
@@ -627,7 +630,7 @@ function spip_pg_sequence($table)
// http://doc.spip.org/@spip_pg_cite
function spip_pg_cite($v, $t)
{
- if ((strpos($t, 'datetime')===0) OR (strpos($t, 'TIMESTAMP')===0)) {
+ if (test_sql_date($t)) {
if (strpos("0123456789", $v[0]) === false)
return spip_pg_frommysql($v);
else {
--
GitLab