diff --git a/ecrire/req/sqlite_fonctions.php b/ecrire/req/sqlite_fonctions.php index 0410162154dca568b578bcdead183d392e7188bf..b476f997d695f63edb72f53ce69a7d46bb8f61b8 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 e1a7f396a8b0a2cb3b9767f3864c9c547a016275..e89ec0d8448b8923bd7494af99ee843e47e9dddb 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;