From 0102f791f3a09353f4d7fce3e4ac329aa06b2d23 Mon Sep 17 00:00:00 2001
From: Matthieu Marcillaud <marcimat@rezo.net>
Date: Sat, 8 Mar 2008 16:15:11 +0000
Subject: [PATCH] =?UTF-8?q?-=20sqlite3=20:=20les=20num=C3=A9ros=20d'erreur?=
=?UTF-8?q?s=20utilisent=20les=20num=C3=A9ros=20d'erreur=20de=20SQLite=20p?=
=?UTF-8?q?lutot=20que=20ceux=20de=20la=20classe=20PDO=20qui=20ne=20sont?=
=?UTF-8?q?=20pas=20forc=C3=A9ment=20num=C3=A9riques=20;=20-=20Ajout=20au?=
=?UTF-8?q?=20passage=20de=20la=20fonction=20"DATE=5FFORMAT"=20pour=20sqli?=
=?UTF-8?q?te.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ecrire/req/sqlite_fonctions.php | 4 ++++
ecrire/req/sqlite_generique.php | 7 +++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ecrire/req/sqlite_fonctions.php b/ecrire/req/sqlite_fonctions.php
index 0410162154..b476f997d6 100644
--- a/ecrire/req/sqlite_fonctions.php
+++ b/ecrire/req/sqlite_fonctions.php
@@ -23,6 +23,7 @@ function _sqlite_init_functions(&$sqlite){
$fonctions = array(
'CONCAT' => array( '_sqlite_func_concat' ,2),
+ 'DATE_FORMAT' => array( '_sqlite_func_strftime' ,2),
'DAYOFMONTH' => array( '_sqlite_func_dayofmonth' ,1),
'FIND_IN_SET' => array( '_sqlite_func_find_in_set' ,2),
@@ -196,6 +197,9 @@ function _sqlite_func_regexp_match($cherche, $quoi) {
return $return;
}
+function _sqlite_func_strftime($date, $conv){
+ return strftime($conv, $date);
+}
function _sqlite_func_to_days ($d) {
$result = date("z", _sqlite_func_unix_timestamp($d));
diff --git a/ecrire/req/sqlite_generique.php b/ecrire/req/sqlite_generique.php
index e1a7f396a8..e89ec0d844 100644
--- a/ecrire/req/sqlite_generique.php
+++ b/ecrire/req/sqlite_generique.php
@@ -365,15 +365,14 @@ function spip_sqlite_errno($serveur='',$requeter=true) {
$link = _sqlite_link($serveur);
if (_sqlite_is_version(3, $link)){
- $s = $link->errorCode();
+ $t = $link->errorInfo();
+ $s = $t[1];
} elseif ($link) {
$s = sqlite_last_error($link);
} else {
$s = ": aucune ressource sqlite (link)";
}
- // si $s = '00000', ne pas croire a une erreur
- if (!(int)$s) $s = 0;
-
+
if ($s) spip_log("Erreur sqlite $s");
return $s;
--
GitLab