diff --git a/ecrire/req/sqlite_fonctions.php b/ecrire/req/sqlite_fonctions.php index 597bce20a4db06db6d76d25d13fdead0ae374bbb..87bc7cf595d5e258dab659c1f7b4373b09c2ca48 100644 --- a/ecrire/req/sqlite_fonctions.php +++ b/ecrire/req/sqlite_fonctions.php @@ -43,7 +43,8 @@ function _sqlite_init_functions(&$sqlite){ 'MONTH' => array( '_sqlite_func_month' ,1), 'RAND' => array( '_sqlite_func_rand' ,0), // sinon random() v2.4 - 'REGEXP_MATCH' => array( '_sqlite_func_regexp_match' ,2), // critere REGEXP supporte a partir de v3.3.2 + 'REGEXP' => array( '_sqlite_func_regexp_match' ,2), // critere REGEXP supporte a partir de v3.3.2 + //'REGEXP_MATCH' => array( '_sqlite_func_regexp_match' ,2), // critere REGEXP supporte a partir de v3.3.2 'REGEXP_REPLACE'=> array( '_sqlite_func_regexp_replace' ,3), 'RIGHT' => array( '_sqlite_func_right' ,2), # 'RTRIM' => array( 'rtrim' ,1), // present en theorie @@ -179,7 +180,7 @@ function _sqlite_func_right ($s, $lenght) { } -function _sqlite_func_regexp_match($quoi, $cherche) { +function _sqlite_func_regexp_match($cherche, $quoi) { $return = preg_match('%'.$cherche.'%', $quoi); #spip_log("regexp_replace : $quoi, $cherche, $remplace, $return",'debug'); return $return; diff --git a/ecrire/req/sqlite_generique.php b/ecrire/req/sqlite_generique.php index db43cdc20946d387958b08c7e5488e0f73cf0d0c..a9ecadfa168bf9af7bd2abc580cf5cf5378d7624 100644 --- a/ecrire/req/sqlite_generique.php +++ b/ecrire/req/sqlite_generique.php @@ -1084,7 +1084,7 @@ class sqlite_analyse_query { // critere REGEXP non reconnu en sqlite2 function corrigerRegexp(){ if (($this->sqlite_version == 2) && (strpos($this->query, 'REGEXP')!==false)){ - $this->query = preg_replace('/([^\s\(]*)(\s*)REGEXP(\s*)([^\s\)]*)/', 'REGEXP_MATCH($1, $4)', $this->query); + $this->query = preg_replace('/([^\s\(]*)(\s*)REGEXP(\s*)([^\s\)]*)/', 'REGEXP($4, $1)', $this->query); } }