spip /
SPIP
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | */ |
| 18 | 18 | |
| 19 | 19 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 20 | - return; |
|
| 20 | + return; |
|
| 21 | 21 | } |
| 22 | 22 | |
| 23 | 23 | /** |
@@ -36,20 +36,20 @@ discard block |
||
| 36 | 36 | **/ |
| 37 | 37 | function base_repair_dist($titre = '', $reprise = '') { |
| 38 | 38 | |
| 39 | - $res = admin_repair_tables(); |
|
| 40 | - if (!$res) { |
|
| 41 | - $res = "<div class='error'>" . _T('avis_erreur_mysql') . ' ' . sql_errno() . ': ' . sql_error() . "</div>\n"; |
|
| 42 | - } else { |
|
| 43 | - include_spip('inc/rubriques'); |
|
| 44 | - calculer_rubriques(); |
|
| 45 | - propager_les_secteurs(); |
|
| 46 | - } |
|
| 47 | - include_spip('inc/minipres'); |
|
| 48 | - $res .= pipeline('base_admin_repair', $res); |
|
| 49 | - echo minipres( |
|
| 50 | - _T('texte_tentative_recuperation'), |
|
| 51 | - $res . generer_form_ecrire('accueil', '', '', _T('public:accueil_site')) |
|
| 52 | - ); |
|
| 39 | + $res = admin_repair_tables(); |
|
| 40 | + if (!$res) { |
|
| 41 | + $res = "<div class='error'>" . _T('avis_erreur_mysql') . ' ' . sql_errno() . ': ' . sql_error() . "</div>\n"; |
|
| 42 | + } else { |
|
| 43 | + include_spip('inc/rubriques'); |
|
| 44 | + calculer_rubriques(); |
|
| 45 | + propager_les_secteurs(); |
|
| 46 | + } |
|
| 47 | + include_spip('inc/minipres'); |
|
| 48 | + $res .= pipeline('base_admin_repair', $res); |
|
| 49 | + echo minipres( |
|
| 50 | + _T('texte_tentative_recuperation'), |
|
| 51 | + $res . generer_form_ecrire('accueil', '', '', _T('public:accueil_site')) |
|
| 52 | + ); |
|
| 53 | 53 | } |
| 54 | 54 | |
| 55 | 55 | /** |
@@ -63,59 +63,59 @@ discard block |
||
| 63 | 63 | **/ |
| 64 | 64 | function admin_repair_tables() { |
| 65 | 65 | |
| 66 | - $repair = sql_serveur('repair', '', true); |
|
| 66 | + $repair = sql_serveur('repair', '', true); |
|
| 67 | 67 | |
| 68 | - // recreer les tables manquantes eventuelles |
|
| 69 | - include_spip('base/create'); |
|
| 70 | - creer_base(); |
|
| 71 | - $tables = sql_alltable(); |
|
| 68 | + // recreer les tables manquantes eventuelles |
|
| 69 | + include_spip('base/create'); |
|
| 70 | + creer_base(); |
|
| 71 | + $tables = sql_alltable(); |
|
| 72 | 72 | |
| 73 | - $res = ''; |
|
| 74 | - foreach ($tables as $tab) { |
|
| 75 | - $class = ''; |
|
| 76 | - $m = "<strong>$tab</strong> "; |
|
| 77 | - spip_log("Repare $tab", _LOG_INFO_IMPORTANTE); |
|
| 78 | - // supprimer la meta avant de lancer la reparation |
|
| 79 | - // car le repair peut etre long ; on ne veut pas boucler |
|
| 80 | - effacer_meta('admin_repair'); |
|
| 81 | - if ($repair) { |
|
| 82 | - $result_repair = sql_repair($tab); |
|
| 83 | - if (!$result_repair) { |
|
| 84 | - return false; |
|
| 85 | - } |
|
| 86 | - } |
|
| 73 | + $res = ''; |
|
| 74 | + foreach ($tables as $tab) { |
|
| 75 | + $class = ''; |
|
| 76 | + $m = "<strong>$tab</strong> "; |
|
| 77 | + spip_log("Repare $tab", _LOG_INFO_IMPORTANTE); |
|
| 78 | + // supprimer la meta avant de lancer la reparation |
|
| 79 | + // car le repair peut etre long ; on ne veut pas boucler |
|
| 80 | + effacer_meta('admin_repair'); |
|
| 81 | + if ($repair) { |
|
| 82 | + $result_repair = sql_repair($tab); |
|
| 83 | + if (!$result_repair) { |
|
| 84 | + return false; |
|
| 85 | + } |
|
| 86 | + } |
|
| 87 | 87 | |
| 88 | - // essayer de maj la table (creation de champs manquants) |
|
| 89 | - maj_tables($tab); |
|
| 88 | + // essayer de maj la table (creation de champs manquants) |
|
| 89 | + maj_tables($tab); |
|
| 90 | 90 | |
| 91 | - $count = sql_countsel($tab); |
|
| 91 | + $count = sql_countsel($tab); |
|
| 92 | 92 | |
| 93 | - if ($count > 1) { |
|
| 94 | - $m .= '(' . _T('texte_compte_elements', ['count' => $count]) . ")\n"; |
|
| 95 | - } else { |
|
| 96 | - if ($count == 1) { |
|
| 97 | - $m .= '(' . _T('texte_compte_element', ['count' => $count]) . ")\n"; |
|
| 98 | - } else { |
|
| 99 | - $m .= '(' . _T('texte_vide') . ")\n"; |
|
| 100 | - } |
|
| 101 | - } |
|
| 93 | + if ($count > 1) { |
|
| 94 | + $m .= '(' . _T('texte_compte_elements', ['count' => $count]) . ")\n"; |
|
| 95 | + } else { |
|
| 96 | + if ($count == 1) { |
|
| 97 | + $m .= '(' . _T('texte_compte_element', ['count' => $count]) . ")\n"; |
|
| 98 | + } else { |
|
| 99 | + $m .= '(' . _T('texte_vide') . ")\n"; |
|
| 100 | + } |
|
| 101 | + } |
|
| 102 | 102 | |
| 103 | - if ( |
|
| 104 | - $result_repair |
|
| 105 | - and $msg = join( |
|
| 106 | - ' ', |
|
| 107 | - (is_resource($result_repair) or is_object($result_repair)) ? sql_fetch($result_repair) : $result_repair |
|
| 108 | - ) . ' ' |
|
| 109 | - and !str_contains($msg, ' OK ') |
|
| 110 | - ) { |
|
| 111 | - $class = " class='notice'"; |
|
| 112 | - $m .= '<br /><tt>' . spip_htmlentities($msg) . "</tt>\n"; |
|
| 113 | - } else { |
|
| 114 | - $m .= ' ' . _T('texte_table_ok'); |
|
| 115 | - } |
|
| 103 | + if ( |
|
| 104 | + $result_repair |
|
| 105 | + and $msg = join( |
|
| 106 | + ' ', |
|
| 107 | + (is_resource($result_repair) or is_object($result_repair)) ? sql_fetch($result_repair) : $result_repair |
|
| 108 | + ) . ' ' |
|
| 109 | + and !str_contains($msg, ' OK ') |
|
| 110 | + ) { |
|
| 111 | + $class = " class='notice'"; |
|
| 112 | + $m .= '<br /><tt>' . spip_htmlentities($msg) . "</tt>\n"; |
|
| 113 | + } else { |
|
| 114 | + $m .= ' ' . _T('texte_table_ok'); |
|
| 115 | + } |
|
| 116 | 116 | |
| 117 | - $res .= "<div$class>$m</div>"; |
|
| 118 | - } |
|
| 117 | + $res .= "<div$class>$m</div>"; |
|
| 118 | + } |
|
| 119 | 119 | |
| 120 | - return $res; |
|
| 120 | + return $res; |
|
| 121 | 121 | } |
@@ -38,7 +38,7 @@ discard block |
||
| 38 | 38 | |
| 39 | 39 | $res = admin_repair_tables(); |
| 40 | 40 | if (!$res) { |
| 41 | - $res = "<div class='error'>" . _T('avis_erreur_mysql') . ' ' . sql_errno() . ': ' . sql_error() . "</div>\n"; |
|
| 41 | + $res = "<div class='error'>"._T('avis_erreur_mysql').' '.sql_errno().': '.sql_error()."</div>\n"; |
|
| 42 | 42 | } else { |
| 43 | 43 | include_spip('inc/rubriques'); |
| 44 | 44 | calculer_rubriques(); |
@@ -48,7 +48,7 @@ discard block |
||
| 48 | 48 | $res .= pipeline('base_admin_repair', $res); |
| 49 | 49 | echo minipres( |
| 50 | 50 | _T('texte_tentative_recuperation'), |
| 51 | - $res . generer_form_ecrire('accueil', '', '', _T('public:accueil_site')) |
|
| 51 | + $res.generer_form_ecrire('accueil', '', '', _T('public:accueil_site')) |
|
| 52 | 52 | ); |
| 53 | 53 | } |
| 54 | 54 | |
@@ -91,12 +91,12 @@ discard block |
||
| 91 | 91 | $count = sql_countsel($tab); |
| 92 | 92 | |
| 93 | 93 | if ($count > 1) { |
| 94 | - $m .= '(' . _T('texte_compte_elements', ['count' => $count]) . ")\n"; |
|
| 94 | + $m .= '('._T('texte_compte_elements', ['count' => $count]).")\n"; |
|
| 95 | 95 | } else { |
| 96 | 96 | if ($count == 1) { |
| 97 | - $m .= '(' . _T('texte_compte_element', ['count' => $count]) . ")\n"; |
|
| 97 | + $m .= '('._T('texte_compte_element', ['count' => $count]).")\n"; |
|
| 98 | 98 | } else { |
| 99 | - $m .= '(' . _T('texte_vide') . ")\n"; |
|
| 99 | + $m .= '('._T('texte_vide').")\n"; |
|
| 100 | 100 | } |
| 101 | 101 | } |
| 102 | 102 | |
@@ -105,13 +105,13 @@ discard block |
||
| 105 | 105 | and $msg = join( |
| 106 | 106 | ' ', |
| 107 | 107 | (is_resource($result_repair) or is_object($result_repair)) ? sql_fetch($result_repair) : $result_repair |
| 108 | - ) . ' ' |
|
| 108 | + ).' ' |
|
| 109 | 109 | and !str_contains($msg, ' OK ') |
| 110 | 110 | ) { |
| 111 | 111 | $class = " class='notice'"; |
| 112 | - $m .= '<br /><tt>' . spip_htmlentities($msg) . "</tt>\n"; |
|
| 112 | + $m .= '<br /><tt>'.spip_htmlentities($msg)."</tt>\n"; |
|
| 113 | 113 | } else { |
| 114 | - $m .= ' ' . _T('texte_table_ok'); |
|
| 114 | + $m .= ' '._T('texte_table_ok'); |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | $res .= "<div$class>$m</div>"; |
@@ -25,7 +25,7 @@ discard block |
||
| 25 | 25 | */ |
| 26 | 26 | |
| 27 | 27 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 28 | - return; |
|
| 28 | + return; |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** Version de l'API SQL */ |
@@ -45,39 +45,39 @@ discard block |
||
| 45 | 45 | * contexte de l'erreur |
| 46 | 46 | **/ |
| 47 | 47 | function sql_error_backtrace($compil_info = false) { |
| 48 | - $trace = debug_backtrace(); |
|
| 49 | - $caller = array_shift($trace); |
|
| 50 | - while (count($trace) and (empty($trace[0]['file']) or $trace[0]['file'] === $caller['file'] or $trace[0]['file'] === __FILE__)) { |
|
| 51 | - array_shift($trace); |
|
| 52 | - } |
|
| 53 | - |
|
| 54 | - if ($compil_info) { |
|
| 55 | - $contexte_compil = [ |
|
| 56 | - $trace[0]['file'],// sourcefile |
|
| 57 | - '', //nom |
|
| 58 | - (isset($trace[1]) ? $trace[1]['function'] . "(){\n" : '') |
|
| 59 | - . $trace[0]['function'] . '();' |
|
| 60 | - . (isset($trace[1]) ? "\n}" : ''), //id_boucle |
|
| 61 | - $trace[0]['line'], // ligne |
|
| 62 | - $GLOBALS['spip_lang'], // lang |
|
| 63 | - ]; |
|
| 64 | - |
|
| 65 | - return $contexte_compil; |
|
| 66 | - } |
|
| 67 | - |
|
| 68 | - $message = count($trace) ? $trace[0]['file'] . ' L' . $trace[0]['line'] : ''; |
|
| 69 | - $f = []; |
|
| 70 | - while (count($trace) and $t = array_shift($trace)) { |
|
| 71 | - if (in_array($t['function'], ['include_once', 'include_spip', 'find_in_path'])) { |
|
| 72 | - break; |
|
| 73 | - } |
|
| 74 | - $f[] = $t['function']; |
|
| 75 | - } |
|
| 76 | - if (count($f)) { |
|
| 77 | - $message .= ' [' . implode('(),', $f) . '()]'; |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - return $message; |
|
| 48 | + $trace = debug_backtrace(); |
|
| 49 | + $caller = array_shift($trace); |
|
| 50 | + while (count($trace) and (empty($trace[0]['file']) or $trace[0]['file'] === $caller['file'] or $trace[0]['file'] === __FILE__)) { |
|
| 51 | + array_shift($trace); |
|
| 52 | + } |
|
| 53 | + |
|
| 54 | + if ($compil_info) { |
|
| 55 | + $contexte_compil = [ |
|
| 56 | + $trace[0]['file'],// sourcefile |
|
| 57 | + '', //nom |
|
| 58 | + (isset($trace[1]) ? $trace[1]['function'] . "(){\n" : '') |
|
| 59 | + . $trace[0]['function'] . '();' |
|
| 60 | + . (isset($trace[1]) ? "\n}" : ''), //id_boucle |
|
| 61 | + $trace[0]['line'], // ligne |
|
| 62 | + $GLOBALS['spip_lang'], // lang |
|
| 63 | + ]; |
|
| 64 | + |
|
| 65 | + return $contexte_compil; |
|
| 66 | + } |
|
| 67 | + |
|
| 68 | + $message = count($trace) ? $trace[0]['file'] . ' L' . $trace[0]['line'] : ''; |
|
| 69 | + $f = []; |
|
| 70 | + while (count($trace) and $t = array_shift($trace)) { |
|
| 71 | + if (in_array($t['function'], ['include_once', 'include_spip', 'find_in_path'])) { |
|
| 72 | + break; |
|
| 73 | + } |
|
| 74 | + $f[] = $t['function']; |
|
| 75 | + } |
|
| 76 | + if (count($f)) { |
|
| 77 | + $message .= ' [' . implode('(),', $f) . '()]'; |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + return $message; |
|
| 81 | 81 | } |
| 82 | 82 | |
| 83 | 83 | |
@@ -102,16 +102,16 @@ discard block |
||
| 102 | 102 | * |
| 103 | 103 | **/ |
| 104 | 104 | function sql_serveur($ins_sql = '', $serveur = '', $continue = false) { |
| 105 | - static $sql_serveur = []; |
|
| 106 | - if (!isset($sql_serveur[$serveur][$ins_sql])) { |
|
| 107 | - $f = spip_connect_sql(\SQL_ABSTRACT_VERSION, $ins_sql, $serveur, $continue); |
|
| 108 | - if (!is_string($f) or !$f) { |
|
| 109 | - return $f; |
|
| 110 | - } |
|
| 111 | - $sql_serveur[$serveur][$ins_sql] = $f; |
|
| 112 | - } |
|
| 113 | - |
|
| 114 | - return $sql_serveur[$serveur][$ins_sql]; |
|
| 105 | + static $sql_serveur = []; |
|
| 106 | + if (!isset($sql_serveur[$serveur][$ins_sql])) { |
|
| 107 | + $f = spip_connect_sql(\SQL_ABSTRACT_VERSION, $ins_sql, $serveur, $continue); |
|
| 108 | + if (!is_string($f) or !$f) { |
|
| 109 | + return $f; |
|
| 110 | + } |
|
| 111 | + $sql_serveur[$serveur][$ins_sql] = $f; |
|
| 112 | + } |
|
| 113 | + |
|
| 114 | + return $sql_serveur[$serveur][$ins_sql]; |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | /** |
@@ -133,23 +133,23 @@ discard block |
||
| 133 | 133 | * Retourne le nom du charset si effectivement trouvé, sinon false. |
| 134 | 134 | **/ |
| 135 | 135 | function sql_get_charset($charset, $serveur = '', $option = true) { |
| 136 | - // le nom http du charset differe parfois du nom SQL utf-8 ==> utf8 etc. |
|
| 137 | - $desc = sql_serveur('', $serveur, true); |
|
| 138 | - $desc = $desc[\SQL_ABSTRACT_VERSION]; |
|
| 139 | - $c = $desc['charsets'][$charset]; |
|
| 140 | - if ($c) { |
|
| 141 | - if (function_exists($f = @$desc['get_charset'])) { |
|
| 142 | - if ($f($c, $serveur, $option !== false)) { |
|
| 143 | - return $c; |
|
| 144 | - } |
|
| 145 | - } |
|
| 146 | - } |
|
| 147 | - spip_log( |
|
| 148 | - "SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", |
|
| 149 | - _LOG_AVERTISSEMENT |
|
| 150 | - ); |
|
| 151 | - |
|
| 152 | - return false; |
|
| 136 | + // le nom http du charset differe parfois du nom SQL utf-8 ==> utf8 etc. |
|
| 137 | + $desc = sql_serveur('', $serveur, true); |
|
| 138 | + $desc = $desc[\SQL_ABSTRACT_VERSION]; |
|
| 139 | + $c = $desc['charsets'][$charset]; |
|
| 140 | + if ($c) { |
|
| 141 | + if (function_exists($f = @$desc['get_charset'])) { |
|
| 142 | + if ($f($c, $serveur, $option !== false)) { |
|
| 143 | + return $c; |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | + } |
|
| 147 | + spip_log( |
|
| 148 | + "SPIP ne connait pas les Charsets disponibles sur le serveur $serveur. Le serveur choisira seul.", |
|
| 149 | + _LOG_AVERTISSEMENT |
|
| 150 | + ); |
|
| 151 | + |
|
| 152 | + return false; |
|
| 153 | 153 | } |
| 154 | 154 | |
| 155 | 155 | |
@@ -175,12 +175,12 @@ discard block |
||
| 175 | 175 | * Retourne true si elle reussie. |
| 176 | 176 | **/ |
| 177 | 177 | function sql_set_charset($charset, $serveur = '', $option = true) { |
| 178 | - $f = sql_serveur('set_charset', $serveur, $option === 'continue' or $option === false); |
|
| 179 | - if (!is_string($f) or !$f) { |
|
| 180 | - return false; |
|
| 181 | - } |
|
| 178 | + $f = sql_serveur('set_charset', $serveur, $option === 'continue' or $option === false); |
|
| 179 | + if (!is_string($f) or !$f) { |
|
| 180 | + return false; |
|
| 181 | + } |
|
| 182 | 182 | |
| 183 | - return $f($charset, $serveur, $option !== false); |
|
| 183 | + return $f($charset, $serveur, $option !== false); |
|
| 184 | 184 | } |
| 185 | 185 | |
| 186 | 186 | |
@@ -231,59 +231,59 @@ discard block |
||
| 231 | 231 | * |
| 232 | 232 | **/ |
| 233 | 233 | function sql_select( |
| 234 | - $select = [], |
|
| 235 | - $from = [], |
|
| 236 | - $where = [], |
|
| 237 | - $groupby = [], |
|
| 238 | - $orderby = [], |
|
| 239 | - $limit = '', |
|
| 240 | - $having = [], |
|
| 241 | - $serveur = '', |
|
| 242 | - $option = true |
|
| 234 | + $select = [], |
|
| 235 | + $from = [], |
|
| 236 | + $where = [], |
|
| 237 | + $groupby = [], |
|
| 238 | + $orderby = [], |
|
| 239 | + $limit = '', |
|
| 240 | + $having = [], |
|
| 241 | + $serveur = '', |
|
| 242 | + $option = true |
|
| 243 | 243 | ) { |
| 244 | - $f = sql_serveur('select', $serveur, $option === 'continue' or $option === false); |
|
| 245 | - if (!is_string($f) or !$f) { |
|
| 246 | - return false; |
|
| 247 | - } |
|
| 248 | - |
|
| 249 | - $debug = (defined('_VAR_MODE') and _VAR_MODE == 'debug'); |
|
| 250 | - if (($option !== false) and !$debug) { |
|
| 251 | - $res = $f( |
|
| 252 | - $select, |
|
| 253 | - $from, |
|
| 254 | - $where, |
|
| 255 | - $groupby, |
|
| 256 | - $orderby, |
|
| 257 | - $limit, |
|
| 258 | - $having, |
|
| 259 | - $serveur, |
|
| 260 | - is_array($option) ? true : $option |
|
| 261 | - ); |
|
| 262 | - } else { |
|
| 263 | - $query = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false); |
|
| 264 | - if (!$option) { |
|
| 265 | - return $query; |
|
| 266 | - } |
|
| 267 | - // le debug, c'est pour ce qui a ete produit par le compilateur |
|
| 268 | - if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 269 | - [$table, $id, ] = $GLOBALS['debug']['aucasou']; |
|
| 270 | - $nom = $GLOBALS['debug_objets']['courant'] . $id; |
|
| 271 | - $GLOBALS['debug_objets']['requete'][$nom] = $query; |
|
| 272 | - } |
|
| 273 | - $res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, true); |
|
| 274 | - } |
|
| 275 | - |
|
| 276 | - // en cas d'erreur |
|
| 277 | - if (!is_string($res)) { |
|
| 278 | - return $res; |
|
| 279 | - } |
|
| 280 | - // denoncer l'erreur SQL dans sa version brute |
|
| 281 | - spip_sql_erreur($serveur); |
|
| 282 | - // idem dans sa version squelette (prefixe des tables non substitue) |
|
| 283 | - $contexte_compil = sql_error_backtrace(true); |
|
| 284 | - erreur_squelette([sql_errno($serveur), sql_error($serveur), $res], $contexte_compil); |
|
| 285 | - |
|
| 286 | - return false; |
|
| 244 | + $f = sql_serveur('select', $serveur, $option === 'continue' or $option === false); |
|
| 245 | + if (!is_string($f) or !$f) { |
|
| 246 | + return false; |
|
| 247 | + } |
|
| 248 | + |
|
| 249 | + $debug = (defined('_VAR_MODE') and _VAR_MODE == 'debug'); |
|
| 250 | + if (($option !== false) and !$debug) { |
|
| 251 | + $res = $f( |
|
| 252 | + $select, |
|
| 253 | + $from, |
|
| 254 | + $where, |
|
| 255 | + $groupby, |
|
| 256 | + $orderby, |
|
| 257 | + $limit, |
|
| 258 | + $having, |
|
| 259 | + $serveur, |
|
| 260 | + is_array($option) ? true : $option |
|
| 261 | + ); |
|
| 262 | + } else { |
|
| 263 | + $query = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false); |
|
| 264 | + if (!$option) { |
|
| 265 | + return $query; |
|
| 266 | + } |
|
| 267 | + // le debug, c'est pour ce qui a ete produit par le compilateur |
|
| 268 | + if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 269 | + [$table, $id, ] = $GLOBALS['debug']['aucasou']; |
|
| 270 | + $nom = $GLOBALS['debug_objets']['courant'] . $id; |
|
| 271 | + $GLOBALS['debug_objets']['requete'][$nom] = $query; |
|
| 272 | + } |
|
| 273 | + $res = $f($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, true); |
|
| 274 | + } |
|
| 275 | + |
|
| 276 | + // en cas d'erreur |
|
| 277 | + if (!is_string($res)) { |
|
| 278 | + return $res; |
|
| 279 | + } |
|
| 280 | + // denoncer l'erreur SQL dans sa version brute |
|
| 281 | + spip_sql_erreur($serveur); |
|
| 282 | + // idem dans sa version squelette (prefixe des tables non substitue) |
|
| 283 | + $contexte_compil = sql_error_backtrace(true); |
|
| 284 | + erreur_squelette([sql_errno($serveur), sql_error($serveur), $res], $contexte_compil); |
|
| 285 | + |
|
| 286 | + return false; |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | |
@@ -320,16 +320,16 @@ discard block |
||
| 320 | 320 | * |
| 321 | 321 | **/ |
| 322 | 322 | function sql_get_select( |
| 323 | - $select = [], |
|
| 324 | - $from = [], |
|
| 325 | - $where = [], |
|
| 326 | - $groupby = [], |
|
| 327 | - $orderby = [], |
|
| 328 | - $limit = '', |
|
| 329 | - $having = [], |
|
| 330 | - $serveur = '' |
|
| 323 | + $select = [], |
|
| 324 | + $from = [], |
|
| 325 | + $where = [], |
|
| 326 | + $groupby = [], |
|
| 327 | + $orderby = [], |
|
| 328 | + $limit = '', |
|
| 329 | + $having = [], |
|
| 330 | + $serveur = '' |
|
| 331 | 331 | ) { |
| 332 | - return sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false); |
|
| 332 | + return sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, false); |
|
| 333 | 333 | } |
| 334 | 334 | |
| 335 | 335 | |
@@ -373,23 +373,23 @@ discard block |
||
| 373 | 373 | * |
| 374 | 374 | **/ |
| 375 | 375 | function sql_countsel( |
| 376 | - $from = [], |
|
| 377 | - $where = [], |
|
| 378 | - $groupby = [], |
|
| 379 | - $having = [], |
|
| 380 | - $serveur = '', |
|
| 381 | - $option = true |
|
| 376 | + $from = [], |
|
| 377 | + $where = [], |
|
| 378 | + $groupby = [], |
|
| 379 | + $having = [], |
|
| 380 | + $serveur = '', |
|
| 381 | + $option = true |
|
| 382 | 382 | ) { |
| 383 | - $f = sql_serveur('countsel', $serveur, $option === 'continue' or $option === false); |
|
| 384 | - if (!is_string($f) or !$f) { |
|
| 385 | - return false; |
|
| 386 | - } |
|
| 387 | - $r = $f($from, $where, $groupby, $having, $serveur, $option !== false); |
|
| 388 | - if ($r === false) { |
|
| 389 | - spip_sql_erreur($serveur); |
|
| 390 | - } |
|
| 391 | - |
|
| 392 | - return $r; |
|
| 383 | + $f = sql_serveur('countsel', $serveur, $option === 'continue' or $option === false); |
|
| 384 | + if (!is_string($f) or !$f) { |
|
| 385 | + return false; |
|
| 386 | + } |
|
| 387 | + $r = $f($from, $where, $groupby, $having, $serveur, $option !== false); |
|
| 388 | + if ($r === false) { |
|
| 389 | + spip_sql_erreur($serveur); |
|
| 390 | + } |
|
| 391 | + |
|
| 392 | + return $r; |
|
| 393 | 393 | } |
| 394 | 394 | |
| 395 | 395 | /** |
@@ -421,16 +421,16 @@ discard block |
||
| 421 | 421 | * Ce retour n'est pas pertinent pour savoir si l'opération est correctement réalisée. |
| 422 | 422 | **/ |
| 423 | 423 | function sql_alter($q, $serveur = '', $option = true) { |
| 424 | - $f = sql_serveur('alter', $serveur, $option === 'continue' or $option === false); |
|
| 425 | - if (!is_string($f) or !$f) { |
|
| 426 | - return false; |
|
| 427 | - } |
|
| 428 | - $r = $f($q, $serveur, $option !== false); |
|
| 429 | - if ($r === false) { |
|
| 430 | - spip_sql_erreur($serveur); |
|
| 431 | - } |
|
| 432 | - |
|
| 433 | - return $r; |
|
| 424 | + $f = sql_serveur('alter', $serveur, $option === 'continue' or $option === false); |
|
| 425 | + if (!is_string($f) or !$f) { |
|
| 426 | + return false; |
|
| 427 | + } |
|
| 428 | + $r = $f($q, $serveur, $option !== false); |
|
| 429 | + if ($r === false) { |
|
| 430 | + spip_sql_erreur($serveur); |
|
| 431 | + } |
|
| 432 | + |
|
| 433 | + return $r; |
|
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | /** |
@@ -453,12 +453,12 @@ discard block |
||
| 453 | 453 | * presentant une ligne de resultat d'une selection |
| 454 | 454 | */ |
| 455 | 455 | function sql_fetch($res, $serveur = '', $option = true) { |
| 456 | - $f = sql_serveur('fetch', $serveur, $option === 'continue' or $option === false); |
|
| 457 | - if (!is_string($f) or !$f) { |
|
| 458 | - return false; |
|
| 459 | - } |
|
| 456 | + $f = sql_serveur('fetch', $serveur, $option === 'continue' or $option === false); |
|
| 457 | + if (!is_string($f) or !$f) { |
|
| 458 | + return false; |
|
| 459 | + } |
|
| 460 | 460 | |
| 461 | - return $f($res, null, $serveur, $option !== false); |
|
| 461 | + return $f($res, null, $serveur, $option !== false); |
|
| 462 | 462 | } |
| 463 | 463 | |
| 464 | 464 | |
@@ -485,20 +485,20 @@ discard block |
||
| 485 | 485 | * presentant une ligne de resultat d'une selection |
| 486 | 486 | */ |
| 487 | 487 | function sql_fetch_all($res, $serveur = '', $option = true) { |
| 488 | - $rows = []; |
|
| 489 | - if (!$res) { |
|
| 490 | - return $rows; |
|
| 491 | - } |
|
| 492 | - $f = sql_serveur('fetch', $serveur, $option === 'continue' or $option === false); |
|
| 493 | - if (!is_string($f) or !$f) { |
|
| 494 | - return []; |
|
| 495 | - } |
|
| 496 | - while ($r = $f($res, null, $serveur, $option !== false)) { |
|
| 497 | - $rows[] = $r; |
|
| 498 | - } |
|
| 499 | - sql_free($res, $serveur); |
|
| 500 | - |
|
| 501 | - return $rows; |
|
| 488 | + $rows = []; |
|
| 489 | + if (!$res) { |
|
| 490 | + return $rows; |
|
| 491 | + } |
|
| 492 | + $f = sql_serveur('fetch', $serveur, $option === 'continue' or $option === false); |
|
| 493 | + if (!is_string($f) or !$f) { |
|
| 494 | + return []; |
|
| 495 | + } |
|
| 496 | + while ($r = $f($res, null, $serveur, $option !== false)) { |
|
| 497 | + $rows[] = $r; |
|
| 498 | + } |
|
| 499 | + sql_free($res, $serveur); |
|
| 500 | + |
|
| 501 | + return $rows; |
|
| 502 | 502 | } |
| 503 | 503 | |
| 504 | 504 | /** |
@@ -526,16 +526,16 @@ discard block |
||
| 526 | 526 | * Operation effectuée (true), sinon false. |
| 527 | 527 | **/ |
| 528 | 528 | function sql_seek($res, $row_number, $serveur = '', $option = true) { |
| 529 | - $f = sql_serveur('seek', $serveur, $option === 'continue' or $option === false); |
|
| 530 | - if (!is_string($f) or !$f) { |
|
| 531 | - return false; |
|
| 532 | - } |
|
| 533 | - $r = $f($res, $row_number, $serveur, $option !== false); |
|
| 534 | - if ($r === false) { |
|
| 535 | - spip_sql_erreur($serveur); |
|
| 536 | - } |
|
| 537 | - |
|
| 538 | - return $r; |
|
| 529 | + $f = sql_serveur('seek', $serveur, $option === 'continue' or $option === false); |
|
| 530 | + if (!is_string($f) or !$f) { |
|
| 531 | + return false; |
|
| 532 | + } |
|
| 533 | + $r = $f($res, $row_number, $serveur, $option !== false); |
|
| 534 | + if ($r === false) { |
|
| 535 | + spip_sql_erreur($serveur); |
|
| 536 | + } |
|
| 537 | + |
|
| 538 | + return $r; |
|
| 539 | 539 | } |
| 540 | 540 | |
| 541 | 541 | |
@@ -560,16 +560,16 @@ discard block |
||
| 560 | 560 | * False en cas d'erreur. |
| 561 | 561 | **/ |
| 562 | 562 | function sql_listdbs($serveur = '', $option = true) { |
| 563 | - $f = sql_serveur('listdbs', $serveur, $option === 'continue' or $option === false); |
|
| 564 | - if (!is_string($f) or !$f) { |
|
| 565 | - return false; |
|
| 566 | - } |
|
| 567 | - $r = $f($serveur); |
|
| 568 | - if ($r === false) { |
|
| 569 | - spip_sql_erreur($serveur); |
|
| 570 | - } |
|
| 571 | - |
|
| 572 | - return $r; |
|
| 563 | + $f = sql_serveur('listdbs', $serveur, $option === 'continue' or $option === false); |
|
| 564 | + if (!is_string($f) or !$f) { |
|
| 565 | + return false; |
|
| 566 | + } |
|
| 567 | + $r = $f($serveur); |
|
| 568 | + if ($r === false) { |
|
| 569 | + spip_sql_erreur($serveur); |
|
| 570 | + } |
|
| 571 | + |
|
| 572 | + return $r; |
|
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | |
@@ -592,16 +592,16 @@ discard block |
||
| 592 | 592 | * - False en cas d'erreur. |
| 593 | 593 | **/ |
| 594 | 594 | function sql_selectdb($nom, $serveur = '', $option = true) { |
| 595 | - $f = sql_serveur('selectdb', $serveur, $option === 'continue' or $option === false); |
|
| 596 | - if (!is_string($f) or !$f) { |
|
| 597 | - return false; |
|
| 598 | - } |
|
| 599 | - $r = $f($nom, $serveur, $option !== false); |
|
| 600 | - if ($r === false) { |
|
| 601 | - spip_sql_erreur($serveur); |
|
| 602 | - } |
|
| 603 | - |
|
| 604 | - return $r; |
|
| 595 | + $f = sql_serveur('selectdb', $serveur, $option === 'continue' or $option === false); |
|
| 596 | + if (!is_string($f) or !$f) { |
|
| 597 | + return false; |
|
| 598 | + } |
|
| 599 | + $r = $f($nom, $serveur, $option !== false); |
|
| 600 | + if ($r === false) { |
|
| 601 | + spip_sql_erreur($serveur); |
|
| 602 | + } |
|
| 603 | + |
|
| 604 | + return $r; |
|
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | /** |
@@ -626,16 +626,16 @@ discard block |
||
| 626 | 626 | * - false en cas d'erreur. |
| 627 | 627 | **/ |
| 628 | 628 | function sql_count($res, $serveur = '', $option = true) { |
| 629 | - $f = sql_serveur('count', $serveur, $option === 'continue' or $option === false); |
|
| 630 | - if (!is_string($f) or !$f) { |
|
| 631 | - return false; |
|
| 632 | - } |
|
| 633 | - $r = $f($res, $serveur, $option !== false); |
|
| 634 | - if ($r === false) { |
|
| 635 | - spip_sql_erreur($serveur); |
|
| 636 | - } |
|
| 637 | - |
|
| 638 | - return $r; |
|
| 629 | + $f = sql_serveur('count', $serveur, $option === 'continue' or $option === false); |
|
| 630 | + if (!is_string($f) or !$f) { |
|
| 631 | + return false; |
|
| 632 | + } |
|
| 633 | + $r = $f($res, $serveur, $option !== false); |
|
| 634 | + if ($r === false) { |
|
| 635 | + spip_sql_erreur($serveur); |
|
| 636 | + } |
|
| 637 | + |
|
| 638 | + return $r; |
|
| 639 | 639 | } |
| 640 | 640 | |
| 641 | 641 | /** |
@@ -657,12 +657,12 @@ discard block |
||
| 657 | 657 | * True si réussi |
| 658 | 658 | */ |
| 659 | 659 | function sql_free($res, $serveur = '', $option = true) { |
| 660 | - $f = sql_serveur('free', $serveur, $option === 'continue' or $option === false); |
|
| 661 | - if (!is_string($f) or !$f) { |
|
| 662 | - return false; |
|
| 663 | - } |
|
| 660 | + $f = sql_serveur('free', $serveur, $option === 'continue' or $option === false); |
|
| 661 | + if (!is_string($f) or !$f) { |
|
| 662 | + return false; |
|
| 663 | + } |
|
| 664 | 664 | |
| 665 | - return $f($res); |
|
| 665 | + return $f($res); |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | |
@@ -700,17 +700,17 @@ discard block |
||
| 700 | 700 | * - False en cas d'erreur. |
| 701 | 701 | **/ |
| 702 | 702 | function sql_insert($table, $noms, $valeurs, $desc = [], $serveur = '', $option = true) { |
| 703 | - $f = sql_serveur('insert', $serveur, $option === 'continue' or $option === false); |
|
| 704 | - if (!is_string($f) or !$f) { |
|
| 705 | - return false; |
|
| 706 | - } |
|
| 707 | - $r = $f($table, $noms, $valeurs, $desc, $serveur, $option !== false); |
|
| 708 | - if ($r === false or $r === null) { |
|
| 709 | - spip_sql_erreur($serveur); |
|
| 710 | - $r = false; |
|
| 711 | - } |
|
| 712 | - |
|
| 713 | - return $r; |
|
| 703 | + $f = sql_serveur('insert', $serveur, $option === 'continue' or $option === false); |
|
| 704 | + if (!is_string($f) or !$f) { |
|
| 705 | + return false; |
|
| 706 | + } |
|
| 707 | + $r = $f($table, $noms, $valeurs, $desc, $serveur, $option !== false); |
|
| 708 | + if ($r === false or $r === null) { |
|
| 709 | + spip_sql_erreur($serveur); |
|
| 710 | + $r = false; |
|
| 711 | + } |
|
| 712 | + |
|
| 713 | + return $r; |
|
| 714 | 714 | } |
| 715 | 715 | |
| 716 | 716 | /** |
@@ -751,17 +751,17 @@ discard block |
||
| 751 | 751 | * - False en cas d'erreur. |
| 752 | 752 | **/ |
| 753 | 753 | function sql_insertq($table, $couples = [], $desc = [], $serveur = '', $option = true) { |
| 754 | - $f = sql_serveur('insertq', $serveur, $option === 'continue' or $option === false); |
|
| 755 | - if (!is_string($f) or !$f) { |
|
| 756 | - return false; |
|
| 757 | - } |
|
| 758 | - $r = $f($table, $couples, $desc, $serveur, $option !== false); |
|
| 759 | - if ($r === false or $r === null) { |
|
| 760 | - spip_sql_erreur($serveur); |
|
| 761 | - $r = false; |
|
| 762 | - } |
|
| 763 | - |
|
| 764 | - return $r; |
|
| 754 | + $f = sql_serveur('insertq', $serveur, $option === 'continue' or $option === false); |
|
| 755 | + if (!is_string($f) or !$f) { |
|
| 756 | + return false; |
|
| 757 | + } |
|
| 758 | + $r = $f($table, $couples, $desc, $serveur, $option !== false); |
|
| 759 | + if ($r === false or $r === null) { |
|
| 760 | + spip_sql_erreur($serveur); |
|
| 761 | + $r = false; |
|
| 762 | + } |
|
| 763 | + |
|
| 764 | + return $r; |
|
| 765 | 765 | } |
| 766 | 766 | |
| 767 | 767 | /** |
@@ -796,17 +796,17 @@ discard block |
||
| 796 | 796 | * - false en cas d'erreur. |
| 797 | 797 | **/ |
| 798 | 798 | function sql_insertq_multi($table, $couples = [], $desc = [], $serveur = '', $option = true) { |
| 799 | - $f = sql_serveur('insertq_multi', $serveur, $option === 'continue' or $option === false); |
|
| 800 | - if (!is_string($f) or !$f) { |
|
| 801 | - return false; |
|
| 802 | - } |
|
| 803 | - $r = $f($table, $couples, $desc, $serveur, $option !== false); |
|
| 804 | - if ($r === false or $r === null) { |
|
| 805 | - spip_sql_erreur($serveur); |
|
| 806 | - $r = false; |
|
| 807 | - } |
|
| 808 | - |
|
| 809 | - return $r; |
|
| 799 | + $f = sql_serveur('insertq_multi', $serveur, $option === 'continue' or $option === false); |
|
| 800 | + if (!is_string($f) or !$f) { |
|
| 801 | + return false; |
|
| 802 | + } |
|
| 803 | + $r = $f($table, $couples, $desc, $serveur, $option !== false); |
|
| 804 | + if ($r === false or $r === null) { |
|
| 805 | + spip_sql_erreur($serveur); |
|
| 806 | + $r = false; |
|
| 807 | + } |
|
| 808 | + |
|
| 809 | + return $r; |
|
| 810 | 810 | } |
| 811 | 811 | |
| 812 | 812 | /** |
@@ -846,16 +846,16 @@ discard block |
||
| 846 | 846 | * - array Tableau décrivant la requête et son temps d'exécution si var_profile est actif |
| 847 | 847 | */ |
| 848 | 848 | function sql_update($table, $exp, $where = '', $desc = [], $serveur = '', $option = true) { |
| 849 | - $f = sql_serveur('update', $serveur, $option === 'continue' or $option === false); |
|
| 850 | - if (!is_string($f) or !$f) { |
|
| 851 | - return false; |
|
| 852 | - } |
|
| 853 | - $r = $f($table, $exp, $where, $desc, $serveur, $option !== false); |
|
| 854 | - if ($r === false) { |
|
| 855 | - spip_sql_erreur($serveur); |
|
| 856 | - } |
|
| 857 | - |
|
| 858 | - return $r; |
|
| 849 | + $f = sql_serveur('update', $serveur, $option === 'continue' or $option === false); |
|
| 850 | + if (!is_string($f) or !$f) { |
|
| 851 | + return false; |
|
| 852 | + } |
|
| 853 | + $r = $f($table, $exp, $where, $desc, $serveur, $option !== false); |
|
| 854 | + if ($r === false) { |
|
| 855 | + spip_sql_erreur($serveur); |
|
| 856 | + } |
|
| 857 | + |
|
| 858 | + return $r; |
|
| 859 | 859 | } |
| 860 | 860 | |
| 861 | 861 | |
@@ -901,16 +901,16 @@ discard block |
||
| 901 | 901 | * - false en cas d'erreur. |
| 902 | 902 | **/ |
| 903 | 903 | function sql_updateq($table, $exp, $where = '', $desc = [], $serveur = '', $option = true) { |
| 904 | - $f = sql_serveur('updateq', $serveur, $option === 'continue' or $option === false); |
|
| 905 | - if (!is_string($f) or !$f) { |
|
| 906 | - return false; |
|
| 907 | - } |
|
| 908 | - $r = $f($table, $exp, $where, $desc, $serveur, $option !== false); |
|
| 909 | - if ($r === false) { |
|
| 910 | - spip_sql_erreur($serveur); |
|
| 911 | - } |
|
| 912 | - |
|
| 913 | - return $r; |
|
| 904 | + $f = sql_serveur('updateq', $serveur, $option === 'continue' or $option === false); |
|
| 905 | + if (!is_string($f) or !$f) { |
|
| 906 | + return false; |
|
| 907 | + } |
|
| 908 | + $r = $f($table, $exp, $where, $desc, $serveur, $option !== false); |
|
| 909 | + if ($r === false) { |
|
| 910 | + spip_sql_erreur($serveur); |
|
| 911 | + } |
|
| 912 | + |
|
| 913 | + return $r; |
|
| 914 | 914 | } |
| 915 | 915 | |
| 916 | 916 | /** |
@@ -941,16 +941,16 @@ discard block |
||
| 941 | 941 | * - false en cas d'erreur. |
| 942 | 942 | **/ |
| 943 | 943 | function sql_delete($table, $where = '', $serveur = '', $option = true) { |
| 944 | - $f = sql_serveur('delete', $serveur, $option === 'continue' or $option === false); |
|
| 945 | - if (!is_string($f) or !$f) { |
|
| 946 | - return false; |
|
| 947 | - } |
|
| 948 | - $r = $f($table, $where, $serveur, $option !== false); |
|
| 949 | - if ($r === false) { |
|
| 950 | - spip_sql_erreur($serveur); |
|
| 951 | - } |
|
| 952 | - |
|
| 953 | - return $r; |
|
| 944 | + $f = sql_serveur('delete', $serveur, $option === 'continue' or $option === false); |
|
| 945 | + if (!is_string($f) or !$f) { |
|
| 946 | + return false; |
|
| 947 | + } |
|
| 948 | + $r = $f($table, $where, $serveur, $option !== false); |
|
| 949 | + if ($r === false) { |
|
| 950 | + spip_sql_erreur($serveur); |
|
| 951 | + } |
|
| 952 | + |
|
| 953 | + return $r; |
|
| 954 | 954 | } |
| 955 | 955 | |
| 956 | 956 | /** |
@@ -986,16 +986,16 @@ discard block |
||
| 986 | 986 | * - false en cas d'erreur. |
| 987 | 987 | **/ |
| 988 | 988 | function sql_replace($table, $couples, $desc = [], $serveur = '', $option = true) { |
| 989 | - $f = sql_serveur('replace', $serveur, $option === 'continue' or $option === false); |
|
| 990 | - if (!is_string($f) or !$f) { |
|
| 991 | - return false; |
|
| 992 | - } |
|
| 993 | - $r = $f($table, $couples, $desc, $serveur, $option !== false); |
|
| 994 | - if ($r === false) { |
|
| 995 | - spip_sql_erreur($serveur); |
|
| 996 | - } |
|
| 997 | - |
|
| 998 | - return $r; |
|
| 989 | + $f = sql_serveur('replace', $serveur, $option === 'continue' or $option === false); |
|
| 990 | + if (!is_string($f) or !$f) { |
|
| 991 | + return false; |
|
| 992 | + } |
|
| 993 | + $r = $f($table, $couples, $desc, $serveur, $option !== false); |
|
| 994 | + if ($r === false) { |
|
| 995 | + spip_sql_erreur($serveur); |
|
| 996 | + } |
|
| 997 | + |
|
| 998 | + return $r; |
|
| 999 | 999 | } |
| 1000 | 1000 | |
| 1001 | 1001 | |
@@ -1033,16 +1033,16 @@ discard block |
||
| 1033 | 1033 | * - false en cas d'erreur. |
| 1034 | 1034 | **/ |
| 1035 | 1035 | function sql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $option = true) { |
| 1036 | - $f = sql_serveur('replace_multi', $serveur, $option === 'continue' or $option === false); |
|
| 1037 | - if (!is_string($f) or !$f) { |
|
| 1038 | - return false; |
|
| 1039 | - } |
|
| 1040 | - $r = $f($table, $tab_couples, $desc, $serveur, $option !== false); |
|
| 1041 | - if ($r === false) { |
|
| 1042 | - spip_sql_erreur($serveur); |
|
| 1043 | - } |
|
| 1044 | - |
|
| 1045 | - return $r; |
|
| 1036 | + $f = sql_serveur('replace_multi', $serveur, $option === 'continue' or $option === false); |
|
| 1037 | + if (!is_string($f) or !$f) { |
|
| 1038 | + return false; |
|
| 1039 | + } |
|
| 1040 | + $r = $f($table, $tab_couples, $desc, $serveur, $option !== false); |
|
| 1041 | + if ($r === false) { |
|
| 1042 | + spip_sql_erreur($serveur); |
|
| 1043 | + } |
|
| 1044 | + |
|
| 1045 | + return $r; |
|
| 1046 | 1046 | } |
| 1047 | 1047 | |
| 1048 | 1048 | /** |
@@ -1070,16 +1070,16 @@ discard block |
||
| 1070 | 1070 | * - false en cas d'erreur. |
| 1071 | 1071 | **/ |
| 1072 | 1072 | function sql_drop_table($table, $exist = '', $serveur = '', $option = true) { |
| 1073 | - $f = sql_serveur('drop_table', $serveur, $option === 'continue' or $option === false); |
|
| 1074 | - if (!is_string($f) or !$f) { |
|
| 1075 | - return false; |
|
| 1076 | - } |
|
| 1077 | - $r = $f($table, $exist, $serveur, $option !== false); |
|
| 1078 | - if ($r === false) { |
|
| 1079 | - spip_sql_erreur($serveur); |
|
| 1080 | - } |
|
| 1081 | - |
|
| 1082 | - return $r; |
|
| 1073 | + $f = sql_serveur('drop_table', $serveur, $option === 'continue' or $option === false); |
|
| 1074 | + if (!is_string($f) or !$f) { |
|
| 1075 | + return false; |
|
| 1076 | + } |
|
| 1077 | + $r = $f($table, $exist, $serveur, $option !== false); |
|
| 1078 | + if ($r === false) { |
|
| 1079 | + spip_sql_erreur($serveur); |
|
| 1080 | + } |
|
| 1081 | + |
|
| 1082 | + return $r; |
|
| 1083 | 1083 | } |
| 1084 | 1084 | |
| 1085 | 1085 | /** |
@@ -1103,16 +1103,16 @@ discard block |
||
| 1103 | 1103 | * - true si la requête a réussie, false sinon |
| 1104 | 1104 | */ |
| 1105 | 1105 | function sql_drop_view($table, $exist = '', $serveur = '', $option = true) { |
| 1106 | - $f = sql_serveur('drop_view', $serveur, $option === 'continue' or $option === false); |
|
| 1107 | - if (!is_string($f) or !$f) { |
|
| 1108 | - return false; |
|
| 1109 | - } |
|
| 1110 | - $r = $f($table, $exist, $serveur, $option !== false); |
|
| 1111 | - if ($r === false) { |
|
| 1112 | - spip_sql_erreur($serveur); |
|
| 1113 | - } |
|
| 1114 | - |
|
| 1115 | - return $r; |
|
| 1106 | + $f = sql_serveur('drop_view', $serveur, $option === 'continue' or $option === false); |
|
| 1107 | + if (!is_string($f) or !$f) { |
|
| 1108 | + return false; |
|
| 1109 | + } |
|
| 1110 | + $r = $f($table, $exist, $serveur, $option !== false); |
|
| 1111 | + if ($r === false) { |
|
| 1112 | + spip_sql_erreur($serveur); |
|
| 1113 | + } |
|
| 1114 | + |
|
| 1115 | + return $r; |
|
| 1116 | 1116 | } |
| 1117 | 1117 | |
| 1118 | 1118 | /** |
@@ -1136,18 +1136,18 @@ discard block |
||
| 1136 | 1136 | * Ressource à utiliser avec sql_fetch() |
| 1137 | 1137 | **/ |
| 1138 | 1138 | function sql_showbase($spip = null, $serveur = '', $option = true) { |
| 1139 | - $f = sql_serveur('showbase', $serveur, $option === 'continue' or $option === false); |
|
| 1140 | - if (!is_string($f) or !$f) { |
|
| 1141 | - return false; |
|
| 1142 | - } |
|
| 1143 | - |
|
| 1144 | - // la globale n'est remplie qu'apres l'appel de sql_serveur. |
|
| 1145 | - if ($spip == null) { |
|
| 1146 | - $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1147 | - $spip = $connexion['prefixe'] . '\_%'; |
|
| 1148 | - } |
|
| 1149 | - |
|
| 1150 | - return $f($spip, $serveur, $option !== false); |
|
| 1139 | + $f = sql_serveur('showbase', $serveur, $option === 'continue' or $option === false); |
|
| 1140 | + if (!is_string($f) or !$f) { |
|
| 1141 | + return false; |
|
| 1142 | + } |
|
| 1143 | + |
|
| 1144 | + // la globale n'est remplie qu'apres l'appel de sql_serveur. |
|
| 1145 | + if ($spip == null) { |
|
| 1146 | + $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1147 | + $spip = $connexion['prefixe'] . '\_%'; |
|
| 1148 | + } |
|
| 1149 | + |
|
| 1150 | + return $f($spip, $serveur, $option !== false); |
|
| 1151 | 1151 | } |
| 1152 | 1152 | |
| 1153 | 1153 | /** |
@@ -1170,15 +1170,15 @@ discard block |
||
| 1170 | 1170 | * Liste des tables SQL |
| 1171 | 1171 | **/ |
| 1172 | 1172 | function sql_alltable($spip = null, $serveur = '', $option = true) { |
| 1173 | - $q = sql_showbase($spip, $serveur, $option); |
|
| 1174 | - $r = []; |
|
| 1175 | - if ($q) { |
|
| 1176 | - while ($t = sql_fetch($q, $serveur)) { |
|
| 1177 | - $r[] = array_shift($t); |
|
| 1178 | - } |
|
| 1179 | - } |
|
| 1180 | - |
|
| 1181 | - return $r; |
|
| 1173 | + $q = sql_showbase($spip, $serveur, $option); |
|
| 1174 | + $r = []; |
|
| 1175 | + if ($q) { |
|
| 1176 | + while ($t = sql_fetch($q, $serveur)) { |
|
| 1177 | + $r[] = array_shift($t); |
|
| 1178 | + } |
|
| 1179 | + } |
|
| 1180 | + |
|
| 1181 | + return $r; |
|
| 1182 | 1182 | } |
| 1183 | 1183 | |
| 1184 | 1184 | /** |
@@ -1211,31 +1211,31 @@ discard block |
||
| 1211 | 1211 | * - 'join' => array() // jointures, si déclarées. |
| 1212 | 1212 | **/ |
| 1213 | 1213 | function sql_showtable($table, $table_spip = false, $serveur = '', $option = true) { |
| 1214 | - $f = sql_serveur('showtable', $serveur, $option === 'continue' or $option === false); |
|
| 1215 | - if (!is_string($f) or !$f) { |
|
| 1216 | - return false; |
|
| 1217 | - } |
|
| 1218 | - |
|
| 1219 | - // la globale n'est remplie qu'apres l'appel de sql_serveur. |
|
| 1220 | - if ($table_spip) { |
|
| 1221 | - $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1222 | - $prefixe = $connexion['prefixe']; |
|
| 1223 | - $vraie_table = prefixer_table_spip($table, $prefixe); |
|
| 1224 | - } else { |
|
| 1225 | - $vraie_table = $table; |
|
| 1226 | - } |
|
| 1227 | - |
|
| 1228 | - $f = $f($vraie_table, $serveur, $option !== false); |
|
| 1229 | - if (!$f) { |
|
| 1230 | - return []; |
|
| 1231 | - } |
|
| 1232 | - if (isset($GLOBALS['tables_principales'][$table]['join'])) { |
|
| 1233 | - $f['join'] = $GLOBALS['tables_principales'][$table]['join']; |
|
| 1234 | - } elseif (isset($GLOBALS['tables_auxiliaires'][$table]['join'])) { |
|
| 1235 | - $f['join'] = $GLOBALS['tables_auxiliaires'][$table]['join']; |
|
| 1236 | - } |
|
| 1237 | - |
|
| 1238 | - return $f; |
|
| 1214 | + $f = sql_serveur('showtable', $serveur, $option === 'continue' or $option === false); |
|
| 1215 | + if (!is_string($f) or !$f) { |
|
| 1216 | + return false; |
|
| 1217 | + } |
|
| 1218 | + |
|
| 1219 | + // la globale n'est remplie qu'apres l'appel de sql_serveur. |
|
| 1220 | + if ($table_spip) { |
|
| 1221 | + $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1222 | + $prefixe = $connexion['prefixe']; |
|
| 1223 | + $vraie_table = prefixer_table_spip($table, $prefixe); |
|
| 1224 | + } else { |
|
| 1225 | + $vraie_table = $table; |
|
| 1226 | + } |
|
| 1227 | + |
|
| 1228 | + $f = $f($vraie_table, $serveur, $option !== false); |
|
| 1229 | + if (!$f) { |
|
| 1230 | + return []; |
|
| 1231 | + } |
|
| 1232 | + if (isset($GLOBALS['tables_principales'][$table]['join'])) { |
|
| 1233 | + $f['join'] = $GLOBALS['tables_principales'][$table]['join']; |
|
| 1234 | + } elseif (isset($GLOBALS['tables_auxiliaires'][$table]['join'])) { |
|
| 1235 | + $f['join'] = $GLOBALS['tables_auxiliaires'][$table]['join']; |
|
| 1236 | + } |
|
| 1237 | + |
|
| 1238 | + return $f; |
|
| 1239 | 1239 | } |
| 1240 | 1240 | |
| 1241 | 1241 | |
@@ -1262,21 +1262,21 @@ discard block |
||
| 1262 | 1262 | * - false en cas d'erreur. |
| 1263 | 1263 | **/ |
| 1264 | 1264 | function sql_table_exists(string $table, bool $table_spip = true, $serveur = '', $option = true) { |
| 1265 | - $f = sql_serveur('table_exists', $serveur, $option === 'continue' or $option === false); |
|
| 1266 | - if (!is_string($f) or !$f) { |
|
| 1267 | - return false; |
|
| 1268 | - } |
|
| 1269 | - |
|
| 1270 | - // la globale n'est remplie qu'apres l'appel de sql_serveur. |
|
| 1271 | - if ($table_spip) { |
|
| 1272 | - $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1273 | - $prefixe = $connexion['prefixe']; |
|
| 1274 | - $vraie_table = prefixer_table_spip($table, $prefixe); |
|
| 1275 | - } else { |
|
| 1276 | - $vraie_table = $table; |
|
| 1277 | - } |
|
| 1278 | - |
|
| 1279 | - return $f($vraie_table, $serveur, $option !== false); |
|
| 1265 | + $f = sql_serveur('table_exists', $serveur, $option === 'continue' or $option === false); |
|
| 1266 | + if (!is_string($f) or !$f) { |
|
| 1267 | + return false; |
|
| 1268 | + } |
|
| 1269 | + |
|
| 1270 | + // la globale n'est remplie qu'apres l'appel de sql_serveur. |
|
| 1271 | + if ($table_spip) { |
|
| 1272 | + $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1273 | + $prefixe = $connexion['prefixe']; |
|
| 1274 | + $vraie_table = prefixer_table_spip($table, $prefixe); |
|
| 1275 | + } else { |
|
| 1276 | + $vraie_table = $table; |
|
| 1277 | + } |
|
| 1278 | + |
|
| 1279 | + return $f($vraie_table, $serveur, $option !== false); |
|
| 1280 | 1280 | } |
| 1281 | 1281 | |
| 1282 | 1282 | |
@@ -1322,24 +1322,24 @@ discard block |
||
| 1322 | 1322 | * true si succès, false en cas d'echec |
| 1323 | 1323 | **/ |
| 1324 | 1324 | function sql_create( |
| 1325 | - $nom, |
|
| 1326 | - $champs, |
|
| 1327 | - $cles = [], |
|
| 1328 | - $autoinc = false, |
|
| 1329 | - $temporary = false, |
|
| 1330 | - $serveur = '', |
|
| 1331 | - $option = true |
|
| 1325 | + $nom, |
|
| 1326 | + $champs, |
|
| 1327 | + $cles = [], |
|
| 1328 | + $autoinc = false, |
|
| 1329 | + $temporary = false, |
|
| 1330 | + $serveur = '', |
|
| 1331 | + $option = true |
|
| 1332 | 1332 | ) { |
| 1333 | - $f = sql_serveur('create', $serveur, $option === 'continue' or $option === false); |
|
| 1334 | - if (!is_string($f) or !$f) { |
|
| 1335 | - return false; |
|
| 1336 | - } |
|
| 1337 | - $r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option !== false); |
|
| 1338 | - if ($r === false) { |
|
| 1339 | - spip_sql_erreur($serveur); |
|
| 1340 | - } |
|
| 1341 | - |
|
| 1342 | - return $r; |
|
| 1333 | + $f = sql_serveur('create', $serveur, $option === 'continue' or $option === false); |
|
| 1334 | + if (!is_string($f) or !$f) { |
|
| 1335 | + return false; |
|
| 1336 | + } |
|
| 1337 | + $r = $f($nom, $champs, $cles, $autoinc, $temporary, $serveur, $option !== false); |
|
| 1338 | + if ($r === false) { |
|
| 1339 | + spip_sql_erreur($serveur); |
|
| 1340 | + } |
|
| 1341 | + |
|
| 1342 | + return $r; |
|
| 1343 | 1343 | } |
| 1344 | 1344 | |
| 1345 | 1345 | /** |
@@ -1357,16 +1357,16 @@ discard block |
||
| 1357 | 1357 | * @return bool true si la base est créee. |
| 1358 | 1358 | **/ |
| 1359 | 1359 | function sql_create_base($nom, $serveur = '', $option = true) { |
| 1360 | - $f = sql_serveur('create_base', $serveur, $option === 'continue' or $option === false); |
|
| 1361 | - if (!is_string($f) or !$f) { |
|
| 1362 | - return false; |
|
| 1363 | - } |
|
| 1364 | - $r = $f($nom, $serveur, $option !== false); |
|
| 1365 | - if ($r === false) { |
|
| 1366 | - spip_sql_erreur($serveur); |
|
| 1367 | - } |
|
| 1368 | - |
|
| 1369 | - return $r; |
|
| 1360 | + $f = sql_serveur('create_base', $serveur, $option === 'continue' or $option === false); |
|
| 1361 | + if (!is_string($f) or !$f) { |
|
| 1362 | + return false; |
|
| 1363 | + } |
|
| 1364 | + $r = $f($nom, $serveur, $option !== false); |
|
| 1365 | + if ($r === false) { |
|
| 1366 | + spip_sql_erreur($serveur); |
|
| 1367 | + } |
|
| 1368 | + |
|
| 1369 | + return $r; |
|
| 1370 | 1370 | } |
| 1371 | 1371 | |
| 1372 | 1372 | |
@@ -1396,16 +1396,16 @@ discard block |
||
| 1396 | 1396 | * - false en cas d'échec. |
| 1397 | 1397 | **/ |
| 1398 | 1398 | function sql_create_view($nom, $select_query, $serveur = '', $option = true) { |
| 1399 | - $f = sql_serveur('create_view', $serveur, $option === 'continue' or $option === false); |
|
| 1400 | - if (!is_string($f) or !$f) { |
|
| 1401 | - return false; |
|
| 1402 | - } |
|
| 1403 | - $r = $f($nom, $select_query, $serveur, $option !== false); |
|
| 1404 | - if ($r === false) { |
|
| 1405 | - spip_sql_erreur($serveur); |
|
| 1406 | - } |
|
| 1407 | - |
|
| 1408 | - return $r; |
|
| 1399 | + $f = sql_serveur('create_view', $serveur, $option === 'continue' or $option === false); |
|
| 1400 | + if (!is_string($f) or !$f) { |
|
| 1401 | + return false; |
|
| 1402 | + } |
|
| 1403 | + $r = $f($nom, $select_query, $serveur, $option !== false); |
|
| 1404 | + if ($r === false) { |
|
| 1405 | + spip_sql_erreur($serveur); |
|
| 1406 | + } |
|
| 1407 | + |
|
| 1408 | + return $r; |
|
| 1409 | 1409 | } |
| 1410 | 1410 | |
| 1411 | 1411 | /** |
@@ -1434,12 +1434,12 @@ discard block |
||
| 1434 | 1434 | * texte de sélection pour la requête |
| 1435 | 1435 | */ |
| 1436 | 1436 | function sql_multi($sel, $lang, $serveur = '', $option = true) { |
| 1437 | - $f = sql_serveur('multi', $serveur, $option === 'continue' or $option === false); |
|
| 1438 | - if (!is_string($f) or !$f) { |
|
| 1439 | - return false; |
|
| 1440 | - } |
|
| 1437 | + $f = sql_serveur('multi', $serveur, $option === 'continue' or $option === false); |
|
| 1438 | + if (!is_string($f) or !$f) { |
|
| 1439 | + return false; |
|
| 1440 | + } |
|
| 1441 | 1441 | |
| 1442 | - return $f($sel, $lang); |
|
| 1442 | + return $f($sel, $lang); |
|
| 1443 | 1443 | } |
| 1444 | 1444 | |
| 1445 | 1445 | |
@@ -1454,12 +1454,12 @@ discard block |
||
| 1454 | 1454 | * False si le serveur est indisponible |
| 1455 | 1455 | */ |
| 1456 | 1456 | function sql_error($serveur = '') { |
| 1457 | - $f = sql_serveur('error', $serveur, true); |
|
| 1458 | - if (!is_string($f) or !$f) { |
|
| 1459 | - return false; |
|
| 1460 | - } |
|
| 1457 | + $f = sql_serveur('error', $serveur, true); |
|
| 1458 | + if (!is_string($f) or !$f) { |
|
| 1459 | + return false; |
|
| 1460 | + } |
|
| 1461 | 1461 | |
| 1462 | - return $f('query inconnue', $serveur); |
|
| 1462 | + return $f('query inconnue', $serveur); |
|
| 1463 | 1463 | } |
| 1464 | 1464 | |
| 1465 | 1465 | /** |
@@ -1473,12 +1473,12 @@ discard block |
||
| 1473 | 1473 | * False si le serveur est indisponible |
| 1474 | 1474 | */ |
| 1475 | 1475 | function sql_errno($serveur = '') { |
| 1476 | - $f = sql_serveur('errno', $serveur, true); |
|
| 1477 | - if (!is_string($f) or !$f) { |
|
| 1478 | - return false; |
|
| 1479 | - } |
|
| 1476 | + $f = sql_serveur('errno', $serveur, true); |
|
| 1477 | + if (!is_string($f) or !$f) { |
|
| 1478 | + return false; |
|
| 1479 | + } |
|
| 1480 | 1480 | |
| 1481 | - return $f($serveur); |
|
| 1481 | + return $f($serveur); |
|
| 1482 | 1482 | } |
| 1483 | 1483 | |
| 1484 | 1484 | /** |
@@ -1496,16 +1496,16 @@ discard block |
||
| 1496 | 1496 | * @return array|false Tableau de l'explication |
| 1497 | 1497 | */ |
| 1498 | 1498 | function sql_explain($q, $serveur = '', $option = true) { |
| 1499 | - $f = sql_serveur('explain', $serveur, true); |
|
| 1500 | - if (!is_string($f) or !$f) { |
|
| 1501 | - return false; |
|
| 1502 | - } |
|
| 1503 | - $r = $f($q, $serveur, $option !== false); |
|
| 1504 | - if ($r === false) { |
|
| 1505 | - spip_sql_erreur($serveur); |
|
| 1506 | - } |
|
| 1507 | - |
|
| 1508 | - return $r; |
|
| 1499 | + $f = sql_serveur('explain', $serveur, true); |
|
| 1500 | + if (!is_string($f) or !$f) { |
|
| 1501 | + return false; |
|
| 1502 | + } |
|
| 1503 | + $r = $f($q, $serveur, $option !== false); |
|
| 1504 | + if ($r === false) { |
|
| 1505 | + spip_sql_erreur($serveur); |
|
| 1506 | + } |
|
| 1507 | + |
|
| 1508 | + return $r; |
|
| 1509 | 1509 | } |
| 1510 | 1510 | |
| 1511 | 1511 | /** |
@@ -1523,16 +1523,16 @@ discard block |
||
| 1523 | 1523 | * @return bool Toujours true |
| 1524 | 1524 | */ |
| 1525 | 1525 | function sql_optimize($table, $serveur = '', $option = true) { |
| 1526 | - $f = sql_serveur('optimize', $serveur, $option === 'continue' or $option === false); |
|
| 1527 | - if (!is_string($f) or !$f) { |
|
| 1528 | - return false; |
|
| 1529 | - } |
|
| 1530 | - $r = $f($table, $serveur, $option !== false); |
|
| 1531 | - if ($r === false) { |
|
| 1532 | - spip_sql_erreur($serveur); |
|
| 1533 | - } |
|
| 1534 | - |
|
| 1535 | - return $r; |
|
| 1526 | + $f = sql_serveur('optimize', $serveur, $option === 'continue' or $option === false); |
|
| 1527 | + if (!is_string($f) or !$f) { |
|
| 1528 | + return false; |
|
| 1529 | + } |
|
| 1530 | + $r = $f($table, $serveur, $option !== false); |
|
| 1531 | + if ($r === false) { |
|
| 1532 | + spip_sql_erreur($serveur); |
|
| 1533 | + } |
|
| 1534 | + |
|
| 1535 | + return $r; |
|
| 1536 | 1536 | } |
| 1537 | 1537 | |
| 1538 | 1538 | /** |
@@ -1552,16 +1552,16 @@ discard block |
||
| 1552 | 1552 | * - true si la requête a réussie, false sinon |
| 1553 | 1553 | */ |
| 1554 | 1554 | function sql_repair($table, $serveur = '', $option = true) { |
| 1555 | - $f = sql_serveur('repair', $serveur, $option === 'continue' or $option === false); |
|
| 1556 | - if (!is_string($f) or !$f) { |
|
| 1557 | - return false; |
|
| 1558 | - } |
|
| 1559 | - $r = $f($table, $serveur, $option !== false); |
|
| 1560 | - if ($r === false) { |
|
| 1561 | - spip_sql_erreur($serveur); |
|
| 1562 | - } |
|
| 1563 | - |
|
| 1564 | - return $r; |
|
| 1555 | + $f = sql_serveur('repair', $serveur, $option === 'continue' or $option === false); |
|
| 1556 | + if (!is_string($f) or !$f) { |
|
| 1557 | + return false; |
|
| 1558 | + } |
|
| 1559 | + $r = $f($table, $serveur, $option !== false); |
|
| 1560 | + if ($r === false) { |
|
| 1561 | + spip_sql_erreur($serveur); |
|
| 1562 | + } |
|
| 1563 | + |
|
| 1564 | + return $r; |
|
| 1565 | 1565 | } |
| 1566 | 1566 | |
| 1567 | 1567 | |
@@ -1586,16 +1586,16 @@ discard block |
||
| 1586 | 1586 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 1587 | 1587 | */ |
| 1588 | 1588 | function sql_query($ins, $serveur = '', $option = true) { |
| 1589 | - $f = sql_serveur('query', $serveur, $option === 'continue' or $option === false); |
|
| 1590 | - if (!is_string($f) or !$f) { |
|
| 1591 | - return false; |
|
| 1592 | - } |
|
| 1593 | - $r = $f($ins, $serveur, $option !== false); |
|
| 1594 | - if ($r === false) { |
|
| 1595 | - spip_sql_erreur($serveur); |
|
| 1596 | - } |
|
| 1597 | - |
|
| 1598 | - return $r; |
|
| 1589 | + $f = sql_serveur('query', $serveur, $option === 'continue' or $option === false); |
|
| 1590 | + if (!is_string($f) or !$f) { |
|
| 1591 | + return false; |
|
| 1592 | + } |
|
| 1593 | + $r = $f($ins, $serveur, $option !== false); |
|
| 1594 | + if ($r === false) { |
|
| 1595 | + spip_sql_erreur($serveur); |
|
| 1596 | + } |
|
| 1597 | + |
|
| 1598 | + return $r; |
|
| 1599 | 1599 | } |
| 1600 | 1600 | |
| 1601 | 1601 | /** |
@@ -1643,27 +1643,27 @@ discard block |
||
| 1643 | 1643 | * |
| 1644 | 1644 | **/ |
| 1645 | 1645 | function sql_fetsel( |
| 1646 | - $select = [], |
|
| 1647 | - $from = [], |
|
| 1648 | - $where = [], |
|
| 1649 | - $groupby = [], |
|
| 1650 | - $orderby = [], |
|
| 1651 | - $limit = '', |
|
| 1652 | - $having = [], |
|
| 1653 | - $serveur = '', |
|
| 1654 | - $option = true |
|
| 1646 | + $select = [], |
|
| 1647 | + $from = [], |
|
| 1648 | + $where = [], |
|
| 1649 | + $groupby = [], |
|
| 1650 | + $orderby = [], |
|
| 1651 | + $limit = '', |
|
| 1652 | + $having = [], |
|
| 1653 | + $serveur = '', |
|
| 1654 | + $option = true |
|
| 1655 | 1655 | ) { |
| 1656 | - $q = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option); |
|
| 1657 | - if ($option === false) { |
|
| 1658 | - return $q; |
|
| 1659 | - } |
|
| 1660 | - if (!$q) { |
|
| 1661 | - return []; |
|
| 1662 | - } |
|
| 1663 | - $r = sql_fetch($q, $serveur, $option); |
|
| 1664 | - sql_free($q, $serveur, $option); |
|
| 1665 | - |
|
| 1666 | - return $r; |
|
| 1656 | + $q = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option); |
|
| 1657 | + if ($option === false) { |
|
| 1658 | + return $q; |
|
| 1659 | + } |
|
| 1660 | + if (!$q) { |
|
| 1661 | + return []; |
|
| 1662 | + } |
|
| 1663 | + $r = sql_fetch($q, $serveur, $option); |
|
| 1664 | + sql_free($q, $serveur, $option); |
|
| 1665 | + |
|
| 1666 | + return $r; |
|
| 1667 | 1667 | } |
| 1668 | 1668 | |
| 1669 | 1669 | |
@@ -1720,22 +1720,22 @@ discard block |
||
| 1720 | 1720 | * |
| 1721 | 1721 | **/ |
| 1722 | 1722 | function sql_allfetsel( |
| 1723 | - $select = [], |
|
| 1724 | - $from = [], |
|
| 1725 | - $where = [], |
|
| 1726 | - $groupby = [], |
|
| 1727 | - $orderby = [], |
|
| 1728 | - $limit = '', |
|
| 1729 | - $having = [], |
|
| 1730 | - $serveur = '', |
|
| 1731 | - $option = true |
|
| 1723 | + $select = [], |
|
| 1724 | + $from = [], |
|
| 1725 | + $where = [], |
|
| 1726 | + $groupby = [], |
|
| 1727 | + $orderby = [], |
|
| 1728 | + $limit = '', |
|
| 1729 | + $having = [], |
|
| 1730 | + $serveur = '', |
|
| 1731 | + $option = true |
|
| 1732 | 1732 | ) { |
| 1733 | - $q = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option); |
|
| 1734 | - if ($option === false) { |
|
| 1735 | - return $q; |
|
| 1736 | - } |
|
| 1733 | + $q = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option); |
|
| 1734 | + if ($option === false) { |
|
| 1735 | + return $q; |
|
| 1736 | + } |
|
| 1737 | 1737 | |
| 1738 | - return sql_fetch_all($q, $serveur, $option); |
|
| 1738 | + return sql_fetch_all($q, $serveur, $option); |
|
| 1739 | 1739 | } |
| 1740 | 1740 | |
| 1741 | 1741 | |
@@ -1782,33 +1782,33 @@ discard block |
||
| 1782 | 1782 | * |
| 1783 | 1783 | **/ |
| 1784 | 1784 | function sql_getfetsel( |
| 1785 | - $select, |
|
| 1786 | - $from = [], |
|
| 1787 | - $where = [], |
|
| 1788 | - $groupby = [], |
|
| 1789 | - $orderby = [], |
|
| 1790 | - $limit = '', |
|
| 1791 | - $having = [], |
|
| 1792 | - $serveur = '', |
|
| 1793 | - $option = true |
|
| 1785 | + $select, |
|
| 1786 | + $from = [], |
|
| 1787 | + $where = [], |
|
| 1788 | + $groupby = [], |
|
| 1789 | + $orderby = [], |
|
| 1790 | + $limit = '', |
|
| 1791 | + $having = [], |
|
| 1792 | + $serveur = '', |
|
| 1793 | + $option = true |
|
| 1794 | 1794 | ) { |
| 1795 | - if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) { |
|
| 1796 | - $id = $c[1]; |
|
| 1797 | - } elseif (!preg_match('/\W/', $select)) { |
|
| 1798 | - $id = $select; |
|
| 1799 | - } else { |
|
| 1800 | - $id = 'n'; |
|
| 1801 | - $select .= ' AS n'; |
|
| 1802 | - } |
|
| 1803 | - $r = sql_fetsel($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option); |
|
| 1804 | - if ($option === false) { |
|
| 1805 | - return $r; |
|
| 1806 | - } |
|
| 1807 | - if (!$r) { |
|
| 1808 | - return null; |
|
| 1809 | - } |
|
| 1810 | - |
|
| 1811 | - return $r[$id]; |
|
| 1795 | + if (preg_match('/\s+as\s+(\w+)$/i', $select, $c)) { |
|
| 1796 | + $id = $c[1]; |
|
| 1797 | + } elseif (!preg_match('/\W/', $select)) { |
|
| 1798 | + $id = $select; |
|
| 1799 | + } else { |
|
| 1800 | + $id = 'n'; |
|
| 1801 | + $select .= ' AS n'; |
|
| 1802 | + } |
|
| 1803 | + $r = sql_fetsel($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur, $option); |
|
| 1804 | + if ($option === false) { |
|
| 1805 | + return $r; |
|
| 1806 | + } |
|
| 1807 | + if (!$r) { |
|
| 1808 | + return null; |
|
| 1809 | + } |
|
| 1810 | + |
|
| 1811 | + return $r[$id]; |
|
| 1812 | 1812 | } |
| 1813 | 1813 | |
| 1814 | 1814 | /** |
@@ -1826,9 +1826,9 @@ discard block |
||
| 1826 | 1826 | * Numero de version du serveur SQL |
| 1827 | 1827 | **/ |
| 1828 | 1828 | function sql_version($serveur = '', $option = true) { |
| 1829 | - $row = sql_fetsel('version() AS n', '', '', '', '', '', '', $serveur); |
|
| 1829 | + $row = sql_fetsel('version() AS n', '', '', '', '', '', '', $serveur); |
|
| 1830 | 1830 | |
| 1831 | - return ($row['n']); |
|
| 1831 | + return ($row['n']); |
|
| 1832 | 1832 | } |
| 1833 | 1833 | |
| 1834 | 1834 | /** |
@@ -1864,16 +1864,16 @@ discard block |
||
| 1864 | 1864 | * Le serveur SQL prefere t'il des transactions pour les insertions multiples ? |
| 1865 | 1865 | **/ |
| 1866 | 1866 | function sql_preferer_transaction($serveur = '', $option = true) { |
| 1867 | - $f = sql_serveur('preferer_transaction', $serveur, true); |
|
| 1868 | - if (!is_string($f) or !$f) { |
|
| 1869 | - return false; |
|
| 1870 | - } |
|
| 1871 | - $r = $f($serveur, $option !== false); |
|
| 1872 | - if ($r === false) { |
|
| 1873 | - spip_sql_erreur($serveur); |
|
| 1874 | - } |
|
| 1875 | - |
|
| 1876 | - return $r; |
|
| 1867 | + $f = sql_serveur('preferer_transaction', $serveur, true); |
|
| 1868 | + if (!is_string($f) or !$f) { |
|
| 1869 | + return false; |
|
| 1870 | + } |
|
| 1871 | + $r = $f($serveur, $option !== false); |
|
| 1872 | + if ($r === false) { |
|
| 1873 | + spip_sql_erreur($serveur); |
|
| 1874 | + } |
|
| 1875 | + |
|
| 1876 | + return $r; |
|
| 1877 | 1877 | } |
| 1878 | 1878 | |
| 1879 | 1879 | ; |
@@ -1898,16 +1898,16 @@ discard block |
||
| 1898 | 1898 | * false en cas d'erreur |
| 1899 | 1899 | **/ |
| 1900 | 1900 | function sql_demarrer_transaction($serveur = '', $option = true) { |
| 1901 | - $f = sql_serveur('demarrer_transaction', $serveur, true); |
|
| 1902 | - if (!is_string($f) or !$f) { |
|
| 1903 | - return false; |
|
| 1904 | - } |
|
| 1905 | - $r = $f($serveur, $option !== false); |
|
| 1906 | - if ($r === false) { |
|
| 1907 | - spip_sql_erreur($serveur); |
|
| 1908 | - } |
|
| 1909 | - |
|
| 1910 | - return $r; |
|
| 1901 | + $f = sql_serveur('demarrer_transaction', $serveur, true); |
|
| 1902 | + if (!is_string($f) or !$f) { |
|
| 1903 | + return false; |
|
| 1904 | + } |
|
| 1905 | + $r = $f($serveur, $option !== false); |
|
| 1906 | + if ($r === false) { |
|
| 1907 | + spip_sql_erreur($serveur); |
|
| 1908 | + } |
|
| 1909 | + |
|
| 1910 | + return $r; |
|
| 1911 | 1911 | } |
| 1912 | 1912 | |
| 1913 | 1913 | ; |
@@ -1932,16 +1932,16 @@ discard block |
||
| 1932 | 1932 | * false en cas d'erreur |
| 1933 | 1933 | **/ |
| 1934 | 1934 | function sql_terminer_transaction($serveur = '', $option = true) { |
| 1935 | - $f = sql_serveur('terminer_transaction', $serveur, true); |
|
| 1936 | - if (!is_string($f) or !$f) { |
|
| 1937 | - return false; |
|
| 1938 | - } |
|
| 1939 | - $r = $f($serveur, $option !== false); |
|
| 1940 | - if ($r === false) { |
|
| 1941 | - spip_sql_erreur($serveur); |
|
| 1942 | - } |
|
| 1943 | - |
|
| 1944 | - return $r; |
|
| 1935 | + $f = sql_serveur('terminer_transaction', $serveur, true); |
|
| 1936 | + if (!is_string($f) or !$f) { |
|
| 1937 | + return false; |
|
| 1938 | + } |
|
| 1939 | + $r = $f($serveur, $option !== false); |
|
| 1940 | + if ($r === false) { |
|
| 1941 | + spip_sql_erreur($serveur); |
|
| 1942 | + } |
|
| 1943 | + |
|
| 1944 | + return $r; |
|
| 1945 | 1945 | } |
| 1946 | 1946 | |
| 1947 | 1947 | ; |
@@ -1968,12 +1968,12 @@ discard block |
||
| 1968 | 1968 | * Valeur hexadécimale attendue par le serveur SQL |
| 1969 | 1969 | **/ |
| 1970 | 1970 | function sql_hex($val, $serveur = '', $option = true) { |
| 1971 | - $f = sql_serveur('hex', $serveur, $option === 'continue' or $option === false); |
|
| 1972 | - if (!is_string($f) or !$f) { |
|
| 1973 | - return false; |
|
| 1974 | - } |
|
| 1971 | + $f = sql_serveur('hex', $serveur, $option === 'continue' or $option === false); |
|
| 1972 | + if (!is_string($f) or !$f) { |
|
| 1973 | + return false; |
|
| 1974 | + } |
|
| 1975 | 1975 | |
| 1976 | - return $f($val); |
|
| 1976 | + return $f($val); |
|
| 1977 | 1977 | } |
| 1978 | 1978 | |
| 1979 | 1979 | /** |
@@ -1999,12 +1999,12 @@ discard block |
||
| 1999 | 1999 | * La chaine echappee |
| 2000 | 2000 | **/ |
| 2001 | 2001 | function sql_quote($val, $serveur = '', $type = '') { |
| 2002 | - $f = sql_serveur('quote', $serveur, true); |
|
| 2003 | - if (!is_string($f) or !$f) { |
|
| 2004 | - $f = '_q'; |
|
| 2005 | - } |
|
| 2002 | + $f = sql_serveur('quote', $serveur, true); |
|
| 2003 | + if (!is_string($f) or !$f) { |
|
| 2004 | + $f = '_q'; |
|
| 2005 | + } |
|
| 2006 | 2006 | |
| 2007 | - return $f($val, $type); |
|
| 2007 | + return $f($val, $type); |
|
| 2008 | 2008 | } |
| 2009 | 2009 | |
| 2010 | 2010 | /** |
@@ -2029,12 +2029,12 @@ discard block |
||
| 2029 | 2029 | * - false si le serveur SQL est indisponible |
| 2030 | 2030 | **/ |
| 2031 | 2031 | function sql_date_proche($champ, $interval, $unite, $serveur = '', $option = true) { |
| 2032 | - $f = sql_serveur('date_proche', $serveur, true); |
|
| 2033 | - if (!is_string($f) or !$f) { |
|
| 2034 | - return false; |
|
| 2035 | - } |
|
| 2032 | + $f = sql_serveur('date_proche', $serveur, true); |
|
| 2033 | + if (!is_string($f) or !$f) { |
|
| 2034 | + return false; |
|
| 2035 | + } |
|
| 2036 | 2036 | |
| 2037 | - return $f($champ, $interval, $unite); |
|
| 2037 | + return $f($champ, $interval, $unite); |
|
| 2038 | 2038 | } |
| 2039 | 2039 | |
| 2040 | 2040 | /** |
@@ -2070,26 +2070,26 @@ discard block |
||
| 2070 | 2070 | * Expression de requête SQL |
| 2071 | 2071 | **/ |
| 2072 | 2072 | function sql_in_quote($champ, $valeurs, $not = '', $serveur = '', $type = '', $option = true) { |
| 2073 | - $quote = sql_serveur('quote', $serveur, true); |
|
| 2074 | - if (!is_string($quote) or !$quote) { |
|
| 2075 | - return false; |
|
| 2076 | - } |
|
| 2077 | - |
|
| 2078 | - // sql_quote produit une chaine dans tous les cas |
|
| 2079 | - $valeurs = array_filter($valeurs, fn($v) => !is_array($v)); |
|
| 2080 | - $valeurs = array_unique($valeurs); |
|
| 2081 | - $valeurs = $quote($valeurs, $type); |
|
| 2082 | - |
|
| 2083 | - if (!strlen(trim($valeurs))) { |
|
| 2084 | - return ($not ? '0=0' : '0=1'); |
|
| 2085 | - } |
|
| 2086 | - |
|
| 2087 | - $f = sql_serveur('in', $serveur, $option === 'continue' or $option === false); |
|
| 2088 | - if (!is_string($f) or !$f) { |
|
| 2089 | - return false; |
|
| 2090 | - } |
|
| 2091 | - |
|
| 2092 | - return $f($champ, $valeurs, $not ? 'NOT' : '', $serveur, $option !== false); |
|
| 2073 | + $quote = sql_serveur('quote', $serveur, true); |
|
| 2074 | + if (!is_string($quote) or !$quote) { |
|
| 2075 | + return false; |
|
| 2076 | + } |
|
| 2077 | + |
|
| 2078 | + // sql_quote produit une chaine dans tous les cas |
|
| 2079 | + $valeurs = array_filter($valeurs, fn($v) => !is_array($v)); |
|
| 2080 | + $valeurs = array_unique($valeurs); |
|
| 2081 | + $valeurs = $quote($valeurs, $type); |
|
| 2082 | + |
|
| 2083 | + if (!strlen(trim($valeurs))) { |
|
| 2084 | + return ($not ? '0=0' : '0=1'); |
|
| 2085 | + } |
|
| 2086 | + |
|
| 2087 | + $f = sql_serveur('in', $serveur, $option === 'continue' or $option === false); |
|
| 2088 | + if (!is_string($f) or !$f) { |
|
| 2089 | + return false; |
|
| 2090 | + } |
|
| 2091 | + |
|
| 2092 | + return $f($champ, $valeurs, $not ? 'NOT' : '', $serveur, $option !== false); |
|
| 2093 | 2093 | } |
| 2094 | 2094 | |
| 2095 | 2095 | /** |
@@ -2106,19 +2106,19 @@ discard block |
||
| 2106 | 2106 | * @param bool $option |
| 2107 | 2107 | */ |
| 2108 | 2108 | function sql_in($champ, $valeurs, $not = '', $serveur = '', $option = true) { |
| 2109 | - $type = ''; |
|
| 2110 | - if (!is_array($valeurs)) { |
|
| 2111 | - $valeurs = strval($valeurs); |
|
| 2112 | - if (isset($valeurs[0]) and $valeurs[0] === ',') { |
|
| 2113 | - $valeurs = substr($valeurs, 1); |
|
| 2114 | - } |
|
| 2115 | - // on explode en tableau pour pouvoir securiser le contenu |
|
| 2116 | - $valeurs = explode(',', $valeurs); |
|
| 2117 | - // et on force un cast de type int donc |
|
| 2118 | - $type = 'int'; |
|
| 2119 | - } |
|
| 2120 | - |
|
| 2121 | - return sql_in_quote($champ, $valeurs, $not, $serveur, $type, $option); |
|
| 2109 | + $type = ''; |
|
| 2110 | + if (!is_array($valeurs)) { |
|
| 2111 | + $valeurs = strval($valeurs); |
|
| 2112 | + if (isset($valeurs[0]) and $valeurs[0] === ',') { |
|
| 2113 | + $valeurs = substr($valeurs, 1); |
|
| 2114 | + } |
|
| 2115 | + // on explode en tableau pour pouvoir securiser le contenu |
|
| 2116 | + $valeurs = explode(',', $valeurs); |
|
| 2117 | + // et on force un cast de type int donc |
|
| 2118 | + $type = 'int'; |
|
| 2119 | + } |
|
| 2120 | + |
|
| 2121 | + return sql_in_quote($champ, $valeurs, $not, $serveur, $type, $option); |
|
| 2122 | 2122 | } |
| 2123 | 2123 | |
| 2124 | 2124 | |
@@ -2159,24 +2159,24 @@ discard block |
||
| 2159 | 2159 | * Expression de requête SQL |
| 2160 | 2160 | **/ |
| 2161 | 2161 | function sql_in_select( |
| 2162 | - $in, |
|
| 2163 | - $select, |
|
| 2164 | - $from = [], |
|
| 2165 | - $where = [], |
|
| 2166 | - $groupby = [], |
|
| 2167 | - $orderby = [], |
|
| 2168 | - $limit = '', |
|
| 2169 | - $having = [], |
|
| 2170 | - $serveur = '' |
|
| 2162 | + $in, |
|
| 2163 | + $select, |
|
| 2164 | + $from = [], |
|
| 2165 | + $where = [], |
|
| 2166 | + $groupby = [], |
|
| 2167 | + $orderby = [], |
|
| 2168 | + $limit = '', |
|
| 2169 | + $having = [], |
|
| 2170 | + $serveur = '' |
|
| 2171 | 2171 | ) { |
| 2172 | - $liste = []; |
|
| 2173 | - $res = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur); |
|
| 2174 | - while ($r = sql_fetch($res)) { |
|
| 2175 | - $liste[] = array_shift($r); |
|
| 2176 | - } |
|
| 2177 | - sql_free($res); |
|
| 2178 | - |
|
| 2179 | - return sql_in($in, $liste); |
|
| 2172 | + $liste = []; |
|
| 2173 | + $res = sql_select($select, $from, $where, $groupby, $orderby, $limit, $having, $serveur); |
|
| 2174 | + while ($r = sql_fetch($res)) { |
|
| 2175 | + $liste[] = array_shift($r); |
|
| 2176 | + } |
|
| 2177 | + sql_free($res); |
|
| 2178 | + |
|
| 2179 | + return sql_in($in, $liste); |
|
| 2180 | 2180 | } |
| 2181 | 2181 | |
| 2182 | 2182 | /** |
@@ -2208,29 +2208,29 @@ discard block |
||
| 2208 | 2208 | * Position apres le saut. |
| 2209 | 2209 | */ |
| 2210 | 2210 | function sql_skip($res, $pos, $saut, $count, $serveur = '', $option = true) { |
| 2211 | - // pas de saut en arriere qu'on ne sait pas faire sans sql_seek |
|
| 2212 | - if (($saut = intval($saut)) <= 0) { |
|
| 2213 | - return $pos; |
|
| 2214 | - } |
|
| 2215 | - |
|
| 2216 | - $seek = $pos + $saut; |
|
| 2217 | - // si le saut fait depasser le maxi, on libere la resource |
|
| 2218 | - // et on sort |
|
| 2219 | - if ($seek >= $count) { |
|
| 2220 | - sql_free($res, $serveur, $option); |
|
| 2221 | - |
|
| 2222 | - return $count; |
|
| 2223 | - } |
|
| 2224 | - |
|
| 2225 | - if (sql_seek($res, $seek)) { |
|
| 2226 | - $pos = $seek; |
|
| 2227 | - } else { |
|
| 2228 | - while ($pos < $seek and sql_fetch($res, $serveur, $option)) { |
|
| 2229 | - $pos++; |
|
| 2230 | - } |
|
| 2231 | - } |
|
| 2232 | - |
|
| 2233 | - return $pos; |
|
| 2211 | + // pas de saut en arriere qu'on ne sait pas faire sans sql_seek |
|
| 2212 | + if (($saut = intval($saut)) <= 0) { |
|
| 2213 | + return $pos; |
|
| 2214 | + } |
|
| 2215 | + |
|
| 2216 | + $seek = $pos + $saut; |
|
| 2217 | + // si le saut fait depasser le maxi, on libere la resource |
|
| 2218 | + // et on sort |
|
| 2219 | + if ($seek >= $count) { |
|
| 2220 | + sql_free($res, $serveur, $option); |
|
| 2221 | + |
|
| 2222 | + return $count; |
|
| 2223 | + } |
|
| 2224 | + |
|
| 2225 | + if (sql_seek($res, $seek)) { |
|
| 2226 | + $pos = $seek; |
|
| 2227 | + } else { |
|
| 2228 | + while ($pos < $seek and sql_fetch($res, $serveur, $option)) { |
|
| 2229 | + $pos++; |
|
| 2230 | + } |
|
| 2231 | + } |
|
| 2232 | + |
|
| 2233 | + return $pos; |
|
| 2234 | 2234 | } |
| 2235 | 2235 | |
| 2236 | 2236 | |
@@ -2250,7 +2250,7 @@ discard block |
||
| 2250 | 2250 | * True si le champ est de type entier |
| 2251 | 2251 | */ |
| 2252 | 2252 | function sql_test_int($type, $serveur = '', $option = true) { |
| 2253 | - return preg_match('/^(TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT)/i', trim($type)); |
|
| 2253 | + return preg_match('/^(TINYINT|SMALLINT|MEDIUMINT|INT|INTEGER|BIGINT)/i', trim($type)); |
|
| 2254 | 2254 | } |
| 2255 | 2255 | |
| 2256 | 2256 | /** |
@@ -2269,7 +2269,7 @@ discard block |
||
| 2269 | 2269 | * True si le champ est de type entier |
| 2270 | 2270 | */ |
| 2271 | 2271 | function sql_test_date($type, $serveur = '', $option = true) { |
| 2272 | - return preg_match('/^(DATE|DATETIME|TIMESTAMP|TIME)/i', trim($type)); |
|
| 2272 | + return preg_match('/^(DATE|DATETIME|TIMESTAMP|TIME)/i', trim($type)); |
|
| 2273 | 2273 | } |
| 2274 | 2274 | |
| 2275 | 2275 | /** |
@@ -2291,19 +2291,19 @@ discard block |
||
| 2291 | 2291 | * La date formatee |
| 2292 | 2292 | */ |
| 2293 | 2293 | function sql_format_date($annee = 0, $mois = 0, $jour = 0, $h = 0, $m = 0, $s = 0, $serveur = '') { |
| 2294 | - $annee = sprintf('%04s', $annee); |
|
| 2295 | - $mois = sprintf('%02s', $mois); |
|
| 2296 | - |
|
| 2297 | - if ($annee == '0000') { |
|
| 2298 | - $mois = 0; |
|
| 2299 | - } |
|
| 2300 | - if ($mois == '00') { |
|
| 2301 | - $jour = 0; |
|
| 2302 | - } |
|
| 2303 | - |
|
| 2304 | - return sprintf('%04u', $annee) . '-' . sprintf('%02u', $mois) . '-' |
|
| 2305 | - . sprintf('%02u', $jour) . ' ' . sprintf('%02u', $h) . ':' |
|
| 2306 | - . sprintf('%02u', $m) . ':' . sprintf('%02u', $s); |
|
| 2294 | + $annee = sprintf('%04s', $annee); |
|
| 2295 | + $mois = sprintf('%02s', $mois); |
|
| 2296 | + |
|
| 2297 | + if ($annee == '0000') { |
|
| 2298 | + $mois = 0; |
|
| 2299 | + } |
|
| 2300 | + if ($mois == '00') { |
|
| 2301 | + $jour = 0; |
|
| 2302 | + } |
|
| 2303 | + |
|
| 2304 | + return sprintf('%04u', $annee) . '-' . sprintf('%02u', $mois) . '-' |
|
| 2305 | + . sprintf('%02u', $jour) . ' ' . sprintf('%02u', $h) . ':' |
|
| 2306 | + . sprintf('%02u', $m) . ':' . sprintf('%02u', $s); |
|
| 2307 | 2307 | } |
| 2308 | 2308 | |
| 2309 | 2309 | |
@@ -2326,32 +2326,32 @@ discard block |
||
| 2326 | 2326 | **/ |
| 2327 | 2327 | function description_table($nom, $serveur = '') { |
| 2328 | 2328 | |
| 2329 | - static $trouver_table; |
|
| 2329 | + static $trouver_table; |
|
| 2330 | 2330 | |
| 2331 | - /* toujours utiliser trouver_table |
|
| 2331 | + /* toujours utiliser trouver_table |
|
| 2332 | 2332 | qui renverra la description theorique |
| 2333 | 2333 | car sinon on va se comporter differement selon que la table est declaree |
| 2334 | 2334 | ou non |
| 2335 | 2335 | */ |
| 2336 | - if (!$trouver_table) { |
|
| 2337 | - $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 2338 | - } |
|
| 2339 | - if ($desc = $trouver_table($nom, $serveur)) { |
|
| 2340 | - return $desc; |
|
| 2341 | - } |
|
| 2342 | - |
|
| 2343 | - // sauf a l'installation : |
|
| 2344 | - include_spip('base/serial'); |
|
| 2345 | - if (isset($GLOBALS['tables_principales'][$nom])) { |
|
| 2346 | - return $GLOBALS['tables_principales'][$nom]; |
|
| 2347 | - } |
|
| 2348 | - |
|
| 2349 | - include_spip('base/auxiliaires'); |
|
| 2350 | - if (isset($GLOBALS['tables_auxiliaires'][$nom])) { |
|
| 2351 | - return $GLOBALS['tables_auxiliaires'][$nom]; |
|
| 2352 | - } |
|
| 2353 | - |
|
| 2354 | - return false; |
|
| 2336 | + if (!$trouver_table) { |
|
| 2337 | + $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 2338 | + } |
|
| 2339 | + if ($desc = $trouver_table($nom, $serveur)) { |
|
| 2340 | + return $desc; |
|
| 2341 | + } |
|
| 2342 | + |
|
| 2343 | + // sauf a l'installation : |
|
| 2344 | + include_spip('base/serial'); |
|
| 2345 | + if (isset($GLOBALS['tables_principales'][$nom])) { |
|
| 2346 | + return $GLOBALS['tables_principales'][$nom]; |
|
| 2347 | + } |
|
| 2348 | + |
|
| 2349 | + include_spip('base/auxiliaires'); |
|
| 2350 | + if (isset($GLOBALS['tables_auxiliaires'][$nom])) { |
|
| 2351 | + return $GLOBALS['tables_auxiliaires'][$nom]; |
|
| 2352 | + } |
|
| 2353 | + |
|
| 2354 | + return false; |
|
| 2355 | 2355 | } |
| 2356 | 2356 | |
| 2357 | 2357 | /** |
@@ -2364,8 +2364,8 @@ discard block |
||
| 2364 | 2364 | * @return string Table sql éventuellement renommée |
| 2365 | 2365 | */ |
| 2366 | 2366 | function prefixer_table_spip($table, $prefixe) { |
| 2367 | - if ($prefixe) { |
|
| 2368 | - $table = preg_replace('/^spip_/', $prefixe . '_', $table); |
|
| 2369 | - } |
|
| 2370 | - return $table; |
|
| 2367 | + if ($prefixe) { |
|
| 2368 | + $table = preg_replace('/^spip_/', $prefixe . '_', $table); |
|
| 2369 | + } |
|
| 2370 | + return $table; |
|
| 2371 | 2371 | } |
@@ -16,7 +16,7 @@ discard block |
||
| 16 | 16 | * @package SPIP\Core\Installation |
| 17 | 17 | **/ |
| 18 | 18 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 19 | - return; |
|
| 19 | + return; |
|
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | include_spip('inc/acces'); |
@@ -33,18 +33,18 @@ discard block |
||
| 33 | 33 | * @return bool |
| 34 | 34 | */ |
| 35 | 35 | function base_determine_autoinc($table, $desc = []) { |
| 36 | - if ($t = lister_tables_principales() and isset($t[$table])) { |
|
| 37 | - $autoinc = true; |
|
| 38 | - } elseif ($t = lister_tables_auxiliaires() and isset($t[$table])) { |
|
| 39 | - $autoinc = false; |
|
| 40 | - } else { |
|
| 41 | - // essayer de faire au mieux ! |
|
| 42 | - $autoinc = (isset($desc['key']['PRIMARY KEY']) |
|
| 43 | - and !str_contains($desc['key']['PRIMARY KEY'], ',') |
|
| 44 | - and !str_contains($desc['field'][$desc['key']['PRIMARY KEY']], 'default')); |
|
| 45 | - } |
|
| 36 | + if ($t = lister_tables_principales() and isset($t[$table])) { |
|
| 37 | + $autoinc = true; |
|
| 38 | + } elseif ($t = lister_tables_auxiliaires() and isset($t[$table])) { |
|
| 39 | + $autoinc = false; |
|
| 40 | + } else { |
|
| 41 | + // essayer de faire au mieux ! |
|
| 42 | + $autoinc = (isset($desc['key']['PRIMARY KEY']) |
|
| 43 | + and !str_contains($desc['key']['PRIMARY KEY'], ',') |
|
| 44 | + and !str_contains($desc['field'][$desc['key']['PRIMARY KEY']], 'default')); |
|
| 45 | + } |
|
| 46 | 46 | |
| 47 | - return $autoinc; |
|
| 47 | + return $autoinc; |
|
| 48 | 48 | } |
| 49 | 49 | |
| 50 | 50 | /** |
@@ -61,58 +61,58 @@ discard block |
||
| 61 | 61 | * @return void |
| 62 | 62 | */ |
| 63 | 63 | function creer_ou_upgrader_table($table, $desc, $autoinc, $upgrade = false, $serveur = '') { |
| 64 | - #spip_log("creer_ou_upgrader_table table=$table autoinc=$autoinc upgrade=$upgrade","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 65 | - $sql_desc = $upgrade ? sql_showtable($table, true, $serveur) : false; |
|
| 66 | - #if (!$sql_desc) $sql_desc = false; |
|
| 67 | - #spip_log("table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 68 | - if (!$sql_desc) { |
|
| 69 | - if ($autoinc === 'auto') { |
|
| 70 | - $autoinc = base_determine_autoinc($table, $desc); |
|
| 71 | - } |
|
| 72 | - #spip_log("sql_create $table autoinc=$autoinc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 73 | - if (isset($desc['field']) and isset($desc['key'])) { |
|
| 74 | - sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur); |
|
| 75 | - } |
|
| 76 | - // verifier la bonne installation de la table (php-fpm es-tu la ?) |
|
| 77 | - $sql_desc = sql_showtable($table, true, $serveur); |
|
| 78 | - #if (!$sql_desc) $sql_desc = false; |
|
| 79 | - #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 80 | - if (!$sql_desc) { |
|
| 81 | - // on retente avec un sleep ? |
|
| 82 | - sleep(1); |
|
| 83 | - sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur); |
|
| 84 | - $sql_desc = sql_showtable($table, true, $serveur); |
|
| 85 | - #if (!$sql_desc) $sql_desc = false; |
|
| 86 | - #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 87 | - if (!$sql_desc) { |
|
| 88 | - spip_log("Echec creation table $table", 'maj' . _LOG_CRITIQUE); |
|
| 89 | - } |
|
| 90 | - } |
|
| 91 | - } else { |
|
| 92 | - #spip_log("sql_alter $table ... (on s'en fiche)","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 93 | - // ajouter les champs manquants |
|
| 94 | - // on ne supprime jamais les champs, car c'est dangereux |
|
| 95 | - // c'est toujours a faire manuellement |
|
| 96 | - $last = ''; |
|
| 97 | - if (isset($desc['field'])) { |
|
| 98 | - foreach ($desc['field'] as $field => $type) { |
|
| 99 | - if (!isset($sql_desc['field'][$field])) { |
|
| 100 | - sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ''), $serveur); |
|
| 101 | - } |
|
| 102 | - $last = $field; |
|
| 103 | - } |
|
| 104 | - } |
|
| 105 | - if (isset($desc['key'])) { |
|
| 106 | - foreach ($desc['key'] as $key => $type) { |
|
| 107 | - // Ne pas oublier les cas des cles non nommees dans la declaration et qui sont retournees |
|
| 108 | - // par le showtable sous la forme d'un index de tableau "KEY $type" et non "KEY" |
|
| 109 | - if (!isset($sql_desc['key'][$key]) and !isset($sql_desc['key']["$key $type"])) { |
|
| 110 | - sql_alter("TABLE $table ADD $key ($type)", $serveur); |
|
| 111 | - } |
|
| 112 | - $last = $field; |
|
| 113 | - } |
|
| 114 | - } |
|
| 115 | - } |
|
| 64 | + #spip_log("creer_ou_upgrader_table table=$table autoinc=$autoinc upgrade=$upgrade","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 65 | + $sql_desc = $upgrade ? sql_showtable($table, true, $serveur) : false; |
|
| 66 | + #if (!$sql_desc) $sql_desc = false; |
|
| 67 | + #spip_log("table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 68 | + if (!$sql_desc) { |
|
| 69 | + if ($autoinc === 'auto') { |
|
| 70 | + $autoinc = base_determine_autoinc($table, $desc); |
|
| 71 | + } |
|
| 72 | + #spip_log("sql_create $table autoinc=$autoinc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 73 | + if (isset($desc['field']) and isset($desc['key'])) { |
|
| 74 | + sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur); |
|
| 75 | + } |
|
| 76 | + // verifier la bonne installation de la table (php-fpm es-tu la ?) |
|
| 77 | + $sql_desc = sql_showtable($table, true, $serveur); |
|
| 78 | + #if (!$sql_desc) $sql_desc = false; |
|
| 79 | + #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 80 | + if (!$sql_desc) { |
|
| 81 | + // on retente avec un sleep ? |
|
| 82 | + sleep(1); |
|
| 83 | + sql_create($table, $desc['field'], $desc['key'], $autoinc, false, $serveur); |
|
| 84 | + $sql_desc = sql_showtable($table, true, $serveur); |
|
| 85 | + #if (!$sql_desc) $sql_desc = false; |
|
| 86 | + #spip_log("Resultat table=$table sql_desc:$sql_desc","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 87 | + if (!$sql_desc) { |
|
| 88 | + spip_log("Echec creation table $table", 'maj' . _LOG_CRITIQUE); |
|
| 89 | + } |
|
| 90 | + } |
|
| 91 | + } else { |
|
| 92 | + #spip_log("sql_alter $table ... (on s'en fiche)","dbinstall"._LOG_INFO_IMPORTANTE); |
|
| 93 | + // ajouter les champs manquants |
|
| 94 | + // on ne supprime jamais les champs, car c'est dangereux |
|
| 95 | + // c'est toujours a faire manuellement |
|
| 96 | + $last = ''; |
|
| 97 | + if (isset($desc['field'])) { |
|
| 98 | + foreach ($desc['field'] as $field => $type) { |
|
| 99 | + if (!isset($sql_desc['field'][$field])) { |
|
| 100 | + sql_alter("TABLE $table ADD $field $type" . ($last ? " AFTER $last" : ''), $serveur); |
|
| 101 | + } |
|
| 102 | + $last = $field; |
|
| 103 | + } |
|
| 104 | + } |
|
| 105 | + if (isset($desc['key'])) { |
|
| 106 | + foreach ($desc['key'] as $key => $type) { |
|
| 107 | + // Ne pas oublier les cas des cles non nommees dans la declaration et qui sont retournees |
|
| 108 | + // par le showtable sous la forme d'un index de tableau "KEY $type" et non "KEY" |
|
| 109 | + if (!isset($sql_desc['key'][$key]) and !isset($sql_desc['key']["$key $type"])) { |
|
| 110 | + sql_alter("TABLE $table ADD $key ($type)", $serveur); |
|
| 111 | + } |
|
| 112 | + $last = $field; |
|
| 113 | + } |
|
| 114 | + } |
|
| 115 | + } |
|
| 116 | 116 | } |
| 117 | 117 | |
| 118 | 118 | /** |
@@ -134,26 +134,26 @@ discard block |
||
| 134 | 134 | * @return void |
| 135 | 135 | */ |
| 136 | 136 | function alterer_base($tables_inc, $tables_noinc, $up = false, $serveur = '') { |
| 137 | - if ($up === false) { |
|
| 138 | - $old = false; |
|
| 139 | - $up = []; |
|
| 140 | - } else { |
|
| 141 | - $old = true; |
|
| 142 | - if (!is_array($up)) { |
|
| 143 | - $up = [$up]; |
|
| 144 | - } |
|
| 145 | - } |
|
| 146 | - foreach ($tables_inc as $k => $v) { |
|
| 147 | - if (!$old or in_array($k, $up)) { |
|
| 148 | - creer_ou_upgrader_table($k, $v, true, $old, $serveur); |
|
| 149 | - } |
|
| 150 | - } |
|
| 137 | + if ($up === false) { |
|
| 138 | + $old = false; |
|
| 139 | + $up = []; |
|
| 140 | + } else { |
|
| 141 | + $old = true; |
|
| 142 | + if (!is_array($up)) { |
|
| 143 | + $up = [$up]; |
|
| 144 | + } |
|
| 145 | + } |
|
| 146 | + foreach ($tables_inc as $k => $v) { |
|
| 147 | + if (!$old or in_array($k, $up)) { |
|
| 148 | + creer_ou_upgrader_table($k, $v, true, $old, $serveur); |
|
| 149 | + } |
|
| 150 | + } |
|
| 151 | 151 | |
| 152 | - foreach ($tables_noinc as $k => $v) { |
|
| 153 | - if (!$old or in_array($k, $up)) { |
|
| 154 | - creer_ou_upgrader_table($k, $v, false, $old, $serveur); |
|
| 155 | - } |
|
| 156 | - } |
|
| 152 | + foreach ($tables_noinc as $k => $v) { |
|
| 153 | + if (!$old or in_array($k, $up)) { |
|
| 154 | + creer_ou_upgrader_table($k, $v, false, $old, $serveur); |
|
| 155 | + } |
|
| 156 | + } |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | /** |
@@ -173,16 +173,16 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function creer_base($serveur = '') { |
| 175 | 175 | |
| 176 | - // Note: les mises a jour reexecutent ce code pour s'assurer |
|
| 177 | - // de la conformite de la base |
|
| 178 | - // pas de panique sur "already exists" et "duplicate entry" donc. |
|
| 176 | + // Note: les mises a jour reexecutent ce code pour s'assurer |
|
| 177 | + // de la conformite de la base |
|
| 178 | + // pas de panique sur "already exists" et "duplicate entry" donc. |
|
| 179 | 179 | |
| 180 | - alterer_base( |
|
| 181 | - lister_tables_principales(), |
|
| 182 | - lister_tables_auxiliaires(), |
|
| 183 | - false, |
|
| 184 | - $serveur |
|
| 185 | - ); |
|
| 180 | + alterer_base( |
|
| 181 | + lister_tables_principales(), |
|
| 182 | + lister_tables_auxiliaires(), |
|
| 183 | + false, |
|
| 184 | + $serveur |
|
| 185 | + ); |
|
| 186 | 186 | } |
| 187 | 187 | |
| 188 | 188 | /** |
@@ -202,10 +202,10 @@ discard block |
||
| 202 | 202 | * @return void |
| 203 | 203 | */ |
| 204 | 204 | function maj_tables($upgrade_tables = [], $serveur = '') { |
| 205 | - alterer_base( |
|
| 206 | - lister_tables_principales(), |
|
| 207 | - lister_tables_auxiliaires(), |
|
| 208 | - $upgrade_tables, |
|
| 209 | - $serveur |
|
| 210 | - ); |
|
| 205 | + alterer_base( |
|
| 206 | + lister_tables_principales(), |
|
| 207 | + lister_tables_auxiliaires(), |
|
| 208 | + $upgrade_tables, |
|
| 209 | + $serveur |
|
| 210 | + ); |
|
| 211 | 211 | } |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | include_spip('inc/charsets'); |
@@ -24,222 +24,222 @@ discard block |
||
| 24 | 24 | * @return string |
| 25 | 25 | */ |
| 26 | 26 | function xml_entites_html($texte) { |
| 27 | - if ( |
|
| 28 | - !is_string($texte) or !$texte |
|
| 29 | - or strpbrk($texte, "&\"'<>") == false |
|
| 30 | - ) { |
|
| 31 | - return $texte; |
|
| 32 | - } |
|
| 33 | - |
|
| 34 | - if (!function_exists('spip_htmlspecialchars')) { |
|
| 35 | - include_spip('inc/filtres_mini'); |
|
| 36 | - } |
|
| 37 | - $texte = spip_htmlspecialchars($texte, ENT_QUOTES); |
|
| 38 | - |
|
| 39 | - return $texte; |
|
| 27 | + if ( |
|
| 28 | + !is_string($texte) or !$texte |
|
| 29 | + or strpbrk($texte, "&\"'<>") == false |
|
| 30 | + ) { |
|
| 31 | + return $texte; |
|
| 32 | + } |
|
| 33 | + |
|
| 34 | + if (!function_exists('spip_htmlspecialchars')) { |
|
| 35 | + include_spip('inc/filtres_mini'); |
|
| 36 | + } |
|
| 37 | + $texte = spip_htmlspecialchars($texte, ENT_QUOTES); |
|
| 38 | + |
|
| 39 | + return $texte; |
|
| 40 | 40 | } |
| 41 | 41 | |
| 42 | 42 | function xml_debutElement($phraseur, $name, $attrs) { |
| 43 | - $depth = $phraseur->depth; |
|
| 44 | - |
|
| 45 | - $t = $phraseur->ouvrant[$depth] ?? ' '; |
|
| 46 | - // espace initial signifie: deja integree au resultat |
|
| 47 | - if ($t[0] != ' ') { |
|
| 48 | - $phraseur->res .= '<' . $t . '>'; |
|
| 49 | - $phraseur->ouvrant[$depth] = ' ' . $t; |
|
| 50 | - } |
|
| 51 | - $t = $phraseur->contenu[$depth]; |
|
| 52 | - // n'indenter que s'il y a un separateur avant |
|
| 53 | - $phraseur->res .= preg_replace("/[\n\t ]+$/", "\n$depth", $t); |
|
| 54 | - $phraseur->contenu[$depth] = ''; |
|
| 55 | - $att = ''; |
|
| 56 | - $sep = ' '; |
|
| 57 | - foreach ($attrs as $k => $v) { |
|
| 58 | - $delim = !str_contains($v, "'") ? "'" : '"'; |
|
| 59 | - $val = xml_entites_html($v); |
|
| 60 | - $att .= $sep . $k . '=' . $delim |
|
| 61 | - . ($delim !== '"' ? str_replace('"', '"', $val) : $val) |
|
| 62 | - . $delim; |
|
| 63 | - $sep = "\n $depth"; |
|
| 64 | - } |
|
| 65 | - $phraseur->depth .= ' '; |
|
| 66 | - $phraseur->contenu[$phraseur->depth] = ''; |
|
| 67 | - $phraseur->ouvrant[$phraseur->depth] = $name . $att; |
|
| 68 | - $phraseur->reperes[$phraseur->depth] = xml_get_current_line_number($phraseur->sax); |
|
| 43 | + $depth = $phraseur->depth; |
|
| 44 | + |
|
| 45 | + $t = $phraseur->ouvrant[$depth] ?? ' '; |
|
| 46 | + // espace initial signifie: deja integree au resultat |
|
| 47 | + if ($t[0] != ' ') { |
|
| 48 | + $phraseur->res .= '<' . $t . '>'; |
|
| 49 | + $phraseur->ouvrant[$depth] = ' ' . $t; |
|
| 50 | + } |
|
| 51 | + $t = $phraseur->contenu[$depth]; |
|
| 52 | + // n'indenter que s'il y a un separateur avant |
|
| 53 | + $phraseur->res .= preg_replace("/[\n\t ]+$/", "\n$depth", $t); |
|
| 54 | + $phraseur->contenu[$depth] = ''; |
|
| 55 | + $att = ''; |
|
| 56 | + $sep = ' '; |
|
| 57 | + foreach ($attrs as $k => $v) { |
|
| 58 | + $delim = !str_contains($v, "'") ? "'" : '"'; |
|
| 59 | + $val = xml_entites_html($v); |
|
| 60 | + $att .= $sep . $k . '=' . $delim |
|
| 61 | + . ($delim !== '"' ? str_replace('"', '"', $val) : $val) |
|
| 62 | + . $delim; |
|
| 63 | + $sep = "\n $depth"; |
|
| 64 | + } |
|
| 65 | + $phraseur->depth .= ' '; |
|
| 66 | + $phraseur->contenu[$phraseur->depth] = ''; |
|
| 67 | + $phraseur->ouvrant[$phraseur->depth] = $name . $att; |
|
| 68 | + $phraseur->reperes[$phraseur->depth] = xml_get_current_line_number($phraseur->sax); |
|
| 69 | 69 | } |
| 70 | 70 | |
| 71 | 71 | function xml_finElement($phraseur, $name, $fusion_bal = false) { |
| 72 | - $ouv = $phraseur->ouvrant[$phraseur->depth]; |
|
| 73 | - |
|
| 74 | - if ($ouv[0] != ' ') { |
|
| 75 | - $phraseur->ouvrant[$phraseur->depth] = ' ' . $ouv; |
|
| 76 | - } else { |
|
| 77 | - $ouv = ''; |
|
| 78 | - } |
|
| 79 | - $t = $phraseur->contenu[$phraseur->depth]; |
|
| 80 | - $phraseur->depth = substr($phraseur->depth, 2); |
|
| 81 | - $t = preg_replace("/[\n\t ]+$/", "\n" . $phraseur->depth, $t); |
|
| 82 | - |
|
| 83 | - // fusion <balise></balise> en <balise />. |
|
| 84 | - // ATTENTION, certains clients http croient que fusion ==> pas d'atttributs |
|
| 85 | - // en particulier pour les balises Script et A. |
|
| 86 | - // en presence d'attributs ne le faire que si la DTD est dispo et d'accord |
|
| 87 | - // (param fusion_bal) |
|
| 88 | - |
|
| 89 | - if ($t || (($ouv != $name) and !$fusion_bal)) { |
|
| 90 | - $phraseur->res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . '</' . $name . '>'; |
|
| 91 | - } else { |
|
| 92 | - $phraseur->res .= ($ouv ? ('<' . $ouv . ' />') : ('</' . $name . '>')); |
|
| 93 | - } |
|
| 72 | + $ouv = $phraseur->ouvrant[$phraseur->depth]; |
|
| 73 | + |
|
| 74 | + if ($ouv[0] != ' ') { |
|
| 75 | + $phraseur->ouvrant[$phraseur->depth] = ' ' . $ouv; |
|
| 76 | + } else { |
|
| 77 | + $ouv = ''; |
|
| 78 | + } |
|
| 79 | + $t = $phraseur->contenu[$phraseur->depth]; |
|
| 80 | + $phraseur->depth = substr($phraseur->depth, 2); |
|
| 81 | + $t = preg_replace("/[\n\t ]+$/", "\n" . $phraseur->depth, $t); |
|
| 82 | + |
|
| 83 | + // fusion <balise></balise> en <balise />. |
|
| 84 | + // ATTENTION, certains clients http croient que fusion ==> pas d'atttributs |
|
| 85 | + // en particulier pour les balises Script et A. |
|
| 86 | + // en presence d'attributs ne le faire que si la DTD est dispo et d'accord |
|
| 87 | + // (param fusion_bal) |
|
| 88 | + |
|
| 89 | + if ($t || (($ouv != $name) and !$fusion_bal)) { |
|
| 90 | + $phraseur->res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . '</' . $name . '>'; |
|
| 91 | + } else { |
|
| 92 | + $phraseur->res .= ($ouv ? ('<' . $ouv . ' />') : ('</' . $name . '>')); |
|
| 93 | + } |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | function xml_textElement($phraseur, $data) { |
| 97 | - $depth = $phraseur->depth; |
|
| 98 | - $phraseur->contenu[$depth] .= preg_match('/^script/', $phraseur->ouvrant[$depth]) |
|
| 99 | - ? $data |
|
| 100 | - : xml_entites_html($data); |
|
| 97 | + $depth = $phraseur->depth; |
|
| 98 | + $phraseur->contenu[$depth] .= preg_match('/^script/', $phraseur->ouvrant[$depth]) |
|
| 99 | + ? $data |
|
| 100 | + : xml_entites_html($data); |
|
| 101 | 101 | } |
| 102 | 102 | |
| 103 | 103 | function xml_piElement($phraseur, $target, $data) { |
| 104 | - $depth = $phraseur->depth; |
|
| 105 | - |
|
| 106 | - if (strtolower($target) != 'php') { |
|
| 107 | - $phraseur->contenu[$depth] .= $data; |
|
| 108 | - } else { |
|
| 109 | - ob_start(); |
|
| 110 | - eval($data); |
|
| 111 | - $data = ob_get_contents(); |
|
| 112 | - ob_end_clean(); |
|
| 113 | - $phraseur->contenu[$depth] .= $data; |
|
| 114 | - } |
|
| 104 | + $depth = $phraseur->depth; |
|
| 105 | + |
|
| 106 | + if (strtolower($target) != 'php') { |
|
| 107 | + $phraseur->contenu[$depth] .= $data; |
|
| 108 | + } else { |
|
| 109 | + ob_start(); |
|
| 110 | + eval($data); |
|
| 111 | + $data = ob_get_contents(); |
|
| 112 | + ob_end_clean(); |
|
| 113 | + $phraseur->contenu[$depth] .= $data; |
|
| 114 | + } |
|
| 115 | 115 | } |
| 116 | 116 | |
| 117 | 117 | |
| 118 | 118 | function xml_defaultElement($phraseur, $data) { |
| 119 | - $depth = $phraseur->depth; |
|
| 119 | + $depth = $phraseur->depth; |
|
| 120 | 120 | |
| 121 | - if (!isset($phraseur->contenu[$depth])) { |
|
| 122 | - $phraseur->contenu[$depth] = ''; |
|
| 123 | - } |
|
| 124 | - $phraseur->contenu[$depth] .= $data; |
|
| 121 | + if (!isset($phraseur->contenu[$depth])) { |
|
| 122 | + $phraseur->contenu[$depth] = ''; |
|
| 123 | + } |
|
| 124 | + $phraseur->contenu[$depth] .= $data; |
|
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | function xml_parsestring($phraseur, $data) { |
| 128 | - $phraseur->contenu[$phraseur->depth] = ''; |
|
| 129 | - |
|
| 130 | - if (!xml_parse($phraseur->sax, $data, true)) { |
|
| 131 | - coordonnees_erreur( |
|
| 132 | - $phraseur, |
|
| 133 | - xml_error_string(xml_get_error_code($phraseur->sax)) |
|
| 134 | - . "<br />\n" . |
|
| 135 | - (!$phraseur->depth ? '' : |
|
| 136 | - ('(' . |
|
| 137 | - _T('erreur_balise_non_fermee') . |
|
| 138 | - ' <tt>' . |
|
| 139 | - $phraseur->ouvrant[$phraseur->depth] . |
|
| 140 | - '</tt> ' . |
|
| 141 | - _T('ligne') . |
|
| 142 | - ' ' . |
|
| 143 | - $phraseur->reperes[$phraseur->depth] . |
|
| 144 | - ") <br />\n")) |
|
| 145 | - ); |
|
| 146 | - } |
|
| 128 | + $phraseur->contenu[$phraseur->depth] = ''; |
|
| 129 | + |
|
| 130 | + if (!xml_parse($phraseur->sax, $data, true)) { |
|
| 131 | + coordonnees_erreur( |
|
| 132 | + $phraseur, |
|
| 133 | + xml_error_string(xml_get_error_code($phraseur->sax)) |
|
| 134 | + . "<br />\n" . |
|
| 135 | + (!$phraseur->depth ? '' : |
|
| 136 | + ('(' . |
|
| 137 | + _T('erreur_balise_non_fermee') . |
|
| 138 | + ' <tt>' . |
|
| 139 | + $phraseur->ouvrant[$phraseur->depth] . |
|
| 140 | + '</tt> ' . |
|
| 141 | + _T('ligne') . |
|
| 142 | + ' ' . |
|
| 143 | + $phraseur->reperes[$phraseur->depth] . |
|
| 144 | + ") <br />\n")) |
|
| 145 | + ); |
|
| 146 | + } |
|
| 147 | 147 | } |
| 148 | 148 | |
| 149 | 149 | function coordonnees_erreur($phraseur, $msg) { |
| 150 | - $entete_length = substr_count($phraseur->entete, "\n"); |
|
| 151 | - $phraseur->err[] = [ |
|
| 152 | - $msg, |
|
| 153 | - xml_get_current_line_number($phraseur->sax) + $entete_length, |
|
| 154 | - xml_get_current_column_number($phraseur->sax) |
|
| 155 | - ]; |
|
| 150 | + $entete_length = substr_count($phraseur->entete, "\n"); |
|
| 151 | + $phraseur->err[] = [ |
|
| 152 | + $msg, |
|
| 153 | + xml_get_current_line_number($phraseur->sax) + $entete_length, |
|
| 154 | + xml_get_current_column_number($phraseur->sax) |
|
| 155 | + ]; |
|
| 156 | 156 | } |
| 157 | 157 | |
| 158 | 158 | function xml_sax_dist($page, $apply = false, $phraseur = null, $doctype = '', $charset = null) { |
| 159 | - if (is_null($charset)) { |
|
| 160 | - $charset = $GLOBALS['meta']['charset']; |
|
| 161 | - } |
|
| 162 | - if ($apply) { |
|
| 163 | - ob_start(); |
|
| 164 | - if (is_array($apply)) { |
|
| 165 | - $r = $page(...$apply); |
|
| 166 | - } else { |
|
| 167 | - $r = $page(); |
|
| 168 | - } |
|
| 169 | - $page = ob_get_contents(); |
|
| 170 | - ob_end_clean(); |
|
| 171 | - // fonction sans aucun "echo", ca doit etre le resultat |
|
| 172 | - if (!$page) { |
|
| 173 | - $page = $r; |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - |
|
| 177 | - if (!$page) { |
|
| 178 | - return ''; |
|
| 179 | - } |
|
| 180 | - // charger la DTD et transcoder les entites, |
|
| 181 | - // et escamoter le doctype que sax mange en php5 mais pas en php4 |
|
| 182 | - if (!$doctype) { |
|
| 183 | - if (!$r = analyser_doctype($page)) { |
|
| 184 | - $page = _MESSAGE_DOCTYPE . _DOCTYPE_ECRIRE |
|
| 185 | - . preg_replace(_REGEXP_DOCTYPE, '', $page); |
|
| 186 | - $r = analyser_doctype($page); |
|
| 187 | - } |
|
| 188 | - [$entete, $avail, $grammaire, $rotlvl] = array_pad($r, 4, null); |
|
| 189 | - $page = substr($page, strlen($entete)); |
|
| 190 | - } else { |
|
| 191 | - $avail = 'SYSTEM'; |
|
| 192 | - $grammaire = $doctype; |
|
| 193 | - $rotlvl = basename($grammaire); |
|
| 194 | - } |
|
| 195 | - |
|
| 196 | - include_spip('xml/analyser_dtd'); |
|
| 197 | - $dtc = charger_dtd($grammaire, $avail, $rotlvl); |
|
| 198 | - $page = sax_bug($page, $dtc, $charset); |
|
| 199 | - |
|
| 200 | - // compatibilite Tidy espace public |
|
| 201 | - if (!$phraseur) { |
|
| 202 | - $indenter_xml = charger_fonction('indenter', 'xml'); |
|
| 203 | - |
|
| 204 | - return $indenter_xml($page, $apply); |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - $xml_parser = xml_parser_create($charset); |
|
| 208 | - |
|
| 209 | - xml_set_element_handler( |
|
| 210 | - $xml_parser, |
|
| 211 | - [$phraseur, 'debutElement'], |
|
| 212 | - [$phraseur, 'finElement'] |
|
| 213 | - ); |
|
| 214 | - |
|
| 215 | - xml_set_character_data_handler( |
|
| 216 | - $xml_parser, |
|
| 217 | - [$phraseur, 'textElement'] |
|
| 218 | - ); |
|
| 219 | - |
|
| 220 | - xml_set_processing_instruction_handler( |
|
| 221 | - $xml_parser, |
|
| 222 | - [$phraseur, 'piElement'] |
|
| 223 | - ); |
|
| 224 | - |
|
| 225 | - xml_set_default_handler( |
|
| 226 | - $xml_parser, |
|
| 227 | - [$phraseur, 'defaultElement'] |
|
| 228 | - ); |
|
| 229 | - |
|
| 230 | - xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, false); |
|
| 231 | - |
|
| 232 | - $phraseur->sax = $xml_parser; |
|
| 233 | - if (isset($entete)) { |
|
| 234 | - $phraseur->entete = $entete; |
|
| 235 | - } |
|
| 236 | - $phraseur->page = $page; |
|
| 237 | - $phraseur->dtc = $dtc; |
|
| 238 | - $phraseur->phraserTout($xml_parser, $page); |
|
| 239 | - xml_parser_free($xml_parser); |
|
| 240 | - $phraseur->sax = ''; |
|
| 241 | - |
|
| 242 | - return $phraseur; |
|
| 159 | + if (is_null($charset)) { |
|
| 160 | + $charset = $GLOBALS['meta']['charset']; |
|
| 161 | + } |
|
| 162 | + if ($apply) { |
|
| 163 | + ob_start(); |
|
| 164 | + if (is_array($apply)) { |
|
| 165 | + $r = $page(...$apply); |
|
| 166 | + } else { |
|
| 167 | + $r = $page(); |
|
| 168 | + } |
|
| 169 | + $page = ob_get_contents(); |
|
| 170 | + ob_end_clean(); |
|
| 171 | + // fonction sans aucun "echo", ca doit etre le resultat |
|
| 172 | + if (!$page) { |
|
| 173 | + $page = $r; |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + |
|
| 177 | + if (!$page) { |
|
| 178 | + return ''; |
|
| 179 | + } |
|
| 180 | + // charger la DTD et transcoder les entites, |
|
| 181 | + // et escamoter le doctype que sax mange en php5 mais pas en php4 |
|
| 182 | + if (!$doctype) { |
|
| 183 | + if (!$r = analyser_doctype($page)) { |
|
| 184 | + $page = _MESSAGE_DOCTYPE . _DOCTYPE_ECRIRE |
|
| 185 | + . preg_replace(_REGEXP_DOCTYPE, '', $page); |
|
| 186 | + $r = analyser_doctype($page); |
|
| 187 | + } |
|
| 188 | + [$entete, $avail, $grammaire, $rotlvl] = array_pad($r, 4, null); |
|
| 189 | + $page = substr($page, strlen($entete)); |
|
| 190 | + } else { |
|
| 191 | + $avail = 'SYSTEM'; |
|
| 192 | + $grammaire = $doctype; |
|
| 193 | + $rotlvl = basename($grammaire); |
|
| 194 | + } |
|
| 195 | + |
|
| 196 | + include_spip('xml/analyser_dtd'); |
|
| 197 | + $dtc = charger_dtd($grammaire, $avail, $rotlvl); |
|
| 198 | + $page = sax_bug($page, $dtc, $charset); |
|
| 199 | + |
|
| 200 | + // compatibilite Tidy espace public |
|
| 201 | + if (!$phraseur) { |
|
| 202 | + $indenter_xml = charger_fonction('indenter', 'xml'); |
|
| 203 | + |
|
| 204 | + return $indenter_xml($page, $apply); |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + $xml_parser = xml_parser_create($charset); |
|
| 208 | + |
|
| 209 | + xml_set_element_handler( |
|
| 210 | + $xml_parser, |
|
| 211 | + [$phraseur, 'debutElement'], |
|
| 212 | + [$phraseur, 'finElement'] |
|
| 213 | + ); |
|
| 214 | + |
|
| 215 | + xml_set_character_data_handler( |
|
| 216 | + $xml_parser, |
|
| 217 | + [$phraseur, 'textElement'] |
|
| 218 | + ); |
|
| 219 | + |
|
| 220 | + xml_set_processing_instruction_handler( |
|
| 221 | + $xml_parser, |
|
| 222 | + [$phraseur, 'piElement'] |
|
| 223 | + ); |
|
| 224 | + |
|
| 225 | + xml_set_default_handler( |
|
| 226 | + $xml_parser, |
|
| 227 | + [$phraseur, 'defaultElement'] |
|
| 228 | + ); |
|
| 229 | + |
|
| 230 | + xml_parser_set_option($xml_parser, XML_OPTION_CASE_FOLDING, false); |
|
| 231 | + |
|
| 232 | + $phraseur->sax = $xml_parser; |
|
| 233 | + if (isset($entete)) { |
|
| 234 | + $phraseur->entete = $entete; |
|
| 235 | + } |
|
| 236 | + $phraseur->page = $page; |
|
| 237 | + $phraseur->dtc = $dtc; |
|
| 238 | + $phraseur->phraserTout($xml_parser, $page); |
|
| 239 | + xml_parser_free($xml_parser); |
|
| 240 | + $phraseur->sax = ''; |
|
| 241 | + |
|
| 242 | + return $phraseur; |
|
| 243 | 243 | } |
| 244 | 244 | |
| 245 | 245 | // SAX ne dit pas si une Entite est dans un attribut ou non. |
@@ -250,24 +250,24 @@ discard block |
||
| 250 | 250 | // sinon on se rabat sur ce qu'en connait SPIP en standard. |
| 251 | 251 | |
| 252 | 252 | function sax_bug($data, $dtc, $charset = null) { |
| 253 | - if (is_null($charset)) { |
|
| 254 | - $charset = $GLOBALS['meta']['charset']; |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - if ($dtc) { |
|
| 258 | - $trans = []; |
|
| 259 | - |
|
| 260 | - foreach ($dtc->entites as $k => $v) { |
|
| 261 | - if (!strpos(' amp lt gt quot ', (string) $k)) { |
|
| 262 | - $trans["&$k;"] = $v; |
|
| 263 | - } |
|
| 264 | - } |
|
| 265 | - $data = strtr($data, $trans); |
|
| 266 | - } else { |
|
| 267 | - $data = html2unicode($data, true); |
|
| 268 | - } |
|
| 269 | - |
|
| 270 | - return unicode2charset($data, $charset); |
|
| 253 | + if (is_null($charset)) { |
|
| 254 | + $charset = $GLOBALS['meta']['charset']; |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + if ($dtc) { |
|
| 258 | + $trans = []; |
|
| 259 | + |
|
| 260 | + foreach ($dtc->entites as $k => $v) { |
|
| 261 | + if (!strpos(' amp lt gt quot ', (string) $k)) { |
|
| 262 | + $trans["&$k;"] = $v; |
|
| 263 | + } |
|
| 264 | + } |
|
| 265 | + $data = strtr($data, $trans); |
|
| 266 | + } else { |
|
| 267 | + $data = html2unicode($data, true); |
|
| 268 | + } |
|
| 269 | + |
|
| 270 | + return unicode2charset($data, $charset); |
|
| 271 | 271 | } |
| 272 | 272 | |
| 273 | 273 | // Retirer < ? xml... ? > et autre PI, ainsi que les commentaires en debut |
@@ -277,52 +277,52 @@ discard block |
||
| 277 | 277 | // les autres formats RSS n'ont pas de DTD, |
| 278 | 278 | // mais un XML Schema que SPIP ne fait pas encore lire. |
| 279 | 279 | function analyser_doctype($data) { |
| 280 | - if (!preg_match(_REGEXP_DOCTYPE, $data, $page)) { |
|
| 281 | - if (preg_match(_REGEXP_XML, $data, $page)) { |
|
| 282 | - [, $entete, $topelement] = $page; |
|
| 283 | - if ($topelement == 'rss') { |
|
| 284 | - return [ |
|
| 285 | - $entete, |
|
| 286 | - 'PUBLIC', |
|
| 287 | - _DOCTYPE_RSS, |
|
| 288 | - 'rss-0.91.dtd' |
|
| 289 | - ]; |
|
| 290 | - } else { |
|
| 291 | - $dtd = $topelement . '.dtd'; |
|
| 292 | - $f = find_in_path($dtd); |
|
| 293 | - if (file_exists($f)) { |
|
| 294 | - return [$entete, 'SYSTEM', $f, $dtd]; |
|
| 295 | - } |
|
| 296 | - } |
|
| 297 | - } |
|
| 298 | - spip_log('Dtd pas vu pour ' . substr($data, 0, 100)); |
|
| 299 | - |
|
| 300 | - return []; |
|
| 301 | - } |
|
| 302 | - [$entete, , $topelement, $avail, $suite] = $page; |
|
| 303 | - |
|
| 304 | - if (!preg_match('/^"([^"]*)"\s*(.*)$/', $suite, $r)) { |
|
| 305 | - if (!preg_match("/^'([^']*)'\s*(.*)$/", $suite, $r)) { |
|
| 306 | - return []; |
|
| 307 | - } |
|
| 308 | - } |
|
| 309 | - [, $rotlvl, $suite] = $r; |
|
| 310 | - |
|
| 311 | - if (!$suite) { |
|
| 312 | - if ($avail != 'SYSTEM') { |
|
| 313 | - return []; |
|
| 314 | - } |
|
| 315 | - $grammaire = $rotlvl; |
|
| 316 | - $rotlvl = ''; |
|
| 317 | - } else { |
|
| 318 | - if (!preg_match('/^"([^"]*)"\s*$/', $suite, $r)) { |
|
| 319 | - if (!preg_match("/^'([^']*)'\s*$/", $suite, $r)) { |
|
| 320 | - return []; |
|
| 321 | - } |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - $grammaire = $r[1]; |
|
| 325 | - } |
|
| 326 | - |
|
| 327 | - return [$entete, $avail, $grammaire, $rotlvl]; |
|
| 280 | + if (!preg_match(_REGEXP_DOCTYPE, $data, $page)) { |
|
| 281 | + if (preg_match(_REGEXP_XML, $data, $page)) { |
|
| 282 | + [, $entete, $topelement] = $page; |
|
| 283 | + if ($topelement == 'rss') { |
|
| 284 | + return [ |
|
| 285 | + $entete, |
|
| 286 | + 'PUBLIC', |
|
| 287 | + _DOCTYPE_RSS, |
|
| 288 | + 'rss-0.91.dtd' |
|
| 289 | + ]; |
|
| 290 | + } else { |
|
| 291 | + $dtd = $topelement . '.dtd'; |
|
| 292 | + $f = find_in_path($dtd); |
|
| 293 | + if (file_exists($f)) { |
|
| 294 | + return [$entete, 'SYSTEM', $f, $dtd]; |
|
| 295 | + } |
|
| 296 | + } |
|
| 297 | + } |
|
| 298 | + spip_log('Dtd pas vu pour ' . substr($data, 0, 100)); |
|
| 299 | + |
|
| 300 | + return []; |
|
| 301 | + } |
|
| 302 | + [$entete, , $topelement, $avail, $suite] = $page; |
|
| 303 | + |
|
| 304 | + if (!preg_match('/^"([^"]*)"\s*(.*)$/', $suite, $r)) { |
|
| 305 | + if (!preg_match("/^'([^']*)'\s*(.*)$/", $suite, $r)) { |
|
| 306 | + return []; |
|
| 307 | + } |
|
| 308 | + } |
|
| 309 | + [, $rotlvl, $suite] = $r; |
|
| 310 | + |
|
| 311 | + if (!$suite) { |
|
| 312 | + if ($avail != 'SYSTEM') { |
|
| 313 | + return []; |
|
| 314 | + } |
|
| 315 | + $grammaire = $rotlvl; |
|
| 316 | + $rotlvl = ''; |
|
| 317 | + } else { |
|
| 318 | + if (!preg_match('/^"([^"]*)"\s*$/', $suite, $r)) { |
|
| 319 | + if (!preg_match("/^'([^']*)'\s*$/", $suite, $r)) { |
|
| 320 | + return []; |
|
| 321 | + } |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + $grammaire = $r[1]; |
|
| 325 | + } |
|
| 326 | + |
|
| 327 | + return [$entete, $avail, $grammaire, $rotlvl]; |
|
| 328 | 328 | } |
@@ -45,8 +45,8 @@ discard block |
||
| 45 | 45 | $t = $phraseur->ouvrant[$depth] ?? ' '; |
| 46 | 46 | // espace initial signifie: deja integree au resultat |
| 47 | 47 | if ($t[0] != ' ') { |
| 48 | - $phraseur->res .= '<' . $t . '>'; |
|
| 49 | - $phraseur->ouvrant[$depth] = ' ' . $t; |
|
| 48 | + $phraseur->res .= '<'.$t.'>'; |
|
| 49 | + $phraseur->ouvrant[$depth] = ' '.$t; |
|
| 50 | 50 | } |
| 51 | 51 | $t = $phraseur->contenu[$depth]; |
| 52 | 52 | // n'indenter que s'il y a un separateur avant |
@@ -57,14 +57,14 @@ discard block |
||
| 57 | 57 | foreach ($attrs as $k => $v) { |
| 58 | 58 | $delim = !str_contains($v, "'") ? "'" : '"'; |
| 59 | 59 | $val = xml_entites_html($v); |
| 60 | - $att .= $sep . $k . '=' . $delim |
|
| 60 | + $att .= $sep.$k.'='.$delim |
|
| 61 | 61 | . ($delim !== '"' ? str_replace('"', '"', $val) : $val) |
| 62 | 62 | . $delim; |
| 63 | 63 | $sep = "\n $depth"; |
| 64 | 64 | } |
| 65 | 65 | $phraseur->depth .= ' '; |
| 66 | 66 | $phraseur->contenu[$phraseur->depth] = ''; |
| 67 | - $phraseur->ouvrant[$phraseur->depth] = $name . $att; |
|
| 67 | + $phraseur->ouvrant[$phraseur->depth] = $name.$att; |
|
| 68 | 68 | $phraseur->reperes[$phraseur->depth] = xml_get_current_line_number($phraseur->sax); |
| 69 | 69 | } |
| 70 | 70 | |
@@ -72,13 +72,13 @@ discard block |
||
| 72 | 72 | $ouv = $phraseur->ouvrant[$phraseur->depth]; |
| 73 | 73 | |
| 74 | 74 | if ($ouv[0] != ' ') { |
| 75 | - $phraseur->ouvrant[$phraseur->depth] = ' ' . $ouv; |
|
| 75 | + $phraseur->ouvrant[$phraseur->depth] = ' '.$ouv; |
|
| 76 | 76 | } else { |
| 77 | 77 | $ouv = ''; |
| 78 | 78 | } |
| 79 | 79 | $t = $phraseur->contenu[$phraseur->depth]; |
| 80 | 80 | $phraseur->depth = substr($phraseur->depth, 2); |
| 81 | - $t = preg_replace("/[\n\t ]+$/", "\n" . $phraseur->depth, $t); |
|
| 81 | + $t = preg_replace("/[\n\t ]+$/", "\n".$phraseur->depth, $t); |
|
| 82 | 82 | |
| 83 | 83 | // fusion <balise></balise> en <balise />. |
| 84 | 84 | // ATTENTION, certains clients http croient que fusion ==> pas d'atttributs |
@@ -87,9 +87,9 @@ discard block |
||
| 87 | 87 | // (param fusion_bal) |
| 88 | 88 | |
| 89 | 89 | if ($t || (($ouv != $name) and !$fusion_bal)) { |
| 90 | - $phraseur->res .= ($ouv ? ('<' . $ouv . '>') : '') . $t . '</' . $name . '>'; |
|
| 90 | + $phraseur->res .= ($ouv ? ('<'.$ouv.'>') : '').$t.'</'.$name.'>'; |
|
| 91 | 91 | } else { |
| 92 | - $phraseur->res .= ($ouv ? ('<' . $ouv . ' />') : ('</' . $name . '>')); |
|
| 92 | + $phraseur->res .= ($ouv ? ('<'.$ouv.' />') : ('</'.$name.'>')); |
|
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | 95 | |
@@ -131,16 +131,15 @@ discard block |
||
| 131 | 131 | coordonnees_erreur( |
| 132 | 132 | $phraseur, |
| 133 | 133 | xml_error_string(xml_get_error_code($phraseur->sax)) |
| 134 | - . "<br />\n" . |
|
| 135 | - (!$phraseur->depth ? '' : |
|
| 136 | - ('(' . |
|
| 137 | - _T('erreur_balise_non_fermee') . |
|
| 138 | - ' <tt>' . |
|
| 139 | - $phraseur->ouvrant[$phraseur->depth] . |
|
| 140 | - '</tt> ' . |
|
| 141 | - _T('ligne') . |
|
| 142 | - ' ' . |
|
| 143 | - $phraseur->reperes[$phraseur->depth] . |
|
| 134 | + . "<br />\n". |
|
| 135 | + (!$phraseur->depth ? '' : ('('. |
|
| 136 | + _T('erreur_balise_non_fermee'). |
|
| 137 | + ' <tt>'. |
|
| 138 | + $phraseur->ouvrant[$phraseur->depth]. |
|
| 139 | + '</tt> '. |
|
| 140 | + _T('ligne'). |
|
| 141 | + ' '. |
|
| 142 | + $phraseur->reperes[$phraseur->depth]. |
|
| 144 | 143 | ") <br />\n")) |
| 145 | 144 | ); |
| 146 | 145 | } |
@@ -181,7 +180,7 @@ discard block |
||
| 181 | 180 | // et escamoter le doctype que sax mange en php5 mais pas en php4 |
| 182 | 181 | if (!$doctype) { |
| 183 | 182 | if (!$r = analyser_doctype($page)) { |
| 184 | - $page = _MESSAGE_DOCTYPE . _DOCTYPE_ECRIRE |
|
| 183 | + $page = _MESSAGE_DOCTYPE._DOCTYPE_ECRIRE |
|
| 185 | 184 | . preg_replace(_REGEXP_DOCTYPE, '', $page); |
| 186 | 185 | $r = analyser_doctype($page); |
| 187 | 186 | } |
@@ -288,18 +287,18 @@ discard block |
||
| 288 | 287 | 'rss-0.91.dtd' |
| 289 | 288 | ]; |
| 290 | 289 | } else { |
| 291 | - $dtd = $topelement . '.dtd'; |
|
| 290 | + $dtd = $topelement.'.dtd'; |
|
| 292 | 291 | $f = find_in_path($dtd); |
| 293 | 292 | if (file_exists($f)) { |
| 294 | 293 | return [$entete, 'SYSTEM', $f, $dtd]; |
| 295 | 294 | } |
| 296 | 295 | } |
| 297 | 296 | } |
| 298 | - spip_log('Dtd pas vu pour ' . substr($data, 0, 100)); |
|
| 297 | + spip_log('Dtd pas vu pour '.substr($data, 0, 100)); |
|
| 299 | 298 | |
| 300 | 299 | return []; |
| 301 | 300 | } |
| 302 | - [$entete, , $topelement, $avail, $suite] = $page; |
|
| 301 | + [$entete,, $topelement, $avail, $suite] = $page; |
|
| 303 | 302 | |
| 304 | 303 | if (!preg_match('/^"([^"]*)"\s*(.*)$/', $suite, $r)) { |
| 305 | 304 | if (!preg_match("/^'([^']*)'\s*(.*)$/", $suite, $r)) { |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | /** |
@@ -23,322 +23,322 @@ discard block |
||
| 23 | 23 | **/ |
| 24 | 24 | class ValidateurXML |
| 25 | 25 | { |
| 26 | - public function validerElement($phraseur, $name, $attrs) { |
|
| 27 | - if (!($p = isset($this->dtc->elements[$name]))) { |
|
| 28 | - if ($p = strpos($name, ':')) { |
|
| 29 | - $name = substr($name, $p + 1); |
|
| 30 | - $p = isset($this->dtc->elements[$name]); |
|
| 31 | - } |
|
| 32 | - if (!$p) { |
|
| 33 | - coordonnees_erreur($this, " <b>$name</b> : " |
|
| 34 | - . _T('zxml_inconnu_balise')); |
|
| 35 | - |
|
| 36 | - return; |
|
| 37 | - } |
|
| 38 | - } |
|
| 39 | - // controler les filles illegitimes, ca suffit |
|
| 40 | - $depth = $this->depth; |
|
| 41 | - $ouvrant = $this->ouvrant; |
|
| 42 | - #spip_log("trouve $name apres " . $ouvrant[$depth]); |
|
| 43 | - if (isset($ouvrant[$depth])) { |
|
| 44 | - if (preg_match('/^\s*(\w+)/', $ouvrant[$depth], $r)) { |
|
| 45 | - $pere = $r[1]; |
|
| 46 | - #spip_log("pere $pere"); |
|
| 47 | - if (isset($this->dtc->elements[$pere])) { |
|
| 48 | - $fils = $this->dtc->elements[$pere]; |
|
| 49 | - #spip_log("rejeton $name fils " . @join(',',$fils)); |
|
| 50 | - if (!($p = @in_array($name, $fils))) { |
|
| 51 | - if ($p = strpos($name, ':')) { |
|
| 52 | - $p = substr($name, $p + 1); |
|
| 53 | - $p = @in_array($p, $fils); |
|
| 54 | - } |
|
| 55 | - } |
|
| 56 | - if (!$p) { |
|
| 57 | - $bons_peres = @join('</b>, <b>', $this->dtc->peres[$name]); |
|
| 58 | - coordonnees_erreur($this, " <b>$name</b> " |
|
| 59 | - . _T('zxml_non_fils') |
|
| 60 | - . ' <b>' |
|
| 61 | - . $pere |
|
| 62 | - . '</b>' |
|
| 63 | - . (!$bons_peres ? '' |
|
| 64 | - : ('<p style="font-size: 80%"> ' . _T('zxml_mais_de') . ' <b>' . $bons_peres . '</b></p>'))); |
|
| 65 | - } elseif ($this->dtc->regles[$pere][0] == '/') { |
|
| 66 | - $frat = substr($depth, 2); |
|
| 67 | - if (!isset($this->fratrie[$frat])) { |
|
| 68 | - $this->fratrie[$frat] = ''; |
|
| 69 | - } |
|
| 70 | - $this->fratrie[$frat] .= "$name "; |
|
| 71 | - } |
|
| 72 | - } |
|
| 73 | - } |
|
| 74 | - } |
|
| 75 | - // Init de la suite des balises a memoriser si regle difficile |
|
| 76 | - if ($this->dtc->regles[$name] and $this->dtc->regles[$name][0] == '/') { |
|
| 77 | - $this->fratrie[$depth] = ''; |
|
| 78 | - } |
|
| 79 | - if (isset($this->dtc->attributs[$name])) { |
|
| 80 | - foreach ($this->dtc->attributs[$name] as $n => $v) { |
|
| 81 | - if (($v[1] == '#REQUIRED') and (!isset($attrs[$n]))) { |
|
| 82 | - coordonnees_erreur($this, " <b>$n</b>" |
|
| 83 | - . ' : ' |
|
| 84 | - . _T('zxml_obligatoire_attribut') |
|
| 85 | - . " <b>$name</b>"); |
|
| 86 | - } |
|
| 87 | - } |
|
| 88 | - } |
|
| 89 | - } |
|
| 90 | - |
|
| 91 | - public function validerAttribut($phraseur, $name, $val, $bal) { |
|
| 92 | - // Si la balise est inconnue, eviter d'insister |
|
| 93 | - if (!isset($this->dtc->attributs[$bal])) { |
|
| 94 | - return; |
|
| 95 | - } |
|
| 96 | - |
|
| 97 | - $a = $this->dtc->attributs[$bal]; |
|
| 98 | - if (!isset($a[$name])) { |
|
| 99 | - $bons = join(', ', array_keys($a)); |
|
| 100 | - if ($bons) { |
|
| 101 | - $bons = " title=' " . |
|
| 102 | - _T('zxml_connus_attributs') . |
|
| 103 | - ' : ' . |
|
| 104 | - $bons . |
|
| 105 | - "'"; |
|
| 106 | - } |
|
| 107 | - $bons .= " style='font-weight: bold'"; |
|
| 108 | - coordonnees_erreur($this, " <b>$name</b> " |
|
| 109 | - . _T('zxml_inconnu_attribut') . ' ' . _T('zxml_de') |
|
| 110 | - . " <a$bons>$bal</a> (" |
|
| 111 | - . _T('zxml_survoler') |
|
| 112 | - . ')'); |
|
| 113 | - } else { |
|
| 114 | - $type = $a[$name][0]; |
|
| 115 | - if (!preg_match('/^\w+$/', $type)) { |
|
| 116 | - $this->valider_motif($phraseur, $name, $val, $bal, $type); |
|
| 117 | - } else { |
|
| 118 | - if (method_exists($this, $f = 'validerAttribut_' . $type)) { |
|
| 119 | - $this->$f($phraseur, $name, $val, $bal); |
|
| 120 | - } |
|
| 121 | - } |
|
| 122 | - # else spip_log("$type type d'attribut inconnu"); |
|
| 123 | - } |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - public function validerAttribut_NMTOKEN($phraseur, $name, $val, $bal) { |
|
| 127 | - $this->valider_motif($phraseur, $name, $val, $bal, _REGEXP_NMTOKEN); |
|
| 128 | - } |
|
| 129 | - |
|
| 130 | - public function validerAttribut_NMTOKENS($phraseur, $name, $val, $bal) { |
|
| 131 | - $this->valider_motif($phraseur, $name, $val, $bal, _REGEXP_NMTOKENS); |
|
| 132 | - } |
|
| 133 | - |
|
| 134 | - public function validerAttribut_ID($phraseur, $name, $val, $bal) { |
|
| 135 | - if (isset($this->ids[$val])) { |
|
| 136 | - [$l, $c] = $this->ids[$val]; |
|
| 137 | - coordonnees_erreur($this, " <p><b>$val</b> " |
|
| 138 | - . _T('zxml_valeur_attribut') |
|
| 139 | - . " <b>$name</b> " |
|
| 140 | - . _T('zxml_de') |
|
| 141 | - . " <b>$bal</b> " |
|
| 142 | - . _T('zxml_vu') |
|
| 143 | - . " (L$l,C$c)"); |
|
| 144 | - } else { |
|
| 145 | - $this->valider_motif($phraseur, $name, $val, $bal, _REGEXP_ID); |
|
| 146 | - $this->ids[$val] = [xml_get_current_line_number($phraseur), xml_get_current_column_number($phraseur)]; |
|
| 147 | - } |
|
| 148 | - } |
|
| 149 | - |
|
| 150 | - public function validerAttribut_IDREF($phraseur, $name, $val, $bal) { |
|
| 151 | - $this->idrefs[] = [$val, xml_get_current_line_number($phraseur), xml_get_current_column_number($phraseur)]; |
|
| 152 | - } |
|
| 153 | - |
|
| 154 | - public function validerAttribut_IDREFS($phraseur, $name, $val, $bal) { |
|
| 155 | - $this->idrefss[] = [$val, xml_get_current_line_number($phraseur), xml_get_current_column_number($phraseur)]; |
|
| 156 | - } |
|
| 157 | - |
|
| 158 | - public function valider_motif($phraseur, $name, $val, $bal, $motif) { |
|
| 159 | - if (!preg_match($motif, $val)) { |
|
| 160 | - coordonnees_erreur($this, "<b>$val</b> " |
|
| 161 | - . _T('zxml_valeur_attribut') |
|
| 162 | - . " <b>$name</b> " |
|
| 163 | - . _T('zxml_de') |
|
| 164 | - . " <b>$bal</b> " |
|
| 165 | - . _T('zxml_non_conforme') |
|
| 166 | - . '</p><p>' |
|
| 167 | - . '<b>' . $motif . '</b>'); |
|
| 168 | - } |
|
| 169 | - } |
|
| 170 | - |
|
| 171 | - public function valider_idref($nom, $ligne, $col) { |
|
| 172 | - if (!isset($this->ids[$nom])) { |
|
| 173 | - $this->err[] = [" <p><b>$nom</b> " . _T('zxml_inconnu_id'), $ligne, $col]; |
|
| 174 | - } |
|
| 175 | - } |
|
| 176 | - |
|
| 177 | - public function valider_passe2() { |
|
| 178 | - if (!$this->err) { |
|
| 179 | - foreach ($this->idrefs as $idref) { |
|
| 180 | - [$nom, $ligne, $col] = $idref; |
|
| 181 | - $this->valider_idref($nom, $ligne, $col); |
|
| 182 | - } |
|
| 183 | - foreach ($this->idrefss as $idref) { |
|
| 184 | - [$noms, $ligne, $col] = $idref; |
|
| 185 | - foreach (preg_split('/\s+/', $noms) as $nom) { |
|
| 186 | - $this->valider_idref($nom, $ligne, $col); |
|
| 187 | - } |
|
| 188 | - } |
|
| 189 | - } |
|
| 190 | - } |
|
| 191 | - |
|
| 192 | - public function debutElement($phraseur, $name, $attrs) { |
|
| 193 | - if ($this->dtc->elements) { |
|
| 194 | - $this->validerElement($phraseur, $name, $attrs); |
|
| 195 | - } |
|
| 196 | - |
|
| 197 | - if ($f = $this->process['debut']) { |
|
| 198 | - $f($this, $name, $attrs); |
|
| 199 | - } |
|
| 200 | - $depth = $this->depth; |
|
| 201 | - $this->debuts[$depth] = strlen($this->res); |
|
| 202 | - foreach ($attrs as $k => $v) { |
|
| 203 | - $this->validerAttribut($phraseur, $k, $v, $name); |
|
| 204 | - } |
|
| 205 | - } |
|
| 206 | - |
|
| 207 | - public function finElement($phraseur, $name) { |
|
| 208 | - $depth = $this->depth; |
|
| 209 | - $contenu = $this->contenu; |
|
| 210 | - |
|
| 211 | - $n = strlen($this->res); |
|
| 212 | - $c = strlen(trim($contenu[$depth])); |
|
| 213 | - $k = $this->debuts[$depth]; |
|
| 214 | - |
|
| 215 | - $regle = $this->dtc->regles[$name] ?? false; |
|
| 216 | - $vide = ($regle == 'EMPTY'); |
|
| 217 | - // controler que les balises devant etre vides le sont |
|
| 218 | - if ($vide) { |
|
| 219 | - if ($n <> ($k + $c)) { |
|
| 220 | - coordonnees_erreur($this, " <p><b>$name</b> " . _T('zxml_nonvide_balise')); |
|
| 221 | - } |
|
| 222 | - // pour les regles PCDATA ou iteration de disjonction, tout est fait |
|
| 223 | - } elseif ($regle and ($regle != '*')) { |
|
| 224 | - if ($regle == '+') { |
|
| 225 | - // iteration de disjonction non vide: 1 balise au - |
|
| 226 | - if ($n == $k) { |
|
| 227 | - coordonnees_erreur($this, "<p>\n<b>$name</b> " |
|
| 228 | - . _T('zxml_vide_balise')); |
|
| 229 | - } |
|
| 230 | - } else { |
|
| 231 | - $f = $this->fratrie[substr($depth, 2)] ?? null; |
|
| 232 | - if (is_null($f) or !preg_match($regle, $f)) { |
|
| 233 | - coordonnees_erreur( |
|
| 234 | - $this, |
|
| 235 | - " <p>\n<b>$name</b> " |
|
| 236 | - . _T('zxml_succession_fils_incorrecte') |
|
| 237 | - . ' : <b>' |
|
| 238 | - . $f |
|
| 239 | - . '</b>' |
|
| 240 | - ); |
|
| 241 | - } |
|
| 242 | - } |
|
| 243 | - } |
|
| 244 | - if ($f = $this->process['fin']) { |
|
| 245 | - $f($this, $name, $vide); |
|
| 246 | - } |
|
| 247 | - } |
|
| 248 | - |
|
| 249 | - public function textElement($phraseur, $data) { |
|
| 250 | - if (trim($data)) { |
|
| 251 | - $d = $this->depth; |
|
| 252 | - $d = $this->ouvrant[$d]; |
|
| 253 | - preg_match('/^\s*(\S+)/', $d, $m); |
|
| 254 | - if (isset($this->dtc->pcdata[$m[1]]) and ($this->dtc->pcdata[$m[1]])) { |
|
| 255 | - coordonnees_erreur($this, ' <p><b>' . $m[1] . '</b> ' |
|
| 256 | - . _T('zxml_nonvide_balise')); // message a affiner |
|
| 257 | - } |
|
| 258 | - } |
|
| 259 | - if ($f = $this->process['text']) { |
|
| 260 | - $f($this, $data); |
|
| 261 | - } |
|
| 262 | - } |
|
| 263 | - |
|
| 264 | - public function piElement($phraseur, $target, $data) { |
|
| 265 | - if ($f = $this->process['pi']) { |
|
| 266 | - $f($this, $target, $data); |
|
| 267 | - } |
|
| 268 | - } |
|
| 269 | - |
|
| 270 | - // Denonciation des entitees XML inconnues |
|
| 271 | - // Pour contourner le bug de conception de SAX qui ne signale pas si elles |
|
| 272 | - // sont dans un attribut, les entites les plus frequentes ont ete |
|
| 273 | - // transcodees au prealable (sauf & < > " que SAX traite correctement). |
|
| 274 | - // On ne les verra donc pas passer a cette etape, contrairement a ce que |
|
| 275 | - // le source de la page laisse legitimement supposer. |
|
| 276 | - |
|
| 277 | - public function defaultElement($phraseur, $data) { |
|
| 278 | - if ( |
|
| 279 | - !preg_match('/^<!--/', $data) |
|
| 280 | - and (preg_match_all('/&([^;]*)?/', $data, $r, PREG_SET_ORDER)) |
|
| 281 | - ) { |
|
| 282 | - foreach ($r as $m) { |
|
| 283 | - [$t, $e] = $m; |
|
| 284 | - if (!isset($this->dtc->entites[$e])) { |
|
| 285 | - coordonnees_erreur($this, " <b>$e</b> " |
|
| 286 | - . _T('zxml_inconnu_entite') |
|
| 287 | - . ' '); |
|
| 288 | - } |
|
| 289 | - } |
|
| 290 | - } |
|
| 291 | - if (isset($this->process['default']) and ($f = $this->process['default'])) { |
|
| 292 | - $f($this, $data); |
|
| 293 | - } |
|
| 294 | - } |
|
| 295 | - |
|
| 296 | - public function phraserTout($phraseur, $data) { |
|
| 297 | - xml_parsestring($this, $data); |
|
| 298 | - |
|
| 299 | - if (!$this->dtc or preg_match(',^' . _MESSAGE_DOCTYPE . ',', $data)) { |
|
| 300 | - $this->err[] = ['DOCTYPE ?', 0, 0]; |
|
| 301 | - } else { |
|
| 302 | - $this->valider_passe2(); |
|
| 303 | - } |
|
| 304 | - } |
|
| 305 | - |
|
| 306 | - /** |
|
| 307 | - * Constructeur |
|
| 308 | - * |
|
| 309 | - * @param array $process ? |
|
| 310 | - **/ |
|
| 311 | - public function __construct($process = []) { |
|
| 312 | - if (is_array($process)) { |
|
| 313 | - $this->process = $process; |
|
| 314 | - } |
|
| 315 | - } |
|
| 316 | - |
|
| 317 | - public $ids = []; |
|
| 318 | - public $idrefs = []; |
|
| 319 | - public $idrefss = []; |
|
| 320 | - public $debuts = []; |
|
| 321 | - public $fratrie = []; |
|
| 322 | - |
|
| 323 | - public $dtc = null; |
|
| 324 | - public $sax = null; |
|
| 325 | - public $depth = ''; |
|
| 326 | - public $entete = ''; |
|
| 327 | - public $page = ''; |
|
| 328 | - public $res = ''; |
|
| 329 | - public array $err = []; |
|
| 330 | - public array $contenu = []; |
|
| 331 | - public array $versions = []; |
|
| 332 | - |
|
| 333 | - public array $ouvrant = []; |
|
| 334 | - public array $reperes = []; |
|
| 335 | - public array $process = [ |
|
| 336 | - 'debut' => 'xml_debutElement', |
|
| 337 | - 'fin' => 'xml_finElement', |
|
| 338 | - 'text' => 'xml_textElement', |
|
| 339 | - 'pi' => 'xml_piElement', |
|
| 340 | - 'default' => 'xml_defaultElement' |
|
| 341 | - ]; |
|
| 26 | + public function validerElement($phraseur, $name, $attrs) { |
|
| 27 | + if (!($p = isset($this->dtc->elements[$name]))) { |
|
| 28 | + if ($p = strpos($name, ':')) { |
|
| 29 | + $name = substr($name, $p + 1); |
|
| 30 | + $p = isset($this->dtc->elements[$name]); |
|
| 31 | + } |
|
| 32 | + if (!$p) { |
|
| 33 | + coordonnees_erreur($this, " <b>$name</b> : " |
|
| 34 | + . _T('zxml_inconnu_balise')); |
|
| 35 | + |
|
| 36 | + return; |
|
| 37 | + } |
|
| 38 | + } |
|
| 39 | + // controler les filles illegitimes, ca suffit |
|
| 40 | + $depth = $this->depth; |
|
| 41 | + $ouvrant = $this->ouvrant; |
|
| 42 | + #spip_log("trouve $name apres " . $ouvrant[$depth]); |
|
| 43 | + if (isset($ouvrant[$depth])) { |
|
| 44 | + if (preg_match('/^\s*(\w+)/', $ouvrant[$depth], $r)) { |
|
| 45 | + $pere = $r[1]; |
|
| 46 | + #spip_log("pere $pere"); |
|
| 47 | + if (isset($this->dtc->elements[$pere])) { |
|
| 48 | + $fils = $this->dtc->elements[$pere]; |
|
| 49 | + #spip_log("rejeton $name fils " . @join(',',$fils)); |
|
| 50 | + if (!($p = @in_array($name, $fils))) { |
|
| 51 | + if ($p = strpos($name, ':')) { |
|
| 52 | + $p = substr($name, $p + 1); |
|
| 53 | + $p = @in_array($p, $fils); |
|
| 54 | + } |
|
| 55 | + } |
|
| 56 | + if (!$p) { |
|
| 57 | + $bons_peres = @join('</b>, <b>', $this->dtc->peres[$name]); |
|
| 58 | + coordonnees_erreur($this, " <b>$name</b> " |
|
| 59 | + . _T('zxml_non_fils') |
|
| 60 | + . ' <b>' |
|
| 61 | + . $pere |
|
| 62 | + . '</b>' |
|
| 63 | + . (!$bons_peres ? '' |
|
| 64 | + : ('<p style="font-size: 80%"> ' . _T('zxml_mais_de') . ' <b>' . $bons_peres . '</b></p>'))); |
|
| 65 | + } elseif ($this->dtc->regles[$pere][0] == '/') { |
|
| 66 | + $frat = substr($depth, 2); |
|
| 67 | + if (!isset($this->fratrie[$frat])) { |
|
| 68 | + $this->fratrie[$frat] = ''; |
|
| 69 | + } |
|
| 70 | + $this->fratrie[$frat] .= "$name "; |
|
| 71 | + } |
|
| 72 | + } |
|
| 73 | + } |
|
| 74 | + } |
|
| 75 | + // Init de la suite des balises a memoriser si regle difficile |
|
| 76 | + if ($this->dtc->regles[$name] and $this->dtc->regles[$name][0] == '/') { |
|
| 77 | + $this->fratrie[$depth] = ''; |
|
| 78 | + } |
|
| 79 | + if (isset($this->dtc->attributs[$name])) { |
|
| 80 | + foreach ($this->dtc->attributs[$name] as $n => $v) { |
|
| 81 | + if (($v[1] == '#REQUIRED') and (!isset($attrs[$n]))) { |
|
| 82 | + coordonnees_erreur($this, " <b>$n</b>" |
|
| 83 | + . ' : ' |
|
| 84 | + . _T('zxml_obligatoire_attribut') |
|
| 85 | + . " <b>$name</b>"); |
|
| 86 | + } |
|
| 87 | + } |
|
| 88 | + } |
|
| 89 | + } |
|
| 90 | + |
|
| 91 | + public function validerAttribut($phraseur, $name, $val, $bal) { |
|
| 92 | + // Si la balise est inconnue, eviter d'insister |
|
| 93 | + if (!isset($this->dtc->attributs[$bal])) { |
|
| 94 | + return; |
|
| 95 | + } |
|
| 96 | + |
|
| 97 | + $a = $this->dtc->attributs[$bal]; |
|
| 98 | + if (!isset($a[$name])) { |
|
| 99 | + $bons = join(', ', array_keys($a)); |
|
| 100 | + if ($bons) { |
|
| 101 | + $bons = " title=' " . |
|
| 102 | + _T('zxml_connus_attributs') . |
|
| 103 | + ' : ' . |
|
| 104 | + $bons . |
|
| 105 | + "'"; |
|
| 106 | + } |
|
| 107 | + $bons .= " style='font-weight: bold'"; |
|
| 108 | + coordonnees_erreur($this, " <b>$name</b> " |
|
| 109 | + . _T('zxml_inconnu_attribut') . ' ' . _T('zxml_de') |
|
| 110 | + . " <a$bons>$bal</a> (" |
|
| 111 | + . _T('zxml_survoler') |
|
| 112 | + . ')'); |
|
| 113 | + } else { |
|
| 114 | + $type = $a[$name][0]; |
|
| 115 | + if (!preg_match('/^\w+$/', $type)) { |
|
| 116 | + $this->valider_motif($phraseur, $name, $val, $bal, $type); |
|
| 117 | + } else { |
|
| 118 | + if (method_exists($this, $f = 'validerAttribut_' . $type)) { |
|
| 119 | + $this->$f($phraseur, $name, $val, $bal); |
|
| 120 | + } |
|
| 121 | + } |
|
| 122 | + # else spip_log("$type type d'attribut inconnu"); |
|
| 123 | + } |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + public function validerAttribut_NMTOKEN($phraseur, $name, $val, $bal) { |
|
| 127 | + $this->valider_motif($phraseur, $name, $val, $bal, _REGEXP_NMTOKEN); |
|
| 128 | + } |
|
| 129 | + |
|
| 130 | + public function validerAttribut_NMTOKENS($phraseur, $name, $val, $bal) { |
|
| 131 | + $this->valider_motif($phraseur, $name, $val, $bal, _REGEXP_NMTOKENS); |
|
| 132 | + } |
|
| 133 | + |
|
| 134 | + public function validerAttribut_ID($phraseur, $name, $val, $bal) { |
|
| 135 | + if (isset($this->ids[$val])) { |
|
| 136 | + [$l, $c] = $this->ids[$val]; |
|
| 137 | + coordonnees_erreur($this, " <p><b>$val</b> " |
|
| 138 | + . _T('zxml_valeur_attribut') |
|
| 139 | + . " <b>$name</b> " |
|
| 140 | + . _T('zxml_de') |
|
| 141 | + . " <b>$bal</b> " |
|
| 142 | + . _T('zxml_vu') |
|
| 143 | + . " (L$l,C$c)"); |
|
| 144 | + } else { |
|
| 145 | + $this->valider_motif($phraseur, $name, $val, $bal, _REGEXP_ID); |
|
| 146 | + $this->ids[$val] = [xml_get_current_line_number($phraseur), xml_get_current_column_number($phraseur)]; |
|
| 147 | + } |
|
| 148 | + } |
|
| 149 | + |
|
| 150 | + public function validerAttribut_IDREF($phraseur, $name, $val, $bal) { |
|
| 151 | + $this->idrefs[] = [$val, xml_get_current_line_number($phraseur), xml_get_current_column_number($phraseur)]; |
|
| 152 | + } |
|
| 153 | + |
|
| 154 | + public function validerAttribut_IDREFS($phraseur, $name, $val, $bal) { |
|
| 155 | + $this->idrefss[] = [$val, xml_get_current_line_number($phraseur), xml_get_current_column_number($phraseur)]; |
|
| 156 | + } |
|
| 157 | + |
|
| 158 | + public function valider_motif($phraseur, $name, $val, $bal, $motif) { |
|
| 159 | + if (!preg_match($motif, $val)) { |
|
| 160 | + coordonnees_erreur($this, "<b>$val</b> " |
|
| 161 | + . _T('zxml_valeur_attribut') |
|
| 162 | + . " <b>$name</b> " |
|
| 163 | + . _T('zxml_de') |
|
| 164 | + . " <b>$bal</b> " |
|
| 165 | + . _T('zxml_non_conforme') |
|
| 166 | + . '</p><p>' |
|
| 167 | + . '<b>' . $motif . '</b>'); |
|
| 168 | + } |
|
| 169 | + } |
|
| 170 | + |
|
| 171 | + public function valider_idref($nom, $ligne, $col) { |
|
| 172 | + if (!isset($this->ids[$nom])) { |
|
| 173 | + $this->err[] = [" <p><b>$nom</b> " . _T('zxml_inconnu_id'), $ligne, $col]; |
|
| 174 | + } |
|
| 175 | + } |
|
| 176 | + |
|
| 177 | + public function valider_passe2() { |
|
| 178 | + if (!$this->err) { |
|
| 179 | + foreach ($this->idrefs as $idref) { |
|
| 180 | + [$nom, $ligne, $col] = $idref; |
|
| 181 | + $this->valider_idref($nom, $ligne, $col); |
|
| 182 | + } |
|
| 183 | + foreach ($this->idrefss as $idref) { |
|
| 184 | + [$noms, $ligne, $col] = $idref; |
|
| 185 | + foreach (preg_split('/\s+/', $noms) as $nom) { |
|
| 186 | + $this->valider_idref($nom, $ligne, $col); |
|
| 187 | + } |
|
| 188 | + } |
|
| 189 | + } |
|
| 190 | + } |
|
| 191 | + |
|
| 192 | + public function debutElement($phraseur, $name, $attrs) { |
|
| 193 | + if ($this->dtc->elements) { |
|
| 194 | + $this->validerElement($phraseur, $name, $attrs); |
|
| 195 | + } |
|
| 196 | + |
|
| 197 | + if ($f = $this->process['debut']) { |
|
| 198 | + $f($this, $name, $attrs); |
|
| 199 | + } |
|
| 200 | + $depth = $this->depth; |
|
| 201 | + $this->debuts[$depth] = strlen($this->res); |
|
| 202 | + foreach ($attrs as $k => $v) { |
|
| 203 | + $this->validerAttribut($phraseur, $k, $v, $name); |
|
| 204 | + } |
|
| 205 | + } |
|
| 206 | + |
|
| 207 | + public function finElement($phraseur, $name) { |
|
| 208 | + $depth = $this->depth; |
|
| 209 | + $contenu = $this->contenu; |
|
| 210 | + |
|
| 211 | + $n = strlen($this->res); |
|
| 212 | + $c = strlen(trim($contenu[$depth])); |
|
| 213 | + $k = $this->debuts[$depth]; |
|
| 214 | + |
|
| 215 | + $regle = $this->dtc->regles[$name] ?? false; |
|
| 216 | + $vide = ($regle == 'EMPTY'); |
|
| 217 | + // controler que les balises devant etre vides le sont |
|
| 218 | + if ($vide) { |
|
| 219 | + if ($n <> ($k + $c)) { |
|
| 220 | + coordonnees_erreur($this, " <p><b>$name</b> " . _T('zxml_nonvide_balise')); |
|
| 221 | + } |
|
| 222 | + // pour les regles PCDATA ou iteration de disjonction, tout est fait |
|
| 223 | + } elseif ($regle and ($regle != '*')) { |
|
| 224 | + if ($regle == '+') { |
|
| 225 | + // iteration de disjonction non vide: 1 balise au - |
|
| 226 | + if ($n == $k) { |
|
| 227 | + coordonnees_erreur($this, "<p>\n<b>$name</b> " |
|
| 228 | + . _T('zxml_vide_balise')); |
|
| 229 | + } |
|
| 230 | + } else { |
|
| 231 | + $f = $this->fratrie[substr($depth, 2)] ?? null; |
|
| 232 | + if (is_null($f) or !preg_match($regle, $f)) { |
|
| 233 | + coordonnees_erreur( |
|
| 234 | + $this, |
|
| 235 | + " <p>\n<b>$name</b> " |
|
| 236 | + . _T('zxml_succession_fils_incorrecte') |
|
| 237 | + . ' : <b>' |
|
| 238 | + . $f |
|
| 239 | + . '</b>' |
|
| 240 | + ); |
|
| 241 | + } |
|
| 242 | + } |
|
| 243 | + } |
|
| 244 | + if ($f = $this->process['fin']) { |
|
| 245 | + $f($this, $name, $vide); |
|
| 246 | + } |
|
| 247 | + } |
|
| 248 | + |
|
| 249 | + public function textElement($phraseur, $data) { |
|
| 250 | + if (trim($data)) { |
|
| 251 | + $d = $this->depth; |
|
| 252 | + $d = $this->ouvrant[$d]; |
|
| 253 | + preg_match('/^\s*(\S+)/', $d, $m); |
|
| 254 | + if (isset($this->dtc->pcdata[$m[1]]) and ($this->dtc->pcdata[$m[1]])) { |
|
| 255 | + coordonnees_erreur($this, ' <p><b>' . $m[1] . '</b> ' |
|
| 256 | + . _T('zxml_nonvide_balise')); // message a affiner |
|
| 257 | + } |
|
| 258 | + } |
|
| 259 | + if ($f = $this->process['text']) { |
|
| 260 | + $f($this, $data); |
|
| 261 | + } |
|
| 262 | + } |
|
| 263 | + |
|
| 264 | + public function piElement($phraseur, $target, $data) { |
|
| 265 | + if ($f = $this->process['pi']) { |
|
| 266 | + $f($this, $target, $data); |
|
| 267 | + } |
|
| 268 | + } |
|
| 269 | + |
|
| 270 | + // Denonciation des entitees XML inconnues |
|
| 271 | + // Pour contourner le bug de conception de SAX qui ne signale pas si elles |
|
| 272 | + // sont dans un attribut, les entites les plus frequentes ont ete |
|
| 273 | + // transcodees au prealable (sauf & < > " que SAX traite correctement). |
|
| 274 | + // On ne les verra donc pas passer a cette etape, contrairement a ce que |
|
| 275 | + // le source de la page laisse legitimement supposer. |
|
| 276 | + |
|
| 277 | + public function defaultElement($phraseur, $data) { |
|
| 278 | + if ( |
|
| 279 | + !preg_match('/^<!--/', $data) |
|
| 280 | + and (preg_match_all('/&([^;]*)?/', $data, $r, PREG_SET_ORDER)) |
|
| 281 | + ) { |
|
| 282 | + foreach ($r as $m) { |
|
| 283 | + [$t, $e] = $m; |
|
| 284 | + if (!isset($this->dtc->entites[$e])) { |
|
| 285 | + coordonnees_erreur($this, " <b>$e</b> " |
|
| 286 | + . _T('zxml_inconnu_entite') |
|
| 287 | + . ' '); |
|
| 288 | + } |
|
| 289 | + } |
|
| 290 | + } |
|
| 291 | + if (isset($this->process['default']) and ($f = $this->process['default'])) { |
|
| 292 | + $f($this, $data); |
|
| 293 | + } |
|
| 294 | + } |
|
| 295 | + |
|
| 296 | + public function phraserTout($phraseur, $data) { |
|
| 297 | + xml_parsestring($this, $data); |
|
| 298 | + |
|
| 299 | + if (!$this->dtc or preg_match(',^' . _MESSAGE_DOCTYPE . ',', $data)) { |
|
| 300 | + $this->err[] = ['DOCTYPE ?', 0, 0]; |
|
| 301 | + } else { |
|
| 302 | + $this->valider_passe2(); |
|
| 303 | + } |
|
| 304 | + } |
|
| 305 | + |
|
| 306 | + /** |
|
| 307 | + * Constructeur |
|
| 308 | + * |
|
| 309 | + * @param array $process ? |
|
| 310 | + **/ |
|
| 311 | + public function __construct($process = []) { |
|
| 312 | + if (is_array($process)) { |
|
| 313 | + $this->process = $process; |
|
| 314 | + } |
|
| 315 | + } |
|
| 316 | + |
|
| 317 | + public $ids = []; |
|
| 318 | + public $idrefs = []; |
|
| 319 | + public $idrefss = []; |
|
| 320 | + public $debuts = []; |
|
| 321 | + public $fratrie = []; |
|
| 322 | + |
|
| 323 | + public $dtc = null; |
|
| 324 | + public $sax = null; |
|
| 325 | + public $depth = ''; |
|
| 326 | + public $entete = ''; |
|
| 327 | + public $page = ''; |
|
| 328 | + public $res = ''; |
|
| 329 | + public array $err = []; |
|
| 330 | + public array $contenu = []; |
|
| 331 | + public array $versions = []; |
|
| 332 | + |
|
| 333 | + public array $ouvrant = []; |
|
| 334 | + public array $reperes = []; |
|
| 335 | + public array $process = [ |
|
| 336 | + 'debut' => 'xml_debutElement', |
|
| 337 | + 'fin' => 'xml_finElement', |
|
| 338 | + 'text' => 'xml_textElement', |
|
| 339 | + 'pi' => 'xml_piElement', |
|
| 340 | + 'default' => 'xml_defaultElement' |
|
| 341 | + ]; |
|
| 342 | 342 | } |
| 343 | 343 | |
| 344 | 344 | |
@@ -348,8 +348,8 @@ discard block |
||
| 348 | 348 | * |
| 349 | 349 | **/ |
| 350 | 350 | function xml_valider_dist($page, $apply = false, $process = false, $doctype = '', $charset = null) { |
| 351 | - $f = new ValidateurXML($process); |
|
| 352 | - $sax = charger_fonction('sax', 'xml'); |
|
| 351 | + $f = new ValidateurXML($process); |
|
| 352 | + $sax = charger_fonction('sax', 'xml'); |
|
| 353 | 353 | |
| 354 | - return $sax($page, $apply, $f, $doctype, $charset); |
|
| 354 | + return $sax($page, $apply, $f, $doctype, $charset); |
|
| 355 | 355 | } |
@@ -11,58 +11,58 @@ discard block |
||
| 11 | 11 | \***************************************************************************/ |
| 12 | 12 | |
| 13 | 13 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 14 | - return; |
|
| 14 | + return; |
|
| 15 | 15 | } |
| 16 | 16 | |
| 17 | 17 | include_spip('xml/interfaces'); |
| 18 | 18 | |
| 19 | 19 | function charger_dtd($grammaire, $avail, $rotlvl) { |
| 20 | - $r = null; |
|
| 21 | - static $dtd = []; # cache bien utile pour le validateur en boucle |
|
| 22 | - |
|
| 23 | - if (isset($dtd[$grammaire])) { |
|
| 24 | - return $dtd[$grammaire]; |
|
| 25 | - } |
|
| 26 | - |
|
| 27 | - if ($avail == 'SYSTEM') { |
|
| 28 | - $grammaire = find_in_path($grammaire); |
|
| 29 | - } |
|
| 30 | - |
|
| 31 | - $file = _DIR_CACHE_XML . preg_replace('/[^\w.]/', '_', $rotlvl) . '.gz'; |
|
| 32 | - |
|
| 33 | - if (lire_fichier($file, $r)) { |
|
| 34 | - if (!$grammaire) { |
|
| 35 | - return []; |
|
| 36 | - } |
|
| 37 | - if (($avail == 'SYSTEM') and filemtime($file) < filemtime($grammaire)) { |
|
| 38 | - $r = false; |
|
| 39 | - } |
|
| 40 | - } |
|
| 41 | - |
|
| 42 | - if ($r) { |
|
| 43 | - $dtc = unserialize($r); |
|
| 44 | - } else { |
|
| 45 | - spip_timer('dtd'); |
|
| 46 | - $dtc = new DTC(); |
|
| 47 | - // L'analyseur retourne un booleen de reussite et modifie $dtc. |
|
| 48 | - // Retourner vide en cas d'echec |
|
| 49 | - if (!analyser_dtd($grammaire, $avail, $dtc)) { |
|
| 50 | - $dtc = []; |
|
| 51 | - } else { |
|
| 52 | - // tri final pour presenter les suggestions de corrections |
|
| 53 | - foreach ($dtc->peres as $k => $v) { |
|
| 54 | - asort($v); |
|
| 55 | - $dtc->peres[$k] = $v; |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - spip_log("Analyser DTD $avail $grammaire (" . spip_timer('dtd') . ') ' . (is_countable($dtc->macros) ? count($dtc->macros) : 0) . ' macros, ' . (is_countable($dtc->elements) ? count($dtc->elements) : 0) . ' elements, ' . (is_countable($dtc->attributs) ? count($dtc->attributs) : 0) . " listes d'attributs, " . (is_countable($dtc->entites) ? count($dtc->entites) : 0) . ' entites'); |
|
| 59 | - # $r = $dtc->regles; ksort($r);foreach($r as $l => $v) {$t=array_keys($dtc->attributs[$l]);echo "<b>$l</b> '$v' ", count($t), " attributs: ", join (', ',$t);$t=$dtc->peres[$l];echo "<br />",count($t), " peres: ", @join (', ',$t), "<br />\n";}exit; |
|
| 60 | - ecrire_fichier($file, serialize($dtc), true); |
|
| 61 | - } |
|
| 62 | - } |
|
| 63 | - $dtd[$grammaire] = $dtc; |
|
| 64 | - |
|
| 65 | - return $dtc; |
|
| 20 | + $r = null; |
|
| 21 | + static $dtd = []; # cache bien utile pour le validateur en boucle |
|
| 22 | + |
|
| 23 | + if (isset($dtd[$grammaire])) { |
|
| 24 | + return $dtd[$grammaire]; |
|
| 25 | + } |
|
| 26 | + |
|
| 27 | + if ($avail == 'SYSTEM') { |
|
| 28 | + $grammaire = find_in_path($grammaire); |
|
| 29 | + } |
|
| 30 | + |
|
| 31 | + $file = _DIR_CACHE_XML . preg_replace('/[^\w.]/', '_', $rotlvl) . '.gz'; |
|
| 32 | + |
|
| 33 | + if (lire_fichier($file, $r)) { |
|
| 34 | + if (!$grammaire) { |
|
| 35 | + return []; |
|
| 36 | + } |
|
| 37 | + if (($avail == 'SYSTEM') and filemtime($file) < filemtime($grammaire)) { |
|
| 38 | + $r = false; |
|
| 39 | + } |
|
| 40 | + } |
|
| 41 | + |
|
| 42 | + if ($r) { |
|
| 43 | + $dtc = unserialize($r); |
|
| 44 | + } else { |
|
| 45 | + spip_timer('dtd'); |
|
| 46 | + $dtc = new DTC(); |
|
| 47 | + // L'analyseur retourne un booleen de reussite et modifie $dtc. |
|
| 48 | + // Retourner vide en cas d'echec |
|
| 49 | + if (!analyser_dtd($grammaire, $avail, $dtc)) { |
|
| 50 | + $dtc = []; |
|
| 51 | + } else { |
|
| 52 | + // tri final pour presenter les suggestions de corrections |
|
| 53 | + foreach ($dtc->peres as $k => $v) { |
|
| 54 | + asort($v); |
|
| 55 | + $dtc->peres[$k] = $v; |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + spip_log("Analyser DTD $avail $grammaire (" . spip_timer('dtd') . ') ' . (is_countable($dtc->macros) ? count($dtc->macros) : 0) . ' macros, ' . (is_countable($dtc->elements) ? count($dtc->elements) : 0) . ' elements, ' . (is_countable($dtc->attributs) ? count($dtc->attributs) : 0) . " listes d'attributs, " . (is_countable($dtc->entites) ? count($dtc->entites) : 0) . ' entites'); |
|
| 59 | + # $r = $dtc->regles; ksort($r);foreach($r as $l => $v) {$t=array_keys($dtc->attributs[$l]);echo "<b>$l</b> '$v' ", count($t), " attributs: ", join (', ',$t);$t=$dtc->peres[$l];echo "<br />",count($t), " peres: ", @join (', ',$t), "<br />\n";}exit; |
|
| 60 | + ecrire_fichier($file, serialize($dtc), true); |
|
| 61 | + } |
|
| 62 | + } |
|
| 63 | + $dtd[$grammaire] = $dtc; |
|
| 64 | + |
|
| 65 | + return $dtc; |
|
| 66 | 66 | } |
| 67 | 67 | |
| 68 | 68 | // Compiler une regle de production en une Regexp qu'on appliquera sur la |
@@ -74,153 +74,153 @@ discard block |
||
| 74 | 74 | // et parentheser le tout pour que | + * ? s'applique dessus. |
| 75 | 75 | |
| 76 | 76 | function compilerRegle($val) { |
| 77 | - $x = str_replace( |
|
| 78 | - '()', |
|
| 79 | - '', |
|
| 80 | - preg_replace( |
|
| 81 | - '/\s*,\s*/', |
|
| 82 | - '', |
|
| 83 | - preg_replace( |
|
| 84 | - '/(\w+)\s*/', |
|
| 85 | - '(?:\1 )', |
|
| 86 | - preg_replace( |
|
| 87 | - '/\s*\)/', |
|
| 88 | - ')', |
|
| 89 | - preg_replace( |
|
| 90 | - '/\s*([(+*|?])\s*/', |
|
| 91 | - '\1', |
|
| 92 | - preg_replace('/\s*#\w+\s*[,|]?\s*/', '', $val) |
|
| 93 | - ) |
|
| 94 | - ) |
|
| 95 | - ) |
|
| 96 | - ) |
|
| 97 | - ); |
|
| 98 | - |
|
| 99 | - return $x; |
|
| 77 | + $x = str_replace( |
|
| 78 | + '()', |
|
| 79 | + '', |
|
| 80 | + preg_replace( |
|
| 81 | + '/\s*,\s*/', |
|
| 82 | + '', |
|
| 83 | + preg_replace( |
|
| 84 | + '/(\w+)\s*/', |
|
| 85 | + '(?:\1 )', |
|
| 86 | + preg_replace( |
|
| 87 | + '/\s*\)/', |
|
| 88 | + ')', |
|
| 89 | + preg_replace( |
|
| 90 | + '/\s*([(+*|?])\s*/', |
|
| 91 | + '\1', |
|
| 92 | + preg_replace('/\s*#\w+\s*[,|]?\s*/', '', $val) |
|
| 93 | + ) |
|
| 94 | + ) |
|
| 95 | + ) |
|
| 96 | + ) |
|
| 97 | + ); |
|
| 98 | + |
|
| 99 | + return $x; |
|
| 100 | 100 | } |
| 101 | 101 | |
| 102 | 102 | |
| 103 | 103 | function analyser_dtd($loc, $avail, &$dtc) { |
| 104 | - // creer le repertoire de cache si ce n'est fait |
|
| 105 | - // (utile aussi pour le resultat de la compil) |
|
| 106 | - $file = sous_repertoire(_DIR_CACHE_XML); |
|
| 107 | - // si DTD locale, ignorer ce repertoire pour le moment |
|
| 108 | - if ($avail == 'SYSTEM') { |
|
| 109 | - $file = $loc; |
|
| 110 | - if (_DIR_RACINE and strncmp($file, _DIR_RACINE, strlen(_DIR_RACINE)) == 0) { |
|
| 111 | - $file = substr($file, strlen(_DIR_RACINE)); |
|
| 112 | - } |
|
| 113 | - $file = find_in_path($file); |
|
| 114 | - } else { |
|
| 115 | - $file .= preg_replace('/[^\w.]/', '_', $loc); |
|
| 116 | - } |
|
| 117 | - |
|
| 118 | - $dtd = ''; |
|
| 119 | - if (@is_readable($file)) { |
|
| 120 | - lire_fichier($file, $dtd); |
|
| 121 | - } else { |
|
| 122 | - if ($avail == 'PUBLIC') { |
|
| 123 | - include_spip('inc/distant'); |
|
| 124 | - $dtd = recuperer_url($loc); |
|
| 125 | - $dtd = trim($dtd['page'] ?? ''); |
|
| 126 | - if ($dtd) { |
|
| 127 | - ecrire_fichier($file, $dtd, true); |
|
| 128 | - } |
|
| 129 | - } |
|
| 130 | - } |
|
| 131 | - |
|
| 132 | - $dtd = ltrim($dtd); |
|
| 133 | - if (!$dtd) { |
|
| 134 | - spip_log("DTD '$loc' ($file) inaccessible"); |
|
| 135 | - |
|
| 136 | - return false; |
|
| 137 | - } else { |
|
| 138 | - spip_log("analyse de la DTD $loc "); |
|
| 139 | - } |
|
| 140 | - |
|
| 141 | - while ($dtd) { |
|
| 142 | - if ($dtd[0] != '<') { |
|
| 143 | - $r = analyser_dtd_lexeme($dtd, $dtc, $loc); |
|
| 144 | - } elseif ($dtd[1] != '!') { |
|
| 145 | - $r = analyser_dtd_pi($dtd, $dtc, $loc); |
|
| 146 | - } elseif ($dtd[2] == '[') { |
|
| 147 | - $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 148 | - } else { |
|
| 149 | - switch ($dtd[3]) { |
|
| 150 | - case '%': |
|
| 151 | - $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 152 | - break; |
|
| 153 | - case 'T': |
|
| 154 | - $r = analyser_dtd_attlist($dtd, $dtc, $loc); |
|
| 155 | - break; |
|
| 156 | - case 'L': |
|
| 157 | - $r = analyser_dtd_element($dtd, $dtc, $loc); |
|
| 158 | - break; |
|
| 159 | - case 'N': |
|
| 160 | - $r = analyser_dtd_entity($dtd, $dtc, $loc); |
|
| 161 | - break; |
|
| 162 | - case 'O': |
|
| 163 | - $r = analyser_dtd_notation($dtd, $dtc, $loc); |
|
| 164 | - break; |
|
| 165 | - case '-': |
|
| 166 | - $r = analyser_dtd_comment($dtd, $dtc, $loc); |
|
| 167 | - break; |
|
| 168 | - default: |
|
| 169 | - $r = -1; |
|
| 170 | - } |
|
| 171 | - } |
|
| 172 | - if (!is_string($r)) { |
|
| 173 | - spip_log("erreur $r dans la DTD " . substr($dtd, 0, 80) . '.....'); |
|
| 174 | - |
|
| 175 | - return false; |
|
| 176 | - } |
|
| 177 | - $dtd = $r; |
|
| 178 | - } |
|
| 179 | - |
|
| 180 | - return true; |
|
| 104 | + // creer le repertoire de cache si ce n'est fait |
|
| 105 | + // (utile aussi pour le resultat de la compil) |
|
| 106 | + $file = sous_repertoire(_DIR_CACHE_XML); |
|
| 107 | + // si DTD locale, ignorer ce repertoire pour le moment |
|
| 108 | + if ($avail == 'SYSTEM') { |
|
| 109 | + $file = $loc; |
|
| 110 | + if (_DIR_RACINE and strncmp($file, _DIR_RACINE, strlen(_DIR_RACINE)) == 0) { |
|
| 111 | + $file = substr($file, strlen(_DIR_RACINE)); |
|
| 112 | + } |
|
| 113 | + $file = find_in_path($file); |
|
| 114 | + } else { |
|
| 115 | + $file .= preg_replace('/[^\w.]/', '_', $loc); |
|
| 116 | + } |
|
| 117 | + |
|
| 118 | + $dtd = ''; |
|
| 119 | + if (@is_readable($file)) { |
|
| 120 | + lire_fichier($file, $dtd); |
|
| 121 | + } else { |
|
| 122 | + if ($avail == 'PUBLIC') { |
|
| 123 | + include_spip('inc/distant'); |
|
| 124 | + $dtd = recuperer_url($loc); |
|
| 125 | + $dtd = trim($dtd['page'] ?? ''); |
|
| 126 | + if ($dtd) { |
|
| 127 | + ecrire_fichier($file, $dtd, true); |
|
| 128 | + } |
|
| 129 | + } |
|
| 130 | + } |
|
| 131 | + |
|
| 132 | + $dtd = ltrim($dtd); |
|
| 133 | + if (!$dtd) { |
|
| 134 | + spip_log("DTD '$loc' ($file) inaccessible"); |
|
| 135 | + |
|
| 136 | + return false; |
|
| 137 | + } else { |
|
| 138 | + spip_log("analyse de la DTD $loc "); |
|
| 139 | + } |
|
| 140 | + |
|
| 141 | + while ($dtd) { |
|
| 142 | + if ($dtd[0] != '<') { |
|
| 143 | + $r = analyser_dtd_lexeme($dtd, $dtc, $loc); |
|
| 144 | + } elseif ($dtd[1] != '!') { |
|
| 145 | + $r = analyser_dtd_pi($dtd, $dtc, $loc); |
|
| 146 | + } elseif ($dtd[2] == '[') { |
|
| 147 | + $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 148 | + } else { |
|
| 149 | + switch ($dtd[3]) { |
|
| 150 | + case '%': |
|
| 151 | + $r = analyser_dtd_data($dtd, $dtc, $loc); |
|
| 152 | + break; |
|
| 153 | + case 'T': |
|
| 154 | + $r = analyser_dtd_attlist($dtd, $dtc, $loc); |
|
| 155 | + break; |
|
| 156 | + case 'L': |
|
| 157 | + $r = analyser_dtd_element($dtd, $dtc, $loc); |
|
| 158 | + break; |
|
| 159 | + case 'N': |
|
| 160 | + $r = analyser_dtd_entity($dtd, $dtc, $loc); |
|
| 161 | + break; |
|
| 162 | + case 'O': |
|
| 163 | + $r = analyser_dtd_notation($dtd, $dtc, $loc); |
|
| 164 | + break; |
|
| 165 | + case '-': |
|
| 166 | + $r = analyser_dtd_comment($dtd, $dtc, $loc); |
|
| 167 | + break; |
|
| 168 | + default: |
|
| 169 | + $r = -1; |
|
| 170 | + } |
|
| 171 | + } |
|
| 172 | + if (!is_string($r)) { |
|
| 173 | + spip_log("erreur $r dans la DTD " . substr($dtd, 0, 80) . '.....'); |
|
| 174 | + |
|
| 175 | + return false; |
|
| 176 | + } |
|
| 177 | + $dtd = $r; |
|
| 178 | + } |
|
| 179 | + |
|
| 180 | + return true; |
|
| 181 | 181 | } |
| 182 | 182 | |
| 183 | 183 | function analyser_dtd_comment($dtd, &$dtc, $grammaire) { |
| 184 | - // ejecter les commentaires, surtout quand ils contiennent du code. |
|
| 185 | - // Option /s car sur plusieurs lignes parfois |
|
| 184 | + // ejecter les commentaires, surtout quand ils contiennent du code. |
|
| 185 | + // Option /s car sur plusieurs lignes parfois |
|
| 186 | 186 | |
| 187 | - if (!preg_match('/^<!--.*?-->\s*(.*)$/s', $dtd, $m)) { |
|
| 188 | - return -6; |
|
| 189 | - } |
|
| 187 | + if (!preg_match('/^<!--.*?-->\s*(.*)$/s', $dtd, $m)) { |
|
| 188 | + return -6; |
|
| 189 | + } |
|
| 190 | 190 | |
| 191 | - return $m[1]; |
|
| 191 | + return $m[1]; |
|
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | function analyser_dtd_pi($dtd, &$dtc, $grammaire) { |
| 195 | - if (!preg_match('/^<\?.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 196 | - return -10; |
|
| 197 | - } |
|
| 195 | + if (!preg_match('/^<\?.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 196 | + return -10; |
|
| 197 | + } |
|
| 198 | 198 | |
| 199 | - return $m[1]; |
|
| 199 | + return $m[1]; |
|
| 200 | 200 | } |
| 201 | 201 | |
| 202 | 202 | function analyser_dtd_lexeme($dtd, &$dtc, $grammaire) { |
| 203 | 203 | |
| 204 | - if (!preg_match(_REGEXP_ENTITY_DEF, $dtd, $m)) { |
|
| 205 | - return -9; |
|
| 206 | - } |
|
| 207 | - |
|
| 208 | - [, $s] = $m; |
|
| 209 | - $n = $dtc->macros[$s]; |
|
| 210 | - |
|
| 211 | - if (is_array($n)) { |
|
| 212 | - // en cas d'inclusion, l'espace de nom est le meme |
|
| 213 | - // mais gaffe aux DTD dont l'URL est relative a l'engloblante |
|
| 214 | - if ( |
|
| 215 | - ($n[0] == 'PUBLIC') |
|
| 216 | - and !tester_url_absolue($n[1]) |
|
| 217 | - ) { |
|
| 218 | - $n[1] = substr($grammaire, 0, strrpos($grammaire, '/') + 1) . $n[1]; |
|
| 219 | - } |
|
| 220 | - analyser_dtd($n[1], $n[0], $dtc); |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - return ltrim(substr($dtd, strlen($m[0]))); |
|
| 204 | + if (!preg_match(_REGEXP_ENTITY_DEF, $dtd, $m)) { |
|
| 205 | + return -9; |
|
| 206 | + } |
|
| 207 | + |
|
| 208 | + [, $s] = $m; |
|
| 209 | + $n = $dtc->macros[$s]; |
|
| 210 | + |
|
| 211 | + if (is_array($n)) { |
|
| 212 | + // en cas d'inclusion, l'espace de nom est le meme |
|
| 213 | + // mais gaffe aux DTD dont l'URL est relative a l'engloblante |
|
| 214 | + if ( |
|
| 215 | + ($n[0] == 'PUBLIC') |
|
| 216 | + and !tester_url_absolue($n[1]) |
|
| 217 | + ) { |
|
| 218 | + $n[1] = substr($grammaire, 0, strrpos($grammaire, '/') + 1) . $n[1]; |
|
| 219 | + } |
|
| 220 | + analyser_dtd($n[1], $n[0], $dtc); |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + return ltrim(substr($dtd, strlen($m[0]))); |
|
| 224 | 224 | } |
| 225 | 225 | |
| 226 | 226 | // il faudrait gerer plus proprement les niveaux d'inclusion: |
@@ -228,83 +228,83 @@ discard block |
||
| 228 | 228 | |
| 229 | 229 | function analyser_dtd_data($dtd, &$dtc, $grammaire) { |
| 230 | 230 | |
| 231 | - if (!preg_match(_REGEXP_INCLUDE_USE, $dtd, $m)) { |
|
| 232 | - return -11; |
|
| 233 | - } |
|
| 234 | - if ( |
|
| 235 | - !preg_match( |
|
| 236 | - '/^((\s*<!(\[\s*%\s*[^;]*;\s*\[([^]<]*<[^>]*>)*[^]<]*\]\]>)|([^]>]*>))*[^]<]*)\]\]>\s*/s', |
|
| 237 | - $m[2], |
|
| 238 | - $r |
|
| 239 | - ) |
|
| 240 | - ) { |
|
| 241 | - return -12; |
|
| 242 | - } |
|
| 243 | - |
|
| 244 | - if ($dtc->macros[$m[1]] == 'INCLUDE') { |
|
| 245 | - $retour = $r[1] . substr($m[2], strlen($r[0])); |
|
| 246 | - } else { |
|
| 247 | - $retour = substr($m[2], strlen($r[0])); |
|
| 248 | - } |
|
| 249 | - |
|
| 250 | - return $retour; |
|
| 231 | + if (!preg_match(_REGEXP_INCLUDE_USE, $dtd, $m)) { |
|
| 232 | + return -11; |
|
| 233 | + } |
|
| 234 | + if ( |
|
| 235 | + !preg_match( |
|
| 236 | + '/^((\s*<!(\[\s*%\s*[^;]*;\s*\[([^]<]*<[^>]*>)*[^]<]*\]\]>)|([^]>]*>))*[^]<]*)\]\]>\s*/s', |
|
| 237 | + $m[2], |
|
| 238 | + $r |
|
| 239 | + ) |
|
| 240 | + ) { |
|
| 241 | + return -12; |
|
| 242 | + } |
|
| 243 | + |
|
| 244 | + if ($dtc->macros[$m[1]] == 'INCLUDE') { |
|
| 245 | + $retour = $r[1] . substr($m[2], strlen($r[0])); |
|
| 246 | + } else { |
|
| 247 | + $retour = substr($m[2], strlen($r[0])); |
|
| 248 | + } |
|
| 249 | + |
|
| 250 | + return $retour; |
|
| 251 | 251 | } |
| 252 | 252 | |
| 253 | 253 | function analyser_dtd_notation($dtd, &$dtc, $grammaire) { |
| 254 | - if (!preg_match('/^<!NOTATION.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 255 | - return -8; |
|
| 256 | - } |
|
| 257 | - spip_log('analyser_dtd_notation a ecrire'); |
|
| 254 | + if (!preg_match('/^<!NOTATION.*?>\s*(.*)$/s', $dtd, $m)) { |
|
| 255 | + return -8; |
|
| 256 | + } |
|
| 257 | + spip_log('analyser_dtd_notation a ecrire'); |
|
| 258 | 258 | |
| 259 | - return $m[1]; |
|
| 259 | + return $m[1]; |
|
| 260 | 260 | } |
| 261 | 261 | |
| 262 | 262 | function analyser_dtd_entity($dtd, &$dtc, $grammaire) { |
| 263 | - if (!preg_match(_REGEXP_ENTITY_DECL, $dtd, $m)) { |
|
| 264 | - return -2; |
|
| 265 | - } |
|
| 266 | - |
|
| 267 | - [$t, $term, $nom, $type, $k1, $k2, $k3, $k4, $k5, $k6, $c, $q, $alt, $dtd] = $m; |
|
| 268 | - |
|
| 269 | - if (isset($dtc->macros[$nom]) and $dtc->macros[$nom]) { |
|
| 270 | - return $dtd; |
|
| 271 | - } |
|
| 272 | - if (isset($dtc->entites[$nom])) { |
|
| 273 | - spip_log("redefinition de l'entite $nom"); |
|
| 274 | - } |
|
| 275 | - if ($k6) { |
|
| 276 | - return $k6 . $dtd; |
|
| 277 | - } // cas du synonyme complet |
|
| 278 | - $val = expanserEntite(($k2 ? $k3 : ($k4 ? $k5 : $k6)), $dtc->macros); |
|
| 279 | - |
|
| 280 | - // cas particulier double evaluation: 'PUBLIC "..." "...."' |
|
| 281 | - if (preg_match('/(PUBLIC|SYSTEM)\s+"([^"]*)"\s*("([^"]*)")?\s*$/s', $val, $r)) { |
|
| 282 | - [$t, $type, $val, $q, $alt] = $r; |
|
| 283 | - } |
|
| 284 | - |
|
| 285 | - if (!$term) { |
|
| 286 | - $dtc->entites[$nom] = $val; |
|
| 287 | - } elseif (!$type) { |
|
| 288 | - $dtc->macros[$nom] = $val; |
|
| 289 | - } else { |
|
| 290 | - if (($type == 'SYSTEM') and !$alt) { |
|
| 291 | - $alt = $val; |
|
| 292 | - } |
|
| 293 | - if (!$alt) { |
|
| 294 | - $dtc->macros[$nom] = $val; |
|
| 295 | - } else { |
|
| 296 | - if ( |
|
| 297 | - ($type == 'PUBLIC') |
|
| 298 | - and (strpos($alt, '/') === false) |
|
| 299 | - ) { |
|
| 300 | - $alt = preg_replace(',/[^/]+$,', '/', $grammaire) |
|
| 301 | - . $alt; |
|
| 302 | - } |
|
| 303 | - $dtc->macros[$nom] = [$type, $alt]; |
|
| 304 | - } |
|
| 305 | - } |
|
| 306 | - |
|
| 307 | - return $dtd; |
|
| 263 | + if (!preg_match(_REGEXP_ENTITY_DECL, $dtd, $m)) { |
|
| 264 | + return -2; |
|
| 265 | + } |
|
| 266 | + |
|
| 267 | + [$t, $term, $nom, $type, $k1, $k2, $k3, $k4, $k5, $k6, $c, $q, $alt, $dtd] = $m; |
|
| 268 | + |
|
| 269 | + if (isset($dtc->macros[$nom]) and $dtc->macros[$nom]) { |
|
| 270 | + return $dtd; |
|
| 271 | + } |
|
| 272 | + if (isset($dtc->entites[$nom])) { |
|
| 273 | + spip_log("redefinition de l'entite $nom"); |
|
| 274 | + } |
|
| 275 | + if ($k6) { |
|
| 276 | + return $k6 . $dtd; |
|
| 277 | + } // cas du synonyme complet |
|
| 278 | + $val = expanserEntite(($k2 ? $k3 : ($k4 ? $k5 : $k6)), $dtc->macros); |
|
| 279 | + |
|
| 280 | + // cas particulier double evaluation: 'PUBLIC "..." "...."' |
|
| 281 | + if (preg_match('/(PUBLIC|SYSTEM)\s+"([^"]*)"\s*("([^"]*)")?\s*$/s', $val, $r)) { |
|
| 282 | + [$t, $type, $val, $q, $alt] = $r; |
|
| 283 | + } |
|
| 284 | + |
|
| 285 | + if (!$term) { |
|
| 286 | + $dtc->entites[$nom] = $val; |
|
| 287 | + } elseif (!$type) { |
|
| 288 | + $dtc->macros[$nom] = $val; |
|
| 289 | + } else { |
|
| 290 | + if (($type == 'SYSTEM') and !$alt) { |
|
| 291 | + $alt = $val; |
|
| 292 | + } |
|
| 293 | + if (!$alt) { |
|
| 294 | + $dtc->macros[$nom] = $val; |
|
| 295 | + } else { |
|
| 296 | + if ( |
|
| 297 | + ($type == 'PUBLIC') |
|
| 298 | + and (strpos($alt, '/') === false) |
|
| 299 | + ) { |
|
| 300 | + $alt = preg_replace(',/[^/]+$,', '/', $grammaire) |
|
| 301 | + . $alt; |
|
| 302 | + } |
|
| 303 | + $dtc->macros[$nom] = [$type, $alt]; |
|
| 304 | + } |
|
| 305 | + } |
|
| 306 | + |
|
| 307 | + return $dtd; |
|
| 308 | 308 | } |
| 309 | 309 | |
| 310 | 310 | // Dresser le tableau des filles potentielles de l'element |
@@ -317,76 +317,76 @@ discard block |
||
| 317 | 317 | // Fin du controle en finElement |
| 318 | 318 | |
| 319 | 319 | function analyser_dtd_element($dtd, &$dtc, $grammaire) { |
| 320 | - if (!preg_match('/^<!ELEMENT\s+([^>\s]+)([^>]*)>\s*(.*)$/s', $dtd, $m)) { |
|
| 321 | - return -3; |
|
| 322 | - } |
|
| 323 | - |
|
| 324 | - [, $nom, $contenu, $dtd] = $m; |
|
| 325 | - $nom = expanserEntite($nom, $dtc->macros); |
|
| 326 | - |
|
| 327 | - if (isset($dtc->elements[$nom])) { |
|
| 328 | - spip_log("redefinition de l'element $nom dans la DTD"); |
|
| 329 | - |
|
| 330 | - return -4; |
|
| 331 | - } |
|
| 332 | - $filles = []; |
|
| 333 | - $contenu = expanserEntite($contenu, $dtc->macros); |
|
| 334 | - $val = $contenu ? compilerRegle($contenu) : '(?:EMPTY )'; |
|
| 335 | - if ($val == '(?:EMPTY )') { |
|
| 336 | - $dtc->regles[$nom] = 'EMPTY'; |
|
| 337 | - } elseif ($val == '(?:ANY )') { |
|
| 338 | - $dtc->regles[$nom] = 'ANY'; |
|
| 339 | - } else { |
|
| 340 | - $last = substr($val, -1); |
|
| 341 | - if ( |
|
| 342 | - preg_match('/ \w/', $val) |
|
| 343 | - or (!empty($last) and !str_contains('*+?', $last)) |
|
| 344 | - ) { |
|
| 345 | - $dtc->regles[$nom] = "/^$val$/"; |
|
| 346 | - } else { |
|
| 347 | - $dtc->regles[$nom] = $last; |
|
| 348 | - } |
|
| 349 | - $filles = array_values(preg_split('/\W+/', $val, -1, PREG_SPLIT_NO_EMPTY)); |
|
| 350 | - |
|
| 351 | - foreach ($filles as $k) { |
|
| 352 | - if (!isset($dtc->peres[$k])) { |
|
| 353 | - $dtc->peres[$k] = []; |
|
| 354 | - } |
|
| 355 | - if (!in_array($nom, $dtc->peres[$k])) { |
|
| 356 | - $dtc->peres[$k][] = $nom; |
|
| 357 | - } |
|
| 358 | - } |
|
| 359 | - } |
|
| 360 | - $dtc->pcdata[$nom] = (strpos($contenu, '#PCDATA') === false); |
|
| 361 | - $dtc->elements[$nom] = $filles; |
|
| 362 | - |
|
| 363 | - return $dtd; |
|
| 320 | + if (!preg_match('/^<!ELEMENT\s+([^>\s]+)([^>]*)>\s*(.*)$/s', $dtd, $m)) { |
|
| 321 | + return -3; |
|
| 322 | + } |
|
| 323 | + |
|
| 324 | + [, $nom, $contenu, $dtd] = $m; |
|
| 325 | + $nom = expanserEntite($nom, $dtc->macros); |
|
| 326 | + |
|
| 327 | + if (isset($dtc->elements[$nom])) { |
|
| 328 | + spip_log("redefinition de l'element $nom dans la DTD"); |
|
| 329 | + |
|
| 330 | + return -4; |
|
| 331 | + } |
|
| 332 | + $filles = []; |
|
| 333 | + $contenu = expanserEntite($contenu, $dtc->macros); |
|
| 334 | + $val = $contenu ? compilerRegle($contenu) : '(?:EMPTY )'; |
|
| 335 | + if ($val == '(?:EMPTY )') { |
|
| 336 | + $dtc->regles[$nom] = 'EMPTY'; |
|
| 337 | + } elseif ($val == '(?:ANY )') { |
|
| 338 | + $dtc->regles[$nom] = 'ANY'; |
|
| 339 | + } else { |
|
| 340 | + $last = substr($val, -1); |
|
| 341 | + if ( |
|
| 342 | + preg_match('/ \w/', $val) |
|
| 343 | + or (!empty($last) and !str_contains('*+?', $last)) |
|
| 344 | + ) { |
|
| 345 | + $dtc->regles[$nom] = "/^$val$/"; |
|
| 346 | + } else { |
|
| 347 | + $dtc->regles[$nom] = $last; |
|
| 348 | + } |
|
| 349 | + $filles = array_values(preg_split('/\W+/', $val, -1, PREG_SPLIT_NO_EMPTY)); |
|
| 350 | + |
|
| 351 | + foreach ($filles as $k) { |
|
| 352 | + if (!isset($dtc->peres[$k])) { |
|
| 353 | + $dtc->peres[$k] = []; |
|
| 354 | + } |
|
| 355 | + if (!in_array($nom, $dtc->peres[$k])) { |
|
| 356 | + $dtc->peres[$k][] = $nom; |
|
| 357 | + } |
|
| 358 | + } |
|
| 359 | + } |
|
| 360 | + $dtc->pcdata[$nom] = (strpos($contenu, '#PCDATA') === false); |
|
| 361 | + $dtc->elements[$nom] = $filles; |
|
| 362 | + |
|
| 363 | + return $dtd; |
|
| 364 | 364 | } |
| 365 | 365 | |
| 366 | 366 | |
| 367 | 367 | function analyser_dtd_attlist($dtd, &$dtc, $grammaire) { |
| 368 | - if (!preg_match('/^<!ATTLIST\s+(\S+)\s+([^>]*)>\s*(.*)/s', $dtd, $m)) { |
|
| 369 | - return -5; |
|
| 370 | - } |
|
| 371 | - |
|
| 372 | - [, $nom, $val, $dtd] = $m; |
|
| 373 | - $nom = expanserEntite($nom, $dtc->macros); |
|
| 374 | - $val = expanserEntite($val, $dtc->macros); |
|
| 375 | - if (!isset($dtc->attributs[$nom])) { |
|
| 376 | - $dtc->attributs[$nom] = []; |
|
| 377 | - } |
|
| 378 | - |
|
| 379 | - if (preg_match_all("/\s*(\S+)\s+(([(][^)]*[)])|(\S+))\s+([^\s']*)(\s*'[^']*')?/", $val, $r2, PREG_SET_ORDER)) { |
|
| 380 | - foreach ($r2 as $m2) { |
|
| 381 | - $v = preg_match('/^\w+$/', $m2[2]) ? $m2[2] |
|
| 382 | - : ('/^' . preg_replace('/\s+/', '', $m2[2]) . '$/'); |
|
| 383 | - $m21 = expanserEntite($m2[1], $dtc->macros); |
|
| 384 | - $m25 = expanserEntite($m2[5], $dtc->macros); |
|
| 385 | - $dtc->attributs[$nom][$m21] = [$v, $m25]; |
|
| 386 | - } |
|
| 387 | - } |
|
| 388 | - |
|
| 389 | - return $dtd; |
|
| 368 | + if (!preg_match('/^<!ATTLIST\s+(\S+)\s+([^>]*)>\s*(.*)/s', $dtd, $m)) { |
|
| 369 | + return -5; |
|
| 370 | + } |
|
| 371 | + |
|
| 372 | + [, $nom, $val, $dtd] = $m; |
|
| 373 | + $nom = expanserEntite($nom, $dtc->macros); |
|
| 374 | + $val = expanserEntite($val, $dtc->macros); |
|
| 375 | + if (!isset($dtc->attributs[$nom])) { |
|
| 376 | + $dtc->attributs[$nom] = []; |
|
| 377 | + } |
|
| 378 | + |
|
| 379 | + if (preg_match_all("/\s*(\S+)\s+(([(][^)]*[)])|(\S+))\s+([^\s']*)(\s*'[^']*')?/", $val, $r2, PREG_SET_ORDER)) { |
|
| 380 | + foreach ($r2 as $m2) { |
|
| 381 | + $v = preg_match('/^\w+$/', $m2[2]) ? $m2[2] |
|
| 382 | + : ('/^' . preg_replace('/\s+/', '', $m2[2]) . '$/'); |
|
| 383 | + $m21 = expanserEntite($m2[1], $dtc->macros); |
|
| 384 | + $m25 = expanserEntite($m2[5], $dtc->macros); |
|
| 385 | + $dtc->attributs[$nom][$m21] = [$v, $m25]; |
|
| 386 | + } |
|
| 387 | + } |
|
| 388 | + |
|
| 389 | + return $dtd; |
|
| 390 | 390 | } |
| 391 | 391 | |
| 392 | 392 | |
@@ -402,26 +402,26 @@ discard block |
||
| 402 | 402 | * @return string|array |
| 403 | 403 | **/ |
| 404 | 404 | function expanserEntite($val, $macros = []) { |
| 405 | - static $vu = []; |
|
| 406 | - if (!is_string($val)) { |
|
| 407 | - return $vu; |
|
| 408 | - } |
|
| 409 | - |
|
| 410 | - if (preg_match_all(_REGEXP_ENTITY_USE, $val, $r, PREG_SET_ORDER)) { |
|
| 411 | - foreach ($r as $m) { |
|
| 412 | - $ent = $m[1]; |
|
| 413 | - // il peut valoir "" |
|
| 414 | - if (!isset($macros[$ent])) { |
|
| 415 | - spip_log("Entite $ent inconnu"); |
|
| 416 | - } else { |
|
| 417 | - if (!isset($vu[$ent])) { |
|
| 418 | - $vu[$ent] = 0; |
|
| 419 | - } |
|
| 420 | - ++$vu[$ent]; |
|
| 421 | - $val = str_replace($m[0], $macros[$ent], $val); |
|
| 422 | - } |
|
| 423 | - } |
|
| 424 | - } |
|
| 425 | - |
|
| 426 | - return trim(preg_replace('/\s+/', ' ', $val)); |
|
| 405 | + static $vu = []; |
|
| 406 | + if (!is_string($val)) { |
|
| 407 | + return $vu; |
|
| 408 | + } |
|
| 409 | + |
|
| 410 | + if (preg_match_all(_REGEXP_ENTITY_USE, $val, $r, PREG_SET_ORDER)) { |
|
| 411 | + foreach ($r as $m) { |
|
| 412 | + $ent = $m[1]; |
|
| 413 | + // il peut valoir "" |
|
| 414 | + if (!isset($macros[$ent])) { |
|
| 415 | + spip_log("Entite $ent inconnu"); |
|
| 416 | + } else { |
|
| 417 | + if (!isset($vu[$ent])) { |
|
| 418 | + $vu[$ent] = 0; |
|
| 419 | + } |
|
| 420 | + ++$vu[$ent]; |
|
| 421 | + $val = str_replace($m[0], $macros[$ent], $val); |
|
| 422 | + } |
|
| 423 | + } |
|
| 424 | + } |
|
| 425 | + |
|
| 426 | + return trim(preg_replace('/\s+/', ' ', $val)); |
|
| 427 | 427 | } |
@@ -20,11 +20,11 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 23 | - return; |
|
| 23 | + return; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | if (!defined('_MYSQL_NOPLANES')) { |
| 27 | - define('_MYSQL_NOPLANES', true); |
|
| 27 | + define('_MYSQL_NOPLANES', true); |
|
| 28 | 28 | } |
| 29 | 29 | |
| 30 | 30 | /** |
@@ -41,112 +41,112 @@ discard block |
||
| 41 | 41 | * - tableau décrivant la connexion sinon |
| 42 | 42 | */ |
| 43 | 43 | function req_mysql_dist($host, $port, $login, $pass, $db = '', $prefixe = '') { |
| 44 | - if (!extension_loaded(\mysqli::class)) { |
|
| 45 | - return false; |
|
| 46 | - } |
|
| 47 | - |
|
| 48 | - // si port est fourni mais pas host, c'est un socket -> compat avec vieille syntaxe de mysql_connect() et anciens fichiers connect.php |
|
| 49 | - try { |
|
| 50 | - if ( |
|
| 51 | - $port and !is_numeric($socket = $port) |
|
| 52 | - and (!$host or $host === 'localhost') |
|
| 53 | - ) { |
|
| 54 | - $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
|
| 55 | - } elseif ($port) { |
|
| 56 | - $link = @mysqli_connect($host, $login, $pass, '', $port); |
|
| 57 | - } else { |
|
| 58 | - $link = @mysqli_connect($host, $login, $pass); |
|
| 59 | - } |
|
| 60 | - } catch (\mysqli_sql_exception $e) { |
|
| 61 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 62 | - $link = false; |
|
| 63 | - } |
|
| 64 | - |
|
| 65 | - if (!$link) { |
|
| 66 | - spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 67 | - |
|
| 68 | - return false; |
|
| 69 | - } |
|
| 70 | - $last = ''; |
|
| 71 | - if (!$db) { |
|
| 72 | - $ok = $link; |
|
| 73 | - $db = 'spip'; |
|
| 74 | - } else { |
|
| 75 | - $ok = mysqli_select_db($link, $db); |
|
| 76 | - if ( |
|
| 77 | - defined('_MYSQL_SET_SQL_MODE') |
|
| 78 | - or defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite |
|
| 79 | - ) { |
|
| 80 | - mysqli_query($link, $last = "set sql_mode=''"); |
|
| 81 | - } |
|
| 82 | - } |
|
| 83 | - |
|
| 84 | - spip_log( |
|
| 85 | - "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 86 | - _LOG_DEBUG |
|
| 87 | - ); |
|
| 88 | - |
|
| 89 | - return !$ok ? false : [ |
|
| 90 | - 'db' => $db, |
|
| 91 | - 'last' => $last, |
|
| 92 | - 'prefixe' => $prefixe ?: $db, |
|
| 93 | - 'link' => $link, |
|
| 94 | - 'total_requetes' => 0, |
|
| 95 | - ]; |
|
| 44 | + if (!extension_loaded(\mysqli::class)) { |
|
| 45 | + return false; |
|
| 46 | + } |
|
| 47 | + |
|
| 48 | + // si port est fourni mais pas host, c'est un socket -> compat avec vieille syntaxe de mysql_connect() et anciens fichiers connect.php |
|
| 49 | + try { |
|
| 50 | + if ( |
|
| 51 | + $port and !is_numeric($socket = $port) |
|
| 52 | + and (!$host or $host === 'localhost') |
|
| 53 | + ) { |
|
| 54 | + $link = @mysqli_connect($host, $login, $pass, '', null, $socket); |
|
| 55 | + } elseif ($port) { |
|
| 56 | + $link = @mysqli_connect($host, $login, $pass, '', $port); |
|
| 57 | + } else { |
|
| 58 | + $link = @mysqli_connect($host, $login, $pass); |
|
| 59 | + } |
|
| 60 | + } catch (\mysqli_sql_exception $e) { |
|
| 61 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 62 | + $link = false; |
|
| 63 | + } |
|
| 64 | + |
|
| 65 | + if (!$link) { |
|
| 66 | + spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 67 | + |
|
| 68 | + return false; |
|
| 69 | + } |
|
| 70 | + $last = ''; |
|
| 71 | + if (!$db) { |
|
| 72 | + $ok = $link; |
|
| 73 | + $db = 'spip'; |
|
| 74 | + } else { |
|
| 75 | + $ok = mysqli_select_db($link, $db); |
|
| 76 | + if ( |
|
| 77 | + defined('_MYSQL_SET_SQL_MODE') |
|
| 78 | + or defined('_MYSQL_SQL_MODE_TEXT_NOT_NULL') // compatibilite |
|
| 79 | + ) { |
|
| 80 | + mysqli_query($link, $last = "set sql_mode=''"); |
|
| 81 | + } |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + spip_log( |
|
| 85 | + "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 86 | + _LOG_DEBUG |
|
| 87 | + ); |
|
| 88 | + |
|
| 89 | + return !$ok ? false : [ |
|
| 90 | + 'db' => $db, |
|
| 91 | + 'last' => $last, |
|
| 92 | + 'prefixe' => $prefixe ?: $db, |
|
| 93 | + 'link' => $link, |
|
| 94 | + 'total_requetes' => 0, |
|
| 95 | + ]; |
|
| 96 | 96 | } |
| 97 | 97 | |
| 98 | 98 | |
| 99 | 99 | $GLOBALS['spip_mysql_functions_1'] = [ |
| 100 | - 'alter' => 'spip_mysql_alter', |
|
| 101 | - 'count' => 'spip_mysql_count', |
|
| 102 | - 'countsel' => 'spip_mysql_countsel', |
|
| 103 | - 'create' => 'spip_mysql_create', |
|
| 104 | - 'create_base' => 'spip_mysql_create_base', |
|
| 105 | - 'create_view' => 'spip_mysql_create_view', |
|
| 106 | - 'date_proche' => 'spip_mysql_date_proche', |
|
| 107 | - 'delete' => 'spip_mysql_delete', |
|
| 108 | - 'drop_table' => 'spip_mysql_drop_table', |
|
| 109 | - 'drop_view' => 'spip_mysql_drop_view', |
|
| 110 | - 'errno' => 'spip_mysql_errno', |
|
| 111 | - 'error' => 'spip_mysql_error', |
|
| 112 | - 'explain' => 'spip_mysql_explain', |
|
| 113 | - 'fetch' => 'spip_mysql_fetch', |
|
| 114 | - 'seek' => 'spip_mysql_seek', |
|
| 115 | - 'free' => 'spip_mysql_free', |
|
| 116 | - 'hex' => 'spip_mysql_hex', |
|
| 117 | - 'in' => 'spip_mysql_in', |
|
| 118 | - 'insert' => 'spip_mysql_insert', |
|
| 119 | - 'insertq' => 'spip_mysql_insertq', |
|
| 120 | - 'insertq_multi' => 'spip_mysql_insertq_multi', |
|
| 121 | - 'listdbs' => 'spip_mysql_listdbs', |
|
| 122 | - 'multi' => 'spip_mysql_multi', |
|
| 123 | - 'optimize' => 'spip_mysql_optimize', |
|
| 124 | - 'query' => 'spip_mysql_query', |
|
| 125 | - 'quote' => 'spip_mysql_quote', |
|
| 126 | - 'replace' => 'spip_mysql_replace', |
|
| 127 | - 'replace_multi' => 'spip_mysql_replace_multi', |
|
| 128 | - 'repair' => 'spip_mysql_repair', |
|
| 129 | - 'select' => 'spip_mysql_select', |
|
| 130 | - 'selectdb' => 'spip_mysql_selectdb', |
|
| 131 | - 'set_charset' => 'spip_mysql_set_charset', |
|
| 132 | - 'get_charset' => 'spip_mysql_get_charset', |
|
| 133 | - 'showbase' => 'spip_mysql_showbase', |
|
| 134 | - 'showtable' => 'spip_mysql_showtable', |
|
| 135 | - 'table_exists' => 'spip_mysql_table_exists', |
|
| 136 | - 'update' => 'spip_mysql_update', |
|
| 137 | - 'updateq' => 'spip_mysql_updateq', |
|
| 138 | - |
|
| 139 | - // association de chaque nom http d'un charset aux couples MySQL |
|
| 140 | - 'charsets' => [ |
|
| 141 | - 'cp1250' => ['charset' => 'cp1250', 'collation' => 'cp1250_general_ci'], |
|
| 142 | - 'cp1251' => ['charset' => 'cp1251', 'collation' => 'cp1251_general_ci'], |
|
| 143 | - 'cp1256' => ['charset' => 'cp1256', 'collation' => 'cp1256_general_ci'], |
|
| 144 | - 'iso-8859-1' => ['charset' => 'latin1', 'collation' => 'latin1_swedish_ci'], |
|
| 100 | + 'alter' => 'spip_mysql_alter', |
|
| 101 | + 'count' => 'spip_mysql_count', |
|
| 102 | + 'countsel' => 'spip_mysql_countsel', |
|
| 103 | + 'create' => 'spip_mysql_create', |
|
| 104 | + 'create_base' => 'spip_mysql_create_base', |
|
| 105 | + 'create_view' => 'spip_mysql_create_view', |
|
| 106 | + 'date_proche' => 'spip_mysql_date_proche', |
|
| 107 | + 'delete' => 'spip_mysql_delete', |
|
| 108 | + 'drop_table' => 'spip_mysql_drop_table', |
|
| 109 | + 'drop_view' => 'spip_mysql_drop_view', |
|
| 110 | + 'errno' => 'spip_mysql_errno', |
|
| 111 | + 'error' => 'spip_mysql_error', |
|
| 112 | + 'explain' => 'spip_mysql_explain', |
|
| 113 | + 'fetch' => 'spip_mysql_fetch', |
|
| 114 | + 'seek' => 'spip_mysql_seek', |
|
| 115 | + 'free' => 'spip_mysql_free', |
|
| 116 | + 'hex' => 'spip_mysql_hex', |
|
| 117 | + 'in' => 'spip_mysql_in', |
|
| 118 | + 'insert' => 'spip_mysql_insert', |
|
| 119 | + 'insertq' => 'spip_mysql_insertq', |
|
| 120 | + 'insertq_multi' => 'spip_mysql_insertq_multi', |
|
| 121 | + 'listdbs' => 'spip_mysql_listdbs', |
|
| 122 | + 'multi' => 'spip_mysql_multi', |
|
| 123 | + 'optimize' => 'spip_mysql_optimize', |
|
| 124 | + 'query' => 'spip_mysql_query', |
|
| 125 | + 'quote' => 'spip_mysql_quote', |
|
| 126 | + 'replace' => 'spip_mysql_replace', |
|
| 127 | + 'replace_multi' => 'spip_mysql_replace_multi', |
|
| 128 | + 'repair' => 'spip_mysql_repair', |
|
| 129 | + 'select' => 'spip_mysql_select', |
|
| 130 | + 'selectdb' => 'spip_mysql_selectdb', |
|
| 131 | + 'set_charset' => 'spip_mysql_set_charset', |
|
| 132 | + 'get_charset' => 'spip_mysql_get_charset', |
|
| 133 | + 'showbase' => 'spip_mysql_showbase', |
|
| 134 | + 'showtable' => 'spip_mysql_showtable', |
|
| 135 | + 'table_exists' => 'spip_mysql_table_exists', |
|
| 136 | + 'update' => 'spip_mysql_update', |
|
| 137 | + 'updateq' => 'spip_mysql_updateq', |
|
| 138 | + |
|
| 139 | + // association de chaque nom http d'un charset aux couples MySQL |
|
| 140 | + 'charsets' => [ |
|
| 141 | + 'cp1250' => ['charset' => 'cp1250', 'collation' => 'cp1250_general_ci'], |
|
| 142 | + 'cp1251' => ['charset' => 'cp1251', 'collation' => 'cp1251_general_ci'], |
|
| 143 | + 'cp1256' => ['charset' => 'cp1256', 'collation' => 'cp1256_general_ci'], |
|
| 144 | + 'iso-8859-1' => ['charset' => 'latin1', 'collation' => 'latin1_swedish_ci'], |
|
| 145 | 145 | //'iso-8859-6'=>array('charset'=>'latin1','collation'=>'latin1_swedish_ci'), |
| 146 | - 'iso-8859-9' => ['charset' => 'latin5', 'collation' => 'latin5_turkish_ci'], |
|
| 146 | + 'iso-8859-9' => ['charset' => 'latin5', 'collation' => 'latin5_turkish_ci'], |
|
| 147 | 147 | //'iso-8859-15'=>array('charset'=>'latin1','collation'=>'latin1_swedish_ci'), |
| 148 | - 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'] |
|
| 149 | - ] |
|
| 148 | + 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'] |
|
| 149 | + ] |
|
| 150 | 150 | ]; |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,9 +157,9 @@ discard block |
||
| 157 | 157 | * @return Object Information de connexion pour mysqli |
| 158 | 158 | */ |
| 159 | 159 | function _mysql_link($serveur = '') { |
| 160 | - $link = &$GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 160 | + $link = &$GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 161 | 161 | |
| 162 | - return $link; |
|
| 162 | + return $link; |
|
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | |
@@ -172,10 +172,10 @@ discard block |
||
| 172 | 172 | * @return mysqli_result|bool Jeu de résultats pour fetch() |
| 173 | 173 | */ |
| 174 | 174 | function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) { |
| 175 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 176 | - spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 175 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 176 | + spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 177 | 177 | |
| 178 | - return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 178 | + return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | |
@@ -188,11 +188,11 @@ discard block |
||
| 188 | 188 | * @return array Description du charset (son nom est dans 'charset') |
| 189 | 189 | */ |
| 190 | 190 | function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) { |
| 191 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 192 | - $connexion['last'] = $c = 'SHOW CHARACTER SET' |
|
| 193 | - . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 191 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 192 | + $connexion['last'] = $c = 'SHOW CHARACTER SET' |
|
| 193 | + . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 194 | 194 | |
| 195 | - return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
|
| 195 | + return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
|
| 196 | 196 | } |
| 197 | 197 | |
| 198 | 198 | /** |
@@ -208,80 +208,80 @@ discard block |
||
| 208 | 208 | */ |
| 209 | 209 | function spip_mysql_query($query, $serveur = '', $requeter = true) { |
| 210 | 210 | |
| 211 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 212 | - $prefixe = $connexion['prefixe']; |
|
| 213 | - $link = $connexion['link']; |
|
| 214 | - $db = $connexion['db']; |
|
| 215 | - |
|
| 216 | - $query = _mysql_traite_query($query, $db, $prefixe); |
|
| 217 | - |
|
| 218 | - // renvoyer la requete inerte si demandee |
|
| 219 | - if (!$requeter) { |
|
| 220 | - return $query; |
|
| 221 | - } |
|
| 222 | - |
|
| 223 | - if (isset($_GET['var_profile']) or (defined('_DEBUG_TRACE_QUERIES') and _DEBUG_TRACE_QUERIES)) { |
|
| 224 | - include_spip('public/tracer'); |
|
| 225 | - $t = trace_query_start(); |
|
| 226 | - } else { |
|
| 227 | - $t = 0; |
|
| 228 | - } |
|
| 229 | - |
|
| 230 | - $connexion['last'] = $query; |
|
| 231 | - $connexion['total_requetes']++; |
|
| 232 | - |
|
| 233 | - // ajouter un debug utile dans log/mysql-slow.log ? |
|
| 234 | - $debug = ''; |
|
| 235 | - if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
|
| 236 | - if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 237 | - [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | - $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 239 | - } |
|
| 240 | - if (isset($_SERVER['REQUEST_URI'])) { |
|
| 241 | - $debug .= $_SERVER['REQUEST_URI']; |
|
| 242 | - } |
|
| 243 | - if (!empty($GLOBALS['ip'])) { |
|
| 244 | - $debug .= ' + ' . $GLOBALS['ip']; |
|
| 245 | - } |
|
| 246 | - $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 247 | - } |
|
| 248 | - try { |
|
| 249 | - $r = mysqli_query($link, $query . $debug); |
|
| 250 | - } catch (\mysqli_sql_exception $e) { |
|
| 251 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 252 | - $r = false; |
|
| 253 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 254 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 255 | - } |
|
| 256 | - |
|
| 257 | - //Eviter de propager le GoneAway sur les autres requetes d'un même processus PHP |
|
| 258 | - if ($e = spip_mysql_errno($serveur)) { // Log d'un Gone Away |
|
| 259 | - if ($e == 2006) { //Si Gone Away on relance une connexion vierge |
|
| 260 | - //Fermer la connexion defaillante |
|
| 261 | - mysqli_close($connexion['link']); |
|
| 262 | - unset($GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]); |
|
| 263 | - //Relancer une connexion vierge |
|
| 264 | - spip_connect($serveur); |
|
| 265 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 266 | - $link = $connexion['link']; |
|
| 267 | - //On retente au cas où |
|
| 268 | - try { |
|
| 269 | - $r = mysqli_query($link, $query . $debug); |
|
| 270 | - } catch (\mysqli_sql_exception $e) { |
|
| 271 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 272 | - $r = false; |
|
| 273 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 274 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 275 | - } |
|
| 276 | - } |
|
| 277 | - } |
|
| 278 | - |
|
| 279 | - // Log de l'erreur eventuelle |
|
| 280 | - if ($e = spip_mysql_errno($serveur)) { |
|
| 281 | - // et du fautif |
|
| 282 | - $e .= spip_mysql_error($query, $serveur); |
|
| 283 | - } |
|
| 284 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 211 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 212 | + $prefixe = $connexion['prefixe']; |
|
| 213 | + $link = $connexion['link']; |
|
| 214 | + $db = $connexion['db']; |
|
| 215 | + |
|
| 216 | + $query = _mysql_traite_query($query, $db, $prefixe); |
|
| 217 | + |
|
| 218 | + // renvoyer la requete inerte si demandee |
|
| 219 | + if (!$requeter) { |
|
| 220 | + return $query; |
|
| 221 | + } |
|
| 222 | + |
|
| 223 | + if (isset($_GET['var_profile']) or (defined('_DEBUG_TRACE_QUERIES') and _DEBUG_TRACE_QUERIES)) { |
|
| 224 | + include_spip('public/tracer'); |
|
| 225 | + $t = trace_query_start(); |
|
| 226 | + } else { |
|
| 227 | + $t = 0; |
|
| 228 | + } |
|
| 229 | + |
|
| 230 | + $connexion['last'] = $query; |
|
| 231 | + $connexion['total_requetes']++; |
|
| 232 | + |
|
| 233 | + // ajouter un debug utile dans log/mysql-slow.log ? |
|
| 234 | + $debug = ''; |
|
| 235 | + if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
|
| 236 | + if (isset($GLOBALS['debug']['aucasou'])) { |
|
| 237 | + [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | + $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 239 | + } |
|
| 240 | + if (isset($_SERVER['REQUEST_URI'])) { |
|
| 241 | + $debug .= $_SERVER['REQUEST_URI']; |
|
| 242 | + } |
|
| 243 | + if (!empty($GLOBALS['ip'])) { |
|
| 244 | + $debug .= ' + ' . $GLOBALS['ip']; |
|
| 245 | + } |
|
| 246 | + $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 247 | + } |
|
| 248 | + try { |
|
| 249 | + $r = mysqli_query($link, $query . $debug); |
|
| 250 | + } catch (\mysqli_sql_exception $e) { |
|
| 251 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 252 | + $r = false; |
|
| 253 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 254 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 255 | + } |
|
| 256 | + |
|
| 257 | + //Eviter de propager le GoneAway sur les autres requetes d'un même processus PHP |
|
| 258 | + if ($e = spip_mysql_errno($serveur)) { // Log d'un Gone Away |
|
| 259 | + if ($e == 2006) { //Si Gone Away on relance une connexion vierge |
|
| 260 | + //Fermer la connexion defaillante |
|
| 261 | + mysqli_close($connexion['link']); |
|
| 262 | + unset($GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]); |
|
| 263 | + //Relancer une connexion vierge |
|
| 264 | + spip_connect($serveur); |
|
| 265 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 266 | + $link = $connexion['link']; |
|
| 267 | + //On retente au cas où |
|
| 268 | + try { |
|
| 269 | + $r = mysqli_query($link, $query . $debug); |
|
| 270 | + } catch (\mysqli_sql_exception $e) { |
|
| 271 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 272 | + $r = false; |
|
| 273 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 274 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 275 | + } |
|
| 276 | + } |
|
| 277 | + } |
|
| 278 | + |
|
| 279 | + // Log de l'erreur eventuelle |
|
| 280 | + if ($e = spip_mysql_errno($serveur)) { |
|
| 281 | + // et du fautif |
|
| 282 | + $e .= spip_mysql_error($query, $serveur); |
|
| 283 | + } |
|
| 284 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 285 | 285 | } |
| 286 | 286 | |
| 287 | 287 | /** |
@@ -296,12 +296,12 @@ discard block |
||
| 296 | 296 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 297 | 297 | */ |
| 298 | 298 | function spip_mysql_alter($query, $serveur = '', $requeter = true) { |
| 299 | - // ici on supprime les ` entourant le nom de table pour permettre |
|
| 300 | - // la transposition du prefixe, compte tenu que les plugins ont la mauvaise habitude |
|
| 301 | - // d'utiliser ceux-ci, copie-colle de phpmyadmin |
|
| 302 | - $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
|
| 299 | + // ici on supprime les ` entourant le nom de table pour permettre |
|
| 300 | + // la transposition du prefixe, compte tenu que les plugins ont la mauvaise habitude |
|
| 301 | + // d'utiliser ceux-ci, copie-colle de phpmyadmin |
|
| 302 | + $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
|
| 303 | 303 | |
| 304 | - return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 304 | + return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | |
@@ -314,9 +314,9 @@ discard block |
||
| 314 | 314 | * @return bool Toujours true |
| 315 | 315 | */ |
| 316 | 316 | function spip_mysql_optimize($table, $serveur = '', $requeter = true) { |
| 317 | - spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 317 | + spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 318 | 318 | |
| 319 | - return true; |
|
| 319 | + return true; |
|
| 320 | 320 | } |
| 321 | 321 | |
| 322 | 322 | |
@@ -329,18 +329,18 @@ discard block |
||
| 329 | 329 | * @return array Tableau de l'explication |
| 330 | 330 | */ |
| 331 | 331 | function spip_mysql_explain($query, $serveur = '', $requeter = true) { |
| 332 | - if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 333 | - return []; |
|
| 334 | - } |
|
| 335 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 336 | - $prefixe = $connexion['prefixe']; |
|
| 337 | - $link = $connexion['link']; |
|
| 338 | - $db = $connexion['db']; |
|
| 339 | - |
|
| 340 | - $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 341 | - $r = mysqli_query($link, $query); |
|
| 342 | - |
|
| 343 | - return spip_mysql_fetch($r, null, $serveur); |
|
| 332 | + if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 333 | + return []; |
|
| 334 | + } |
|
| 335 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 336 | + $prefixe = $connexion['prefixe']; |
|
| 337 | + $link = $connexion['link']; |
|
| 338 | + $db = $connexion['db']; |
|
| 339 | + |
|
| 340 | + $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 341 | + $r = mysqli_query($link, $query); |
|
| 342 | + |
|
| 343 | + return spip_mysql_fetch($r, null, $serveur); |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | |
@@ -369,35 +369,35 @@ discard block |
||
| 369 | 369 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 370 | 370 | */ |
| 371 | 371 | function spip_mysql_select( |
| 372 | - $select, |
|
| 373 | - $from, |
|
| 374 | - $where = '', |
|
| 375 | - $groupby = '', |
|
| 376 | - $orderby = '', |
|
| 377 | - $limit = '', |
|
| 378 | - $having = '', |
|
| 379 | - $serveur = '', |
|
| 380 | - $requeter = true |
|
| 372 | + $select, |
|
| 373 | + $from, |
|
| 374 | + $where = '', |
|
| 375 | + $groupby = '', |
|
| 376 | + $orderby = '', |
|
| 377 | + $limit = '', |
|
| 378 | + $having = '', |
|
| 379 | + $serveur = '', |
|
| 380 | + $requeter = true |
|
| 381 | 381 | ) { |
| 382 | 382 | |
| 383 | 383 | |
| 384 | - $from = (!is_array($from) ? $from : spip_mysql_select_as($from)); |
|
| 385 | - $query = |
|
| 386 | - calculer_mysql_expression('SELECT', $select, ', ') |
|
| 387 | - . calculer_mysql_expression('FROM', $from, ', ') |
|
| 388 | - . calculer_mysql_expression('WHERE', $where) |
|
| 389 | - . calculer_mysql_expression('GROUP BY', $groupby, ',') |
|
| 390 | - . calculer_mysql_expression('HAVING', $having) |
|
| 391 | - . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 392 | - . ($limit ? "\nLIMIT $limit" : ''); |
|
| 384 | + $from = (!is_array($from) ? $from : spip_mysql_select_as($from)); |
|
| 385 | + $query = |
|
| 386 | + calculer_mysql_expression('SELECT', $select, ', ') |
|
| 387 | + . calculer_mysql_expression('FROM', $from, ', ') |
|
| 388 | + . calculer_mysql_expression('WHERE', $where) |
|
| 389 | + . calculer_mysql_expression('GROUP BY', $groupby, ',') |
|
| 390 | + . calculer_mysql_expression('HAVING', $having) |
|
| 391 | + . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 392 | + . ($limit ? "\nLIMIT $limit" : ''); |
|
| 393 | 393 | |
| 394 | - // renvoyer la requete inerte si demandee |
|
| 395 | - if ($requeter === false) { |
|
| 396 | - return $query; |
|
| 397 | - } |
|
| 398 | - $r = spip_mysql_query($query, $serveur, $requeter); |
|
| 394 | + // renvoyer la requete inerte si demandee |
|
| 395 | + if ($requeter === false) { |
|
| 396 | + return $query; |
|
| 397 | + } |
|
| 398 | + $r = spip_mysql_query($query, $serveur, $requeter); |
|
| 399 | 399 | |
| 400 | - return $r ?: $query; |
|
| 400 | + return $r ?: $query; |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | |
@@ -414,7 +414,7 @@ discard block |
||
| 414 | 414 | * @return string texte du orderby préparé |
| 415 | 415 | */ |
| 416 | 416 | function spip_mysql_order($orderby) { |
| 417 | - return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 417 | + return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 418 | 418 | } |
| 419 | 419 | |
| 420 | 420 | |
@@ -437,26 +437,26 @@ discard block |
||
| 437 | 437 | * Contrainte pour clause WHERE |
| 438 | 438 | */ |
| 439 | 439 | function calculer_mysql_where($v) { |
| 440 | - if (!is_array($v)) { |
|
| 441 | - return $v; |
|
| 442 | - } |
|
| 443 | - |
|
| 444 | - $op = array_shift($v); |
|
| 445 | - if (!($n = count($v))) { |
|
| 446 | - return $op; |
|
| 447 | - } else { |
|
| 448 | - $arg = calculer_mysql_where(array_shift($v)); |
|
| 449 | - if ($n == 1) { |
|
| 450 | - return "$op($arg)"; |
|
| 451 | - } else { |
|
| 452 | - $arg2 = calculer_mysql_where(array_shift($v)); |
|
| 453 | - if ($n == 2) { |
|
| 454 | - return "($arg $op $arg2)"; |
|
| 455 | - } else { |
|
| 456 | - return "($arg $op ($arg2) : $v[0])"; |
|
| 457 | - } |
|
| 458 | - } |
|
| 459 | - } |
|
| 440 | + if (!is_array($v)) { |
|
| 441 | + return $v; |
|
| 442 | + } |
|
| 443 | + |
|
| 444 | + $op = array_shift($v); |
|
| 445 | + if (!($n = count($v))) { |
|
| 446 | + return $op; |
|
| 447 | + } else { |
|
| 448 | + $arg = calculer_mysql_where(array_shift($v)); |
|
| 449 | + if ($n == 1) { |
|
| 450 | + return "$op($arg)"; |
|
| 451 | + } else { |
|
| 452 | + $arg2 = calculer_mysql_where(array_shift($v)); |
|
| 453 | + if ($n == 2) { |
|
| 454 | + return "($arg $op $arg2)"; |
|
| 455 | + } else { |
|
| 456 | + return "($arg $op ($arg2) : $v[0])"; |
|
| 457 | + } |
|
| 458 | + } |
|
| 459 | + } |
|
| 460 | 460 | } |
| 461 | 461 | |
| 462 | 462 | /** |
@@ -471,21 +471,21 @@ discard block |
||
| 471 | 471 | * @return string texte de l'expression, une partie donc, du texte la requête. |
| 472 | 472 | */ |
| 473 | 473 | function calculer_mysql_expression($expression, $v, $join = 'AND') { |
| 474 | - if (empty($v)) { |
|
| 475 | - return ''; |
|
| 476 | - } |
|
| 477 | - |
|
| 478 | - $exp = "\n$expression "; |
|
| 479 | - |
|
| 480 | - if (!is_array($v)) { |
|
| 481 | - return $exp . $v; |
|
| 482 | - } else { |
|
| 483 | - if (strtoupper($join) === 'AND') { |
|
| 484 | - return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 485 | - } else { |
|
| 486 | - return $exp . join($join, $v); |
|
| 487 | - } |
|
| 488 | - } |
|
| 474 | + if (empty($v)) { |
|
| 475 | + return ''; |
|
| 476 | + } |
|
| 477 | + |
|
| 478 | + $exp = "\n$expression "; |
|
| 479 | + |
|
| 480 | + if (!is_array($v)) { |
|
| 481 | + return $exp . $v; |
|
| 482 | + } else { |
|
| 483 | + if (strtoupper($join) === 'AND') { |
|
| 484 | + return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 485 | + } else { |
|
| 486 | + return $exp . join($join, $v); |
|
| 487 | + } |
|
| 488 | + } |
|
| 489 | 489 | } |
| 490 | 490 | |
| 491 | 491 | |
@@ -496,26 +496,26 @@ discard block |
||
| 496 | 496 | * @return string Sélection de colonnes pour une clause SELECT |
| 497 | 497 | */ |
| 498 | 498 | function spip_mysql_select_as($args) { |
| 499 | - $res = ''; |
|
| 500 | - foreach ($args as $k => $v) { |
|
| 501 | - if (substr($k, -1) == '@') { |
|
| 502 | - // c'est une jointure qui se refere au from precedent |
|
| 503 | - // pas de virgule |
|
| 504 | - $res .= ' ' . $v; |
|
| 505 | - } else { |
|
| 506 | - if (!is_numeric($k)) { |
|
| 507 | - $p = strpos($v, ' '); |
|
| 508 | - if ($p) { |
|
| 509 | - $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 510 | - } else { |
|
| 511 | - $v .= " AS `$k`"; |
|
| 512 | - } |
|
| 513 | - } |
|
| 514 | - $res .= ', ' . $v; |
|
| 515 | - } |
|
| 516 | - } |
|
| 517 | - |
|
| 518 | - return substr($res, 2); |
|
| 499 | + $res = ''; |
|
| 500 | + foreach ($args as $k => $v) { |
|
| 501 | + if (substr($k, -1) == '@') { |
|
| 502 | + // c'est une jointure qui se refere au from precedent |
|
| 503 | + // pas de virgule |
|
| 504 | + $res .= ' ' . $v; |
|
| 505 | + } else { |
|
| 506 | + if (!is_numeric($k)) { |
|
| 507 | + $p = strpos($v, ' '); |
|
| 508 | + if ($p) { |
|
| 509 | + $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 510 | + } else { |
|
| 511 | + $v .= " AS `$k`"; |
|
| 512 | + } |
|
| 513 | + } |
|
| 514 | + $res .= ', ' . $v; |
|
| 515 | + } |
|
| 516 | + } |
|
| 517 | + |
|
| 518 | + return substr($res, 2); |
|
| 519 | 519 | } |
| 520 | 520 | |
| 521 | 521 | |
@@ -540,58 +540,58 @@ discard block |
||
| 540 | 540 | */ |
| 541 | 541 | function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) { |
| 542 | 542 | |
| 543 | - if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
|
| 544 | - $pref = '`' . $db . '`.'; |
|
| 545 | - } else { |
|
| 546 | - $pref = ''; |
|
| 547 | - } |
|
| 548 | - |
|
| 549 | - if ($prefixe) { |
|
| 550 | - $pref .= $prefixe . '_'; |
|
| 551 | - } |
|
| 552 | - |
|
| 553 | - if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 554 | - $suite = ''; |
|
| 555 | - } else { |
|
| 556 | - $suite = strstr($query, (string) $regs[0]); |
|
| 557 | - $query = substr($query, 0, -strlen($suite)); |
|
| 558 | - // propager le prefixe en cas de requete imbriquee |
|
| 559 | - // il faut alors echapper les chaine avant de le faire, pour ne pas risquer de |
|
| 560 | - // modifier une requete qui est en fait juste du texte dans un champ |
|
| 561 | - if (stripos($suite, 'SELECT') !== false) { |
|
| 562 | - if ($echappe_textes) { |
|
| 563 | - [$suite_echap, $textes] = query_echappe_textes($suite); |
|
| 564 | - } |
|
| 565 | - else { |
|
| 566 | - $suite_echap = $suite; |
|
| 567 | - } |
|
| 568 | - if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
|
| 569 | - $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 570 | - if ($echappe_textes) { |
|
| 571 | - $suite = query_reinjecte_textes($suite_echap, $textes); |
|
| 572 | - } |
|
| 573 | - else { |
|
| 574 | - $suite = $suite_echap; |
|
| 575 | - } |
|
| 576 | - } |
|
| 577 | - } |
|
| 578 | - } |
|
| 579 | - $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 580 | - |
|
| 581 | - // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 582 | - // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 583 | - if ( |
|
| 584 | - defined('_MYSQL_NOPLANES') |
|
| 585 | - and _MYSQL_NOPLANES |
|
| 586 | - and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 587 | - and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 588 | - ) { |
|
| 589 | - include_spip('inc/charsets'); |
|
| 590 | - $r = utf8_noplanes($r); |
|
| 591 | - } |
|
| 592 | - |
|
| 593 | - #spip_log("_mysql_traite_query: " . substr($r,0, 50) . ".... $db, $prefixe", _LOG_DEBUG); |
|
| 594 | - return $r; |
|
| 543 | + if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
|
| 544 | + $pref = '`' . $db . '`.'; |
|
| 545 | + } else { |
|
| 546 | + $pref = ''; |
|
| 547 | + } |
|
| 548 | + |
|
| 549 | + if ($prefixe) { |
|
| 550 | + $pref .= $prefixe . '_'; |
|
| 551 | + } |
|
| 552 | + |
|
| 553 | + if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 554 | + $suite = ''; |
|
| 555 | + } else { |
|
| 556 | + $suite = strstr($query, (string) $regs[0]); |
|
| 557 | + $query = substr($query, 0, -strlen($suite)); |
|
| 558 | + // propager le prefixe en cas de requete imbriquee |
|
| 559 | + // il faut alors echapper les chaine avant de le faire, pour ne pas risquer de |
|
| 560 | + // modifier une requete qui est en fait juste du texte dans un champ |
|
| 561 | + if (stripos($suite, 'SELECT') !== false) { |
|
| 562 | + if ($echappe_textes) { |
|
| 563 | + [$suite_echap, $textes] = query_echappe_textes($suite); |
|
| 564 | + } |
|
| 565 | + else { |
|
| 566 | + $suite_echap = $suite; |
|
| 567 | + } |
|
| 568 | + if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
|
| 569 | + $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 570 | + if ($echappe_textes) { |
|
| 571 | + $suite = query_reinjecte_textes($suite_echap, $textes); |
|
| 572 | + } |
|
| 573 | + else { |
|
| 574 | + $suite = $suite_echap; |
|
| 575 | + } |
|
| 576 | + } |
|
| 577 | + } |
|
| 578 | + } |
|
| 579 | + $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 580 | + |
|
| 581 | + // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 582 | + // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 583 | + if ( |
|
| 584 | + defined('_MYSQL_NOPLANES') |
|
| 585 | + and _MYSQL_NOPLANES |
|
| 586 | + and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 587 | + and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 588 | + ) { |
|
| 589 | + include_spip('inc/charsets'); |
|
| 590 | + $r = utf8_noplanes($r); |
|
| 591 | + } |
|
| 592 | + |
|
| 593 | + #spip_log("_mysql_traite_query: " . substr($r,0, 50) . ".... $db, $prefixe", _LOG_DEBUG); |
|
| 594 | + return $r; |
|
| 595 | 595 | } |
| 596 | 596 | |
| 597 | 597 | /** |
@@ -609,17 +609,17 @@ discard block |
||
| 609 | 609 | * - False en cas d'erreur. |
| 610 | 610 | **/ |
| 611 | 611 | function spip_mysql_selectdb($db, $serveur = '', $requeter = true) { |
| 612 | - $link = _mysql_link($serveur); |
|
| 613 | - try { |
|
| 614 | - $ok = mysqli_select_db($link, $db); |
|
| 615 | - } catch (\mysqli_sql_exception $e) { |
|
| 616 | - $ok = false; |
|
| 617 | - } |
|
| 618 | - if (!$ok) { |
|
| 619 | - spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 620 | - } |
|
| 621 | - |
|
| 622 | - return $ok; |
|
| 612 | + $link = _mysql_link($serveur); |
|
| 613 | + try { |
|
| 614 | + $ok = mysqli_select_db($link, $db); |
|
| 615 | + } catch (\mysqli_sql_exception $e) { |
|
| 616 | + $ok = false; |
|
| 617 | + } |
|
| 618 | + if (!$ok) { |
|
| 619 | + spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 620 | + } |
|
| 621 | + |
|
| 622 | + return $ok; |
|
| 623 | 623 | } |
| 624 | 624 | |
| 625 | 625 | |
@@ -640,14 +640,14 @@ discard block |
||
| 640 | 640 | * Liste de noms de bases de données |
| 641 | 641 | **/ |
| 642 | 642 | function spip_mysql_listdbs($serveur = '', $requeter = true) { |
| 643 | - $dbs = []; |
|
| 644 | - if ($res = spip_mysql_query('SHOW DATABASES', $serveur)) { |
|
| 645 | - while ($row = mysqli_fetch_assoc($res)) { |
|
| 646 | - $dbs[] = $row['Database']; |
|
| 647 | - } |
|
| 648 | - } |
|
| 649 | - |
|
| 650 | - return $dbs; |
|
| 643 | + $dbs = []; |
|
| 644 | + if ($res = spip_mysql_query('SHOW DATABASES', $serveur)) { |
|
| 645 | + while ($row = mysqli_fetch_assoc($res)) { |
|
| 646 | + $dbs[] = $row['Database']; |
|
| 647 | + } |
|
| 648 | + } |
|
| 649 | + |
|
| 650 | + return $dbs; |
|
| 651 | 651 | } |
| 652 | 652 | |
| 653 | 653 | |
@@ -670,73 +670,73 @@ discard block |
||
| 670 | 670 | * - true si la requête réussie, false sinon. |
| 671 | 671 | */ |
| 672 | 672 | function spip_mysql_create( |
| 673 | - $nom, |
|
| 674 | - $champs, |
|
| 675 | - $cles, |
|
| 676 | - $autoinc = false, |
|
| 677 | - $temporary = false, |
|
| 678 | - $serveur = '', |
|
| 679 | - $requeter = true |
|
| 673 | + $nom, |
|
| 674 | + $champs, |
|
| 675 | + $cles, |
|
| 676 | + $autoinc = false, |
|
| 677 | + $temporary = false, |
|
| 678 | + $serveur = '', |
|
| 679 | + $requeter = true |
|
| 680 | 680 | ) { |
| 681 | 681 | |
| 682 | - $query = ''; |
|
| 683 | - $keys = ''; |
|
| 684 | - $s = ''; |
|
| 685 | - $p = ''; |
|
| 686 | - |
|
| 687 | - // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 688 | - // sans les renseigner (laisse le compilo recuperer la description) |
|
| 689 | - if (!is_array($champs) || !is_array($cles)) { |
|
| 690 | - return; |
|
| 691 | - } |
|
| 692 | - |
|
| 693 | - $res = spip_mysql_query('SELECT version() as v', $serveur); |
|
| 694 | - if (($row = mysqli_fetch_array($res)) && (version_compare($row['v'], '5.0', '>='))) { |
|
| 695 | - spip_mysql_query("SET sql_mode=''", $serveur); |
|
| 696 | - } |
|
| 697 | - |
|
| 698 | - foreach ($cles as $k => $v) { |
|
| 699 | - $keys .= "$s\n\t\t$k ($v)"; |
|
| 700 | - if ($k == 'PRIMARY KEY') { |
|
| 701 | - $p = $v; |
|
| 702 | - } |
|
| 703 | - $s = ','; |
|
| 704 | - } |
|
| 705 | - $s = ''; |
|
| 706 | - |
|
| 707 | - $character_set = ''; |
|
| 708 | - if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 709 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 710 | - } |
|
| 711 | - if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 712 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 713 | - } |
|
| 714 | - |
|
| 715 | - foreach ($champs as $k => $v) { |
|
| 716 | - $v = _mysql_remplacements_definitions_table($v); |
|
| 717 | - if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 718 | - if ( |
|
| 719 | - preg_match(',(char|text),i', $defs[1]) |
|
| 720 | - and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
|
| 721 | - ) { |
|
| 722 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 723 | - } |
|
| 724 | - } |
|
| 725 | - |
|
| 726 | - $query .= "$s\n\t\t$k $v" |
|
| 727 | - . (($autoinc && ($p == $k) && preg_match(',\b(big|small|medium)?int\b,i', $v)) |
|
| 728 | - ? ' auto_increment' |
|
| 729 | - : '' |
|
| 730 | - ); |
|
| 731 | - $s = ','; |
|
| 732 | - } |
|
| 733 | - $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 734 | - $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 735 | - . (defined('_MYSQL_ENGINE') ? ' ENGINE=' . _MYSQL_ENGINE : '') |
|
| 736 | - . ($character_set ? " DEFAULT $character_set" : '') |
|
| 737 | - . "\n"; |
|
| 738 | - |
|
| 739 | - return spip_mysql_query($q, $serveur); |
|
| 682 | + $query = ''; |
|
| 683 | + $keys = ''; |
|
| 684 | + $s = ''; |
|
| 685 | + $p = ''; |
|
| 686 | + |
|
| 687 | + // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 688 | + // sans les renseigner (laisse le compilo recuperer la description) |
|
| 689 | + if (!is_array($champs) || !is_array($cles)) { |
|
| 690 | + return; |
|
| 691 | + } |
|
| 692 | + |
|
| 693 | + $res = spip_mysql_query('SELECT version() as v', $serveur); |
|
| 694 | + if (($row = mysqli_fetch_array($res)) && (version_compare($row['v'], '5.0', '>='))) { |
|
| 695 | + spip_mysql_query("SET sql_mode=''", $serveur); |
|
| 696 | + } |
|
| 697 | + |
|
| 698 | + foreach ($cles as $k => $v) { |
|
| 699 | + $keys .= "$s\n\t\t$k ($v)"; |
|
| 700 | + if ($k == 'PRIMARY KEY') { |
|
| 701 | + $p = $v; |
|
| 702 | + } |
|
| 703 | + $s = ','; |
|
| 704 | + } |
|
| 705 | + $s = ''; |
|
| 706 | + |
|
| 707 | + $character_set = ''; |
|
| 708 | + if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 709 | + $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 710 | + } |
|
| 711 | + if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 712 | + $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 713 | + } |
|
| 714 | + |
|
| 715 | + foreach ($champs as $k => $v) { |
|
| 716 | + $v = _mysql_remplacements_definitions_table($v); |
|
| 717 | + if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 718 | + if ( |
|
| 719 | + preg_match(',(char|text),i', $defs[1]) |
|
| 720 | + and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
|
| 721 | + ) { |
|
| 722 | + $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 723 | + } |
|
| 724 | + } |
|
| 725 | + |
|
| 726 | + $query .= "$s\n\t\t$k $v" |
|
| 727 | + . (($autoinc && ($p == $k) && preg_match(',\b(big|small|medium)?int\b,i', $v)) |
|
| 728 | + ? ' auto_increment' |
|
| 729 | + : '' |
|
| 730 | + ); |
|
| 731 | + $s = ','; |
|
| 732 | + } |
|
| 733 | + $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 734 | + $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 735 | + . (defined('_MYSQL_ENGINE') ? ' ENGINE=' . _MYSQL_ENGINE : '') |
|
| 736 | + . ($character_set ? " DEFAULT $character_set" : '') |
|
| 737 | + . "\n"; |
|
| 738 | + |
|
| 739 | + return spip_mysql_query($q, $serveur); |
|
| 740 | 740 | } |
| 741 | 741 | |
| 742 | 742 | |
@@ -749,25 +749,25 @@ discard block |
||
| 749 | 749 | * Définition SQL adaptée pour MySQL d'un champ de table |
| 750 | 750 | */ |
| 751 | 751 | function _mysql_remplacements_definitions_table($query) { |
| 752 | - // quelques remplacements |
|
| 753 | - $num = '(\s*\([0-9]*\))?'; |
|
| 754 | - $enum = '(\s*\([^\)]*\))?'; |
|
| 755 | - |
|
| 756 | - $remplace = [ |
|
| 757 | - '/VARCHAR(\s*[^\s\(])/is' => 'VARCHAR(255)\\1', |
|
| 758 | - '/^TIMESTAMP($| NULL DEFAULT NULL)/is' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', |
|
| 759 | - ]; |
|
| 760 | - |
|
| 761 | - if (is_string($query)) { |
|
| 762 | - $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 763 | - } elseif (is_array($query)) { |
|
| 764 | - $keys = array_keys($remplace); |
|
| 765 | - foreach ($query as $k => $q) { |
|
| 766 | - $query[$k] = preg_replace($keys, $remplace, $q); |
|
| 767 | - } |
|
| 768 | - } |
|
| 769 | - |
|
| 770 | - return $query; |
|
| 752 | + // quelques remplacements |
|
| 753 | + $num = '(\s*\([0-9]*\))?'; |
|
| 754 | + $enum = '(\s*\([^\)]*\))?'; |
|
| 755 | + |
|
| 756 | + $remplace = [ |
|
| 757 | + '/VARCHAR(\s*[^\s\(])/is' => 'VARCHAR(255)\\1', |
|
| 758 | + '/^TIMESTAMP($| NULL DEFAULT NULL)/is' => 'TIMESTAMP DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP', |
|
| 759 | + ]; |
|
| 760 | + |
|
| 761 | + if (is_string($query)) { |
|
| 762 | + $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 763 | + } elseif (is_array($query)) { |
|
| 764 | + $keys = array_keys($remplace); |
|
| 765 | + foreach ($query as $k => $q) { |
|
| 766 | + $query[$k] = preg_replace($keys, $remplace, $q); |
|
| 767 | + } |
|
| 768 | + } |
|
| 769 | + |
|
| 770 | + return $query; |
|
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | |
@@ -780,7 +780,7 @@ discard block |
||
| 780 | 780 | * @return bool true si la base est créee. |
| 781 | 781 | **/ |
| 782 | 782 | function spip_mysql_create_base($nom, $serveur = '', $requeter = true) { |
| 783 | - return spip_mysql_query("CREATE DATABASE `$nom`", $serveur, $requeter); |
|
| 783 | + return spip_mysql_query("CREATE DATABASE `$nom`", $serveur, $requeter); |
|
| 784 | 784 | } |
| 785 | 785 | |
| 786 | 786 | |
@@ -801,19 +801,19 @@ discard block |
||
| 801 | 801 | * - string texte de la requête si $requeter vaut false |
| 802 | 802 | */ |
| 803 | 803 | function spip_mysql_create_view($nom, $query_select, $serveur = '', $requeter = true) { |
| 804 | - if (!$query_select) { |
|
| 805 | - return false; |
|
| 806 | - } |
|
| 807 | - // vue deja presente |
|
| 808 | - if (sql_showtable($nom, false, $serveur)) { |
|
| 809 | - spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", _LOG_ERREUR); |
|
| 804 | + if (!$query_select) { |
|
| 805 | + return false; |
|
| 806 | + } |
|
| 807 | + // vue deja presente |
|
| 808 | + if (sql_showtable($nom, false, $serveur)) { |
|
| 809 | + spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", _LOG_ERREUR); |
|
| 810 | 810 | |
| 811 | - return false; |
|
| 812 | - } |
|
| 811 | + return false; |
|
| 812 | + } |
|
| 813 | 813 | |
| 814 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 814 | + $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 815 | 815 | |
| 816 | - return spip_mysql_query($query, $serveur, $requeter); |
|
| 816 | + return spip_mysql_query($query, $serveur, $requeter); |
|
| 817 | 817 | } |
| 818 | 818 | |
| 819 | 819 | |
@@ -829,11 +829,11 @@ discard block |
||
| 829 | 829 | * - true si la requête a réussie, false sinon |
| 830 | 830 | */ |
| 831 | 831 | function spip_mysql_drop_table($table, $exist = '', $serveur = '', $requeter = true) { |
| 832 | - if ($exist) { |
|
| 833 | - $exist = ' IF EXISTS'; |
|
| 834 | - } |
|
| 832 | + if ($exist) { |
|
| 833 | + $exist = ' IF EXISTS'; |
|
| 834 | + } |
|
| 835 | 835 | |
| 836 | - return spip_mysql_query("DROP TABLE$exist $table", $serveur, $requeter); |
|
| 836 | + return spip_mysql_query("DROP TABLE$exist $table", $serveur, $requeter); |
|
| 837 | 837 | } |
| 838 | 838 | |
| 839 | 839 | /** |
@@ -848,11 +848,11 @@ discard block |
||
| 848 | 848 | * - true si la requête a réussie, false sinon |
| 849 | 849 | */ |
| 850 | 850 | function spip_mysql_drop_view($view, $exist = '', $serveur = '', $requeter = true) { |
| 851 | - if ($exist) { |
|
| 852 | - $exist = ' IF EXISTS'; |
|
| 853 | - } |
|
| 851 | + if ($exist) { |
|
| 852 | + $exist = ' IF EXISTS'; |
|
| 853 | + } |
|
| 854 | 854 | |
| 855 | - return spip_mysql_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 855 | + return spip_mysql_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 856 | 856 | } |
| 857 | 857 | |
| 858 | 858 | /** |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | * Ressource à utiliser avec sql_fetch() |
| 870 | 870 | **/ |
| 871 | 871 | function spip_mysql_showbase($match, $serveur = '', $requeter = true) { |
| 872 | - return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 872 | + return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | 875 | /** |
@@ -885,17 +885,17 @@ discard block |
||
| 885 | 885 | * - true si la requête a réussie, false sinon |
| 886 | 886 | */ |
| 887 | 887 | function spip_mysql_repair($table, $serveur = '', $requeter = true) { |
| 888 | - $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = ' . _q($table), $serveur, true)); |
|
| 889 | - $engine = $table_status['Engine']; |
|
| 890 | - if ($engine == 'InnoDB') { |
|
| 891 | - if (spip_mysql_alter("TABLE $table ENGINE = InnoDB", $serveur, $requeter)) { |
|
| 892 | - return [' OK ']; |
|
| 893 | - } |
|
| 894 | - } elseif ($engine == 'MyISAM') { |
|
| 895 | - return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
|
| 896 | - } else { |
|
| 897 | - spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.' . _LOG_DEBUG); |
|
| 898 | - } |
|
| 888 | + $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = ' . _q($table), $serveur, true)); |
|
| 889 | + $engine = $table_status['Engine']; |
|
| 890 | + if ($engine == 'InnoDB') { |
|
| 891 | + if (spip_mysql_alter("TABLE $table ENGINE = InnoDB", $serveur, $requeter)) { |
|
| 892 | + return [' OK ']; |
|
| 893 | + } |
|
| 894 | + } elseif ($engine == 'MyISAM') { |
|
| 895 | + return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
|
| 896 | + } else { |
|
| 897 | + spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.' . _LOG_DEBUG); |
|
| 898 | + } |
|
| 899 | 899 | } |
| 900 | 900 | |
| 901 | 901 | /** |
@@ -913,12 +913,12 @@ discard block |
||
| 913 | 913 | * - string : requete sql, si $requeter = true |
| 914 | 914 | **/ |
| 915 | 915 | function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) { |
| 916 | - $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 917 | - if (!$requeter) { |
|
| 918 | - return $r; |
|
| 919 | - } |
|
| 920 | - $res = spip_mysql_fetch($r); |
|
| 921 | - return (bool) $res; |
|
| 916 | + $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 917 | + if (!$requeter) { |
|
| 918 | + return $r; |
|
| 919 | + } |
|
| 920 | + $res = spip_mysql_fetch($r); |
|
| 921 | + return (bool) $res; |
|
| 922 | 922 | } |
| 923 | 923 | |
| 924 | 924 | define('_MYSQL_RE_SHOW_TABLE', '/^[^(),]*\(((?:[^()]*\((?:[^()]*\([^()]*\))?[^()]*\)[^()]*)*[^()]*)\)[^()]*$/'); |
@@ -941,86 +941,86 @@ discard block |
||
| 941 | 941 | * - array description de la table sinon |
| 942 | 942 | */ |
| 943 | 943 | function spip_mysql_showtable($nom_table, $serveur = '', $requeter = true) { |
| 944 | - $s = spip_mysql_query("SHOW CREATE TABLE `$nom_table`", $serveur, $requeter); |
|
| 945 | - if (!$s) { |
|
| 946 | - return ''; |
|
| 947 | - } |
|
| 948 | - if (!$requeter) { |
|
| 949 | - return $s; |
|
| 950 | - } |
|
| 951 | - |
|
| 952 | - [, $a] = mysqli_fetch_array($s, MYSQLI_NUM); |
|
| 953 | - if (preg_match(_MYSQL_RE_SHOW_TABLE, $a, $r)) { |
|
| 954 | - $desc = $r[1]; |
|
| 955 | - // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 956 | - // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 957 | - if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 958 | - $namedkeys = $r[2]; |
|
| 959 | - $desc = $r[1]; |
|
| 960 | - } else { |
|
| 961 | - $namedkeys = ''; |
|
| 962 | - } |
|
| 963 | - |
|
| 964 | - $fields = []; |
|
| 965 | - foreach (preg_split('/,\s*`/', $desc) as $v) { |
|
| 966 | - preg_match('/^\s*`?([^`]*)`\s*(.*)/', $v, $r); |
|
| 967 | - $fields[strtolower($r[1])] = $r[2]; |
|
| 968 | - } |
|
| 969 | - $keys = []; |
|
| 970 | - |
|
| 971 | - foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 972 | - if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 973 | - $k = str_replace('`', '', trim($r[1])); |
|
| 974 | - $t = strtolower(str_replace('`', '', $r[2])); |
|
| 975 | - if ($k && !isset($keys[$k])) { |
|
| 976 | - $keys[$k] = $t; |
|
| 977 | - } else { |
|
| 978 | - $keys[] = $t; |
|
| 979 | - } |
|
| 980 | - } |
|
| 981 | - } |
|
| 982 | - spip_mysql_free($s); |
|
| 983 | - |
|
| 984 | - return ['field' => $fields, 'key' => $keys]; |
|
| 985 | - } |
|
| 986 | - |
|
| 987 | - $res = spip_mysql_query("SHOW COLUMNS FROM `$nom_table`", $serveur); |
|
| 988 | - if ($res) { |
|
| 989 | - $nfields = []; |
|
| 990 | - $nkeys = []; |
|
| 991 | - while ($val = spip_mysql_fetch($res)) { |
|
| 992 | - $nfields[$val['Field']] = $val['Type']; |
|
| 993 | - if ($val['Null'] == 'NO') { |
|
| 994 | - $nfields[$val['Field']] .= ' NOT NULL'; |
|
| 995 | - } |
|
| 996 | - if ($val['Default'] === '0' || $val['Default']) { |
|
| 997 | - if (preg_match('/[A-Z_]/', $val['Default'])) { |
|
| 998 | - $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 999 | - } else { |
|
| 1000 | - $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 1001 | - } |
|
| 1002 | - } |
|
| 1003 | - if ($val['Extra']) { |
|
| 1004 | - $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 1005 | - } |
|
| 1006 | - if ($val['Key'] == 'PRI') { |
|
| 1007 | - $nkeys['PRIMARY KEY'] = $val['Field']; |
|
| 1008 | - } else { |
|
| 1009 | - if ($val['Key'] == 'MUL') { |
|
| 1010 | - $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 1011 | - } else { |
|
| 1012 | - if ($val['Key'] == 'UNI') { |
|
| 1013 | - $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 1014 | - } |
|
| 1015 | - } |
|
| 1016 | - } |
|
| 1017 | - } |
|
| 1018 | - spip_mysql_free($res); |
|
| 1019 | - |
|
| 1020 | - return ['field' => $nfields, 'key' => $nkeys]; |
|
| 1021 | - } |
|
| 1022 | - |
|
| 1023 | - return ''; |
|
| 944 | + $s = spip_mysql_query("SHOW CREATE TABLE `$nom_table`", $serveur, $requeter); |
|
| 945 | + if (!$s) { |
|
| 946 | + return ''; |
|
| 947 | + } |
|
| 948 | + if (!$requeter) { |
|
| 949 | + return $s; |
|
| 950 | + } |
|
| 951 | + |
|
| 952 | + [, $a] = mysqli_fetch_array($s, MYSQLI_NUM); |
|
| 953 | + if (preg_match(_MYSQL_RE_SHOW_TABLE, $a, $r)) { |
|
| 954 | + $desc = $r[1]; |
|
| 955 | + // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 956 | + // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 957 | + if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 958 | + $namedkeys = $r[2]; |
|
| 959 | + $desc = $r[1]; |
|
| 960 | + } else { |
|
| 961 | + $namedkeys = ''; |
|
| 962 | + } |
|
| 963 | + |
|
| 964 | + $fields = []; |
|
| 965 | + foreach (preg_split('/,\s*`/', $desc) as $v) { |
|
| 966 | + preg_match('/^\s*`?([^`]*)`\s*(.*)/', $v, $r); |
|
| 967 | + $fields[strtolower($r[1])] = $r[2]; |
|
| 968 | + } |
|
| 969 | + $keys = []; |
|
| 970 | + |
|
| 971 | + foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 972 | + if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 973 | + $k = str_replace('`', '', trim($r[1])); |
|
| 974 | + $t = strtolower(str_replace('`', '', $r[2])); |
|
| 975 | + if ($k && !isset($keys[$k])) { |
|
| 976 | + $keys[$k] = $t; |
|
| 977 | + } else { |
|
| 978 | + $keys[] = $t; |
|
| 979 | + } |
|
| 980 | + } |
|
| 981 | + } |
|
| 982 | + spip_mysql_free($s); |
|
| 983 | + |
|
| 984 | + return ['field' => $fields, 'key' => $keys]; |
|
| 985 | + } |
|
| 986 | + |
|
| 987 | + $res = spip_mysql_query("SHOW COLUMNS FROM `$nom_table`", $serveur); |
|
| 988 | + if ($res) { |
|
| 989 | + $nfields = []; |
|
| 990 | + $nkeys = []; |
|
| 991 | + while ($val = spip_mysql_fetch($res)) { |
|
| 992 | + $nfields[$val['Field']] = $val['Type']; |
|
| 993 | + if ($val['Null'] == 'NO') { |
|
| 994 | + $nfields[$val['Field']] .= ' NOT NULL'; |
|
| 995 | + } |
|
| 996 | + if ($val['Default'] === '0' || $val['Default']) { |
|
| 997 | + if (preg_match('/[A-Z_]/', $val['Default'])) { |
|
| 998 | + $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 999 | + } else { |
|
| 1000 | + $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 1001 | + } |
|
| 1002 | + } |
|
| 1003 | + if ($val['Extra']) { |
|
| 1004 | + $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 1005 | + } |
|
| 1006 | + if ($val['Key'] == 'PRI') { |
|
| 1007 | + $nkeys['PRIMARY KEY'] = $val['Field']; |
|
| 1008 | + } else { |
|
| 1009 | + if ($val['Key'] == 'MUL') { |
|
| 1010 | + $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 1011 | + } else { |
|
| 1012 | + if ($val['Key'] == 'UNI') { |
|
| 1013 | + $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 1014 | + } |
|
| 1015 | + } |
|
| 1016 | + } |
|
| 1017 | + } |
|
| 1018 | + spip_mysql_free($res); |
|
| 1019 | + |
|
| 1020 | + return ['field' => $nfields, 'key' => $nkeys]; |
|
| 1021 | + } |
|
| 1022 | + |
|
| 1023 | + return ''; |
|
| 1024 | 1024 | } |
| 1025 | 1025 | |
| 1026 | 1026 | |
@@ -1039,13 +1039,13 @@ discard block |
||
| 1039 | 1039 | * - false Erreur |
| 1040 | 1040 | */ |
| 1041 | 1041 | function spip_mysql_fetch($r, $t = '', $serveur = '', $requeter = true) { |
| 1042 | - if (!$t) { |
|
| 1043 | - $t = \MYSQLI_ASSOC; |
|
| 1044 | - } |
|
| 1045 | - if ($r) { |
|
| 1046 | - return mysqli_fetch_array($r, $t); |
|
| 1047 | - } |
|
| 1048 | - return false; |
|
| 1042 | + if (!$t) { |
|
| 1043 | + $t = \MYSQLI_ASSOC; |
|
| 1044 | + } |
|
| 1045 | + if ($r) { |
|
| 1046 | + return mysqli_fetch_array($r, $t); |
|
| 1047 | + } |
|
| 1048 | + return false; |
|
| 1049 | 1049 | } |
| 1050 | 1050 | |
| 1051 | 1051 | /** |
@@ -1058,9 +1058,9 @@ discard block |
||
| 1058 | 1058 | * @return bool True si déplacement réussi, false sinon. |
| 1059 | 1059 | **/ |
| 1060 | 1060 | function spip_mysql_seek($r, $row_number, $serveur = '', $requeter = true) { |
| 1061 | - if ($r and mysqli_num_rows($r)) { |
|
| 1062 | - return mysqli_data_seek($r, $row_number); |
|
| 1063 | - } |
|
| 1061 | + if ($r and mysqli_num_rows($r)) { |
|
| 1062 | + return mysqli_data_seek($r, $row_number); |
|
| 1063 | + } |
|
| 1064 | 1064 | } |
| 1065 | 1065 | |
| 1066 | 1066 | |
@@ -1078,26 +1078,26 @@ discard block |
||
| 1078 | 1078 | * - int Nombre de lignes (0 si la requête n'a pas réussie) |
| 1079 | 1079 | **/ |
| 1080 | 1080 | function spip_mysql_countsel( |
| 1081 | - $from = [], |
|
| 1082 | - $where = [], |
|
| 1083 | - $groupby = '', |
|
| 1084 | - $having = [], |
|
| 1085 | - $serveur = '', |
|
| 1086 | - $requeter = true |
|
| 1081 | + $from = [], |
|
| 1082 | + $where = [], |
|
| 1083 | + $groupby = '', |
|
| 1084 | + $having = [], |
|
| 1085 | + $serveur = '', |
|
| 1086 | + $requeter = true |
|
| 1087 | 1087 | ) { |
| 1088 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1089 | - |
|
| 1090 | - $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 1091 | - if (!$requeter) { |
|
| 1092 | - return $r; |
|
| 1093 | - } |
|
| 1094 | - if (!$r instanceof mysqli_result) { |
|
| 1095 | - return 0; |
|
| 1096 | - } |
|
| 1097 | - [$c] = mysqli_fetch_array($r, MYSQLI_NUM); |
|
| 1098 | - mysqli_free_result($r); |
|
| 1099 | - |
|
| 1100 | - return intval($c); |
|
| 1088 | + $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1089 | + |
|
| 1090 | + $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 1091 | + if (!$requeter) { |
|
| 1092 | + return $r; |
|
| 1093 | + } |
|
| 1094 | + if (!$r instanceof mysqli_result) { |
|
| 1095 | + return 0; |
|
| 1096 | + } |
|
| 1097 | + [$c] = mysqli_fetch_array($r, MYSQLI_NUM); |
|
| 1098 | + mysqli_free_result($r); |
|
| 1099 | + |
|
| 1100 | + return intval($c); |
|
| 1101 | 1101 | } |
| 1102 | 1102 | |
| 1103 | 1103 | |
@@ -1120,16 +1120,16 @@ discard block |
||
| 1120 | 1120 | * Erreur eventuelle |
| 1121 | 1121 | **/ |
| 1122 | 1122 | function spip_mysql_error($query = '', $serveur = '', $requeter = true) { |
| 1123 | - $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1124 | - $s = mysqli_error($link); |
|
| 1125 | - if ($s) { |
|
| 1126 | - $trace = debug_backtrace(); |
|
| 1127 | - if ($trace[0]['function'] != 'spip_mysql_error') { |
|
| 1128 | - spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1129 | - } |
|
| 1130 | - } |
|
| 1131 | - |
|
| 1132 | - return $s; |
|
| 1123 | + $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1124 | + $s = mysqli_error($link); |
|
| 1125 | + if ($s) { |
|
| 1126 | + $trace = debug_backtrace(); |
|
| 1127 | + if ($trace[0]['function'] != 'spip_mysql_error') { |
|
| 1128 | + spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1129 | + } |
|
| 1130 | + } |
|
| 1131 | + |
|
| 1132 | + return $s; |
|
| 1133 | 1133 | } |
| 1134 | 1134 | |
| 1135 | 1135 | |
@@ -1144,18 +1144,18 @@ discard block |
||
| 1144 | 1144 | * 0, pas d'erreur. Autre, numéro de l'erreur. |
| 1145 | 1145 | **/ |
| 1146 | 1146 | function spip_mysql_errno($serveur = '', $requeter = true) { |
| 1147 | - $link = $GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 1148 | - $s = mysqli_errno($link); |
|
| 1149 | - // 2006 MySQL server has gone away |
|
| 1150 | - // 2013 Lost connection to MySQL server during query |
|
| 1151 | - if (in_array($s, [2006, 2013])) { |
|
| 1152 | - define('spip_interdire_cache', true); |
|
| 1153 | - } |
|
| 1154 | - if ($s) { |
|
| 1155 | - spip_log("Erreur mysql $s", _LOG_ERREUR); |
|
| 1156 | - } |
|
| 1157 | - |
|
| 1158 | - return $s; |
|
| 1147 | + $link = $GLOBALS['connexions'][$serveur ?: 0]['link']; |
|
| 1148 | + $s = mysqli_errno($link); |
|
| 1149 | + // 2006 MySQL server has gone away |
|
| 1150 | + // 2013 Lost connection to MySQL server during query |
|
| 1151 | + if (in_array($s, [2006, 2013])) { |
|
| 1152 | + define('spip_interdire_cache', true); |
|
| 1153 | + } |
|
| 1154 | + if ($s) { |
|
| 1155 | + spip_log("Erreur mysql $s", _LOG_ERREUR); |
|
| 1156 | + } |
|
| 1157 | + |
|
| 1158 | + return $s; |
|
| 1159 | 1159 | } |
| 1160 | 1160 | |
| 1161 | 1161 | |
@@ -1169,9 +1169,9 @@ discard block |
||
| 1169 | 1169 | * @return int Nombre de lignes |
| 1170 | 1170 | */ |
| 1171 | 1171 | function spip_mysql_count($r, $serveur = '', $requeter = true) { |
| 1172 | - if ($r) { |
|
| 1173 | - return mysqli_num_rows($r); |
|
| 1174 | - } |
|
| 1172 | + if ($r) { |
|
| 1173 | + return mysqli_num_rows($r); |
|
| 1174 | + } |
|
| 1175 | 1175 | } |
| 1176 | 1176 | |
| 1177 | 1177 | |
@@ -1187,7 +1187,7 @@ discard block |
||
| 1187 | 1187 | * @return bool True si réussi |
| 1188 | 1188 | */ |
| 1189 | 1189 | function spip_mysql_free($r, $serveur = '', $requeter = true) { |
| 1190 | - return (($r instanceof mysqli_result) ? mysqli_free_result($r) : false); |
|
| 1190 | + return (($r instanceof mysqli_result) ? mysqli_free_result($r) : false); |
|
| 1191 | 1191 | } |
| 1192 | 1192 | |
| 1193 | 1193 | |
@@ -1215,59 +1215,59 @@ discard block |
||
| 1215 | 1215 | **/ |
| 1216 | 1216 | function spip_mysql_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) { |
| 1217 | 1217 | |
| 1218 | - $e = null; |
|
| 1219 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1220 | - $link = $connexion['link']; |
|
| 1221 | - $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1222 | - |
|
| 1223 | - // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 1224 | - if ( |
|
| 1225 | - defined('_MYSQL_NOPLANES') |
|
| 1226 | - and _MYSQL_NOPLANES |
|
| 1227 | - and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 1228 | - and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 1229 | - ) { |
|
| 1230 | - include_spip('inc/charsets'); |
|
| 1231 | - $valeurs = utf8_noplanes($valeurs); |
|
| 1232 | - } |
|
| 1233 | - |
|
| 1234 | - $query = "INSERT INTO $table $champs VALUES $valeurs"; |
|
| 1235 | - if (!$requeter) { |
|
| 1236 | - return $query; |
|
| 1237 | - } |
|
| 1238 | - |
|
| 1239 | - if (isset($_GET['var_profile'])) { |
|
| 1240 | - include_spip('public/tracer'); |
|
| 1241 | - $t = trace_query_start(); |
|
| 1242 | - $e = ''; |
|
| 1243 | - } else { |
|
| 1244 | - $t = 0; |
|
| 1245 | - } |
|
| 1246 | - |
|
| 1247 | - $connexion['last'] = $query; |
|
| 1248 | - #spip_log($query, 'mysql.'._LOG_DEBUG); |
|
| 1249 | - $r = false; |
|
| 1250 | - $insert = false; |
|
| 1251 | - try { |
|
| 1252 | - $insert = mysqli_query($link, $query); |
|
| 1253 | - } catch (\mysqli_sql_exception $e) { |
|
| 1254 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1255 | - // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 1256 | - // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 1257 | - } |
|
| 1258 | - if ($insert) { |
|
| 1259 | - $r = mysqli_insert_id($link); |
|
| 1260 | - } else { |
|
| 1261 | - // Log de l'erreur eventuelle |
|
| 1262 | - if ($e = spip_mysql_errno($serveur)) { |
|
| 1263 | - // et du fautif |
|
| 1264 | - $e .= spip_mysql_error($query, $serveur); |
|
| 1265 | - } |
|
| 1266 | - } |
|
| 1267 | - |
|
| 1268 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 1269 | - |
|
| 1270 | - // return $r ? $r : (($r===0) ? -1 : 0); pb avec le multi-base. |
|
| 1218 | + $e = null; |
|
| 1219 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1220 | + $link = $connexion['link']; |
|
| 1221 | + $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1222 | + |
|
| 1223 | + // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
|
| 1224 | + if ( |
|
| 1225 | + defined('_MYSQL_NOPLANES') |
|
| 1226 | + and _MYSQL_NOPLANES |
|
| 1227 | + and !empty($GLOBALS['meta']['charset_sql_connexion']) |
|
| 1228 | + and $GLOBALS['meta']['charset_sql_connexion'] == 'utf8' |
|
| 1229 | + ) { |
|
| 1230 | + include_spip('inc/charsets'); |
|
| 1231 | + $valeurs = utf8_noplanes($valeurs); |
|
| 1232 | + } |
|
| 1233 | + |
|
| 1234 | + $query = "INSERT INTO $table $champs VALUES $valeurs"; |
|
| 1235 | + if (!$requeter) { |
|
| 1236 | + return $query; |
|
| 1237 | + } |
|
| 1238 | + |
|
| 1239 | + if (isset($_GET['var_profile'])) { |
|
| 1240 | + include_spip('public/tracer'); |
|
| 1241 | + $t = trace_query_start(); |
|
| 1242 | + $e = ''; |
|
| 1243 | + } else { |
|
| 1244 | + $t = 0; |
|
| 1245 | + } |
|
| 1246 | + |
|
| 1247 | + $connexion['last'] = $query; |
|
| 1248 | + #spip_log($query, 'mysql.'._LOG_DEBUG); |
|
| 1249 | + $r = false; |
|
| 1250 | + $insert = false; |
|
| 1251 | + try { |
|
| 1252 | + $insert = mysqli_query($link, $query); |
|
| 1253 | + } catch (\mysqli_sql_exception $e) { |
|
| 1254 | + spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1255 | + // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
|
| 1256 | + // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
|
| 1257 | + } |
|
| 1258 | + if ($insert) { |
|
| 1259 | + $r = mysqli_insert_id($link); |
|
| 1260 | + } else { |
|
| 1261 | + // Log de l'erreur eventuelle |
|
| 1262 | + if ($e = spip_mysql_errno($serveur)) { |
|
| 1263 | + // et du fautif |
|
| 1264 | + $e .= spip_mysql_error($query, $serveur); |
|
| 1265 | + } |
|
| 1266 | + } |
|
| 1267 | + |
|
| 1268 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 1269 | + |
|
| 1270 | + // return $r ? $r : (($r===0) ? -1 : 0); pb avec le multi-base. |
|
| 1271 | 1271 | } |
| 1272 | 1272 | |
| 1273 | 1273 | /** |
@@ -1292,26 +1292,26 @@ discard block |
||
| 1292 | 1292 | **/ |
| 1293 | 1293 | function spip_mysql_insertq($table, $couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 1294 | 1294 | |
| 1295 | - if (!$desc) { |
|
| 1296 | - $desc = description_table($table, $serveur); |
|
| 1297 | - } |
|
| 1298 | - if (!$desc) { |
|
| 1299 | - $couples = []; |
|
| 1300 | - } |
|
| 1301 | - $fields = $desc['field'] ?? []; |
|
| 1302 | - |
|
| 1303 | - foreach ($couples as $champ => $val) { |
|
| 1304 | - $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1305 | - } |
|
| 1306 | - |
|
| 1307 | - return spip_mysql_insert( |
|
| 1308 | - $table, |
|
| 1309 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 1310 | - '(' . join(',', $couples) . ')', |
|
| 1311 | - $desc, |
|
| 1312 | - $serveur, |
|
| 1313 | - $requeter |
|
| 1314 | - ); |
|
| 1295 | + if (!$desc) { |
|
| 1296 | + $desc = description_table($table, $serveur); |
|
| 1297 | + } |
|
| 1298 | + if (!$desc) { |
|
| 1299 | + $couples = []; |
|
| 1300 | + } |
|
| 1301 | + $fields = $desc['field'] ?? []; |
|
| 1302 | + |
|
| 1303 | + foreach ($couples as $champ => $val) { |
|
| 1304 | + $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1305 | + } |
|
| 1306 | + |
|
| 1307 | + return spip_mysql_insert( |
|
| 1308 | + $table, |
|
| 1309 | + '(' . join(',', array_keys($couples)) . ')', |
|
| 1310 | + '(' . join(',', $couples) . ')', |
|
| 1311 | + $desc, |
|
| 1312 | + $serveur, |
|
| 1313 | + $requeter |
|
| 1314 | + ); |
|
| 1315 | 1315 | } |
| 1316 | 1316 | |
| 1317 | 1317 | |
@@ -1336,34 +1336,34 @@ discard block |
||
| 1336 | 1336 | **/ |
| 1337 | 1337 | function spip_mysql_insertq_multi($table, $tab_couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 1338 | 1338 | |
| 1339 | - if (!$desc) { |
|
| 1340 | - $desc = description_table($table, $serveur); |
|
| 1341 | - } |
|
| 1342 | - if (!$desc) { |
|
| 1343 | - $tab_couples = []; |
|
| 1344 | - } |
|
| 1345 | - $fields = $desc['field'] ?? []; |
|
| 1346 | - |
|
| 1347 | - $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1348 | - $valeurs = []; |
|
| 1349 | - $r = false; |
|
| 1350 | - |
|
| 1351 | - // Quoter et Inserer par groupes de 100 max pour eviter un debordement de pile |
|
| 1352 | - foreach ($tab_couples as $couples) { |
|
| 1353 | - foreach ($couples as $champ => $val) { |
|
| 1354 | - $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1355 | - } |
|
| 1356 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1357 | - if (count($valeurs) >= 100) { |
|
| 1358 | - $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1359 | - $valeurs = []; |
|
| 1360 | - } |
|
| 1361 | - } |
|
| 1362 | - if (count($valeurs)) { |
|
| 1363 | - $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1364 | - } |
|
| 1365 | - |
|
| 1366 | - return $r; // dans le cas d'une table auto_increment, le dernier insert_id |
|
| 1339 | + if (!$desc) { |
|
| 1340 | + $desc = description_table($table, $serveur); |
|
| 1341 | + } |
|
| 1342 | + if (!$desc) { |
|
| 1343 | + $tab_couples = []; |
|
| 1344 | + } |
|
| 1345 | + $fields = $desc['field'] ?? []; |
|
| 1346 | + |
|
| 1347 | + $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1348 | + $valeurs = []; |
|
| 1349 | + $r = false; |
|
| 1350 | + |
|
| 1351 | + // Quoter et Inserer par groupes de 100 max pour eviter un debordement de pile |
|
| 1352 | + foreach ($tab_couples as $couples) { |
|
| 1353 | + foreach ($couples as $champ => $val) { |
|
| 1354 | + $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
|
| 1355 | + } |
|
| 1356 | + $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1357 | + if (count($valeurs) >= 100) { |
|
| 1358 | + $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1359 | + $valeurs = []; |
|
| 1360 | + } |
|
| 1361 | + } |
|
| 1362 | + if (count($valeurs)) { |
|
| 1363 | + $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
|
| 1364 | + } |
|
| 1365 | + |
|
| 1366 | + return $r; // dans le cas d'une table auto_increment, le dernier insert_id |
|
| 1367 | 1367 | } |
| 1368 | 1368 | |
| 1369 | 1369 | /** |
@@ -1388,19 +1388,19 @@ discard block |
||
| 1388 | 1388 | * - array Tableau décrivant la requête et son temps d'exécution si var_profile est actif |
| 1389 | 1389 | */ |
| 1390 | 1390 | function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1391 | - $set = []; |
|
| 1392 | - foreach ($champs as $champ => $val) { |
|
| 1393 | - $set[] = $champ . "=$val"; |
|
| 1394 | - } |
|
| 1395 | - if (!empty($set)) { |
|
| 1396 | - return spip_mysql_query( |
|
| 1397 | - calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1398 | - . calculer_mysql_expression('SET', $set, ',') |
|
| 1399 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1400 | - $serveur, |
|
| 1401 | - $requeter |
|
| 1402 | - ); |
|
| 1403 | - } |
|
| 1391 | + $set = []; |
|
| 1392 | + foreach ($champs as $champ => $val) { |
|
| 1393 | + $set[] = $champ . "=$val"; |
|
| 1394 | + } |
|
| 1395 | + if (!empty($set)) { |
|
| 1396 | + return spip_mysql_query( |
|
| 1397 | + calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1398 | + . calculer_mysql_expression('SET', $set, ',') |
|
| 1399 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1400 | + $serveur, |
|
| 1401 | + $requeter |
|
| 1402 | + ); |
|
| 1403 | + } |
|
| 1404 | 1404 | } |
| 1405 | 1405 | |
| 1406 | 1406 | /** |
@@ -1433,29 +1433,29 @@ discard block |
||
| 1433 | 1433 | */ |
| 1434 | 1434 | function spip_mysql_updateq($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1435 | 1435 | |
| 1436 | - if (!$champs) { |
|
| 1437 | - return; |
|
| 1438 | - } |
|
| 1439 | - if (!$desc) { |
|
| 1440 | - $desc = description_table($table, $serveur); |
|
| 1441 | - } |
|
| 1442 | - if (!$desc) { |
|
| 1443 | - $champs = []; |
|
| 1444 | - } else { |
|
| 1445 | - $fields = $desc['field']; |
|
| 1446 | - } |
|
| 1447 | - $set = []; |
|
| 1448 | - foreach ($champs as $champ => $val) { |
|
| 1449 | - $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1450 | - } |
|
| 1451 | - |
|
| 1452 | - return spip_mysql_query( |
|
| 1453 | - calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1454 | - . calculer_mysql_expression('SET', $set, ',') |
|
| 1455 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1456 | - $serveur, |
|
| 1457 | - $requeter |
|
| 1458 | - ); |
|
| 1436 | + if (!$champs) { |
|
| 1437 | + return; |
|
| 1438 | + } |
|
| 1439 | + if (!$desc) { |
|
| 1440 | + $desc = description_table($table, $serveur); |
|
| 1441 | + } |
|
| 1442 | + if (!$desc) { |
|
| 1443 | + $champs = []; |
|
| 1444 | + } else { |
|
| 1445 | + $fields = $desc['field']; |
|
| 1446 | + } |
|
| 1447 | + $set = []; |
|
| 1448 | + foreach ($champs as $champ => $val) { |
|
| 1449 | + $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1450 | + } |
|
| 1451 | + |
|
| 1452 | + return spip_mysql_query( |
|
| 1453 | + calculer_mysql_expression('UPDATE', $table, ',') |
|
| 1454 | + . calculer_mysql_expression('SET', $set, ',') |
|
| 1455 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1456 | + $serveur, |
|
| 1457 | + $requeter |
|
| 1458 | + ); |
|
| 1459 | 1459 | } |
| 1460 | 1460 | |
| 1461 | 1461 | /** |
@@ -1471,22 +1471,22 @@ discard block |
||
| 1471 | 1471 | * - false en cas d'erreur. |
| 1472 | 1472 | **/ |
| 1473 | 1473 | function spip_mysql_delete($table, $where = '', $serveur = '', $requeter = true) { |
| 1474 | - $res = spip_mysql_query( |
|
| 1475 | - calculer_mysql_expression('DELETE FROM', $table, ',') |
|
| 1476 | - . calculer_mysql_expression('WHERE', $where), |
|
| 1477 | - $serveur, |
|
| 1478 | - $requeter |
|
| 1479 | - ); |
|
| 1480 | - if (!$requeter) { |
|
| 1481 | - return $res; |
|
| 1482 | - } |
|
| 1483 | - if ($res) { |
|
| 1484 | - $link = _mysql_link($serveur); |
|
| 1485 | - |
|
| 1486 | - return mysqli_affected_rows($link); |
|
| 1487 | - } else { |
|
| 1488 | - return false; |
|
| 1489 | - } |
|
| 1474 | + $res = spip_mysql_query( |
|
| 1475 | + calculer_mysql_expression('DELETE FROM', $table, ',') |
|
| 1476 | + . calculer_mysql_expression('WHERE', $where), |
|
| 1477 | + $serveur, |
|
| 1478 | + $requeter |
|
| 1479 | + ); |
|
| 1480 | + if (!$requeter) { |
|
| 1481 | + return $res; |
|
| 1482 | + } |
|
| 1483 | + if ($res) { |
|
| 1484 | + $link = _mysql_link($serveur); |
|
| 1485 | + |
|
| 1486 | + return mysqli_affected_rows($link); |
|
| 1487 | + } else { |
|
| 1488 | + return false; |
|
| 1489 | + } |
|
| 1490 | 1490 | } |
| 1491 | 1491 | |
| 1492 | 1492 | |
@@ -1515,10 +1515,10 @@ discard block |
||
| 1515 | 1515 | * - false en cas d'erreur. |
| 1516 | 1516 | **/ |
| 1517 | 1517 | function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) { |
| 1518 | - return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1519 | - ',', |
|
| 1520 | - array_map('_q', $couples) |
|
| 1521 | - ) . ')', $serveur, $requeter); |
|
| 1518 | + return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1519 | + ',', |
|
| 1520 | + array_map('_q', $couples) |
|
| 1521 | + ) . ')', $serveur, $requeter); |
|
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | |
@@ -1547,14 +1547,14 @@ discard block |
||
| 1547 | 1547 | * - false en cas d'erreur. |
| 1548 | 1548 | **/ |
| 1549 | 1549 | function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1550 | - $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1551 | - $valeurs = []; |
|
| 1552 | - foreach ($tab_couples as $couples) { |
|
| 1553 | - $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1554 | - } |
|
| 1555 | - $valeurs = implode(', ', $valeurs); |
|
| 1556 | - |
|
| 1557 | - return spip_mysql_query("REPLACE $table $cles VALUES $valeurs", $serveur, $requeter); |
|
| 1550 | + $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1551 | + $valeurs = []; |
|
| 1552 | + foreach ($tab_couples as $couples) { |
|
| 1553 | + $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1554 | + } |
|
| 1555 | + $valeurs = implode(', ', $valeurs); |
|
| 1556 | + |
|
| 1557 | + return spip_mysql_query("REPLACE $table $cles VALUES $valeurs", $serveur, $requeter); |
|
| 1558 | 1558 | } |
| 1559 | 1559 | |
| 1560 | 1560 | |
@@ -1569,32 +1569,32 @@ discard block |
||
| 1569 | 1569 | * @return string texte de sélection pour la requête |
| 1570 | 1570 | */ |
| 1571 | 1571 | function spip_mysql_multi($objet, $lang) { |
| 1572 | - $lengthlang = strlen("[$lang]"); |
|
| 1573 | - $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1574 | - $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1575 | - $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1576 | - $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1577 | - $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1578 | - $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1579 | - $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
|
| 1580 | - $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1581 | - $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1582 | - $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
|
| 1583 | - //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
|
| 1584 | - $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1585 | - ' TRIM(' . $objet . '), ' . |
|
| 1586 | - ' CONCAT( ' . |
|
| 1587 | - " $debutchaine, " . |
|
| 1588 | - ' IF( ' . |
|
| 1589 | - " $poslang = 0, " . |
|
| 1590 | - " $chainemulti, " . |
|
| 1591 | - " $chainelang" . |
|
| 1592 | - ' ), ' . |
|
| 1593 | - " $finchaine" . |
|
| 1594 | - ' ) ' . |
|
| 1595 | - '))) AS multi'; |
|
| 1596 | - |
|
| 1597 | - return $retour; |
|
| 1572 | + $lengthlang = strlen("[$lang]"); |
|
| 1573 | + $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1574 | + $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1575 | + $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1576 | + $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1577 | + $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1578 | + $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1579 | + $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
|
| 1580 | + $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1581 | + $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1582 | + $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
|
| 1583 | + //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
|
| 1584 | + $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1585 | + ' TRIM(' . $objet . '), ' . |
|
| 1586 | + ' CONCAT( ' . |
|
| 1587 | + " $debutchaine, " . |
|
| 1588 | + ' IF( ' . |
|
| 1589 | + " $poslang = 0, " . |
|
| 1590 | + " $chainemulti, " . |
|
| 1591 | + " $chainelang" . |
|
| 1592 | + ' ), ' . |
|
| 1593 | + " $finchaine" . |
|
| 1594 | + ' ) ' . |
|
| 1595 | + '))) AS multi'; |
|
| 1596 | + |
|
| 1597 | + return $retour; |
|
| 1598 | 1598 | } |
| 1599 | 1599 | |
| 1600 | 1600 | /** |
@@ -1608,7 +1608,7 @@ discard block |
||
| 1608 | 1608 | * Valeur hexadécimale pour MySQL |
| 1609 | 1609 | **/ |
| 1610 | 1610 | function spip_mysql_hex($v) { |
| 1611 | - return '0x' . $v; |
|
| 1611 | + return '0x' . $v; |
|
| 1612 | 1612 | } |
| 1613 | 1613 | |
| 1614 | 1614 | /** |
@@ -1624,15 +1624,15 @@ discard block |
||
| 1624 | 1624 | * Donnée prête à être utilisée par le gestionnaire SQL |
| 1625 | 1625 | */ |
| 1626 | 1626 | function spip_mysql_quote($v, $type = '') { |
| 1627 | - if (!is_array($v)) { |
|
| 1628 | - return spip_mysql_cite($v, $type); |
|
| 1629 | - } |
|
| 1630 | - |
|
| 1631 | - // si c'est un tableau, le parcourir en propageant le type |
|
| 1632 | - foreach ($v as $k => $r) { |
|
| 1633 | - $v[$k] = spip_mysql_quote($r, $type); |
|
| 1634 | - } |
|
| 1635 | - return implode(',', $v); |
|
| 1627 | + if (!is_array($v)) { |
|
| 1628 | + return spip_mysql_cite($v, $type); |
|
| 1629 | + } |
|
| 1630 | + |
|
| 1631 | + // si c'est un tableau, le parcourir en propageant le type |
|
| 1632 | + foreach ($v as $k => $r) { |
|
| 1633 | + $v[$k] = spip_mysql_quote($r, $type); |
|
| 1634 | + } |
|
| 1635 | + return implode(',', $v); |
|
| 1636 | 1636 | } |
| 1637 | 1637 | |
| 1638 | 1638 | /** |
@@ -1648,18 +1648,18 @@ discard block |
||
| 1648 | 1648 | * Expression SQL |
| 1649 | 1649 | **/ |
| 1650 | 1650 | function spip_mysql_date_proche($champ, $interval, $unite) { |
| 1651 | - $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1652 | - return '(' |
|
| 1653 | - . $champ |
|
| 1654 | - . (($interval <= 0) ? '>' : '<') |
|
| 1655 | - . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1656 | - . '(' |
|
| 1657 | - . ($use_now ? 'NOW()' : sql_quote(date('Y-m-d H:i:s'))) |
|
| 1658 | - . ', INTERVAL ' |
|
| 1659 | - . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1660 | - . ' ' |
|
| 1661 | - . $unite |
|
| 1662 | - . '))'; |
|
| 1651 | + $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1652 | + return '(' |
|
| 1653 | + . $champ |
|
| 1654 | + . (($interval <= 0) ? '>' : '<') |
|
| 1655 | + . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1656 | + . '(' |
|
| 1657 | + . ($use_now ? 'NOW()' : sql_quote(date('Y-m-d H:i:s'))) |
|
| 1658 | + . ', INTERVAL ' |
|
| 1659 | + . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1660 | + . ' ' |
|
| 1661 | + . $unite |
|
| 1662 | + . '))'; |
|
| 1663 | 1663 | } |
| 1664 | 1664 | |
| 1665 | 1665 | |
@@ -1683,7 +1683,7 @@ discard block |
||
| 1683 | 1683 | * Expression de requête SQL |
| 1684 | 1684 | **/ |
| 1685 | 1685 | function spip_mysql_in($val, $valeurs, $not = '', $serveur = '', $requeter = true) { |
| 1686 | - return "($val $not IN ($valeurs))"; |
|
| 1686 | + return "($val $not IN ($valeurs))"; |
|
| 1687 | 1687 | } |
| 1688 | 1688 | |
| 1689 | 1689 | |
@@ -1695,39 +1695,39 @@ discard block |
||
| 1695 | 1695 | * @return string|number texte ou nombre échappé |
| 1696 | 1696 | */ |
| 1697 | 1697 | function spip_mysql_cite($v, $type) { |
| 1698 | - if (!$type) { |
|
| 1699 | - if (is_bool($v)) { |
|
| 1700 | - return strval(intval($v)); |
|
| 1701 | - } elseif (is_numeric($v)) { |
|
| 1702 | - return strval($v); |
|
| 1703 | - } elseif ($v === null) { |
|
| 1704 | - return "''"; |
|
| 1705 | - } |
|
| 1706 | - return "'" . addslashes($v) . "'"; |
|
| 1707 | - } |
|
| 1708 | - |
|
| 1709 | - if ($v === null) { |
|
| 1710 | - if (stripos($type, 'NOT NULL') === false) { |
|
| 1711 | - // null php se traduit en NULL SQL |
|
| 1712 | - return 'NULL'; |
|
| 1713 | - } else { |
|
| 1714 | - return "''"; |
|
| 1715 | - } |
|
| 1716 | - } elseif (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 1717 | - return $v; |
|
| 1718 | - } elseif (sql_test_int($type)) { |
|
| 1719 | - if ( |
|
| 1720 | - is_numeric($v) |
|
| 1721 | - or ($v and ctype_xdigit(substr($v, 2)) and $v[0] === '0' and $v[1] === 'x') |
|
| 1722 | - ) { |
|
| 1723 | - return $v; |
|
| 1724 | - } else { |
|
| 1725 | - // si pas numerique, forcer le intval |
|
| 1726 | - return intval($v); |
|
| 1727 | - } |
|
| 1728 | - } |
|
| 1729 | - |
|
| 1730 | - return ("'" . addslashes($v) . "'"); |
|
| 1698 | + if (!$type) { |
|
| 1699 | + if (is_bool($v)) { |
|
| 1700 | + return strval(intval($v)); |
|
| 1701 | + } elseif (is_numeric($v)) { |
|
| 1702 | + return strval($v); |
|
| 1703 | + } elseif ($v === null) { |
|
| 1704 | + return "''"; |
|
| 1705 | + } |
|
| 1706 | + return "'" . addslashes($v) . "'"; |
|
| 1707 | + } |
|
| 1708 | + |
|
| 1709 | + if ($v === null) { |
|
| 1710 | + if (stripos($type, 'NOT NULL') === false) { |
|
| 1711 | + // null php se traduit en NULL SQL |
|
| 1712 | + return 'NULL'; |
|
| 1713 | + } else { |
|
| 1714 | + return "''"; |
|
| 1715 | + } |
|
| 1716 | + } elseif (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 1717 | + return $v; |
|
| 1718 | + } elseif (sql_test_int($type)) { |
|
| 1719 | + if ( |
|
| 1720 | + is_numeric($v) |
|
| 1721 | + or ($v and ctype_xdigit(substr($v, 2)) and $v[0] === '0' and $v[1] === 'x') |
|
| 1722 | + ) { |
|
| 1723 | + return $v; |
|
| 1724 | + } else { |
|
| 1725 | + // si pas numerique, forcer le intval |
|
| 1726 | + return intval($v); |
|
| 1727 | + } |
|
| 1728 | + } |
|
| 1729 | + |
|
| 1730 | + return ("'" . addslashes($v) . "'"); |
|
| 1731 | 1731 | } |
| 1732 | 1732 | |
| 1733 | 1733 | /** |
@@ -1737,7 +1737,7 @@ discard block |
||
| 1737 | 1737 | * True si on a les fonctions, false sinon |
| 1738 | 1738 | */ |
| 1739 | 1739 | function spip_versions_mysql() { |
| 1740 | - return function_exists('mysqli_query'); |
|
| 1740 | + return function_exists('mysqli_query'); |
|
| 1741 | 1741 | } |
| 1742 | 1742 | |
| 1743 | 1743 | |
@@ -1750,20 +1750,20 @@ discard block |
||
| 1750 | 1750 | * - chaîne : code compilé pour le faire désactiver par SPIP sinon |
| 1751 | 1751 | */ |
| 1752 | 1752 | function test_rappel_nom_base_mysql($server_db) { |
| 1753 | - $GLOBALS['mysql_rappel_nom_base'] = true; |
|
| 1754 | - sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1755 | - $ok = spip_query("INSERT INTO spip_meta (nom,valeur) VALUES ('mysql_rappel_nom_base', 'test')", $server_db); |
|
| 1753 | + $GLOBALS['mysql_rappel_nom_base'] = true; |
|
| 1754 | + sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1755 | + $ok = spip_query("INSERT INTO spip_meta (nom,valeur) VALUES ('mysql_rappel_nom_base', 'test')", $server_db); |
|
| 1756 | 1756 | |
| 1757 | - if ($ok) { |
|
| 1758 | - sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1757 | + if ($ok) { |
|
| 1758 | + sql_delete('spip_meta', "nom='mysql_rappel_nom_base'", $server_db); |
|
| 1759 | 1759 | |
| 1760 | - return ''; |
|
| 1761 | - } else { |
|
| 1762 | - $GLOBALS['mysql_rappel_nom_base'] = false; |
|
| 1760 | + return ''; |
|
| 1761 | + } else { |
|
| 1762 | + $GLOBALS['mysql_rappel_nom_base'] = false; |
|
| 1763 | 1763 | |
| 1764 | - return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1765 | - "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
|
| 1766 | - } |
|
| 1764 | + return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1765 | + "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
|
| 1766 | + } |
|
| 1767 | 1767 | } |
| 1768 | 1768 | |
| 1769 | 1769 | /** |
@@ -1777,13 +1777,13 @@ discard block |
||
| 1777 | 1777 | * - chaîne : code compilé pour l'indiquer le résultat du test à SPIP |
| 1778 | 1778 | */ |
| 1779 | 1779 | function test_sql_mode_mysql($server_db) { |
| 1780 | - $res = sql_select('version() as v', '', '', '', '', '', '', $server_db); |
|
| 1781 | - $row = sql_fetch($res, $server_db); |
|
| 1782 | - if (version_compare($row['v'], '5.0.0', '>=')) { |
|
| 1783 | - defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE', true); |
|
| 1780 | + $res = sql_select('version() as v', '', '', '', '', '', '', $server_db); |
|
| 1781 | + $row = sql_fetch($res, $server_db); |
|
| 1782 | + if (version_compare($row['v'], '5.0.0', '>=')) { |
|
| 1783 | + defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE', true); |
|
| 1784 | 1784 | |
| 1785 | - return "defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE',true);\n"; |
|
| 1786 | - } |
|
| 1785 | + return "defined('_MYSQL_SET_SQL_MODE') || define('_MYSQL_SET_SQL_MODE',true);\n"; |
|
| 1786 | + } |
|
| 1787 | 1787 | |
| 1788 | - return ''; |
|
| 1788 | + return ''; |
|
| 1789 | 1789 | } |
@@ -58,12 +58,12 @@ discard block |
||
| 58 | 58 | $link = @mysqli_connect($host, $login, $pass); |
| 59 | 59 | } |
| 60 | 60 | } catch (\mysqli_sql_exception $e) { |
| 61 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 61 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 62 | 62 | $link = false; |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | if (!$link) { |
| 66 | - spip_log('Echec mysqli_connect. Erreur : ' . mysqli_connect_error(), 'mysql.' . _LOG_HS); |
|
| 66 | + spip_log('Echec mysqli_connect. Erreur : '.mysqli_connect_error(), 'mysql.'._LOG_HS); |
|
| 67 | 67 | |
| 68 | 68 | return false; |
| 69 | 69 | } |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | spip_log( |
| 85 | - "Connexion MySQLi vers $host, base $db, prefixe $prefixe " . ($ok ? 'operationnelle' : 'impossible'), |
|
| 85 | + "Connexion MySQLi vers $host, base $db, prefixe $prefixe ".($ok ? 'operationnelle' : 'impossible'), |
|
| 86 | 86 | _LOG_DEBUG |
| 87 | 87 | ); |
| 88 | 88 | |
@@ -173,9 +173,9 @@ discard block |
||
| 173 | 173 | */ |
| 174 | 174 | function spip_mysql_set_charset($charset, $serveur = '', $requeter = true) { |
| 175 | 175 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 176 | - spip_log('changement de charset sql : ' . 'SET NAMES ' . _q($charset), _LOG_DEBUG); |
|
| 176 | + spip_log('changement de charset sql : '.'SET NAMES '._q($charset), _LOG_DEBUG); |
|
| 177 | 177 | |
| 178 | - return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES ' . _q($charset)); |
|
| 178 | + return mysqli_query($connexion['link'], $connexion['last'] = 'SET NAMES '._q($charset)); |
|
| 179 | 179 | } |
| 180 | 180 | |
| 181 | 181 | |
@@ -190,7 +190,7 @@ discard block |
||
| 190 | 190 | function spip_mysql_get_charset($charset = [], $serveur = '', $requeter = true) { |
| 191 | 191 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 192 | 192 | $connexion['last'] = $c = 'SHOW CHARACTER SET' |
| 193 | - . (!$charset ? '' : (' LIKE ' . _q($charset['charset']))); |
|
| 193 | + . (!$charset ? '' : (' LIKE '._q($charset['charset']))); |
|
| 194 | 194 | |
| 195 | 195 | return spip_mysql_fetch(mysqli_query($connexion['link'], $c), null, $serveur); |
| 196 | 196 | } |
@@ -234,21 +234,21 @@ discard block |
||
| 234 | 234 | $debug = ''; |
| 235 | 235 | if (defined('_DEBUG_SLOW_QUERIES') and _DEBUG_SLOW_QUERIES) { |
| 236 | 236 | if (isset($GLOBALS['debug']['aucasou'])) { |
| 237 | - [, $id, , $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | - $debug .= "BOUCLE$id @ " . ($infos[0] ?? '') . ' | '; |
|
| 237 | + [, $id,, $infos] = $GLOBALS['debug']['aucasou']; |
|
| 238 | + $debug .= "BOUCLE$id @ ".($infos[0] ?? '').' | '; |
|
| 239 | 239 | } |
| 240 | 240 | if (isset($_SERVER['REQUEST_URI'])) { |
| 241 | 241 | $debug .= $_SERVER['REQUEST_URI']; |
| 242 | 242 | } |
| 243 | 243 | if (!empty($GLOBALS['ip'])) { |
| 244 | - $debug .= ' + ' . $GLOBALS['ip']; |
|
| 244 | + $debug .= ' + '.$GLOBALS['ip']; |
|
| 245 | 245 | } |
| 246 | - $debug = ' /* ' . mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)) . ' */'; |
|
| 246 | + $debug = ' /* '.mysqli_real_escape_string($link, str_replace('*/', '@/', $debug)).' */'; |
|
| 247 | 247 | } |
| 248 | 248 | try { |
| 249 | - $r = mysqli_query($link, $query . $debug); |
|
| 249 | + $r = mysqli_query($link, $query.$debug); |
|
| 250 | 250 | } catch (\mysqli_sql_exception $e) { |
| 251 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 251 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 252 | 252 | $r = false; |
| 253 | 253 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 254 | 254 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
@@ -266,9 +266,9 @@ discard block |
||
| 266 | 266 | $link = $connexion['link']; |
| 267 | 267 | //On retente au cas où |
| 268 | 268 | try { |
| 269 | - $r = mysqli_query($link, $query . $debug); |
|
| 269 | + $r = mysqli_query($link, $query.$debug); |
|
| 270 | 270 | } catch (\mysqli_sql_exception $e) { |
| 271 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 271 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 272 | 272 | $r = false; |
| 273 | 273 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 274 | 274 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
@@ -301,7 +301,7 @@ discard block |
||
| 301 | 301 | // d'utiliser ceux-ci, copie-colle de phpmyadmin |
| 302 | 302 | $query = preg_replace(',^TABLE\s*`([^`]*)`,i', "TABLE \\1", $query); |
| 303 | 303 | |
| 304 | - return spip_mysql_query('ALTER ' . $query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 304 | + return spip_mysql_query('ALTER '.$query, $serveur, $requeter); # i.e. que PG se debrouille |
|
| 305 | 305 | } |
| 306 | 306 | |
| 307 | 307 | |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * @return bool Toujours true |
| 315 | 315 | */ |
| 316 | 316 | function spip_mysql_optimize($table, $serveur = '', $requeter = true) { |
| 317 | - spip_mysql_query('OPTIMIZE TABLE ' . $table); |
|
| 317 | + spip_mysql_query('OPTIMIZE TABLE '.$table); |
|
| 318 | 318 | |
| 319 | 319 | return true; |
| 320 | 320 | } |
@@ -337,7 +337,7 @@ discard block |
||
| 337 | 337 | $link = $connexion['link']; |
| 338 | 338 | $db = $connexion['db']; |
| 339 | 339 | |
| 340 | - $query = 'EXPLAIN ' . _mysql_traite_query($query, $db, $prefixe); |
|
| 340 | + $query = 'EXPLAIN '._mysql_traite_query($query, $db, $prefixe); |
|
| 341 | 341 | $r = mysqli_query($link, $query); |
| 342 | 342 | |
| 343 | 343 | return spip_mysql_fetch($r, null, $serveur); |
@@ -388,7 +388,7 @@ discard block |
||
| 388 | 388 | . calculer_mysql_expression('WHERE', $where) |
| 389 | 389 | . calculer_mysql_expression('GROUP BY', $groupby, ',') |
| 390 | 390 | . calculer_mysql_expression('HAVING', $having) |
| 391 | - . ($orderby ? ("\nORDER BY " . spip_mysql_order($orderby)) : '') |
|
| 391 | + . ($orderby ? ("\nORDER BY ".spip_mysql_order($orderby)) : '') |
|
| 392 | 392 | . ($limit ? "\nLIMIT $limit" : ''); |
| 393 | 393 | |
| 394 | 394 | // renvoyer la requete inerte si demandee |
@@ -478,12 +478,12 @@ discard block |
||
| 478 | 478 | $exp = "\n$expression "; |
| 479 | 479 | |
| 480 | 480 | if (!is_array($v)) { |
| 481 | - return $exp . $v; |
|
| 481 | + return $exp.$v; |
|
| 482 | 482 | } else { |
| 483 | 483 | if (strtoupper($join) === 'AND') { |
| 484 | - return $exp . join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 484 | + return $exp.join("\n\t$join ", array_map('calculer_mysql_where', $v)); |
|
| 485 | 485 | } else { |
| 486 | - return $exp . join($join, $v); |
|
| 486 | + return $exp.join($join, $v); |
|
| 487 | 487 | } |
| 488 | 488 | } |
| 489 | 489 | } |
@@ -501,17 +501,17 @@ discard block |
||
| 501 | 501 | if (substr($k, -1) == '@') { |
| 502 | 502 | // c'est une jointure qui se refere au from precedent |
| 503 | 503 | // pas de virgule |
| 504 | - $res .= ' ' . $v; |
|
| 504 | + $res .= ' '.$v; |
|
| 505 | 505 | } else { |
| 506 | 506 | if (!is_numeric($k)) { |
| 507 | 507 | $p = strpos($v, ' '); |
| 508 | 508 | if ($p) { |
| 509 | - $v = substr($v, 0, $p) . " AS `$k`" . substr($v, $p); |
|
| 509 | + $v = substr($v, 0, $p)." AS `$k`".substr($v, $p); |
|
| 510 | 510 | } else { |
| 511 | 511 | $v .= " AS `$k`"; |
| 512 | 512 | } |
| 513 | 513 | } |
| 514 | - $res .= ', ' . $v; |
|
| 514 | + $res .= ', '.$v; |
|
| 515 | 515 | } |
| 516 | 516 | } |
| 517 | 517 | |
@@ -541,13 +541,13 @@ discard block |
||
| 541 | 541 | function _mysql_traite_query($query, $db = '', $prefixe = '', $echappe_textes = true) { |
| 542 | 542 | |
| 543 | 543 | if ($GLOBALS['mysql_rappel_nom_base'] and $db) { |
| 544 | - $pref = '`' . $db . '`.'; |
|
| 544 | + $pref = '`'.$db.'`.'; |
|
| 545 | 545 | } else { |
| 546 | 546 | $pref = ''; |
| 547 | 547 | } |
| 548 | 548 | |
| 549 | 549 | if ($prefixe) { |
| 550 | - $pref .= $prefixe . '_'; |
|
| 550 | + $pref .= $prefixe.'_'; |
|
| 551 | 551 | } |
| 552 | 552 | |
| 553 | 553 | if (!preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
@@ -566,7 +566,7 @@ discard block |
||
| 566 | 566 | $suite_echap = $suite; |
| 567 | 567 | } |
| 568 | 568 | if (preg_match('/^(.*?)([(]\s*SELECT\b.*)$/si', $suite_echap, $r)) { |
| 569 | - $suite_echap = $r[1] . _mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 569 | + $suite_echap = $r[1]._mysql_traite_query($r[2], $db, $prefixe, false); |
|
| 570 | 570 | if ($echappe_textes) { |
| 571 | 571 | $suite = query_reinjecte_textes($suite_echap, $textes); |
| 572 | 572 | } |
@@ -576,7 +576,7 @@ discard block |
||
| 576 | 576 | } |
| 577 | 577 | } |
| 578 | 578 | } |
| 579 | - $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1' . $pref, $query) . $suite; |
|
| 579 | + $r = preg_replace(_SQL_PREFIXE_TABLE_MYSQL, '\1'.$pref, $query).$suite; |
|
| 580 | 580 | |
| 581 | 581 | // en option, remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
| 582 | 582 | // remplacer les emoji (que mysql ne sait pas gérer) en 💩 |
@@ -616,7 +616,7 @@ discard block |
||
| 616 | 616 | $ok = false; |
| 617 | 617 | } |
| 618 | 618 | if (!$ok) { |
| 619 | - spip_log('Echec mysqli_selectdb. Erreur : ' . mysqli_error($link), 'mysql.' . _LOG_CRITIQUE); |
|
| 619 | + spip_log('Echec mysqli_selectdb. Erreur : '.mysqli_error($link), 'mysql.'._LOG_CRITIQUE); |
|
| 620 | 620 | } |
| 621 | 621 | |
| 622 | 622 | return $ok; |
@@ -706,10 +706,10 @@ discard block |
||
| 706 | 706 | |
| 707 | 707 | $character_set = ''; |
| 708 | 708 | if (@$GLOBALS['meta']['charset_sql_base']) { |
| 709 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 709 | + $character_set .= ' CHARACTER SET '.$GLOBALS['meta']['charset_sql_base']; |
|
| 710 | 710 | } |
| 711 | 711 | if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
| 712 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 712 | + $character_set .= ' COLLATE '.$GLOBALS['meta']['charset_collation_sql_base']; |
|
| 713 | 713 | } |
| 714 | 714 | |
| 715 | 715 | foreach ($champs as $k => $v) { |
@@ -719,7 +719,7 @@ discard block |
||
| 719 | 719 | preg_match(',(char|text),i', $defs[1]) |
| 720 | 720 | and !preg_match(',(binary|CHARACTER|COLLATE),i', $v) |
| 721 | 721 | ) { |
| 722 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 722 | + $v = $defs[1].$character_set.' '.substr($v, strlen($defs[1])); |
|
| 723 | 723 | } |
| 724 | 724 | } |
| 725 | 725 | |
@@ -731,8 +731,8 @@ discard block |
||
| 731 | 731 | $s = ','; |
| 732 | 732 | } |
| 733 | 733 | $temporary = $temporary ? 'TEMPORARY' : ''; |
| 734 | - $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query" . ($keys ? ",$keys" : '') . ')' |
|
| 735 | - . (defined('_MYSQL_ENGINE') ? ' ENGINE=' . _MYSQL_ENGINE : '') |
|
| 734 | + $q = "CREATE $temporary TABLE IF NOT EXISTS $nom ($query".($keys ? ",$keys" : '').')' |
|
| 735 | + . (defined('_MYSQL_ENGINE') ? ' ENGINE='._MYSQL_ENGINE : '') |
|
| 736 | 736 | . ($character_set ? " DEFAULT $character_set" : '') |
| 737 | 737 | . "\n"; |
| 738 | 738 | |
@@ -811,7 +811,7 @@ discard block |
||
| 811 | 811 | return false; |
| 812 | 812 | } |
| 813 | 813 | |
| 814 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 814 | + $query = "CREATE VIEW $nom AS ".$query_select; |
|
| 815 | 815 | |
| 816 | 816 | return spip_mysql_query($query, $serveur, $requeter); |
| 817 | 817 | } |
@@ -869,7 +869,7 @@ discard block |
||
| 869 | 869 | * Ressource à utiliser avec sql_fetch() |
| 870 | 870 | **/ |
| 871 | 871 | function spip_mysql_showbase($match, $serveur = '', $requeter = true) { |
| 872 | - return spip_mysql_query('SHOW TABLES LIKE ' . _q($match), $serveur, $requeter); |
|
| 872 | + return spip_mysql_query('SHOW TABLES LIKE '._q($match), $serveur, $requeter); |
|
| 873 | 873 | } |
| 874 | 874 | |
| 875 | 875 | /** |
@@ -885,7 +885,7 @@ discard block |
||
| 885 | 885 | * - true si la requête a réussie, false sinon |
| 886 | 886 | */ |
| 887 | 887 | function spip_mysql_repair($table, $serveur = '', $requeter = true) { |
| 888 | - $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = ' . _q($table), $serveur, true)); |
|
| 888 | + $table_status = spip_mysql_fetch(spip_mysql_query('SHOW TABLE STATUS WHERE Name = '._q($table), $serveur, true)); |
|
| 889 | 889 | $engine = $table_status['Engine']; |
| 890 | 890 | if ($engine == 'InnoDB') { |
| 891 | 891 | if (spip_mysql_alter("TABLE $table ENGINE = InnoDB", $serveur, $requeter)) { |
@@ -894,7 +894,7 @@ discard block |
||
| 894 | 894 | } elseif ($engine == 'MyISAM') { |
| 895 | 895 | return spip_mysql_query("REPAIR TABLE `$table`", $serveur, $requeter); |
| 896 | 896 | } else { |
| 897 | - spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.' . _LOG_DEBUG); |
|
| 897 | + spip_log("spip_mysql_repair impossible pour la table $table engine $engine", 'mysql.'._LOG_DEBUG); |
|
| 898 | 898 | } |
| 899 | 899 | } |
| 900 | 900 | |
@@ -913,7 +913,7 @@ discard block |
||
| 913 | 913 | * - string : requete sql, si $requeter = true |
| 914 | 914 | **/ |
| 915 | 915 | function spip_mysql_table_exists(string $table, $serveur = '', $requeter = true) { |
| 916 | - $r = spip_mysql_query('SHOW TABLES LIKE ' . _q($table), $serveur, $requeter); |
|
| 916 | + $r = spip_mysql_query('SHOW TABLES LIKE '._q($table), $serveur, $requeter); |
|
| 917 | 917 | if (!$requeter) { |
| 918 | 918 | return $r; |
| 919 | 919 | } |
@@ -995,22 +995,22 @@ discard block |
||
| 995 | 995 | } |
| 996 | 996 | if ($val['Default'] === '0' || $val['Default']) { |
| 997 | 997 | if (preg_match('/[A-Z_]/', $val['Default'])) { |
| 998 | - $nfields[$val['Field']] .= ' DEFAULT ' . $val['Default']; |
|
| 998 | + $nfields[$val['Field']] .= ' DEFAULT '.$val['Default']; |
|
| 999 | 999 | } else { |
| 1000 | - $nfields[$val['Field']] .= " DEFAULT '" . $val['Default'] . "'"; |
|
| 1000 | + $nfields[$val['Field']] .= " DEFAULT '".$val['Default']."'"; |
|
| 1001 | 1001 | } |
| 1002 | 1002 | } |
| 1003 | 1003 | if ($val['Extra']) { |
| 1004 | - $nfields[$val['Field']] .= ' ' . $val['Extra']; |
|
| 1004 | + $nfields[$val['Field']] .= ' '.$val['Extra']; |
|
| 1005 | 1005 | } |
| 1006 | 1006 | if ($val['Key'] == 'PRI') { |
| 1007 | 1007 | $nkeys['PRIMARY KEY'] = $val['Field']; |
| 1008 | 1008 | } else { |
| 1009 | 1009 | if ($val['Key'] == 'MUL') { |
| 1010 | - $nkeys['KEY ' . $val['Field']] = $val['Field']; |
|
| 1010 | + $nkeys['KEY '.$val['Field']] = $val['Field']; |
|
| 1011 | 1011 | } else { |
| 1012 | 1012 | if ($val['Key'] == 'UNI') { |
| 1013 | - $nkeys['UNIQUE KEY ' . $val['Field']] = $val['Field']; |
|
| 1013 | + $nkeys['UNIQUE KEY '.$val['Field']] = $val['Field']; |
|
| 1014 | 1014 | } |
| 1015 | 1015 | } |
| 1016 | 1016 | } |
@@ -1085,7 +1085,7 @@ discard block |
||
| 1085 | 1085 | $serveur = '', |
| 1086 | 1086 | $requeter = true |
| 1087 | 1087 | ) { |
| 1088 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1088 | + $c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 1089 | 1089 | |
| 1090 | 1090 | $r = spip_mysql_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
| 1091 | 1091 | if (!$requeter) { |
@@ -1125,7 +1125,7 @@ discard block |
||
| 1125 | 1125 | if ($s) { |
| 1126 | 1126 | $trace = debug_backtrace(); |
| 1127 | 1127 | if ($trace[0]['function'] != 'spip_mysql_error') { |
| 1128 | - spip_log("$s - $query - " . sql_error_backtrace(), 'mysql.' . _LOG_ERREUR); |
|
| 1128 | + spip_log("$s - $query - ".sql_error_backtrace(), 'mysql.'._LOG_ERREUR); |
|
| 1129 | 1129 | } |
| 1130 | 1130 | } |
| 1131 | 1131 | |
@@ -1251,7 +1251,7 @@ discard block |
||
| 1251 | 1251 | try { |
| 1252 | 1252 | $insert = mysqli_query($link, $query); |
| 1253 | 1253 | } catch (\mysqli_sql_exception $e) { |
| 1254 | - spip_log('mysqli_sql_exception: ' . $e->getMessage(), 'mysql.' . _LOG_DEBUG); |
|
| 1254 | + spip_log('mysqli_sql_exception: '.$e->getMessage(), 'mysql.'._LOG_DEBUG); |
|
| 1255 | 1255 | // TODO: utiliser l’exception ensuite plutôt que les appels à spip_mysql_errno() |
| 1256 | 1256 | // mais il faut pour php < 8.1 forcer les exeptions via mysqli_report(). |
| 1257 | 1257 | } |
@@ -1306,8 +1306,8 @@ discard block |
||
| 1306 | 1306 | |
| 1307 | 1307 | return spip_mysql_insert( |
| 1308 | 1308 | $table, |
| 1309 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 1310 | - '(' . join(',', $couples) . ')', |
|
| 1309 | + '('.join(',', array_keys($couples)).')', |
|
| 1310 | + '('.join(',', $couples).')', |
|
| 1311 | 1311 | $desc, |
| 1312 | 1312 | $serveur, |
| 1313 | 1313 | $requeter |
@@ -1344,7 +1344,7 @@ discard block |
||
| 1344 | 1344 | } |
| 1345 | 1345 | $fields = $desc['field'] ?? []; |
| 1346 | 1346 | |
| 1347 | - $cles = '(' . join(',', array_keys(reset($tab_couples))) . ')'; |
|
| 1347 | + $cles = '('.join(',', array_keys(reset($tab_couples))).')'; |
|
| 1348 | 1348 | $valeurs = []; |
| 1349 | 1349 | $r = false; |
| 1350 | 1350 | |
@@ -1353,7 +1353,7 @@ discard block |
||
| 1353 | 1353 | foreach ($couples as $champ => $val) { |
| 1354 | 1354 | $couples[$champ] = spip_mysql_cite($val, $fields[$champ]); |
| 1355 | 1355 | } |
| 1356 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1356 | + $valeurs[] = '('.join(',', $couples).')'; |
|
| 1357 | 1357 | if (count($valeurs) >= 100) { |
| 1358 | 1358 | $r = spip_mysql_insert($table, $cles, join(', ', $valeurs), $desc, $serveur, $requeter); |
| 1359 | 1359 | $valeurs = []; |
@@ -1390,7 +1390,7 @@ discard block |
||
| 1390 | 1390 | function spip_mysql_update($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1391 | 1391 | $set = []; |
| 1392 | 1392 | foreach ($champs as $champ => $val) { |
| 1393 | - $set[] = $champ . "=$val"; |
|
| 1393 | + $set[] = $champ."=$val"; |
|
| 1394 | 1394 | } |
| 1395 | 1395 | if (!empty($set)) { |
| 1396 | 1396 | return spip_mysql_query( |
@@ -1446,7 +1446,7 @@ discard block |
||
| 1446 | 1446 | } |
| 1447 | 1447 | $set = []; |
| 1448 | 1448 | foreach ($champs as $champ => $val) { |
| 1449 | - $set[] = $champ . '=' . spip_mysql_cite($val, @$fields[$champ]); |
|
| 1449 | + $set[] = $champ.'='.spip_mysql_cite($val, @$fields[$champ]); |
|
| 1450 | 1450 | } |
| 1451 | 1451 | |
| 1452 | 1452 | return spip_mysql_query( |
@@ -1515,10 +1515,10 @@ discard block |
||
| 1515 | 1515 | * - false en cas d'erreur. |
| 1516 | 1516 | **/ |
| 1517 | 1517 | function spip_mysql_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) { |
| 1518 | - return spip_mysql_query("REPLACE $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1518 | + return spip_mysql_query("REPLACE $table (".join(',', array_keys($couples)).') VALUES ('.join( |
|
| 1519 | 1519 | ',', |
| 1520 | 1520 | array_map('_q', $couples) |
| 1521 | - ) . ')', $serveur, $requeter); |
|
| 1521 | + ).')', $serveur, $requeter); |
|
| 1522 | 1522 | } |
| 1523 | 1523 | |
| 1524 | 1524 | |
@@ -1547,10 +1547,10 @@ discard block |
||
| 1547 | 1547 | * - false en cas d'erreur. |
| 1548 | 1548 | **/ |
| 1549 | 1549 | function spip_mysql_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1550 | - $cles = '(' . join(',', array_keys($tab_couples[0])) . ')'; |
|
| 1550 | + $cles = '('.join(',', array_keys($tab_couples[0])).')'; |
|
| 1551 | 1551 | $valeurs = []; |
| 1552 | 1552 | foreach ($tab_couples as $couples) { |
| 1553 | - $valeurs[] = '(' . join(',', array_map('_q', $couples)) . ')'; |
|
| 1553 | + $valeurs[] = '('.join(',', array_map('_q', $couples)).')'; |
|
| 1554 | 1554 | } |
| 1555 | 1555 | $valeurs = implode(', ', $valeurs); |
| 1556 | 1556 | |
@@ -1570,28 +1570,28 @@ discard block |
||
| 1570 | 1570 | */ |
| 1571 | 1571 | function spip_mysql_multi($objet, $lang) { |
| 1572 | 1572 | $lengthlang = strlen("[$lang]"); |
| 1573 | - $posmulti = 'INSTR(' . $objet . ", '<multi>')"; |
|
| 1574 | - $posfinmulti = 'INSTR(' . $objet . ", '</multi>')"; |
|
| 1575 | - $debutchaine = 'LEFT(' . $objet . ", $posmulti-1)"; |
|
| 1576 | - $finchaine = 'RIGHT(' . $objet . ', CHAR_LENGTH(' . $objet . ") -(7+$posfinmulti))"; |
|
| 1577 | - $chainemulti = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1578 | - $poslang = "INSTR($chainemulti,'[" . $lang . "]')"; |
|
| 1573 | + $posmulti = 'INSTR('.$objet.", '<multi>')"; |
|
| 1574 | + $posfinmulti = 'INSTR('.$objet.", '</multi>')"; |
|
| 1575 | + $debutchaine = 'LEFT('.$objet.", $posmulti-1)"; |
|
| 1576 | + $finchaine = 'RIGHT('.$objet.', CHAR_LENGTH('.$objet.") -(7+$posfinmulti))"; |
|
| 1577 | + $chainemulti = 'TRIM(SUBSTRING('.$objet.", $posmulti+7, $posfinmulti -(7+$posmulti)))"; |
|
| 1578 | + $poslang = "INSTR($chainemulti,'[".$lang."]')"; |
|
| 1579 | 1579 | $poslang = "IF($poslang=0,INSTR($chainemulti,']')+1,$poslang+$lengthlang)"; |
| 1580 | - $chainelang = 'TRIM(SUBSTRING(' . $objet . ", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1581 | - $posfinlang = 'INSTR(' . $chainelang . ", '[')"; |
|
| 1580 | + $chainelang = 'TRIM(SUBSTRING('.$objet.", $posmulti+7+$poslang-1,$posfinmulti -($posmulti+7+$poslang-1) ))"; |
|
| 1581 | + $posfinlang = 'INSTR('.$chainelang.", '[')"; |
|
| 1582 | 1582 | $chainelang = "IF($posfinlang>0,LEFT($chainelang,$posfinlang-1),$chainelang)"; |
| 1583 | 1583 | //$chainelang = "LEFT($chainelang,$posfinlang-1)"; |
| 1584 | - $retour = "(TRIM(IF($posmulti = 0 , " . |
|
| 1585 | - ' TRIM(' . $objet . '), ' . |
|
| 1586 | - ' CONCAT( ' . |
|
| 1587 | - " $debutchaine, " . |
|
| 1588 | - ' IF( ' . |
|
| 1589 | - " $poslang = 0, " . |
|
| 1590 | - " $chainemulti, " . |
|
| 1591 | - " $chainelang" . |
|
| 1592 | - ' ), ' . |
|
| 1593 | - " $finchaine" . |
|
| 1594 | - ' ) ' . |
|
| 1584 | + $retour = "(TRIM(IF($posmulti = 0 , ". |
|
| 1585 | + ' TRIM('.$objet.'), '. |
|
| 1586 | + ' CONCAT( '. |
|
| 1587 | + " $debutchaine, ". |
|
| 1588 | + ' IF( '. |
|
| 1589 | + " $poslang = 0, ". |
|
| 1590 | + " $chainemulti, ". |
|
| 1591 | + " $chainelang". |
|
| 1592 | + ' ), '. |
|
| 1593 | + " $finchaine". |
|
| 1594 | + ' ) '. |
|
| 1595 | 1595 | '))) AS multi'; |
| 1596 | 1596 | |
| 1597 | 1597 | return $retour; |
@@ -1608,7 +1608,7 @@ discard block |
||
| 1608 | 1608 | * Valeur hexadécimale pour MySQL |
| 1609 | 1609 | **/ |
| 1610 | 1610 | function spip_mysql_hex($v) { |
| 1611 | - return '0x' . $v; |
|
| 1611 | + return '0x'.$v; |
|
| 1612 | 1612 | } |
| 1613 | 1613 | |
| 1614 | 1614 | /** |
@@ -1648,7 +1648,7 @@ discard block |
||
| 1648 | 1648 | * Expression SQL |
| 1649 | 1649 | **/ |
| 1650 | 1650 | function spip_mysql_date_proche($champ, $interval, $unite) { |
| 1651 | - $use_now = ( ($champ === 'maj' or strpos($champ, '.maj')) ? true : false ); |
|
| 1651 | + $use_now = (($champ === 'maj' or strpos($champ, '.maj')) ? true : false); |
|
| 1652 | 1652 | return '(' |
| 1653 | 1653 | . $champ |
| 1654 | 1654 | . (($interval <= 0) ? '>' : '<') |
@@ -1703,7 +1703,7 @@ discard block |
||
| 1703 | 1703 | } elseif ($v === null) { |
| 1704 | 1704 | return "''"; |
| 1705 | 1705 | } |
| 1706 | - return "'" . addslashes($v) . "'"; |
|
| 1706 | + return "'".addslashes($v)."'"; |
|
| 1707 | 1707 | } |
| 1708 | 1708 | |
| 1709 | 1709 | if ($v === null) { |
@@ -1727,7 +1727,7 @@ discard block |
||
| 1727 | 1727 | } |
| 1728 | 1728 | } |
| 1729 | 1729 | |
| 1730 | - return ("'" . addslashes($v) . "'"); |
|
| 1730 | + return ("'".addslashes($v)."'"); |
|
| 1731 | 1731 | } |
| 1732 | 1732 | |
| 1733 | 1733 | /** |
@@ -1761,7 +1761,7 @@ discard block |
||
| 1761 | 1761 | } else { |
| 1762 | 1762 | $GLOBALS['mysql_rappel_nom_base'] = false; |
| 1763 | 1763 | |
| 1764 | - return "\$GLOBALS['mysql_rappel_nom_base'] = false; " . |
|
| 1764 | + return "\$GLOBALS['mysql_rappel_nom_base'] = false; ". |
|
| 1765 | 1765 | "/* echec de test_rappel_nom_base_mysql a l'installation. */\n"; |
| 1766 | 1766 | } |
| 1767 | 1767 | } |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | */ |
| 19 | 19 | |
| 20 | 20 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 21 | - return; |
|
| 21 | + return; |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | define('_DEFAULT_DB', 'spip'); |
@@ -31,159 +31,159 @@ discard block |
||
| 31 | 31 | // si ca ne marche toujours pas, echec. |
| 32 | 32 | |
| 33 | 33 | function req_pg_dist($addr, $port, $login, $pass, $db = '', $prefixe = '') { |
| 34 | - static $last_connect = []; |
|
| 35 | - if (!extension_loaded('pgsql')) { |
|
| 36 | - return false; |
|
| 37 | - } |
|
| 38 | - |
|
| 39 | - // si provient de selectdb |
|
| 40 | - if (empty($addr) && empty($port) && empty($login) && empty($pass)) { |
|
| 41 | - foreach (['addr', 'port', 'login', 'pass', 'prefixe'] as $a) { |
|
| 42 | - ${$a} = $last_connect[$a]; |
|
| 43 | - } |
|
| 44 | - } |
|
| 45 | - [$host, $p] = array_pad(explode(';', $addr), 2, null); |
|
| 46 | - if ($p > 0) { |
|
| 47 | - $port = " port=$p"; |
|
| 48 | - } else { |
|
| 49 | - $port = ''; |
|
| 50 | - } |
|
| 51 | - $erreurs = []; |
|
| 52 | - if ($db) { |
|
| 53 | - @$link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW); |
|
| 54 | - } elseif (!@$link = pg_connect("host=$host$port user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) { |
|
| 55 | - $erreurs[] = pg_last_error(); |
|
| 56 | - if (@$link = pg_connect("host=$host$port dbname=$login user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) { |
|
| 57 | - $db = $login; |
|
| 58 | - } else { |
|
| 59 | - $erreurs[] = pg_last_error(); |
|
| 60 | - $db = _DEFAULT_DB; |
|
| 61 | - $link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW); |
|
| 62 | - } |
|
| 63 | - } |
|
| 64 | - if (!$link) { |
|
| 65 | - $erreurs[] = pg_last_error(); |
|
| 66 | - foreach ($erreurs as $e) { |
|
| 67 | - spip_log('Echec pg_connect. Erreur : ' . $e, 'pg.' . _LOG_HS); |
|
| 68 | - } |
|
| 69 | - |
|
| 70 | - return false; |
|
| 71 | - } |
|
| 72 | - |
|
| 73 | - if ($link) { |
|
| 74 | - $last_connect = [ |
|
| 75 | - 'addr' => $addr, |
|
| 76 | - 'port' => $port, |
|
| 77 | - 'login' => $login, |
|
| 78 | - 'pass' => $pass, |
|
| 79 | - 'db' => $db, |
|
| 80 | - 'prefixe' => $prefixe, |
|
| 81 | - ]; |
|
| 82 | - } |
|
| 83 | - |
|
| 84 | - spip_log( |
|
| 85 | - "Connexion vers $host, base $db, prefixe $prefixe " . ($link ? 'operationnelle' : 'impossible'), |
|
| 86 | - 'pg.' . _LOG_DEBUG |
|
| 87 | - ); |
|
| 88 | - |
|
| 89 | - return !$link ? false : [ |
|
| 90 | - 'db' => $db, |
|
| 91 | - 'prefixe' => $prefixe ?: $db, |
|
| 92 | - 'link' => $link, |
|
| 93 | - ]; |
|
| 34 | + static $last_connect = []; |
|
| 35 | + if (!extension_loaded('pgsql')) { |
|
| 36 | + return false; |
|
| 37 | + } |
|
| 38 | + |
|
| 39 | + // si provient de selectdb |
|
| 40 | + if (empty($addr) && empty($port) && empty($login) && empty($pass)) { |
|
| 41 | + foreach (['addr', 'port', 'login', 'pass', 'prefixe'] as $a) { |
|
| 42 | + ${$a} = $last_connect[$a]; |
|
| 43 | + } |
|
| 44 | + } |
|
| 45 | + [$host, $p] = array_pad(explode(';', $addr), 2, null); |
|
| 46 | + if ($p > 0) { |
|
| 47 | + $port = " port=$p"; |
|
| 48 | + } else { |
|
| 49 | + $port = ''; |
|
| 50 | + } |
|
| 51 | + $erreurs = []; |
|
| 52 | + if ($db) { |
|
| 53 | + @$link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW); |
|
| 54 | + } elseif (!@$link = pg_connect("host=$host$port user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) { |
|
| 55 | + $erreurs[] = pg_last_error(); |
|
| 56 | + if (@$link = pg_connect("host=$host$port dbname=$login user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW)) { |
|
| 57 | + $db = $login; |
|
| 58 | + } else { |
|
| 59 | + $erreurs[] = pg_last_error(); |
|
| 60 | + $db = _DEFAULT_DB; |
|
| 61 | + $link = pg_connect("host=$host$port dbname=$db user=$login password='$pass'", PGSQL_CONNECT_FORCE_NEW); |
|
| 62 | + } |
|
| 63 | + } |
|
| 64 | + if (!$link) { |
|
| 65 | + $erreurs[] = pg_last_error(); |
|
| 66 | + foreach ($erreurs as $e) { |
|
| 67 | + spip_log('Echec pg_connect. Erreur : ' . $e, 'pg.' . _LOG_HS); |
|
| 68 | + } |
|
| 69 | + |
|
| 70 | + return false; |
|
| 71 | + } |
|
| 72 | + |
|
| 73 | + if ($link) { |
|
| 74 | + $last_connect = [ |
|
| 75 | + 'addr' => $addr, |
|
| 76 | + 'port' => $port, |
|
| 77 | + 'login' => $login, |
|
| 78 | + 'pass' => $pass, |
|
| 79 | + 'db' => $db, |
|
| 80 | + 'prefixe' => $prefixe, |
|
| 81 | + ]; |
|
| 82 | + } |
|
| 83 | + |
|
| 84 | + spip_log( |
|
| 85 | + "Connexion vers $host, base $db, prefixe $prefixe " . ($link ? 'operationnelle' : 'impossible'), |
|
| 86 | + 'pg.' . _LOG_DEBUG |
|
| 87 | + ); |
|
| 88 | + |
|
| 89 | + return !$link ? false : [ |
|
| 90 | + 'db' => $db, |
|
| 91 | + 'prefixe' => $prefixe ?: $db, |
|
| 92 | + 'link' => $link, |
|
| 93 | + ]; |
|
| 94 | 94 | } |
| 95 | 95 | |
| 96 | 96 | $GLOBALS['spip_pg_functions_1'] = [ |
| 97 | - 'alter' => 'spip_pg_alter', |
|
| 98 | - 'count' => 'spip_pg_count', |
|
| 99 | - 'countsel' => 'spip_pg_countsel', |
|
| 100 | - 'create' => 'spip_pg_create', |
|
| 101 | - 'create_base' => 'spip_pg_create_base', |
|
| 102 | - 'create_view' => 'spip_pg_create_view', |
|
| 103 | - 'date_proche' => 'spip_pg_date_proche', |
|
| 104 | - 'delete' => 'spip_pg_delete', |
|
| 105 | - 'drop_table' => 'spip_pg_drop_table', |
|
| 106 | - 'drop_view' => 'spip_pg_drop_view', |
|
| 107 | - 'errno' => 'spip_pg_errno', |
|
| 108 | - 'error' => 'spip_pg_error', |
|
| 109 | - 'explain' => 'spip_pg_explain', |
|
| 110 | - 'fetch' => 'spip_pg_fetch', |
|
| 111 | - 'seek' => 'spip_pg_seek', |
|
| 112 | - 'free' => 'spip_pg_free', |
|
| 113 | - 'hex' => 'spip_pg_hex', |
|
| 114 | - 'in' => 'spip_pg_in', |
|
| 115 | - 'insert' => 'spip_pg_insert', |
|
| 116 | - 'insertq' => 'spip_pg_insertq', |
|
| 117 | - 'insertq_multi' => 'spip_pg_insertq_multi', |
|
| 118 | - 'listdbs' => 'spip_pg_listdbs', |
|
| 119 | - 'multi' => 'spip_pg_multi', |
|
| 120 | - 'optimize' => 'spip_pg_optimize', |
|
| 121 | - 'query' => 'spip_pg_query', |
|
| 122 | - 'quote' => 'spip_pg_quote', |
|
| 123 | - 'replace' => 'spip_pg_replace', |
|
| 124 | - 'replace_multi' => 'spip_pg_replace_multi', |
|
| 125 | - 'select' => 'spip_pg_select', |
|
| 126 | - 'selectdb' => 'spip_pg_selectdb', |
|
| 127 | - 'set_connect_charset' => 'spip_pg_set_connect_charset', |
|
| 128 | - 'showbase' => 'spip_pg_showbase', |
|
| 129 | - 'showtable' => 'spip_pg_showtable', |
|
| 130 | - 'update' => 'spip_pg_update', |
|
| 131 | - 'updateq' => 'spip_pg_updateq', |
|
| 97 | + 'alter' => 'spip_pg_alter', |
|
| 98 | + 'count' => 'spip_pg_count', |
|
| 99 | + 'countsel' => 'spip_pg_countsel', |
|
| 100 | + 'create' => 'spip_pg_create', |
|
| 101 | + 'create_base' => 'spip_pg_create_base', |
|
| 102 | + 'create_view' => 'spip_pg_create_view', |
|
| 103 | + 'date_proche' => 'spip_pg_date_proche', |
|
| 104 | + 'delete' => 'spip_pg_delete', |
|
| 105 | + 'drop_table' => 'spip_pg_drop_table', |
|
| 106 | + 'drop_view' => 'spip_pg_drop_view', |
|
| 107 | + 'errno' => 'spip_pg_errno', |
|
| 108 | + 'error' => 'spip_pg_error', |
|
| 109 | + 'explain' => 'spip_pg_explain', |
|
| 110 | + 'fetch' => 'spip_pg_fetch', |
|
| 111 | + 'seek' => 'spip_pg_seek', |
|
| 112 | + 'free' => 'spip_pg_free', |
|
| 113 | + 'hex' => 'spip_pg_hex', |
|
| 114 | + 'in' => 'spip_pg_in', |
|
| 115 | + 'insert' => 'spip_pg_insert', |
|
| 116 | + 'insertq' => 'spip_pg_insertq', |
|
| 117 | + 'insertq_multi' => 'spip_pg_insertq_multi', |
|
| 118 | + 'listdbs' => 'spip_pg_listdbs', |
|
| 119 | + 'multi' => 'spip_pg_multi', |
|
| 120 | + 'optimize' => 'spip_pg_optimize', |
|
| 121 | + 'query' => 'spip_pg_query', |
|
| 122 | + 'quote' => 'spip_pg_quote', |
|
| 123 | + 'replace' => 'spip_pg_replace', |
|
| 124 | + 'replace_multi' => 'spip_pg_replace_multi', |
|
| 125 | + 'select' => 'spip_pg_select', |
|
| 126 | + 'selectdb' => 'spip_pg_selectdb', |
|
| 127 | + 'set_connect_charset' => 'spip_pg_set_connect_charset', |
|
| 128 | + 'showbase' => 'spip_pg_showbase', |
|
| 129 | + 'showtable' => 'spip_pg_showtable', |
|
| 130 | + 'update' => 'spip_pg_update', |
|
| 131 | + 'updateq' => 'spip_pg_updateq', |
|
| 132 | 132 | ]; |
| 133 | 133 | |
| 134 | 134 | // Par ou ca passe une fois les traductions faites |
| 135 | 135 | function spip_pg_trace_query($query, $serveur = '') { |
| 136 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 137 | - $prefixe = $connexion['prefixe']; |
|
| 138 | - $link = $connexion['link']; |
|
| 139 | - $db = $connexion['db']; |
|
| 140 | - |
|
| 141 | - if (isset($_GET['var_profile'])) { |
|
| 142 | - include_spip('public/tracer'); |
|
| 143 | - $t = trace_query_start(); |
|
| 144 | - $e = ''; |
|
| 145 | - } else { |
|
| 146 | - $t = 0; |
|
| 147 | - } |
|
| 148 | - |
|
| 149 | - $connexion['last'] = $query; |
|
| 150 | - $r = spip_pg_query_simple($link, $query); |
|
| 151 | - |
|
| 152 | - // Log de l'erreur eventuelle |
|
| 153 | - if ($e = spip_pg_errno($serveur)) { |
|
| 154 | - $e .= spip_pg_error($query, $serveur); |
|
| 155 | - } // et du fautif |
|
| 156 | - return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 136 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 137 | + $prefixe = $connexion['prefixe']; |
|
| 138 | + $link = $connexion['link']; |
|
| 139 | + $db = $connexion['db']; |
|
| 140 | + |
|
| 141 | + if (isset($_GET['var_profile'])) { |
|
| 142 | + include_spip('public/tracer'); |
|
| 143 | + $t = trace_query_start(); |
|
| 144 | + $e = ''; |
|
| 145 | + } else { |
|
| 146 | + $t = 0; |
|
| 147 | + } |
|
| 148 | + |
|
| 149 | + $connexion['last'] = $query; |
|
| 150 | + $r = spip_pg_query_simple($link, $query); |
|
| 151 | + |
|
| 152 | + // Log de l'erreur eventuelle |
|
| 153 | + if ($e = spip_pg_errno($serveur)) { |
|
| 154 | + $e .= spip_pg_error($query, $serveur); |
|
| 155 | + } // et du fautif |
|
| 156 | + return $t ? trace_query_end($query, $t, $r, $e, $serveur) : $r; |
|
| 157 | 157 | } |
| 158 | 158 | |
| 159 | 159 | // Fonction de requete generale quand on est sur que c'est SQL standard. |
| 160 | 160 | // Elle change juste le noms des tables ($table_prefix) dans le FROM etc |
| 161 | 161 | |
| 162 | 162 | function spip_pg_query($query, $serveur = '', $requeter = true) { |
| 163 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 164 | - $prefixe = $connexion['prefixe']; |
|
| 165 | - $link = $connexion['link']; |
|
| 166 | - $db = $connexion['db']; |
|
| 167 | - |
|
| 168 | - if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 169 | - $suite = strstr($query, (string) $regs[0]); |
|
| 170 | - $query = substr($query, 0, -strlen($suite)); |
|
| 171 | - } else { |
|
| 172 | - $suite = ''; |
|
| 173 | - } |
|
| 174 | - $query = preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite; |
|
| 175 | - |
|
| 176 | - // renvoyer la requete inerte si demandee |
|
| 177 | - if (!$requeter) { |
|
| 178 | - return $query; |
|
| 179 | - } |
|
| 180 | - |
|
| 181 | - return spip_pg_trace_query($query, $serveur); |
|
| 163 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 164 | + $prefixe = $connexion['prefixe']; |
|
| 165 | + $link = $connexion['link']; |
|
| 166 | + $db = $connexion['db']; |
|
| 167 | + |
|
| 168 | + if (preg_match('/\s(SET|VALUES|WHERE|DATABASE)\s/i', $query, $regs)) { |
|
| 169 | + $suite = strstr($query, (string) $regs[0]); |
|
| 170 | + $query = substr($query, 0, -strlen($suite)); |
|
| 171 | + } else { |
|
| 172 | + $suite = ''; |
|
| 173 | + } |
|
| 174 | + $query = preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite; |
|
| 175 | + |
|
| 176 | + // renvoyer la requete inerte si demandee |
|
| 177 | + if (!$requeter) { |
|
| 178 | + return $query; |
|
| 179 | + } |
|
| 180 | + |
|
| 181 | + return spip_pg_trace_query($query, $serveur); |
|
| 182 | 182 | } |
| 183 | 183 | |
| 184 | 184 | function spip_pg_query_simple($link, $query) { |
| 185 | - #spip_log(var_export($query,true), 'pg.'._LOG_DEBUG); |
|
| 186 | - return pg_query($link, $query); |
|
| 185 | + #spip_log(var_export($query,true), 'pg.'._LOG_DEBUG); |
|
| 186 | + return pg_query($link, $query); |
|
| 187 | 187 | } |
| 188 | 188 | |
| 189 | 189 | /* |
@@ -195,196 +195,196 @@ discard block |
||
| 195 | 195 | * de requetes showtable intempestives |
| 196 | 196 | */ |
| 197 | 197 | function spip_pg_ajouter_champs_timestamp($table, $couples, $desc = '', $serveur = '') { |
| 198 | - static $tables = []; |
|
| 199 | - |
|
| 200 | - if (!isset($tables[$table])) { |
|
| 201 | - if (!$desc) { |
|
| 202 | - $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 203 | - $desc = $trouver_table($table, $serveur); |
|
| 204 | - // si pas de description, on ne fait rien, ou on die() ? |
|
| 205 | - if (!$desc) { |
|
| 206 | - return $couples; |
|
| 207 | - } |
|
| 208 | - } |
|
| 209 | - |
|
| 210 | - // recherche des champs avec simplement 'TIMESTAMP' |
|
| 211 | - // cependant, il faudra peut etre etendre |
|
| 212 | - // avec la gestion de DEFAULT et ON UPDATE |
|
| 213 | - // mais ceux-ci ne sont pas utilises dans le core |
|
| 214 | - $tables[$table] = []; |
|
| 215 | - foreach ($desc['field'] as $k => $v) { |
|
| 216 | - $v = strtolower(ltrim($v)); |
|
| 217 | - // ne pas ajouter de timestamp now() si un default est specifie |
|
| 218 | - if (strpos($v, 'timestamp') === 0 and !str_contains($v, 'default')) { |
|
| 219 | - $tables[$table][] = $k; |
|
| 220 | - } |
|
| 221 | - } |
|
| 222 | - } |
|
| 223 | - |
|
| 224 | - // ajout des champs type 'timestamp' absents |
|
| 225 | - foreach ($tables[$table] as $maj) { |
|
| 226 | - if (!array_key_exists($maj, $couples)) { |
|
| 227 | - $couples[$maj] = 'NOW()'; |
|
| 228 | - } |
|
| 229 | - } |
|
| 230 | - |
|
| 231 | - return $couples; |
|
| 198 | + static $tables = []; |
|
| 199 | + |
|
| 200 | + if (!isset($tables[$table])) { |
|
| 201 | + if (!$desc) { |
|
| 202 | + $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 203 | + $desc = $trouver_table($table, $serveur); |
|
| 204 | + // si pas de description, on ne fait rien, ou on die() ? |
|
| 205 | + if (!$desc) { |
|
| 206 | + return $couples; |
|
| 207 | + } |
|
| 208 | + } |
|
| 209 | + |
|
| 210 | + // recherche des champs avec simplement 'TIMESTAMP' |
|
| 211 | + // cependant, il faudra peut etre etendre |
|
| 212 | + // avec la gestion de DEFAULT et ON UPDATE |
|
| 213 | + // mais ceux-ci ne sont pas utilises dans le core |
|
| 214 | + $tables[$table] = []; |
|
| 215 | + foreach ($desc['field'] as $k => $v) { |
|
| 216 | + $v = strtolower(ltrim($v)); |
|
| 217 | + // ne pas ajouter de timestamp now() si un default est specifie |
|
| 218 | + if (strpos($v, 'timestamp') === 0 and !str_contains($v, 'default')) { |
|
| 219 | + $tables[$table][] = $k; |
|
| 220 | + } |
|
| 221 | + } |
|
| 222 | + } |
|
| 223 | + |
|
| 224 | + // ajout des champs type 'timestamp' absents |
|
| 225 | + foreach ($tables[$table] as $maj) { |
|
| 226 | + if (!array_key_exists($maj, $couples)) { |
|
| 227 | + $couples[$maj] = 'NOW()'; |
|
| 228 | + } |
|
| 229 | + } |
|
| 230 | + |
|
| 231 | + return $couples; |
|
| 232 | 232 | } |
| 233 | 233 | |
| 234 | 234 | |
| 235 | 235 | // Alter en PG ne traite pas les index |
| 236 | 236 | function spip_pg_alter($query, $serveur = '', $requeter = true) { |
| 237 | - // il faudrait une regexp pour eviter de spliter ADD PRIMARY KEY (colA, colB) |
|
| 238 | - // tout en cassant en deux alter distincts "ADD PRIMARY KEY (colA, colB), ADD INDEX (chose)"... |
|
| 239 | - // ou revoir l'api de sql_alter en creant un |
|
| 240 | - // sql_alter_table($table,array($actions)); |
|
| 241 | - if (!preg_match('/\s*((\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) { |
|
| 242 | - spip_log("$query mal comprise", 'pg.' . _LOG_ERREUR); |
|
| 243 | - |
|
| 244 | - return false; |
|
| 245 | - } |
|
| 246 | - $debut = $regs[1]; |
|
| 247 | - $table = $regs[3]; |
|
| 248 | - $suite = $regs[4]; |
|
| 249 | - $todo = explode(',', $suite); |
|
| 250 | - // on remet les morceaux dechires ensembles... que c'est laid ! |
|
| 251 | - $todo2 = []; |
|
| 252 | - $i = 0; |
|
| 253 | - $ouverte = false; |
|
| 254 | - while ($do = array_shift($todo)) { |
|
| 255 | - $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do; |
|
| 256 | - $o = (str_contains($do, '(')); |
|
| 257 | - $f = (str_contains($do, ')')); |
|
| 258 | - if ($o and !$f) { |
|
| 259 | - $ouverte = true; |
|
| 260 | - } elseif ($f) { |
|
| 261 | - $ouverte = false; |
|
| 262 | - } |
|
| 263 | - if (!$ouverte) { |
|
| 264 | - $i++; |
|
| 265 | - } |
|
| 266 | - } |
|
| 267 | - $todo = $todo2; |
|
| 268 | - $query = $debut . ' ' . array_shift($todo); |
|
| 269 | - |
|
| 270 | - if (!preg_match('/^\s*(IGNORE\s*)?TABLE\s+(\w+)\s+(ADD|DROP|CHANGE|MODIFY|RENAME)\s*(.*)$/is', $query, $r)) { |
|
| 271 | - spip_log("$query incompris", 'pg.' . _LOG_ERREUR); |
|
| 272 | - } else { |
|
| 273 | - if ($r[1]) { |
|
| 274 | - spip_log("j'ignore IGNORE dans $query", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 275 | - } |
|
| 276 | - $f = 'spip_pg_alter_' . strtolower($r[3]); |
|
| 277 | - if (function_exists($f)) { |
|
| 278 | - $f($r[2], $r[4], $serveur, $requeter); |
|
| 279 | - } else { |
|
| 280 | - spip_log("$query non prevu", 'pg.' . _LOG_ERREUR); |
|
| 281 | - } |
|
| 282 | - } |
|
| 283 | - // Alter a plusieurs args. Faudrait optimiser. |
|
| 284 | - if ($todo) { |
|
| 285 | - spip_pg_alter("TABLE $table " . join(',', $todo)); |
|
| 286 | - } |
|
| 237 | + // il faudrait une regexp pour eviter de spliter ADD PRIMARY KEY (colA, colB) |
|
| 238 | + // tout en cassant en deux alter distincts "ADD PRIMARY KEY (colA, colB), ADD INDEX (chose)"... |
|
| 239 | + // ou revoir l'api de sql_alter en creant un |
|
| 240 | + // sql_alter_table($table,array($actions)); |
|
| 241 | + if (!preg_match('/\s*((\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) { |
|
| 242 | + spip_log("$query mal comprise", 'pg.' . _LOG_ERREUR); |
|
| 243 | + |
|
| 244 | + return false; |
|
| 245 | + } |
|
| 246 | + $debut = $regs[1]; |
|
| 247 | + $table = $regs[3]; |
|
| 248 | + $suite = $regs[4]; |
|
| 249 | + $todo = explode(',', $suite); |
|
| 250 | + // on remet les morceaux dechires ensembles... que c'est laid ! |
|
| 251 | + $todo2 = []; |
|
| 252 | + $i = 0; |
|
| 253 | + $ouverte = false; |
|
| 254 | + while ($do = array_shift($todo)) { |
|
| 255 | + $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do; |
|
| 256 | + $o = (str_contains($do, '(')); |
|
| 257 | + $f = (str_contains($do, ')')); |
|
| 258 | + if ($o and !$f) { |
|
| 259 | + $ouverte = true; |
|
| 260 | + } elseif ($f) { |
|
| 261 | + $ouverte = false; |
|
| 262 | + } |
|
| 263 | + if (!$ouverte) { |
|
| 264 | + $i++; |
|
| 265 | + } |
|
| 266 | + } |
|
| 267 | + $todo = $todo2; |
|
| 268 | + $query = $debut . ' ' . array_shift($todo); |
|
| 269 | + |
|
| 270 | + if (!preg_match('/^\s*(IGNORE\s*)?TABLE\s+(\w+)\s+(ADD|DROP|CHANGE|MODIFY|RENAME)\s*(.*)$/is', $query, $r)) { |
|
| 271 | + spip_log("$query incompris", 'pg.' . _LOG_ERREUR); |
|
| 272 | + } else { |
|
| 273 | + if ($r[1]) { |
|
| 274 | + spip_log("j'ignore IGNORE dans $query", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 275 | + } |
|
| 276 | + $f = 'spip_pg_alter_' . strtolower($r[3]); |
|
| 277 | + if (function_exists($f)) { |
|
| 278 | + $f($r[2], $r[4], $serveur, $requeter); |
|
| 279 | + } else { |
|
| 280 | + spip_log("$query non prevu", 'pg.' . _LOG_ERREUR); |
|
| 281 | + } |
|
| 282 | + } |
|
| 283 | + // Alter a plusieurs args. Faudrait optimiser. |
|
| 284 | + if ($todo) { |
|
| 285 | + spip_pg_alter("TABLE $table " . join(',', $todo)); |
|
| 286 | + } |
|
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | function spip_pg_alter_change($table, $arg, $serveur = '', $requeter = true) { |
| 290 | - if (!preg_match('/^`?(\w+)`?\s+`?(\w+)`?\s+(.*?)\s*(DEFAULT .*?)?(NOT\s+NULL)?\s*(DEFAULT .*?)?$/i', $arg, $r)) { |
|
| 291 | - spip_log("alter change: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 292 | - } else { |
|
| 293 | - [, $old, $new, $type, $default, $null, $def2] = $r; |
|
| 294 | - $actions = ["ALTER $old TYPE " . mysql2pg_type($type)]; |
|
| 295 | - if ($null) { |
|
| 296 | - $actions[] = "ALTER $old SET NOT NULL"; |
|
| 297 | - } else { |
|
| 298 | - $actions[] = "ALTER $old DROP NOT NULL"; |
|
| 299 | - } |
|
| 300 | - |
|
| 301 | - if ($d = ($default ?: $def2)) { |
|
| 302 | - $actions[] = "ALTER $old SET $d"; |
|
| 303 | - } else { |
|
| 304 | - $actions[] = "ALTER $old DROP DEFAULT"; |
|
| 305 | - } |
|
| 306 | - |
|
| 307 | - spip_pg_query("ALTER TABLE $table " . join(', ', $actions)); |
|
| 308 | - |
|
| 309 | - if ($old != $new) { |
|
| 310 | - spip_pg_query("ALTER TABLE $table RENAME $old TO $new", $serveur); |
|
| 311 | - } |
|
| 312 | - } |
|
| 290 | + if (!preg_match('/^`?(\w+)`?\s+`?(\w+)`?\s+(.*?)\s*(DEFAULT .*?)?(NOT\s+NULL)?\s*(DEFAULT .*?)?$/i', $arg, $r)) { |
|
| 291 | + spip_log("alter change: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 292 | + } else { |
|
| 293 | + [, $old, $new, $type, $default, $null, $def2] = $r; |
|
| 294 | + $actions = ["ALTER $old TYPE " . mysql2pg_type($type)]; |
|
| 295 | + if ($null) { |
|
| 296 | + $actions[] = "ALTER $old SET NOT NULL"; |
|
| 297 | + } else { |
|
| 298 | + $actions[] = "ALTER $old DROP NOT NULL"; |
|
| 299 | + } |
|
| 300 | + |
|
| 301 | + if ($d = ($default ?: $def2)) { |
|
| 302 | + $actions[] = "ALTER $old SET $d"; |
|
| 303 | + } else { |
|
| 304 | + $actions[] = "ALTER $old DROP DEFAULT"; |
|
| 305 | + } |
|
| 306 | + |
|
| 307 | + spip_pg_query("ALTER TABLE $table " . join(', ', $actions)); |
|
| 308 | + |
|
| 309 | + if ($old != $new) { |
|
| 310 | + spip_pg_query("ALTER TABLE $table RENAME $old TO $new", $serveur); |
|
| 311 | + } |
|
| 312 | + } |
|
| 313 | 313 | } |
| 314 | 314 | |
| 315 | 315 | function spip_pg_alter_add($table, $arg, $serveur = '', $requeter = true) { |
| 316 | - $nom_index = null; |
|
| 317 | - if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*(.*)$/', $arg, $r)) { |
|
| 318 | - spip_log("alter add $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 319 | - |
|
| 320 | - return null; |
|
| 321 | - } |
|
| 322 | - if (!$r[1] or $r[1] == 'COLUMN') { |
|
| 323 | - preg_match('/`?(\w+)`?(.*)/', $r[2], $m); |
|
| 324 | - if (preg_match('/^(.*)(BEFORE|AFTER|FIRST)(.*)$/is', $m[2], $n)) { |
|
| 325 | - $m[2] = $n[1]; |
|
| 326 | - } |
|
| 327 | - |
|
| 328 | - return spip_pg_query("ALTER TABLE $table ADD " . $m[1] . ' ' . mysql2pg_type($m[2]), $serveur, $requeter); |
|
| 329 | - } elseif ($r[1][0] == 'P') { |
|
| 330 | - // la primary peut etre sur plusieurs champs |
|
| 331 | - $r[2] = trim(str_replace('`', '', $r[2])); |
|
| 332 | - $m = ($r[2][0] == '(') ? substr($r[2], 1, -1) : $r[2]; |
|
| 333 | - |
|
| 334 | - return spip_pg_query( |
|
| 335 | - "ALTER TABLE $table ADD CONSTRAINT $table" . '_pkey PRIMARY KEY (' . $m . ')', |
|
| 336 | - $serveur, |
|
| 337 | - $requeter |
|
| 338 | - ); |
|
| 339 | - } else { |
|
| 340 | - preg_match('/([^\s,]*)\s*(.*)?/', $r[2], $m); |
|
| 341 | - // peut etre "(colonne)" ou "nom_index (colonnes)" |
|
| 342 | - // bug potentiel si qqn met "(colonne, colonne)" |
|
| 343 | - // |
|
| 344 | - // nom_index (colonnes) |
|
| 345 | - if ($m[2]) { |
|
| 346 | - $colonnes = substr($m[2], 1, -1); |
|
| 347 | - $nom_index = $m[1]; |
|
| 348 | - } else { |
|
| 349 | - // (colonne) |
|
| 350 | - if ($m[1][0] == '(') { |
|
| 351 | - $colonnes = substr($m[1], 1, -1); |
|
| 352 | - if (str_contains(',', $colonnes)) { |
|
| 353 | - spip_log('PG : Erreur, impossible de creer un index sur plusieurs colonnes' |
|
| 354 | - . " sans qu'il ait de nom ($table, ($colonnes))", 'pg.' . _LOG_ERREUR); |
|
| 355 | - } else { |
|
| 356 | - $nom_index = $colonnes; |
|
| 357 | - } |
|
| 358 | - } // nom_index |
|
| 359 | - else { |
|
| 360 | - $nom_index = $colonnes = $m[1]; |
|
| 361 | - } |
|
| 362 | - } |
|
| 363 | - |
|
| 364 | - return spip_pg_create_index($nom_index, $table, $colonnes, $serveur, $requeter); |
|
| 365 | - } |
|
| 316 | + $nom_index = null; |
|
| 317 | + if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*(.*)$/', $arg, $r)) { |
|
| 318 | + spip_log("alter add $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 319 | + |
|
| 320 | + return null; |
|
| 321 | + } |
|
| 322 | + if (!$r[1] or $r[1] == 'COLUMN') { |
|
| 323 | + preg_match('/`?(\w+)`?(.*)/', $r[2], $m); |
|
| 324 | + if (preg_match('/^(.*)(BEFORE|AFTER|FIRST)(.*)$/is', $m[2], $n)) { |
|
| 325 | + $m[2] = $n[1]; |
|
| 326 | + } |
|
| 327 | + |
|
| 328 | + return spip_pg_query("ALTER TABLE $table ADD " . $m[1] . ' ' . mysql2pg_type($m[2]), $serveur, $requeter); |
|
| 329 | + } elseif ($r[1][0] == 'P') { |
|
| 330 | + // la primary peut etre sur plusieurs champs |
|
| 331 | + $r[2] = trim(str_replace('`', '', $r[2])); |
|
| 332 | + $m = ($r[2][0] == '(') ? substr($r[2], 1, -1) : $r[2]; |
|
| 333 | + |
|
| 334 | + return spip_pg_query( |
|
| 335 | + "ALTER TABLE $table ADD CONSTRAINT $table" . '_pkey PRIMARY KEY (' . $m . ')', |
|
| 336 | + $serveur, |
|
| 337 | + $requeter |
|
| 338 | + ); |
|
| 339 | + } else { |
|
| 340 | + preg_match('/([^\s,]*)\s*(.*)?/', $r[2], $m); |
|
| 341 | + // peut etre "(colonne)" ou "nom_index (colonnes)" |
|
| 342 | + // bug potentiel si qqn met "(colonne, colonne)" |
|
| 343 | + // |
|
| 344 | + // nom_index (colonnes) |
|
| 345 | + if ($m[2]) { |
|
| 346 | + $colonnes = substr($m[2], 1, -1); |
|
| 347 | + $nom_index = $m[1]; |
|
| 348 | + } else { |
|
| 349 | + // (colonne) |
|
| 350 | + if ($m[1][0] == '(') { |
|
| 351 | + $colonnes = substr($m[1], 1, -1); |
|
| 352 | + if (str_contains(',', $colonnes)) { |
|
| 353 | + spip_log('PG : Erreur, impossible de creer un index sur plusieurs colonnes' |
|
| 354 | + . " sans qu'il ait de nom ($table, ($colonnes))", 'pg.' . _LOG_ERREUR); |
|
| 355 | + } else { |
|
| 356 | + $nom_index = $colonnes; |
|
| 357 | + } |
|
| 358 | + } // nom_index |
|
| 359 | + else { |
|
| 360 | + $nom_index = $colonnes = $m[1]; |
|
| 361 | + } |
|
| 362 | + } |
|
| 363 | + |
|
| 364 | + return spip_pg_create_index($nom_index, $table, $colonnes, $serveur, $requeter); |
|
| 365 | + } |
|
| 366 | 366 | } |
| 367 | 367 | |
| 368 | 368 | function spip_pg_alter_drop($table, $arg, $serveur = '', $requeter = true) { |
| 369 | - if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*`?(\w*)`?/', $arg, $r)) { |
|
| 370 | - spip_log("alter drop: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 371 | - } else { |
|
| 372 | - if (!$r[1] or $r[1] == 'COLUMN') { |
|
| 373 | - return spip_pg_query("ALTER TABLE $table DROP " . $r[2], $serveur); |
|
| 374 | - } elseif ($r[1][0] == 'P') { |
|
| 375 | - return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table" . '_pkey', $serveur); |
|
| 376 | - } else { |
|
| 377 | - return spip_pg_query('DROP INDEX ' . $table . '_' . $r[2], $serveur); |
|
| 378 | - } |
|
| 379 | - } |
|
| 369 | + if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*`?(\w*)`?/', $arg, $r)) { |
|
| 370 | + spip_log("alter drop: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 371 | + } else { |
|
| 372 | + if (!$r[1] or $r[1] == 'COLUMN') { |
|
| 373 | + return spip_pg_query("ALTER TABLE $table DROP " . $r[2], $serveur); |
|
| 374 | + } elseif ($r[1][0] == 'P') { |
|
| 375 | + return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table" . '_pkey', $serveur); |
|
| 376 | + } else { |
|
| 377 | + return spip_pg_query('DROP INDEX ' . $table . '_' . $r[2], $serveur); |
|
| 378 | + } |
|
| 379 | + } |
|
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | function spip_pg_alter_modify($table, $arg, $serveur = '', $requeter = true) { |
| 383 | - if (!preg_match('/^`?(\w+)`?\s+(.*)$/', $arg, $r)) { |
|
| 384 | - spip_log("alter modify: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 385 | - } else { |
|
| 386 | - return spip_pg_alter_change($table, $r[1] . ' ' . $arg, $serveur = '', $requeter = true); |
|
| 387 | - } |
|
| 383 | + if (!preg_match('/^`?(\w+)`?\s+(.*)$/', $arg, $r)) { |
|
| 384 | + spip_log("alter modify: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 385 | + } else { |
|
| 386 | + return spip_pg_alter_change($table, $r[1] . ' ' . $arg, $serveur = '', $requeter = true); |
|
| 387 | + } |
|
| 388 | 388 | } |
| 389 | 389 | |
| 390 | 390 | // attention (en pg) : |
@@ -392,17 +392,17 @@ discard block |
||
| 392 | 392 | // - alter table A rename X to Y = changer le nom de la colonne X en Y |
| 393 | 393 | // pour l'instant, traiter simplement RENAME TO X |
| 394 | 394 | function spip_pg_alter_rename($table, $arg, $serveur = '', $requeter = true) { |
| 395 | - $rename = ''; |
|
| 396 | - // si TO, mais pas au debut |
|
| 397 | - if (!stripos($arg, 'TO ')) { |
|
| 398 | - $rename = $arg; |
|
| 399 | - } elseif (preg_match('/^(TO)\s*`?(\w*)`?/', $arg, $r)) { |
|
| 400 | - $rename = $r[2]; |
|
| 401 | - } else { |
|
| 402 | - spip_log("alter rename: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 403 | - } |
|
| 404 | - |
|
| 405 | - return $rename ? spip_pg_query("ALTER TABLE $table RENAME TO $rename") : false; |
|
| 395 | + $rename = ''; |
|
| 396 | + // si TO, mais pas au debut |
|
| 397 | + if (!stripos($arg, 'TO ')) { |
|
| 398 | + $rename = $arg; |
|
| 399 | + } elseif (preg_match('/^(TO)\s*`?(\w*)`?/', $arg, $r)) { |
|
| 400 | + $rename = $r[2]; |
|
| 401 | + } else { |
|
| 402 | + spip_log("alter rename: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 403 | + } |
|
| 404 | + |
|
| 405 | + return $rename ? spip_pg_query("ALTER TABLE $table RENAME TO $rename") : false; |
|
| 406 | 406 | } |
| 407 | 407 | |
| 408 | 408 | |
@@ -418,59 +418,59 @@ discard block |
||
| 418 | 418 | * @return bool ou requete |
| 419 | 419 | */ |
| 420 | 420 | function spip_pg_create_index($nom, $table, $champs, $serveur = '', $requeter = true) { |
| 421 | - if (!($nom or $table or $champs)) { |
|
| 422 | - spip_log( |
|
| 423 | - "Champ manquant pour creer un index pg ($nom, $table, (" . @join(',', $champs) . '))', |
|
| 424 | - 'pg.' . _LOG_ERREUR |
|
| 425 | - ); |
|
| 426 | - |
|
| 427 | - return false; |
|
| 428 | - } |
|
| 429 | - |
|
| 430 | - $nom = str_replace('`', '', $nom); |
|
| 431 | - $champs = str_replace('`', '', $champs); |
|
| 432 | - |
|
| 433 | - // PG ne differentie pas noms des index en fonction des tables |
|
| 434 | - // il faut donc creer des noms uniques d'index pour une base pg |
|
| 435 | - $nom = $table . '_' . $nom; |
|
| 436 | - // enlever d'eventuelles parentheses deja presentes sur champs |
|
| 437 | - if (!is_array($champs)) { |
|
| 438 | - if ($champs[0] == '(') { |
|
| 439 | - $champs = substr($champs, 1, -1); |
|
| 440 | - } |
|
| 441 | - $champs = [$champs]; |
|
| 442 | - } |
|
| 443 | - $query = "CREATE INDEX $nom ON $table (" . join(',', $champs) . ')'; |
|
| 444 | - if (!$requeter) { |
|
| 445 | - return $query; |
|
| 446 | - } |
|
| 447 | - $res = spip_pg_query($query, $serveur, $requeter); |
|
| 448 | - |
|
| 449 | - return $res; |
|
| 421 | + if (!($nom or $table or $champs)) { |
|
| 422 | + spip_log( |
|
| 423 | + "Champ manquant pour creer un index pg ($nom, $table, (" . @join(',', $champs) . '))', |
|
| 424 | + 'pg.' . _LOG_ERREUR |
|
| 425 | + ); |
|
| 426 | + |
|
| 427 | + return false; |
|
| 428 | + } |
|
| 429 | + |
|
| 430 | + $nom = str_replace('`', '', $nom); |
|
| 431 | + $champs = str_replace('`', '', $champs); |
|
| 432 | + |
|
| 433 | + // PG ne differentie pas noms des index en fonction des tables |
|
| 434 | + // il faut donc creer des noms uniques d'index pour une base pg |
|
| 435 | + $nom = $table . '_' . $nom; |
|
| 436 | + // enlever d'eventuelles parentheses deja presentes sur champs |
|
| 437 | + if (!is_array($champs)) { |
|
| 438 | + if ($champs[0] == '(') { |
|
| 439 | + $champs = substr($champs, 1, -1); |
|
| 440 | + } |
|
| 441 | + $champs = [$champs]; |
|
| 442 | + } |
|
| 443 | + $query = "CREATE INDEX $nom ON $table (" . join(',', $champs) . ')'; |
|
| 444 | + if (!$requeter) { |
|
| 445 | + return $query; |
|
| 446 | + } |
|
| 447 | + $res = spip_pg_query($query, $serveur, $requeter); |
|
| 448 | + |
|
| 449 | + return $res; |
|
| 450 | 450 | } |
| 451 | 451 | |
| 452 | 452 | |
| 453 | 453 | function spip_pg_explain($query, $serveur = '', $requeter = true) { |
| 454 | - if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 455 | - return []; |
|
| 456 | - } |
|
| 457 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 458 | - $prefixe = $connexion['prefixe']; |
|
| 459 | - $link = $connexion['link']; |
|
| 460 | - if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $query, $regs)) { |
|
| 461 | - $suite = strstr($query, (string) $regs[0]); |
|
| 462 | - $query = substr($query, 0, -strlen($suite)); |
|
| 463 | - } else { |
|
| 464 | - $suite = ''; |
|
| 465 | - } |
|
| 466 | - $query = 'EXPLAIN ' . preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite; |
|
| 467 | - |
|
| 468 | - if (!$requeter) { |
|
| 469 | - return $query; |
|
| 470 | - } |
|
| 471 | - $r = spip_pg_query_simple($link, $query); |
|
| 472 | - |
|
| 473 | - return spip_pg_fetch($r, null, $serveur); |
|
| 454 | + if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 455 | + return []; |
|
| 456 | + } |
|
| 457 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 458 | + $prefixe = $connexion['prefixe']; |
|
| 459 | + $link = $connexion['link']; |
|
| 460 | + if (preg_match('/\s(SET|VALUES|WHERE)\s/i', $query, $regs)) { |
|
| 461 | + $suite = strstr($query, (string) $regs[0]); |
|
| 462 | + $query = substr($query, 0, -strlen($suite)); |
|
| 463 | + } else { |
|
| 464 | + $suite = ''; |
|
| 465 | + } |
|
| 466 | + $query = 'EXPLAIN ' . preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite; |
|
| 467 | + |
|
| 468 | + if (!$requeter) { |
|
| 469 | + return $query; |
|
| 470 | + } |
|
| 471 | + $r = spip_pg_query_simple($link, $query); |
|
| 472 | + |
|
| 473 | + return spip_pg_fetch($r, null, $serveur); |
|
| 474 | 474 | } |
| 475 | 475 | |
| 476 | 476 | |
@@ -489,92 +489,92 @@ discard block |
||
| 489 | 489 | * - False en cas d'erreur. |
| 490 | 490 | **/ |
| 491 | 491 | function spip_pg_selectdb($db, $serveur = '', $requeter = true) { |
| 492 | - // se connecter a la base indiquee |
|
| 493 | - // avec les identifiants connus |
|
| 494 | - $index = $serveur ? strtolower($serveur) : 0; |
|
| 495 | - |
|
| 496 | - if ($link = spip_connect_db('', '', '', '', $db, 'pg', '', '')) { |
|
| 497 | - if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) { |
|
| 498 | - return $db; |
|
| 499 | - } |
|
| 500 | - } else { |
|
| 501 | - return false; |
|
| 502 | - } |
|
| 492 | + // se connecter a la base indiquee |
|
| 493 | + // avec les identifiants connus |
|
| 494 | + $index = $serveur ? strtolower($serveur) : 0; |
|
| 495 | + |
|
| 496 | + if ($link = spip_connect_db('', '', '', '', $db, 'pg', '', '')) { |
|
| 497 | + if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) { |
|
| 498 | + return $db; |
|
| 499 | + } |
|
| 500 | + } else { |
|
| 501 | + return false; |
|
| 502 | + } |
|
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | // Qu'une seule base pour le moment |
| 506 | 506 | |
| 507 | 507 | function spip_pg_listdbs($serveur) { |
| 508 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 509 | - $link = $connexion['link']; |
|
| 510 | - $dbs = []; |
|
| 511 | - $res = spip_pg_query_simple($link, 'select * From pg_database'); |
|
| 512 | - while ($row = pg_fetch_array($res, null, PGSQL_NUM)) { |
|
| 513 | - $dbs[] = reset($row); |
|
| 514 | - } |
|
| 515 | - |
|
| 516 | - return $dbs; |
|
| 508 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 509 | + $link = $connexion['link']; |
|
| 510 | + $dbs = []; |
|
| 511 | + $res = spip_pg_query_simple($link, 'select * From pg_database'); |
|
| 512 | + while ($row = pg_fetch_array($res, null, PGSQL_NUM)) { |
|
| 513 | + $dbs[] = reset($row); |
|
| 514 | + } |
|
| 515 | + |
|
| 516 | + return $dbs; |
|
| 517 | 517 | } |
| 518 | 518 | |
| 519 | 519 | function spip_pg_select( |
| 520 | - $select, |
|
| 521 | - $from, |
|
| 522 | - $where = '', |
|
| 523 | - $groupby = [], |
|
| 524 | - $orderby = '', |
|
| 525 | - $limit = '', |
|
| 526 | - $having = '', |
|
| 527 | - $serveur = '', |
|
| 528 | - $requeter = true |
|
| 520 | + $select, |
|
| 521 | + $from, |
|
| 522 | + $where = '', |
|
| 523 | + $groupby = [], |
|
| 524 | + $orderby = '', |
|
| 525 | + $limit = '', |
|
| 526 | + $having = '', |
|
| 527 | + $serveur = '', |
|
| 528 | + $requeter = true |
|
| 529 | 529 | ) { |
| 530 | 530 | |
| 531 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 532 | - $prefixe = $connexion['prefixe']; |
|
| 533 | - $link = $connexion['link']; |
|
| 534 | - $db = $connexion['db']; |
|
| 535 | - |
|
| 536 | - $limit = preg_match('/^\s*(([0-9]+),)?\s*([0-9]+)\s*$/', $limit, $limatch); |
|
| 537 | - if ($limit) { |
|
| 538 | - $offset = $limatch[2]; |
|
| 539 | - $count = $limatch[3]; |
|
| 540 | - } |
|
| 541 | - |
|
| 542 | - $select = spip_pg_frommysql($select); |
|
| 543 | - |
|
| 544 | - // si pas de tri explicitement demande, le GROUP BY ne |
|
| 545 | - // contient que la clef primaire. |
|
| 546 | - // lui ajouter alors le champ de tri par defaut |
|
| 547 | - if (preg_match('/FIELD\(([a-z]+\.[a-z]+),/i', $orderby[0], $groupbyplus)) { |
|
| 548 | - $groupby[] = $groupbyplus[1]; |
|
| 549 | - } |
|
| 550 | - |
|
| 551 | - $orderby = spip_pg_orderby($orderby, $select); |
|
| 552 | - |
|
| 553 | - if ($having) { |
|
| 554 | - if (is_array($having)) { |
|
| 555 | - $having = join("\n\tAND ", array_map('calculer_pg_where', $having)); |
|
| 556 | - } |
|
| 557 | - } |
|
| 558 | - $from = spip_pg_from($from, $prefixe); |
|
| 559 | - $query = 'SELECT ' . $select |
|
| 560 | - . (!$from ? '' : "\nFROM $from") |
|
| 561 | - . (!$where ? '' : ("\nWHERE " . (!is_array($where) ? calculer_pg_where($where) : (join( |
|
| 562 | - "\n\tAND ", |
|
| 563 | - array_map('calculer_pg_where', $where) |
|
| 564 | - ))))) |
|
| 565 | - . spip_pg_groupby($groupby, $from, $select) |
|
| 566 | - . (!$having ? '' : "\nHAVING $having") |
|
| 567 | - . ($orderby ? ("\nORDER BY $orderby") : '') |
|
| 568 | - . (!$limit ? '' : (" LIMIT $count" . (!$offset ? '' : " OFFSET $offset"))); |
|
| 569 | - |
|
| 570 | - // renvoyer la requete inerte si demandee |
|
| 571 | - if ($requeter === false) { |
|
| 572 | - return $query; |
|
| 573 | - } |
|
| 574 | - |
|
| 575 | - $r = spip_pg_trace_query($query, $serveur); |
|
| 576 | - |
|
| 577 | - return $r ?: $query; |
|
| 531 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 532 | + $prefixe = $connexion['prefixe']; |
|
| 533 | + $link = $connexion['link']; |
|
| 534 | + $db = $connexion['db']; |
|
| 535 | + |
|
| 536 | + $limit = preg_match('/^\s*(([0-9]+),)?\s*([0-9]+)\s*$/', $limit, $limatch); |
|
| 537 | + if ($limit) { |
|
| 538 | + $offset = $limatch[2]; |
|
| 539 | + $count = $limatch[3]; |
|
| 540 | + } |
|
| 541 | + |
|
| 542 | + $select = spip_pg_frommysql($select); |
|
| 543 | + |
|
| 544 | + // si pas de tri explicitement demande, le GROUP BY ne |
|
| 545 | + // contient que la clef primaire. |
|
| 546 | + // lui ajouter alors le champ de tri par defaut |
|
| 547 | + if (preg_match('/FIELD\(([a-z]+\.[a-z]+),/i', $orderby[0], $groupbyplus)) { |
|
| 548 | + $groupby[] = $groupbyplus[1]; |
|
| 549 | + } |
|
| 550 | + |
|
| 551 | + $orderby = spip_pg_orderby($orderby, $select); |
|
| 552 | + |
|
| 553 | + if ($having) { |
|
| 554 | + if (is_array($having)) { |
|
| 555 | + $having = join("\n\tAND ", array_map('calculer_pg_where', $having)); |
|
| 556 | + } |
|
| 557 | + } |
|
| 558 | + $from = spip_pg_from($from, $prefixe); |
|
| 559 | + $query = 'SELECT ' . $select |
|
| 560 | + . (!$from ? '' : "\nFROM $from") |
|
| 561 | + . (!$where ? '' : ("\nWHERE " . (!is_array($where) ? calculer_pg_where($where) : (join( |
|
| 562 | + "\n\tAND ", |
|
| 563 | + array_map('calculer_pg_where', $where) |
|
| 564 | + ))))) |
|
| 565 | + . spip_pg_groupby($groupby, $from, $select) |
|
| 566 | + . (!$having ? '' : "\nHAVING $having") |
|
| 567 | + . ($orderby ? ("\nORDER BY $orderby") : '') |
|
| 568 | + . (!$limit ? '' : (" LIMIT $count" . (!$offset ? '' : " OFFSET $offset"))); |
|
| 569 | + |
|
| 570 | + // renvoyer la requete inerte si demandee |
|
| 571 | + if ($requeter === false) { |
|
| 572 | + return $query; |
|
| 573 | + } |
|
| 574 | + |
|
| 575 | + $r = spip_pg_trace_query($query, $serveur); |
|
| 576 | + |
|
| 577 | + return $r ?: $query; |
|
| 578 | 578 | ; |
| 579 | 579 | } |
| 580 | 580 | |
@@ -582,26 +582,26 @@ discard block |
||
| 582 | 582 | // car le reste de la requete utilise les alias (AS) systematiquement |
| 583 | 583 | |
| 584 | 584 | function spip_pg_from($from, $prefixe) { |
| 585 | - if (is_array($from)) { |
|
| 586 | - $from = spip_pg_select_as($from); |
|
| 587 | - } |
|
| 585 | + if (is_array($from)) { |
|
| 586 | + $from = spip_pg_select_as($from); |
|
| 587 | + } |
|
| 588 | 588 | |
| 589 | - return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1' . $prefixe . '_', $from); |
|
| 589 | + return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1' . $prefixe . '_', $from); |
|
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | function spip_pg_orderby($order, $select) { |
| 593 | - $res = []; |
|
| 594 | - $arg = (is_array($order) ? $order : preg_split('/\s*,\s*/', $order)); |
|
| 595 | - |
|
| 596 | - foreach ($arg as $v) { |
|
| 597 | - if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+' . $v . '/', $select, $m)) { |
|
| 598 | - $res[] = $m[1]; |
|
| 599 | - } else { |
|
| 600 | - $res[] = $v; |
|
| 601 | - } |
|
| 602 | - } |
|
| 603 | - |
|
| 604 | - return spip_pg_frommysql(join(',', $res)); |
|
| 593 | + $res = []; |
|
| 594 | + $arg = (is_array($order) ? $order : preg_split('/\s*,\s*/', $order)); |
|
| 595 | + |
|
| 596 | + foreach ($arg as $v) { |
|
| 597 | + if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+' . $v . '/', $select, $m)) { |
|
| 598 | + $res[] = $m[1]; |
|
| 599 | + } else { |
|
| 600 | + $res[] = $v; |
|
| 601 | + } |
|
| 602 | + } |
|
| 603 | + |
|
| 604 | + return spip_pg_frommysql(join(',', $res)); |
|
| 605 | 605 | } |
| 606 | 606 | |
| 607 | 607 | // Conversion a l'arrach' des jointures MySQL en jointures PG |
@@ -609,56 +609,56 @@ discard block |
||
| 609 | 609 | // et pour enlever les repetitions (sans incidence de perf, mais ca fait sale) |
| 610 | 610 | |
| 611 | 611 | function spip_pg_groupby($groupby, $from, $select) { |
| 612 | - $join = strpos($from, ','); |
|
| 613 | - // ismplifier avant de decouper |
|
| 614 | - if (is_string($select)) { // fct SQL sur colonne et constante apostrophee ==> la colonne |
|
| 615 | - $select = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $select); |
|
| 616 | - } |
|
| 617 | - |
|
| 618 | - if ($join or $groupby) { |
|
| 619 | - $join = is_array($select) ? $select : explode(', ', $select); |
|
| 620 | - } |
|
| 621 | - if ($join) { |
|
| 622 | - // enlever les 0 as points, '', ... |
|
| 623 | - foreach ($join as $k => $v) { |
|
| 624 | - $v = str_replace('DISTINCT ', '', $v); |
|
| 625 | - // fct SQL sur colonne et constante apostrophee ==> la colonne |
|
| 626 | - $v = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $v); |
|
| 627 | - $v = preg_replace('/CAST\(\s*([^(),\' ]*\s+)as\s*\w+\)/', '\\1', $v); |
|
| 628 | - // resultat d'agregat ne sont pas a mettre dans le groupby |
|
| 629 | - $v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)(\s*AS\s+\w+)\s*,?/i', '', $v); |
|
| 630 | - // idem sans AS (fetch numerique) |
|
| 631 | - $v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)\s*,?/i', '', $v); |
|
| 632 | - // des AS simples : on garde le cote droit du AS |
|
| 633 | - $v = preg_replace('/^.*\sAS\s+(\w+)\s*$/i', '\\1', $v); |
|
| 634 | - // ne reste plus que les vrais colonnes, ou des constantes a virer |
|
| 635 | - if (preg_match(',^[\'"],', $v) or is_numeric($v)) { |
|
| 636 | - unset($join[$k]); |
|
| 637 | - } else { |
|
| 638 | - $join[$k] = trim($v); |
|
| 639 | - } |
|
| 640 | - } |
|
| 641 | - $join = array_diff($join, ['']); |
|
| 642 | - $join = implode(',', $join); |
|
| 643 | - } |
|
| 644 | - if (is_array($groupby)) { |
|
| 645 | - $groupby = join(',', $groupby); |
|
| 646 | - } |
|
| 647 | - if ($join) { |
|
| 648 | - $groupby = $groupby ? "$groupby, $join" : $join; |
|
| 649 | - } |
|
| 650 | - if (!$groupby) { |
|
| 651 | - return ''; |
|
| 652 | - } |
|
| 653 | - |
|
| 654 | - $groupby = spip_pg_frommysql($groupby); |
|
| 655 | - // Ne pas mettre dans le Group-By des valeurs numeriques |
|
| 656 | - // issue de prepare_recherche |
|
| 657 | - $groupby = preg_replace('/^\s*\d+\s+AS\s+\w+\s*,?\s*/i', '', $groupby); |
|
| 658 | - $groupby = preg_replace('/,\s*\d+\s+AS\s+\w+\s*/i', '', $groupby); |
|
| 659 | - $groupby = preg_replace('/\s+AS\s+\w+\s*/i', '', $groupby); |
|
| 660 | - |
|
| 661 | - return "\nGROUP BY $groupby"; |
|
| 612 | + $join = strpos($from, ','); |
|
| 613 | + // ismplifier avant de decouper |
|
| 614 | + if (is_string($select)) { // fct SQL sur colonne et constante apostrophee ==> la colonne |
|
| 615 | + $select = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $select); |
|
| 616 | + } |
|
| 617 | + |
|
| 618 | + if ($join or $groupby) { |
|
| 619 | + $join = is_array($select) ? $select : explode(', ', $select); |
|
| 620 | + } |
|
| 621 | + if ($join) { |
|
| 622 | + // enlever les 0 as points, '', ... |
|
| 623 | + foreach ($join as $k => $v) { |
|
| 624 | + $v = str_replace('DISTINCT ', '', $v); |
|
| 625 | + // fct SQL sur colonne et constante apostrophee ==> la colonne |
|
| 626 | + $v = preg_replace('/\w+\(\s*([^(),\']*),\s*\'[^\']*\'[^)]*\)/', '\\1', $v); |
|
| 627 | + $v = preg_replace('/CAST\(\s*([^(),\' ]*\s+)as\s*\w+\)/', '\\1', $v); |
|
| 628 | + // resultat d'agregat ne sont pas a mettre dans le groupby |
|
| 629 | + $v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)(\s*AS\s+\w+)\s*,?/i', '', $v); |
|
| 630 | + // idem sans AS (fetch numerique) |
|
| 631 | + $v = preg_replace('/(SUM|COUNT|MAX|MIN|UPPER)\([^)]+\)\s*,?/i', '', $v); |
|
| 632 | + // des AS simples : on garde le cote droit du AS |
|
| 633 | + $v = preg_replace('/^.*\sAS\s+(\w+)\s*$/i', '\\1', $v); |
|
| 634 | + // ne reste plus que les vrais colonnes, ou des constantes a virer |
|
| 635 | + if (preg_match(',^[\'"],', $v) or is_numeric($v)) { |
|
| 636 | + unset($join[$k]); |
|
| 637 | + } else { |
|
| 638 | + $join[$k] = trim($v); |
|
| 639 | + } |
|
| 640 | + } |
|
| 641 | + $join = array_diff($join, ['']); |
|
| 642 | + $join = implode(',', $join); |
|
| 643 | + } |
|
| 644 | + if (is_array($groupby)) { |
|
| 645 | + $groupby = join(',', $groupby); |
|
| 646 | + } |
|
| 647 | + if ($join) { |
|
| 648 | + $groupby = $groupby ? "$groupby, $join" : $join; |
|
| 649 | + } |
|
| 650 | + if (!$groupby) { |
|
| 651 | + return ''; |
|
| 652 | + } |
|
| 653 | + |
|
| 654 | + $groupby = spip_pg_frommysql($groupby); |
|
| 655 | + // Ne pas mettre dans le Group-By des valeurs numeriques |
|
| 656 | + // issue de prepare_recherche |
|
| 657 | + $groupby = preg_replace('/^\s*\d+\s+AS\s+\w+\s*,?\s*/i', '', $groupby); |
|
| 658 | + $groupby = preg_replace('/,\s*\d+\s+AS\s+\w+\s*/i', '', $groupby); |
|
| 659 | + $groupby = preg_replace('/\s+AS\s+\w+\s*/i', '', $groupby); |
|
| 660 | + |
|
| 661 | + return "\nGROUP BY $groupby"; |
|
| 662 | 662 | } |
| 663 | 663 | |
| 664 | 664 | // Conversion des operateurs MySQL en PG |
@@ -669,492 +669,492 @@ discard block |
||
| 669 | 669 | // A ameliorer. |
| 670 | 670 | |
| 671 | 671 | function spip_pg_frommysql($arg) { |
| 672 | - if (is_array($arg)) { |
|
| 673 | - $arg = join(', ', $arg); |
|
| 674 | - } |
|
| 675 | - |
|
| 676 | - $res = spip_pg_fromfield($arg); |
|
| 677 | - |
|
| 678 | - $res = preg_replace('/\brand[(][)]/i', 'random()', $res); |
|
| 679 | - |
|
| 680 | - $res = preg_replace( |
|
| 681 | - '/\b0\.0[+]([a-zA-Z0-9_.]+)\s*/', |
|
| 682 | - 'CAST(substring(\1, \'^ *[0-9.]+\') as float)', |
|
| 683 | - $res |
|
| 684 | - ); |
|
| 685 | - $res = preg_replace( |
|
| 686 | - '/\b0[+]([a-zA-Z0-9_.]+)\s*/', |
|
| 687 | - 'CAST(substring(\1, \'^ *[0-9]+\') as int)', |
|
| 688 | - $res |
|
| 689 | - ); |
|
| 690 | - $res = preg_replace( |
|
| 691 | - '/\bconv[(]([^,]*)[^)]*[)]/i', |
|
| 692 | - 'CAST(substring(\1, \'^ *[0-9]+\') as int)', |
|
| 693 | - $res |
|
| 694 | - ); |
|
| 695 | - |
|
| 696 | - $res = preg_replace( |
|
| 697 | - '/UNIX_TIMESTAMP\s*[(]\s*[)]/', |
|
| 698 | - ' EXTRACT(epoch FROM NOW())', |
|
| 699 | - $res |
|
| 700 | - ); |
|
| 701 | - |
|
| 702 | - // la fonction md5(integer) n'est pas connu en pg |
|
| 703 | - // il faut donc forcer les types en text (cas de md5(id_article)) |
|
| 704 | - $res = preg_replace( |
|
| 705 | - '/md5\s*[(]([^)]*)[)]/i', |
|
| 706 | - 'MD5(CAST(\1 AS text))', |
|
| 707 | - $res |
|
| 708 | - ); |
|
| 709 | - |
|
| 710 | - $res = preg_replace( |
|
| 711 | - '/UNIX_TIMESTAMP\s*[(]([^)]*)[)]/', |
|
| 712 | - ' EXTRACT(epoch FROM \1)', |
|
| 713 | - $res |
|
| 714 | - ); |
|
| 715 | - |
|
| 716 | - $res = preg_replace( |
|
| 717 | - '/\bDAYOFMONTH\s*[(]([^()]*([(][^()]*[)][^()]*)*[^)]*)[)]/', |
|
| 718 | - ' EXTRACT(day FROM \1)', |
|
| 719 | - $res |
|
| 720 | - ); |
|
| 721 | - |
|
| 722 | - $res = preg_replace( |
|
| 723 | - '/\bMONTH\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/', |
|
| 724 | - ' EXTRACT(month FROM \1)', |
|
| 725 | - $res |
|
| 726 | - ); |
|
| 727 | - |
|
| 728 | - $res = preg_replace( |
|
| 729 | - '/\bYEAR\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/', |
|
| 730 | - ' EXTRACT(year FROM \1)', |
|
| 731 | - $res |
|
| 732 | - ); |
|
| 733 | - |
|
| 734 | - $res = preg_replace( |
|
| 735 | - '/TO_DAYS\s*[(]([^()]*([(][^)]*[)][()]*)*)[)]/', |
|
| 736 | - ' EXTRACT(day FROM \1 - \'0001-01-01\')', |
|
| 737 | - $res |
|
| 738 | - ); |
|
| 739 | - |
|
| 740 | - $res = preg_replace('/(EXTRACT[(][^ ]* FROM *)"([^"]*)"/', '\1\'\2\'', $res); |
|
| 741 | - |
|
| 742 | - $res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m%d\'[)]/', 'to_char(\1, \'YYYYMMDD\')', $res); |
|
| 743 | - |
|
| 744 | - $res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m\'[)]/', 'to_char(\1, \'YYYYMM\')', $res); |
|
| 745 | - |
|
| 746 | - $res = preg_replace('/DATE_SUB\s*[(]([^,]*),/', '(\1 -', $res); |
|
| 747 | - $res = preg_replace('/DATE_ADD\s*[(]([^,]*),/', '(\1 +', $res); |
|
| 748 | - $res = preg_replace('/INTERVAL\s+(\d+\s+\w+)/', 'INTERVAL \'\1\'', $res); |
|
| 749 | - $res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\s+\d+:\d+(:\d+)\')/', '\1 timestamp \2', $res); |
|
| 750 | - $res = preg_replace('/(\'\d+-\d+-\d+\s+\d+:\d+:\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res); |
|
| 751 | - |
|
| 752 | - $res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\')/', '\1 timestamp \2', $res); |
|
| 753 | - $res = preg_replace('/(\'\d+-\d+-\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res); |
|
| 754 | - |
|
| 755 | - $res = preg_replace('/(timestamp .\d+)-00-/', '\1-01-', $res); |
|
| 756 | - $res = preg_replace('/(timestamp .\d+-\d+)-00/', '\1-01', $res); |
|
| 672 | + if (is_array($arg)) { |
|
| 673 | + $arg = join(', ', $arg); |
|
| 674 | + } |
|
| 675 | + |
|
| 676 | + $res = spip_pg_fromfield($arg); |
|
| 677 | + |
|
| 678 | + $res = preg_replace('/\brand[(][)]/i', 'random()', $res); |
|
| 679 | + |
|
| 680 | + $res = preg_replace( |
|
| 681 | + '/\b0\.0[+]([a-zA-Z0-9_.]+)\s*/', |
|
| 682 | + 'CAST(substring(\1, \'^ *[0-9.]+\') as float)', |
|
| 683 | + $res |
|
| 684 | + ); |
|
| 685 | + $res = preg_replace( |
|
| 686 | + '/\b0[+]([a-zA-Z0-9_.]+)\s*/', |
|
| 687 | + 'CAST(substring(\1, \'^ *[0-9]+\') as int)', |
|
| 688 | + $res |
|
| 689 | + ); |
|
| 690 | + $res = preg_replace( |
|
| 691 | + '/\bconv[(]([^,]*)[^)]*[)]/i', |
|
| 692 | + 'CAST(substring(\1, \'^ *[0-9]+\') as int)', |
|
| 693 | + $res |
|
| 694 | + ); |
|
| 695 | + |
|
| 696 | + $res = preg_replace( |
|
| 697 | + '/UNIX_TIMESTAMP\s*[(]\s*[)]/', |
|
| 698 | + ' EXTRACT(epoch FROM NOW())', |
|
| 699 | + $res |
|
| 700 | + ); |
|
| 701 | + |
|
| 702 | + // la fonction md5(integer) n'est pas connu en pg |
|
| 703 | + // il faut donc forcer les types en text (cas de md5(id_article)) |
|
| 704 | + $res = preg_replace( |
|
| 705 | + '/md5\s*[(]([^)]*)[)]/i', |
|
| 706 | + 'MD5(CAST(\1 AS text))', |
|
| 707 | + $res |
|
| 708 | + ); |
|
| 709 | + |
|
| 710 | + $res = preg_replace( |
|
| 711 | + '/UNIX_TIMESTAMP\s*[(]([^)]*)[)]/', |
|
| 712 | + ' EXTRACT(epoch FROM \1)', |
|
| 713 | + $res |
|
| 714 | + ); |
|
| 715 | + |
|
| 716 | + $res = preg_replace( |
|
| 717 | + '/\bDAYOFMONTH\s*[(]([^()]*([(][^()]*[)][^()]*)*[^)]*)[)]/', |
|
| 718 | + ' EXTRACT(day FROM \1)', |
|
| 719 | + $res |
|
| 720 | + ); |
|
| 721 | + |
|
| 722 | + $res = preg_replace( |
|
| 723 | + '/\bMONTH\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/', |
|
| 724 | + ' EXTRACT(month FROM \1)', |
|
| 725 | + $res |
|
| 726 | + ); |
|
| 727 | + |
|
| 728 | + $res = preg_replace( |
|
| 729 | + '/\bYEAR\s*[(]([^()]*([(][^)]*[)][^()]*)*[^)]*)[)]/', |
|
| 730 | + ' EXTRACT(year FROM \1)', |
|
| 731 | + $res |
|
| 732 | + ); |
|
| 733 | + |
|
| 734 | + $res = preg_replace( |
|
| 735 | + '/TO_DAYS\s*[(]([^()]*([(][^)]*[)][()]*)*)[)]/', |
|
| 736 | + ' EXTRACT(day FROM \1 - \'0001-01-01\')', |
|
| 737 | + $res |
|
| 738 | + ); |
|
| 739 | + |
|
| 740 | + $res = preg_replace('/(EXTRACT[(][^ ]* FROM *)"([^"]*)"/', '\1\'\2\'', $res); |
|
| 741 | + |
|
| 742 | + $res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m%d\'[)]/', 'to_char(\1, \'YYYYMMDD\')', $res); |
|
| 743 | + |
|
| 744 | + $res = preg_replace('/DATE_FORMAT\s*[(]([^,]*),\s*\'%Y%m\'[)]/', 'to_char(\1, \'YYYYMM\')', $res); |
|
| 745 | + |
|
| 746 | + $res = preg_replace('/DATE_SUB\s*[(]([^,]*),/', '(\1 -', $res); |
|
| 747 | + $res = preg_replace('/DATE_ADD\s*[(]([^,]*),/', '(\1 +', $res); |
|
| 748 | + $res = preg_replace('/INTERVAL\s+(\d+\s+\w+)/', 'INTERVAL \'\1\'', $res); |
|
| 749 | + $res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\s+\d+:\d+(:\d+)\')/', '\1 timestamp \2', $res); |
|
| 750 | + $res = preg_replace('/(\'\d+-\d+-\d+\s+\d+:\d+:\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res); |
|
| 751 | + |
|
| 752 | + $res = preg_replace('/([+<>-]=?)\s*(\'\d+-\d+-\d+\')/', '\1 timestamp \2', $res); |
|
| 753 | + $res = preg_replace('/(\'\d+-\d+-\d+\')\s*([+<>-]=?)/', 'timestamp \1 \2', $res); |
|
| 754 | + |
|
| 755 | + $res = preg_replace('/(timestamp .\d+)-00-/', '\1-01-', $res); |
|
| 756 | + $res = preg_replace('/(timestamp .\d+-\d+)-00/', '\1-01', $res); |
|
| 757 | 757 | # correct en theorie mais produit des debordements arithmetiques |
| 758 | 758 | # $res = preg_replace("/(EXTRACT[(][^ ]* FROM *)(timestamp *'[^']*' *[+-] *timestamp *'[^']*') *[)]/", '\2', $res); |
| 759 | - $res = preg_replace("/(EXTRACT[(][^ ]* FROM *)('[^']*')/", '\1 timestamp \2', $res); |
|
| 760 | - $res = preg_replace('/\sLIKE\s+/', ' ILIKE ', $res); |
|
| 759 | + $res = preg_replace("/(EXTRACT[(][^ ]* FROM *)('[^']*')/", '\1 timestamp \2', $res); |
|
| 760 | + $res = preg_replace('/\sLIKE\s+/', ' ILIKE ', $res); |
|
| 761 | 761 | |
| 762 | - return str_replace('REGEXP', '~', $res); |
|
| 762 | + return str_replace('REGEXP', '~', $res); |
|
| 763 | 763 | } |
| 764 | 764 | |
| 765 | 765 | function spip_pg_fromfield($arg) { |
| 766 | - while (preg_match('/^(.*?)FIELD\s*\(([^,]*)((,[^,)]*)*)\)/', $arg, $m)) { |
|
| 767 | - preg_match_all('/,([^,]*)/', $m[3], $r, PREG_PATTERN_ORDER); |
|
| 768 | - $res = ''; |
|
| 769 | - $n = 0; |
|
| 770 | - $index = $m[2]; |
|
| 771 | - foreach ($r[1] as $v) { |
|
| 772 | - $n++; |
|
| 773 | - $res .= "\nwhen $index=$v then $n"; |
|
| 774 | - } |
|
| 775 | - $arg = $m[1] . "case $res else 0 end " |
|
| 776 | - . substr($arg, strlen($m[0])); |
|
| 777 | - } |
|
| 778 | - |
|
| 779 | - return $arg; |
|
| 766 | + while (preg_match('/^(.*?)FIELD\s*\(([^,]*)((,[^,)]*)*)\)/', $arg, $m)) { |
|
| 767 | + preg_match_all('/,([^,]*)/', $m[3], $r, PREG_PATTERN_ORDER); |
|
| 768 | + $res = ''; |
|
| 769 | + $n = 0; |
|
| 770 | + $index = $m[2]; |
|
| 771 | + foreach ($r[1] as $v) { |
|
| 772 | + $n++; |
|
| 773 | + $res .= "\nwhen $index=$v then $n"; |
|
| 774 | + } |
|
| 775 | + $arg = $m[1] . "case $res else 0 end " |
|
| 776 | + . substr($arg, strlen($m[0])); |
|
| 777 | + } |
|
| 778 | + |
|
| 779 | + return $arg; |
|
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | function calculer_pg_where($v) { |
| 783 | - if (!is_array($v)) { |
|
| 784 | - return spip_pg_frommysql($v); |
|
| 785 | - } |
|
| 786 | - |
|
| 787 | - $op = str_replace('REGEXP', '~', array_shift($v)); |
|
| 788 | - if (!($n = count($v))) { |
|
| 789 | - return $op; |
|
| 790 | - } else { |
|
| 791 | - $arg = calculer_pg_where(array_shift($v)); |
|
| 792 | - if ($n == 1) { |
|
| 793 | - return "$op($arg)"; |
|
| 794 | - } else { |
|
| 795 | - $arg2 = calculer_pg_where(array_shift($v)); |
|
| 796 | - if ($n == 2) { |
|
| 797 | - return "($arg $op $arg2)"; |
|
| 798 | - } else { |
|
| 799 | - return "($arg $op ($arg2) : $v[0])"; |
|
| 800 | - } |
|
| 801 | - } |
|
| 802 | - } |
|
| 783 | + if (!is_array($v)) { |
|
| 784 | + return spip_pg_frommysql($v); |
|
| 785 | + } |
|
| 786 | + |
|
| 787 | + $op = str_replace('REGEXP', '~', array_shift($v)); |
|
| 788 | + if (!($n = count($v))) { |
|
| 789 | + return $op; |
|
| 790 | + } else { |
|
| 791 | + $arg = calculer_pg_where(array_shift($v)); |
|
| 792 | + if ($n == 1) { |
|
| 793 | + return "$op($arg)"; |
|
| 794 | + } else { |
|
| 795 | + $arg2 = calculer_pg_where(array_shift($v)); |
|
| 796 | + if ($n == 2) { |
|
| 797 | + return "($arg $op $arg2)"; |
|
| 798 | + } else { |
|
| 799 | + return "($arg $op ($arg2) : $v[0])"; |
|
| 800 | + } |
|
| 801 | + } |
|
| 802 | + } |
|
| 803 | 803 | } |
| 804 | 804 | |
| 805 | 805 | |
| 806 | 806 | function calculer_pg_expression($expression, $v, $join = 'AND') { |
| 807 | - if (empty($v)) { |
|
| 808 | - return ''; |
|
| 809 | - } |
|
| 807 | + if (empty($v)) { |
|
| 808 | + return ''; |
|
| 809 | + } |
|
| 810 | 810 | |
| 811 | - $exp = "\n$expression "; |
|
| 811 | + $exp = "\n$expression "; |
|
| 812 | 812 | |
| 813 | - if (!is_array($v)) { |
|
| 814 | - $v = [$v]; |
|
| 815 | - } |
|
| 813 | + if (!is_array($v)) { |
|
| 814 | + $v = [$v]; |
|
| 815 | + } |
|
| 816 | 816 | |
| 817 | - if (strtoupper($join) === 'AND') { |
|
| 818 | - return $exp . join("\n\t$join ", array_map('calculer_pg_where', $v)); |
|
| 819 | - } else { |
|
| 820 | - return $exp . join($join, $v); |
|
| 821 | - } |
|
| 817 | + if (strtoupper($join) === 'AND') { |
|
| 818 | + return $exp . join("\n\t$join ", array_map('calculer_pg_where', $v)); |
|
| 819 | + } else { |
|
| 820 | + return $exp . join($join, $v); |
|
| 821 | + } |
|
| 822 | 822 | } |
| 823 | 823 | |
| 824 | 824 | function spip_pg_select_as($args) { |
| 825 | - $argsas = ''; |
|
| 826 | - foreach ($args as $k => $v) { |
|
| 827 | - if (substr($k, -1) == '@') { |
|
| 828 | - // c'est une jointure qui se refere au from precedent |
|
| 829 | - // pas de virgule |
|
| 830 | - $argsas .= ' ' . $v; |
|
| 831 | - } else { |
|
| 832 | - $as = ''; |
|
| 833 | - // spip_log("$k : $v", _LOG_DEBUG); |
|
| 834 | - if (!is_numeric($k)) { |
|
| 835 | - if (preg_match('/\.(.*)$/', $k, $r)) { |
|
| 836 | - $v = $k; |
|
| 837 | - } elseif ($v != $k) { |
|
| 838 | - $p = strpos($v, ' '); |
|
| 839 | - if ($p) { |
|
| 840 | - $v = substr($v, 0, $p) . " AS $k" . substr($v, $p); |
|
| 841 | - } else { |
|
| 842 | - $as = " AS $k"; |
|
| 843 | - } |
|
| 844 | - } |
|
| 845 | - } |
|
| 846 | - // spip_log("subs $k : $v avec $as", _LOG_DEBUG); |
|
| 847 | - // if (strpos($v, 'JOIN') === false) $argsas .= ', '; |
|
| 848 | - $argsas .= ', ' . $v . $as; |
|
| 849 | - } |
|
| 850 | - } |
|
| 851 | - |
|
| 852 | - return substr($argsas, 2); |
|
| 825 | + $argsas = ''; |
|
| 826 | + foreach ($args as $k => $v) { |
|
| 827 | + if (substr($k, -1) == '@') { |
|
| 828 | + // c'est une jointure qui se refere au from precedent |
|
| 829 | + // pas de virgule |
|
| 830 | + $argsas .= ' ' . $v; |
|
| 831 | + } else { |
|
| 832 | + $as = ''; |
|
| 833 | + // spip_log("$k : $v", _LOG_DEBUG); |
|
| 834 | + if (!is_numeric($k)) { |
|
| 835 | + if (preg_match('/\.(.*)$/', $k, $r)) { |
|
| 836 | + $v = $k; |
|
| 837 | + } elseif ($v != $k) { |
|
| 838 | + $p = strpos($v, ' '); |
|
| 839 | + if ($p) { |
|
| 840 | + $v = substr($v, 0, $p) . " AS $k" . substr($v, $p); |
|
| 841 | + } else { |
|
| 842 | + $as = " AS $k"; |
|
| 843 | + } |
|
| 844 | + } |
|
| 845 | + } |
|
| 846 | + // spip_log("subs $k : $v avec $as", _LOG_DEBUG); |
|
| 847 | + // if (strpos($v, 'JOIN') === false) $argsas .= ', '; |
|
| 848 | + $argsas .= ', ' . $v . $as; |
|
| 849 | + } |
|
| 850 | + } |
|
| 851 | + |
|
| 852 | + return substr($argsas, 2); |
|
| 853 | 853 | } |
| 854 | 854 | |
| 855 | 855 | function spip_pg_fetch($res, $t = '', $serveur = '', $requeter = true) { |
| 856 | 856 | |
| 857 | - if ($res) { |
|
| 858 | - $res = pg_fetch_array($res, null, PGSQL_ASSOC); |
|
| 859 | - } |
|
| 857 | + if ($res) { |
|
| 858 | + $res = pg_fetch_array($res, null, PGSQL_ASSOC); |
|
| 859 | + } |
|
| 860 | 860 | |
| 861 | - return $res; |
|
| 861 | + return $res; |
|
| 862 | 862 | } |
| 863 | 863 | |
| 864 | 864 | function spip_pg_seek($r, $row_number, $serveur = '', $requeter = true) { |
| 865 | - if ($r) { |
|
| 866 | - return pg_result_seek($r, $row_number); |
|
| 867 | - } |
|
| 865 | + if ($r) { |
|
| 866 | + return pg_result_seek($r, $row_number); |
|
| 867 | + } |
|
| 868 | 868 | } |
| 869 | 869 | |
| 870 | 870 | |
| 871 | 871 | function spip_pg_countsel( |
| 872 | - $from = [], |
|
| 873 | - $where = [], |
|
| 874 | - $groupby = [], |
|
| 875 | - $having = [], |
|
| 876 | - $serveur = '', |
|
| 877 | - $requeter = true |
|
| 872 | + $from = [], |
|
| 873 | + $where = [], |
|
| 874 | + $groupby = [], |
|
| 875 | + $having = [], |
|
| 876 | + $serveur = '', |
|
| 877 | + $requeter = true |
|
| 878 | 878 | ) { |
| 879 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 880 | - $r = spip_pg_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 881 | - if (!$requeter) { |
|
| 882 | - return $r; |
|
| 883 | - } |
|
| 884 | - if (!is_resource($r)) { |
|
| 885 | - return 0; |
|
| 886 | - } |
|
| 887 | - [$c] = pg_fetch_array($r, null, PGSQL_NUM); |
|
| 888 | - |
|
| 889 | - return $c; |
|
| 879 | + $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 880 | + $r = spip_pg_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
|
| 881 | + if (!$requeter) { |
|
| 882 | + return $r; |
|
| 883 | + } |
|
| 884 | + if (!is_resource($r)) { |
|
| 885 | + return 0; |
|
| 886 | + } |
|
| 887 | + [$c] = pg_fetch_array($r, null, PGSQL_NUM); |
|
| 888 | + |
|
| 889 | + return $c; |
|
| 890 | 890 | } |
| 891 | 891 | |
| 892 | 892 | function spip_pg_count($res, $serveur = '', $requeter = true) { |
| 893 | - return !$res ? 0 : pg_numrows($res); |
|
| 893 | + return !$res ? 0 : pg_numrows($res); |
|
| 894 | 894 | } |
| 895 | 895 | |
| 896 | 896 | function spip_pg_free($res, $serveur = '', $requeter = true) { |
| 897 | - // rien a faire en postgres |
|
| 897 | + // rien a faire en postgres |
|
| 898 | 898 | } |
| 899 | 899 | |
| 900 | 900 | function spip_pg_delete($table, $where = '', $serveur = '', $requeter = true) { |
| 901 | 901 | |
| 902 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 903 | - $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 902 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 903 | + $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 904 | 904 | |
| 905 | - $query = calculer_pg_expression('DELETE FROM', $table, ',') |
|
| 906 | - . calculer_pg_expression('WHERE', $where, 'AND'); |
|
| 905 | + $query = calculer_pg_expression('DELETE FROM', $table, ',') |
|
| 906 | + . calculer_pg_expression('WHERE', $where, 'AND'); |
|
| 907 | 907 | |
| 908 | - // renvoyer la requete inerte si demandee |
|
| 909 | - if (!$requeter) { |
|
| 910 | - return $query; |
|
| 911 | - } |
|
| 908 | + // renvoyer la requete inerte si demandee |
|
| 909 | + if (!$requeter) { |
|
| 910 | + return $query; |
|
| 911 | + } |
|
| 912 | 912 | |
| 913 | - $res = spip_pg_trace_query($query, $serveur); |
|
| 914 | - if ($res) { |
|
| 915 | - return pg_affected_rows($res); |
|
| 916 | - } else { |
|
| 917 | - return false; |
|
| 918 | - } |
|
| 913 | + $res = spip_pg_trace_query($query, $serveur); |
|
| 914 | + if ($res) { |
|
| 915 | + return pg_affected_rows($res); |
|
| 916 | + } else { |
|
| 917 | + return false; |
|
| 918 | + } |
|
| 919 | 919 | } |
| 920 | 920 | |
| 921 | 921 | function spip_pg_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) { |
| 922 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 923 | - $prefixe = $connexion['prefixe']; |
|
| 924 | - $link = $connexion['link']; |
|
| 925 | - |
|
| 926 | - if (!$desc) { |
|
| 927 | - $desc = description_table($table, $serveur); |
|
| 928 | - } |
|
| 929 | - $seq = spip_pg_sequence($table, true); |
|
| 930 | - // si pas de cle primaire dans l'insertion, renvoyer curval |
|
| 931 | - if (!preg_match(",\b$seq\b,", $champs)) { |
|
| 932 | - $seq = spip_pg_sequence($table); |
|
| 933 | - $seq = prefixer_table_spip($seq, $prefixe); |
|
| 934 | - $seq = "currval('$seq')"; |
|
| 935 | - } |
|
| 936 | - |
|
| 937 | - $table = prefixer_table_spip($table, $prefixe); |
|
| 938 | - $ret = !$seq ? '' : (" RETURNING $seq"); |
|
| 939 | - $ins = (strlen($champs) < 3) |
|
| 940 | - ? ' DEFAULT VALUES' |
|
| 941 | - : "$champs VALUES $valeurs"; |
|
| 942 | - $q = "INSERT INTO $table $ins $ret"; |
|
| 943 | - if (!$requeter) { |
|
| 944 | - return $q; |
|
| 945 | - } |
|
| 946 | - $connexion['last'] = $q; |
|
| 947 | - $r = spip_pg_query_simple($link, $q); |
|
| 922 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 923 | + $prefixe = $connexion['prefixe']; |
|
| 924 | + $link = $connexion['link']; |
|
| 925 | + |
|
| 926 | + if (!$desc) { |
|
| 927 | + $desc = description_table($table, $serveur); |
|
| 928 | + } |
|
| 929 | + $seq = spip_pg_sequence($table, true); |
|
| 930 | + // si pas de cle primaire dans l'insertion, renvoyer curval |
|
| 931 | + if (!preg_match(",\b$seq\b,", $champs)) { |
|
| 932 | + $seq = spip_pg_sequence($table); |
|
| 933 | + $seq = prefixer_table_spip($seq, $prefixe); |
|
| 934 | + $seq = "currval('$seq')"; |
|
| 935 | + } |
|
| 936 | + |
|
| 937 | + $table = prefixer_table_spip($table, $prefixe); |
|
| 938 | + $ret = !$seq ? '' : (" RETURNING $seq"); |
|
| 939 | + $ins = (strlen($champs) < 3) |
|
| 940 | + ? ' DEFAULT VALUES' |
|
| 941 | + : "$champs VALUES $valeurs"; |
|
| 942 | + $q = "INSERT INTO $table $ins $ret"; |
|
| 943 | + if (!$requeter) { |
|
| 944 | + return $q; |
|
| 945 | + } |
|
| 946 | + $connexion['last'] = $q; |
|
| 947 | + $r = spip_pg_query_simple($link, $q); |
|
| 948 | 948 | # spip_log($q,'pg.'._LOG_DEBUG); |
| 949 | - if ($r) { |
|
| 950 | - if (!$ret) { |
|
| 951 | - return 0; |
|
| 952 | - } |
|
| 953 | - if ($r2 = pg_fetch_array($r, null, PGSQL_NUM)) { |
|
| 954 | - return $r2[0]; |
|
| 955 | - } |
|
| 956 | - } |
|
| 957 | - |
|
| 958 | - return false; |
|
| 949 | + if ($r) { |
|
| 950 | + if (!$ret) { |
|
| 951 | + return 0; |
|
| 952 | + } |
|
| 953 | + if ($r2 = pg_fetch_array($r, null, PGSQL_NUM)) { |
|
| 954 | + return $r2[0]; |
|
| 955 | + } |
|
| 956 | + } |
|
| 957 | + |
|
| 958 | + return false; |
|
| 959 | 959 | } |
| 960 | 960 | |
| 961 | 961 | function spip_pg_insertq($table, $couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 962 | 962 | |
| 963 | - if (!$desc) { |
|
| 964 | - $desc = description_table($table, $serveur); |
|
| 965 | - } |
|
| 966 | - if (!$desc) { |
|
| 967 | - die("$table insertion sans description"); |
|
| 968 | - } |
|
| 969 | - $fields = $desc['field']; |
|
| 970 | - |
|
| 971 | - foreach ($couples as $champ => $val) { |
|
| 972 | - $couples[$champ] = spip_pg_cite($val, $fields[$champ]); |
|
| 973 | - } |
|
| 974 | - |
|
| 975 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 976 | - $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 977 | - |
|
| 978 | - return spip_pg_insert( |
|
| 979 | - $table, |
|
| 980 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 981 | - '(' . join(',', $couples) . ')', |
|
| 982 | - $desc, |
|
| 983 | - $serveur, |
|
| 984 | - $requeter |
|
| 985 | - ); |
|
| 963 | + if (!$desc) { |
|
| 964 | + $desc = description_table($table, $serveur); |
|
| 965 | + } |
|
| 966 | + if (!$desc) { |
|
| 967 | + die("$table insertion sans description"); |
|
| 968 | + } |
|
| 969 | + $fields = $desc['field']; |
|
| 970 | + |
|
| 971 | + foreach ($couples as $champ => $val) { |
|
| 972 | + $couples[$champ] = spip_pg_cite($val, $fields[$champ]); |
|
| 973 | + } |
|
| 974 | + |
|
| 975 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 976 | + $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 977 | + |
|
| 978 | + return spip_pg_insert( |
|
| 979 | + $table, |
|
| 980 | + '(' . join(',', array_keys($couples)) . ')', |
|
| 981 | + '(' . join(',', $couples) . ')', |
|
| 982 | + $desc, |
|
| 983 | + $serveur, |
|
| 984 | + $requeter |
|
| 985 | + ); |
|
| 986 | 986 | } |
| 987 | 987 | |
| 988 | 988 | |
| 989 | 989 | function spip_pg_insertq_multi($table, $tab_couples = [], $desc = [], $serveur = '', $requeter = true) { |
| 990 | 990 | |
| 991 | - if (!$desc) { |
|
| 992 | - $desc = description_table($table, $serveur); |
|
| 993 | - } |
|
| 994 | - if (!$desc) { |
|
| 995 | - die("$table insertion sans description"); |
|
| 996 | - } |
|
| 997 | - $fields = $desc['field'] ?? []; |
|
| 998 | - |
|
| 999 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1000 | - // une premiere fois pour ajouter maj dans les cles |
|
| 1001 | - $c = $tab_couples[0] ?? []; |
|
| 1002 | - $les_cles = spip_pg_ajouter_champs_timestamp($table, $c, $desc, $serveur); |
|
| 1003 | - |
|
| 1004 | - $cles = '(' . join(',', array_keys($les_cles)) . ')'; |
|
| 1005 | - $valeurs = []; |
|
| 1006 | - foreach ($tab_couples as $couples) { |
|
| 1007 | - foreach ($couples as $champ => $val) { |
|
| 1008 | - $couples[$champ] = spip_pg_cite($val, $fields[$champ]); |
|
| 1009 | - } |
|
| 1010 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1011 | - $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1012 | - |
|
| 1013 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1014 | - } |
|
| 1015 | - $valeurs = implode(', ', $valeurs); |
|
| 1016 | - |
|
| 1017 | - return spip_pg_insert($table, $cles, $valeurs, $desc, $serveur, $requeter); |
|
| 991 | + if (!$desc) { |
|
| 992 | + $desc = description_table($table, $serveur); |
|
| 993 | + } |
|
| 994 | + if (!$desc) { |
|
| 995 | + die("$table insertion sans description"); |
|
| 996 | + } |
|
| 997 | + $fields = $desc['field'] ?? []; |
|
| 998 | + |
|
| 999 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1000 | + // une premiere fois pour ajouter maj dans les cles |
|
| 1001 | + $c = $tab_couples[0] ?? []; |
|
| 1002 | + $les_cles = spip_pg_ajouter_champs_timestamp($table, $c, $desc, $serveur); |
|
| 1003 | + |
|
| 1004 | + $cles = '(' . join(',', array_keys($les_cles)) . ')'; |
|
| 1005 | + $valeurs = []; |
|
| 1006 | + foreach ($tab_couples as $couples) { |
|
| 1007 | + foreach ($couples as $champ => $val) { |
|
| 1008 | + $couples[$champ] = spip_pg_cite($val, $fields[$champ]); |
|
| 1009 | + } |
|
| 1010 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1011 | + $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1012 | + |
|
| 1013 | + $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1014 | + } |
|
| 1015 | + $valeurs = implode(', ', $valeurs); |
|
| 1016 | + |
|
| 1017 | + return spip_pg_insert($table, $cles, $valeurs, $desc, $serveur, $requeter); |
|
| 1018 | 1018 | } |
| 1019 | 1019 | |
| 1020 | 1020 | |
| 1021 | 1021 | function spip_pg_update($table, $couples, $where = '', $desc = '', $serveur = '', $requeter = true) { |
| 1022 | 1022 | |
| 1023 | - if (!$couples) { |
|
| 1024 | - return; |
|
| 1025 | - } |
|
| 1026 | - $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1027 | - $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1023 | + if (!$couples) { |
|
| 1024 | + return; |
|
| 1025 | + } |
|
| 1026 | + $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1027 | + $table = prefixer_table_spip($table, $connexion['prefixe']); |
|
| 1028 | 1028 | |
| 1029 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1030 | - $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1029 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1030 | + $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1031 | 1031 | |
| 1032 | - $set = []; |
|
| 1033 | - foreach ($couples as $champ => $val) { |
|
| 1034 | - $set[] = $champ . '=' . $val; |
|
| 1035 | - } |
|
| 1032 | + $set = []; |
|
| 1033 | + foreach ($couples as $champ => $val) { |
|
| 1034 | + $set[] = $champ . '=' . $val; |
|
| 1035 | + } |
|
| 1036 | 1036 | |
| 1037 | - $query = calculer_pg_expression('UPDATE', $table, ',') |
|
| 1038 | - . calculer_pg_expression('SET', $set, ',') |
|
| 1039 | - . calculer_pg_expression('WHERE', $where, 'AND'); |
|
| 1037 | + $query = calculer_pg_expression('UPDATE', $table, ',') |
|
| 1038 | + . calculer_pg_expression('SET', $set, ',') |
|
| 1039 | + . calculer_pg_expression('WHERE', $where, 'AND'); |
|
| 1040 | 1040 | |
| 1041 | - // renvoyer la requete inerte si demandee |
|
| 1042 | - if (!$requeter) { |
|
| 1043 | - return $query; |
|
| 1044 | - } |
|
| 1041 | + // renvoyer la requete inerte si demandee |
|
| 1042 | + if (!$requeter) { |
|
| 1043 | + return $query; |
|
| 1044 | + } |
|
| 1045 | 1045 | |
| 1046 | - return spip_pg_trace_query($query, $serveur); |
|
| 1046 | + return spip_pg_trace_query($query, $serveur); |
|
| 1047 | 1047 | } |
| 1048 | 1048 | |
| 1049 | 1049 | // idem, mais les valeurs sont des constantes a mettre entre apostrophes |
| 1050 | 1050 | // sauf les expressions de date lorsqu'il s'agit de fonctions SQL (NOW etc) |
| 1051 | 1051 | function spip_pg_updateq($table, $couples, $where = '', $desc = [], $serveur = '', $requeter = true) { |
| 1052 | - if (!$couples) { |
|
| 1053 | - return; |
|
| 1054 | - } |
|
| 1055 | - if (!$desc) { |
|
| 1056 | - $desc = description_table($table, $serveur); |
|
| 1057 | - } |
|
| 1058 | - $fields = $desc['field']; |
|
| 1059 | - foreach ($couples as $k => $val) { |
|
| 1060 | - $couples[$k] = spip_pg_cite($val, $fields[$k]); |
|
| 1061 | - } |
|
| 1062 | - |
|
| 1063 | - return spip_pg_update($table, $couples, $where, $desc, $serveur, $requeter); |
|
| 1052 | + if (!$couples) { |
|
| 1053 | + return; |
|
| 1054 | + } |
|
| 1055 | + if (!$desc) { |
|
| 1056 | + $desc = description_table($table, $serveur); |
|
| 1057 | + } |
|
| 1058 | + $fields = $desc['field']; |
|
| 1059 | + foreach ($couples as $k => $val) { |
|
| 1060 | + $couples[$k] = spip_pg_cite($val, $fields[$k]); |
|
| 1061 | + } |
|
| 1062 | + |
|
| 1063 | + return spip_pg_update($table, $couples, $where, $desc, $serveur, $requeter); |
|
| 1064 | 1064 | } |
| 1065 | 1065 | |
| 1066 | 1066 | |
| 1067 | 1067 | function spip_pg_replace($table, $values, $desc, $serveur = '', $requeter = true) { |
| 1068 | - if (!$values) { |
|
| 1069 | - spip_log("replace vide $table", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 1070 | - |
|
| 1071 | - return 0; |
|
| 1072 | - } |
|
| 1073 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1074 | - $prefixe = $connexion['prefixe']; |
|
| 1075 | - $link = $connexion['link']; |
|
| 1076 | - |
|
| 1077 | - if (!$desc) { |
|
| 1078 | - $desc = description_table($table, $serveur); |
|
| 1079 | - } |
|
| 1080 | - if (!$desc) { |
|
| 1081 | - die("$table insertion sans description"); |
|
| 1082 | - } |
|
| 1083 | - $prim = $desc['key']['PRIMARY KEY']; |
|
| 1084 | - $ids = preg_split('/,\s*/', $prim); |
|
| 1085 | - $noprims = $prims = []; |
|
| 1086 | - foreach ($values as $k => $v) { |
|
| 1087 | - $values[$k] = $v = spip_pg_cite($v, $desc['field'][$k]); |
|
| 1088 | - |
|
| 1089 | - if (!in_array($k, $ids)) { |
|
| 1090 | - $noprims[$k] = "$k=$v"; |
|
| 1091 | - } else { |
|
| 1092 | - $prims[$k] = "$k=$v"; |
|
| 1093 | - } |
|
| 1094 | - } |
|
| 1095 | - |
|
| 1096 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1097 | - $values = spip_pg_ajouter_champs_timestamp($table, $values, $desc, $serveur); |
|
| 1098 | - |
|
| 1099 | - $where = join(' AND ', $prims); |
|
| 1100 | - if (!$where) { |
|
| 1101 | - return spip_pg_insert( |
|
| 1102 | - $table, |
|
| 1103 | - '(' . join(',', array_keys($values)) . ')', |
|
| 1104 | - '(' . join(',', $values) . ')', |
|
| 1105 | - $desc, |
|
| 1106 | - $serveur |
|
| 1107 | - ); |
|
| 1108 | - } |
|
| 1109 | - $couples = join(',', $noprims); |
|
| 1110 | - |
|
| 1111 | - $seq = spip_pg_sequence($table); |
|
| 1112 | - $table = prefixer_table_spip($table, $prefixe); |
|
| 1113 | - $seq = prefixer_table_spip($seq, $prefixe); |
|
| 1114 | - |
|
| 1115 | - $connexion['last'] = $q = "UPDATE $table SET $couples WHERE $where"; |
|
| 1116 | - if ($couples) { |
|
| 1117 | - $couples = spip_pg_query_simple($link, $q); |
|
| 1068 | + if (!$values) { |
|
| 1069 | + spip_log("replace vide $table", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 1070 | + |
|
| 1071 | + return 0; |
|
| 1072 | + } |
|
| 1073 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1074 | + $prefixe = $connexion['prefixe']; |
|
| 1075 | + $link = $connexion['link']; |
|
| 1076 | + |
|
| 1077 | + if (!$desc) { |
|
| 1078 | + $desc = description_table($table, $serveur); |
|
| 1079 | + } |
|
| 1080 | + if (!$desc) { |
|
| 1081 | + die("$table insertion sans description"); |
|
| 1082 | + } |
|
| 1083 | + $prim = $desc['key']['PRIMARY KEY']; |
|
| 1084 | + $ids = preg_split('/,\s*/', $prim); |
|
| 1085 | + $noprims = $prims = []; |
|
| 1086 | + foreach ($values as $k => $v) { |
|
| 1087 | + $values[$k] = $v = spip_pg_cite($v, $desc['field'][$k]); |
|
| 1088 | + |
|
| 1089 | + if (!in_array($k, $ids)) { |
|
| 1090 | + $noprims[$k] = "$k=$v"; |
|
| 1091 | + } else { |
|
| 1092 | + $prims[$k] = "$k=$v"; |
|
| 1093 | + } |
|
| 1094 | + } |
|
| 1095 | + |
|
| 1096 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1097 | + $values = spip_pg_ajouter_champs_timestamp($table, $values, $desc, $serveur); |
|
| 1098 | + |
|
| 1099 | + $where = join(' AND ', $prims); |
|
| 1100 | + if (!$where) { |
|
| 1101 | + return spip_pg_insert( |
|
| 1102 | + $table, |
|
| 1103 | + '(' . join(',', array_keys($values)) . ')', |
|
| 1104 | + '(' . join(',', $values) . ')', |
|
| 1105 | + $desc, |
|
| 1106 | + $serveur |
|
| 1107 | + ); |
|
| 1108 | + } |
|
| 1109 | + $couples = join(',', $noprims); |
|
| 1110 | + |
|
| 1111 | + $seq = spip_pg_sequence($table); |
|
| 1112 | + $table = prefixer_table_spip($table, $prefixe); |
|
| 1113 | + $seq = prefixer_table_spip($seq, $prefixe); |
|
| 1114 | + |
|
| 1115 | + $connexion['last'] = $q = "UPDATE $table SET $couples WHERE $where"; |
|
| 1116 | + if ($couples) { |
|
| 1117 | + $couples = spip_pg_query_simple($link, $q); |
|
| 1118 | 1118 | # spip_log($q,'pg.'._LOG_DEBUG); |
| 1119 | - if (!$couples) { |
|
| 1120 | - return false; |
|
| 1121 | - } |
|
| 1122 | - $couples = pg_affected_rows($couples); |
|
| 1123 | - } |
|
| 1124 | - if (!$couples) { |
|
| 1125 | - $ret = !$seq ? '' : |
|
| 1126 | - (" RETURNING nextval('$seq') < $prim"); |
|
| 1127 | - $connexion['last'] = $q = "INSERT INTO $table (" . join(',', array_keys($values)) . ') VALUES (' . join( |
|
| 1128 | - ',', |
|
| 1129 | - $values |
|
| 1130 | - ) . ")$ret"; |
|
| 1131 | - $couples = spip_pg_query_simple($link, $q); |
|
| 1132 | - if (!$couples) { |
|
| 1133 | - return false; |
|
| 1134 | - } elseif ($ret) { |
|
| 1135 | - $r = pg_fetch_array($couples, null, PGSQL_NUM); |
|
| 1136 | - if ($r[0]) { |
|
| 1137 | - $connexion['last'] = $q = "SELECT setval('$seq', $prim) from $table"; |
|
| 1138 | - // Le code de SPIP met parfois la sequence a 0 (dans l'import) |
|
| 1139 | - // MySQL n'en dit rien, on fait pareil pour PG |
|
| 1140 | - $r = @pg_query($link, $q); |
|
| 1141 | - } |
|
| 1142 | - } |
|
| 1143 | - } |
|
| 1144 | - |
|
| 1145 | - return $couples; |
|
| 1119 | + if (!$couples) { |
|
| 1120 | + return false; |
|
| 1121 | + } |
|
| 1122 | + $couples = pg_affected_rows($couples); |
|
| 1123 | + } |
|
| 1124 | + if (!$couples) { |
|
| 1125 | + $ret = !$seq ? '' : |
|
| 1126 | + (" RETURNING nextval('$seq') < $prim"); |
|
| 1127 | + $connexion['last'] = $q = "INSERT INTO $table (" . join(',', array_keys($values)) . ') VALUES (' . join( |
|
| 1128 | + ',', |
|
| 1129 | + $values |
|
| 1130 | + ) . ")$ret"; |
|
| 1131 | + $couples = spip_pg_query_simple($link, $q); |
|
| 1132 | + if (!$couples) { |
|
| 1133 | + return false; |
|
| 1134 | + } elseif ($ret) { |
|
| 1135 | + $r = pg_fetch_array($couples, null, PGSQL_NUM); |
|
| 1136 | + if ($r[0]) { |
|
| 1137 | + $connexion['last'] = $q = "SELECT setval('$seq', $prim) from $table"; |
|
| 1138 | + // Le code de SPIP met parfois la sequence a 0 (dans l'import) |
|
| 1139 | + // MySQL n'en dit rien, on fait pareil pour PG |
|
| 1140 | + $r = @pg_query($link, $q); |
|
| 1141 | + } |
|
| 1142 | + } |
|
| 1143 | + } |
|
| 1144 | + |
|
| 1145 | + return $couples; |
|
| 1146 | 1146 | } |
| 1147 | 1147 | |
| 1148 | 1148 | |
| 1149 | 1149 | function spip_pg_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) { |
| 1150 | - $retour = null; |
|
| 1151 | - // boucler pour traiter chaque requete independemment |
|
| 1152 | - foreach ($tab_couples as $couples) { |
|
| 1153 | - $retour = spip_pg_replace($table, $couples, $desc, $serveur, $requeter); |
|
| 1154 | - } |
|
| 1155 | - |
|
| 1156 | - // renvoie le dernier id |
|
| 1157 | - return $retour; |
|
| 1150 | + $retour = null; |
|
| 1151 | + // boucler pour traiter chaque requete independemment |
|
| 1152 | + foreach ($tab_couples as $couples) { |
|
| 1153 | + $retour = spip_pg_replace($table, $couples, $desc, $serveur, $requeter); |
|
| 1154 | + } |
|
| 1155 | + |
|
| 1156 | + // renvoie le dernier id |
|
| 1157 | + return $retour; |
|
| 1158 | 1158 | } |
| 1159 | 1159 | |
| 1160 | 1160 | |
@@ -1163,149 +1163,149 @@ discard block |
||
| 1163 | 1163 | |
| 1164 | 1164 | function spip_pg_sequence($table, $raw = false) { |
| 1165 | 1165 | |
| 1166 | - include_spip('base/serial'); |
|
| 1167 | - if (!isset($GLOBALS['tables_principales'][$table])) { |
|
| 1168 | - return false; |
|
| 1169 | - } |
|
| 1170 | - $desc = $GLOBALS['tables_principales'][$table]; |
|
| 1171 | - $prim = @$desc['key']['PRIMARY KEY']; |
|
| 1172 | - if ( |
|
| 1173 | - !preg_match('/^\w+$/', $prim) |
|
| 1174 | - or !str_contains($desc['field'][$prim], 'int') |
|
| 1175 | - ) { |
|
| 1176 | - return ''; |
|
| 1177 | - } else { |
|
| 1178 | - return $raw ? $prim : $table . '_' . $prim . '_seq'; |
|
| 1179 | - } |
|
| 1166 | + include_spip('base/serial'); |
|
| 1167 | + if (!isset($GLOBALS['tables_principales'][$table])) { |
|
| 1168 | + return false; |
|
| 1169 | + } |
|
| 1170 | + $desc = $GLOBALS['tables_principales'][$table]; |
|
| 1171 | + $prim = @$desc['key']['PRIMARY KEY']; |
|
| 1172 | + if ( |
|
| 1173 | + !preg_match('/^\w+$/', $prim) |
|
| 1174 | + or !str_contains($desc['field'][$prim], 'int') |
|
| 1175 | + ) { |
|
| 1176 | + return ''; |
|
| 1177 | + } else { |
|
| 1178 | + return $raw ? $prim : $table . '_' . $prim . '_seq'; |
|
| 1179 | + } |
|
| 1180 | 1180 | } |
| 1181 | 1181 | |
| 1182 | 1182 | // Explicite les conversions de Mysql d'une valeur $v de type $t |
| 1183 | 1183 | // Dans le cas d'un champ date, pas d'apostrophe, c'est une syntaxe ad hoc |
| 1184 | 1184 | |
| 1185 | 1185 | function spip_pg_cite($v, $t) { |
| 1186 | - if (is_null($v)) { |
|
| 1187 | - return 'NULL'; |
|
| 1188 | - } // null php se traduit en NULL SQL |
|
| 1189 | - |
|
| 1190 | - if (sql_test_date($t)) { |
|
| 1191 | - if ($v and (strpos('0123456789', (string) $v[0]) === false)) { |
|
| 1192 | - return spip_pg_frommysql($v); |
|
| 1193 | - } else { |
|
| 1194 | - if (strncmp($v, '0000', 4) == 0) { |
|
| 1195 | - $v = '0001' . substr($v, 4); |
|
| 1196 | - } |
|
| 1197 | - if (strpos($v, '-00-00') === 4) { |
|
| 1198 | - $v = substr($v, 0, 4) . '-01-01' . substr($v, 10); |
|
| 1199 | - } |
|
| 1200 | - |
|
| 1201 | - return "timestamp '$v'"; |
|
| 1202 | - } |
|
| 1203 | - } elseif (!sql_test_int($t)) { |
|
| 1204 | - return ("'" . pg_escape_string($v) . "'"); |
|
| 1205 | - } elseif (is_numeric($v) or (strpos($v, 'CAST(') === 0)) { |
|
| 1206 | - return $v; |
|
| 1207 | - } elseif ($v[0] == '0' and $v[1] !== 'x' and ctype_xdigit(substr($v, 1))) { |
|
| 1208 | - return substr($v, 1); |
|
| 1209 | - } else { |
|
| 1210 | - spip_log("Warning: '$v' n'est pas de type $t", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 1211 | - |
|
| 1212 | - return intval($v); |
|
| 1213 | - } |
|
| 1186 | + if (is_null($v)) { |
|
| 1187 | + return 'NULL'; |
|
| 1188 | + } // null php se traduit en NULL SQL |
|
| 1189 | + |
|
| 1190 | + if (sql_test_date($t)) { |
|
| 1191 | + if ($v and (strpos('0123456789', (string) $v[0]) === false)) { |
|
| 1192 | + return spip_pg_frommysql($v); |
|
| 1193 | + } else { |
|
| 1194 | + if (strncmp($v, '0000', 4) == 0) { |
|
| 1195 | + $v = '0001' . substr($v, 4); |
|
| 1196 | + } |
|
| 1197 | + if (strpos($v, '-00-00') === 4) { |
|
| 1198 | + $v = substr($v, 0, 4) . '-01-01' . substr($v, 10); |
|
| 1199 | + } |
|
| 1200 | + |
|
| 1201 | + return "timestamp '$v'"; |
|
| 1202 | + } |
|
| 1203 | + } elseif (!sql_test_int($t)) { |
|
| 1204 | + return ("'" . pg_escape_string($v) . "'"); |
|
| 1205 | + } elseif (is_numeric($v) or (strpos($v, 'CAST(') === 0)) { |
|
| 1206 | + return $v; |
|
| 1207 | + } elseif ($v[0] == '0' and $v[1] !== 'x' and ctype_xdigit(substr($v, 1))) { |
|
| 1208 | + return substr($v, 1); |
|
| 1209 | + } else { |
|
| 1210 | + spip_log("Warning: '$v' n'est pas de type $t", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 1211 | + |
|
| 1212 | + return intval($v); |
|
| 1213 | + } |
|
| 1214 | 1214 | } |
| 1215 | 1215 | |
| 1216 | 1216 | function spip_pg_hex($v) { |
| 1217 | - return "CAST(x'" . $v . "' as bigint)"; |
|
| 1217 | + return "CAST(x'" . $v . "' as bigint)"; |
|
| 1218 | 1218 | } |
| 1219 | 1219 | |
| 1220 | 1220 | function spip_pg_quote($v, $type = '') { |
| 1221 | - if (!is_array($v)) { |
|
| 1222 | - return spip_pg_cite($v, $type); |
|
| 1223 | - } |
|
| 1224 | - // si c'est un tableau, le parcourir en propageant le type |
|
| 1225 | - foreach ($v as $k => $r) { |
|
| 1226 | - $v[$k] = spip_pg_quote($r, $type); |
|
| 1227 | - } |
|
| 1228 | - |
|
| 1229 | - return join(',', $v); |
|
| 1221 | + if (!is_array($v)) { |
|
| 1222 | + return spip_pg_cite($v, $type); |
|
| 1223 | + } |
|
| 1224 | + // si c'est un tableau, le parcourir en propageant le type |
|
| 1225 | + foreach ($v as $k => $r) { |
|
| 1226 | + $v[$k] = spip_pg_quote($r, $type); |
|
| 1227 | + } |
|
| 1228 | + |
|
| 1229 | + return join(',', $v); |
|
| 1230 | 1230 | } |
| 1231 | 1231 | |
| 1232 | 1232 | function spip_pg_date_proche($champ, $interval, $unite) { |
| 1233 | - return '(' |
|
| 1234 | - . $champ |
|
| 1235 | - . (($interval <= 0) ? '>' : '<') |
|
| 1236 | - . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1237 | - . '(' |
|
| 1238 | - . sql_quote(date('Y-m-d H:i:s')) |
|
| 1239 | - . ', INTERVAL ' |
|
| 1240 | - . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1241 | - . ' ' |
|
| 1242 | - . $unite |
|
| 1243 | - . '))'; |
|
| 1233 | + return '(' |
|
| 1234 | + . $champ |
|
| 1235 | + . (($interval <= 0) ? '>' : '<') |
|
| 1236 | + . (($interval <= 0) ? 'DATE_SUB' : 'DATE_ADD') |
|
| 1237 | + . '(' |
|
| 1238 | + . sql_quote(date('Y-m-d H:i:s')) |
|
| 1239 | + . ', INTERVAL ' |
|
| 1240 | + . (($interval > 0) ? $interval : (0 - $interval)) |
|
| 1241 | + . ' ' |
|
| 1242 | + . $unite |
|
| 1243 | + . '))'; |
|
| 1244 | 1244 | } |
| 1245 | 1245 | |
| 1246 | 1246 | function spip_pg_in($val, $valeurs, $not = '', $serveur = '') { |
| 1247 | 1247 | // |
| 1248 | 1248 | // IN (...) souvent limite a 255 elements, d'ou cette fonction assistante |
| 1249 | 1249 | // |
| 1250 | - // s'il n'y a pas de valeur, eviter de produire un IN vide: PG rale. |
|
| 1251 | - if (!$valeurs) { |
|
| 1252 | - return $not ? '0=0' : '0=1'; |
|
| 1253 | - } |
|
| 1254 | - if (strpos($valeurs, "CAST(x'") !== false) { |
|
| 1255 | - return "($val=" . join("OR $val=", explode(',', $valeurs)) . ')'; |
|
| 1256 | - } |
|
| 1257 | - $n = $i = 0; |
|
| 1258 | - $in_sql = ''; |
|
| 1259 | - while ($n = strpos($valeurs, ',', $n + 1)) { |
|
| 1260 | - if ((++$i) >= 255) { |
|
| 1261 | - $in_sql .= "($val $not IN (" . |
|
| 1262 | - substr($valeurs, 0, $n) . |
|
| 1263 | - "))\n" . |
|
| 1264 | - ($not ? "AND\t" : "OR\t"); |
|
| 1265 | - $valeurs = substr($valeurs, $n + 1); |
|
| 1266 | - $i = $n = 0; |
|
| 1267 | - } |
|
| 1268 | - } |
|
| 1269 | - $in_sql .= "($val $not IN ($valeurs))"; |
|
| 1270 | - |
|
| 1271 | - return "($in_sql)"; |
|
| 1250 | + // s'il n'y a pas de valeur, eviter de produire un IN vide: PG rale. |
|
| 1251 | + if (!$valeurs) { |
|
| 1252 | + return $not ? '0=0' : '0=1'; |
|
| 1253 | + } |
|
| 1254 | + if (strpos($valeurs, "CAST(x'") !== false) { |
|
| 1255 | + return "($val=" . join("OR $val=", explode(',', $valeurs)) . ')'; |
|
| 1256 | + } |
|
| 1257 | + $n = $i = 0; |
|
| 1258 | + $in_sql = ''; |
|
| 1259 | + while ($n = strpos($valeurs, ',', $n + 1)) { |
|
| 1260 | + if ((++$i) >= 255) { |
|
| 1261 | + $in_sql .= "($val $not IN (" . |
|
| 1262 | + substr($valeurs, 0, $n) . |
|
| 1263 | + "))\n" . |
|
| 1264 | + ($not ? "AND\t" : "OR\t"); |
|
| 1265 | + $valeurs = substr($valeurs, $n + 1); |
|
| 1266 | + $i = $n = 0; |
|
| 1267 | + } |
|
| 1268 | + } |
|
| 1269 | + $in_sql .= "($val $not IN ($valeurs))"; |
|
| 1270 | + |
|
| 1271 | + return "($in_sql)"; |
|
| 1272 | 1272 | } |
| 1273 | 1273 | |
| 1274 | 1274 | function spip_pg_error($query = '', $serveur = '', $requeter = true) { |
| 1275 | - $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1276 | - $s = $link ? pg_last_error($link) : pg_last_error(); |
|
| 1277 | - if ($s) { |
|
| 1278 | - $s = str_replace('ERROR', 'errcode: 1000 ', $s); |
|
| 1279 | - spip_log("$s - $query", 'pg.' . _LOG_ERREUR); |
|
| 1280 | - } |
|
| 1281 | - |
|
| 1282 | - return $s; |
|
| 1275 | + $link = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]['link']; |
|
| 1276 | + $s = $link ? pg_last_error($link) : pg_last_error(); |
|
| 1277 | + if ($s) { |
|
| 1278 | + $s = str_replace('ERROR', 'errcode: 1000 ', $s); |
|
| 1279 | + spip_log("$s - $query", 'pg.' . _LOG_ERREUR); |
|
| 1280 | + } |
|
| 1281 | + |
|
| 1282 | + return $s; |
|
| 1283 | 1283 | } |
| 1284 | 1284 | |
| 1285 | 1285 | function spip_pg_errno($serveur = '') { |
| 1286 | - // il faudrait avoir la derniere ressource retournee et utiliser |
|
| 1287 | - // http://fr2.php.net/manual/fr/function.pg-result-error.php |
|
| 1288 | - return 0; |
|
| 1286 | + // il faudrait avoir la derniere ressource retournee et utiliser |
|
| 1287 | + // http://fr2.php.net/manual/fr/function.pg-result-error.php |
|
| 1288 | + return 0; |
|
| 1289 | 1289 | } |
| 1290 | 1290 | |
| 1291 | 1291 | function spip_pg_drop_table($table, $exist = '', $serveur = '', $requeter = true) { |
| 1292 | - if ($exist) { |
|
| 1293 | - $exist = ' IF EXISTS'; |
|
| 1294 | - } |
|
| 1295 | - if (spip_pg_query("DROP TABLE$exist $table", $serveur, $requeter)) { |
|
| 1296 | - return true; |
|
| 1297 | - } else { |
|
| 1298 | - return false; |
|
| 1299 | - } |
|
| 1292 | + if ($exist) { |
|
| 1293 | + $exist = ' IF EXISTS'; |
|
| 1294 | + } |
|
| 1295 | + if (spip_pg_query("DROP TABLE$exist $table", $serveur, $requeter)) { |
|
| 1296 | + return true; |
|
| 1297 | + } else { |
|
| 1298 | + return false; |
|
| 1299 | + } |
|
| 1300 | 1300 | } |
| 1301 | 1301 | |
| 1302 | 1302 | // supprime une vue |
| 1303 | 1303 | function spip_pg_drop_view($view, $exist = '', $serveur = '', $requeter = true) { |
| 1304 | - if ($exist) { |
|
| 1305 | - $exist = ' IF EXISTS'; |
|
| 1306 | - } |
|
| 1304 | + if ($exist) { |
|
| 1305 | + $exist = ' IF EXISTS'; |
|
| 1306 | + } |
|
| 1307 | 1307 | |
| 1308 | - return spip_pg_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 1308 | + return spip_pg_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 1309 | 1309 | } |
| 1310 | 1310 | |
| 1311 | 1311 | /** |
@@ -1322,40 +1322,40 @@ discard block |
||
| 1322 | 1322 | * Ressource à utiliser avec sql_fetch() |
| 1323 | 1323 | **/ |
| 1324 | 1324 | function spip_pg_showbase($match, $serveur = '', $requeter = true) { |
| 1325 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1326 | - $link = $connexion['link']; |
|
| 1327 | - $connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE ' . _q($match); |
|
| 1325 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1326 | + $link = $connexion['link']; |
|
| 1327 | + $connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE ' . _q($match); |
|
| 1328 | 1328 | |
| 1329 | - return spip_pg_query_simple($link, $q); |
|
| 1329 | + return spip_pg_query_simple($link, $q); |
|
| 1330 | 1330 | } |
| 1331 | 1331 | |
| 1332 | 1332 | function spip_pg_showtable($nom_table, $serveur = '', $requeter = true) { |
| 1333 | - $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1334 | - $link = $connexion['link']; |
|
| 1335 | - $connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE ' . _q($nom_table); |
|
| 1336 | - |
|
| 1337 | - $res = spip_pg_query_simple($link, $q); |
|
| 1338 | - if (!$res) { |
|
| 1339 | - return false; |
|
| 1340 | - } |
|
| 1341 | - |
|
| 1342 | - // etrangement, $res peut ne rien contenir, mais arriver ici... |
|
| 1343 | - // il faut en tenir compte dans le return |
|
| 1344 | - $fields = []; |
|
| 1345 | - while ($field = pg_fetch_array($res, null, PGSQL_NUM)) { |
|
| 1346 | - $fields[$field[0]] = $field[2] . (!$field[1] ? '' : (' DEFAULT ' . $field[1])); |
|
| 1347 | - } |
|
| 1348 | - $connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE ' . _q($nom_table); |
|
| 1349 | - $res = spip_pg_query_simple($link, $q); |
|
| 1350 | - $keys = []; |
|
| 1351 | - while ($index = pg_fetch_array($res, null, PGSQL_NUM)) { |
|
| 1352 | - if (preg_match('/CREATE\s+(UNIQUE\s+)?INDEX\s([^\s]+).*\((.*)\)$/', $index[0], $r)) { |
|
| 1353 | - $nom = str_replace($nom_table . '_', '', $r[2]); |
|
| 1354 | - $keys[($r[1] ? 'PRIMARY KEY' : ('KEY ' . $nom))] = $r[3]; |
|
| 1355 | - } |
|
| 1356 | - } |
|
| 1357 | - |
|
| 1358 | - return count($fields) ? ['field' => $fields, 'key' => $keys] : false; |
|
| 1333 | + $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1334 | + $link = $connexion['link']; |
|
| 1335 | + $connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE ' . _q($nom_table); |
|
| 1336 | + |
|
| 1337 | + $res = spip_pg_query_simple($link, $q); |
|
| 1338 | + if (!$res) { |
|
| 1339 | + return false; |
|
| 1340 | + } |
|
| 1341 | + |
|
| 1342 | + // etrangement, $res peut ne rien contenir, mais arriver ici... |
|
| 1343 | + // il faut en tenir compte dans le return |
|
| 1344 | + $fields = []; |
|
| 1345 | + while ($field = pg_fetch_array($res, null, PGSQL_NUM)) { |
|
| 1346 | + $fields[$field[0]] = $field[2] . (!$field[1] ? '' : (' DEFAULT ' . $field[1])); |
|
| 1347 | + } |
|
| 1348 | + $connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE ' . _q($nom_table); |
|
| 1349 | + $res = spip_pg_query_simple($link, $q); |
|
| 1350 | + $keys = []; |
|
| 1351 | + while ($index = pg_fetch_array($res, null, PGSQL_NUM)) { |
|
| 1352 | + if (preg_match('/CREATE\s+(UNIQUE\s+)?INDEX\s([^\s]+).*\((.*)\)$/', $index[0], $r)) { |
|
| 1353 | + $nom = str_replace($nom_table . '_', '', $r[2]); |
|
| 1354 | + $keys[($r[1] ? 'PRIMARY KEY' : ('KEY ' . $nom))] = $r[3]; |
|
| 1355 | + } |
|
| 1356 | + } |
|
| 1357 | + |
|
| 1358 | + return count($fields) ? ['field' => $fields, 'key' => $keys] : false; |
|
| 1359 | 1359 | } |
| 1360 | 1360 | |
| 1361 | 1361 | // Fonction de creation d'une table SQL nommee $nom |
@@ -1366,116 +1366,116 @@ discard block |
||
| 1366 | 1366 | // Le nom des index est prefixe par celui de la table pour eviter les conflits |
| 1367 | 1367 | function spip_pg_create($nom, $champs, $cles, $autoinc = false, $temporary = false, $serveur = '', $requeter = true) { |
| 1368 | 1368 | |
| 1369 | - $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1370 | - $link = $connexion['link']; |
|
| 1371 | - $nom = prefixer_table_spip($nom, $connexion['prefixe']); |
|
| 1372 | - |
|
| 1373 | - $query = $prim = $prim_name = $v = $s = $p = ''; |
|
| 1374 | - $keys = []; |
|
| 1375 | - |
|
| 1376 | - // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 1377 | - // sans les renseigner (laisse le compilo recuperer la description) |
|
| 1378 | - if (!is_array($champs) || !is_array($cles)) { |
|
| 1379 | - return; |
|
| 1380 | - } |
|
| 1381 | - |
|
| 1382 | - foreach ($cles as $k => $v) { |
|
| 1383 | - if (strpos($k, 'KEY ') === 0) { |
|
| 1384 | - $n = str_replace('`', '', $k); |
|
| 1385 | - $v = str_replace('`', '"', $v); |
|
| 1386 | - $i = $nom . preg_replace('/KEY +/', '_', $n); |
|
| 1387 | - if ($k != $n) { |
|
| 1388 | - $i = "\"$i\""; |
|
| 1389 | - } |
|
| 1390 | - $keys[] = "CREATE INDEX $i ON $nom ($v);"; |
|
| 1391 | - } elseif (strpos($k, 'UNIQUE ') === 0) { |
|
| 1392 | - $k = preg_replace('/^UNIQUE +/', '', $k); |
|
| 1393 | - $prim .= "$s\n\t\tCONSTRAINT " . str_replace('`', '"', $k) . " UNIQUE ($v)"; |
|
| 1394 | - } else { |
|
| 1395 | - $prim .= "$s\n\t\t" . str_replace('`', '"', $k) . " ($v)"; |
|
| 1396 | - } |
|
| 1397 | - if ($k == 'PRIMARY KEY') { |
|
| 1398 | - $prim_name = $v; |
|
| 1399 | - } |
|
| 1400 | - $s = ','; |
|
| 1401 | - } |
|
| 1402 | - $s = ''; |
|
| 1403 | - |
|
| 1404 | - $character_set = ''; |
|
| 1405 | - if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 1406 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 1407 | - } |
|
| 1408 | - if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 1409 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 1410 | - } |
|
| 1411 | - |
|
| 1412 | - foreach ($champs as $k => $v) { |
|
| 1413 | - $k = str_replace('`', '"', $k); |
|
| 1414 | - if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 1415 | - if (preg_match(',(char|text),i', $defs[1]) and !preg_match(',binary,i', $defs[1])) { |
|
| 1416 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 1417 | - } |
|
| 1418 | - } |
|
| 1419 | - |
|
| 1420 | - $query .= "$s\n\t\t$k " |
|
| 1421 | - . (($autoinc && ($prim_name == $k) && preg_match(',\b(big|small|medium|tiny)?int\b,i', $v)) |
|
| 1422 | - ? ' bigserial' |
|
| 1423 | - : mysql2pg_type($v) |
|
| 1424 | - ); |
|
| 1425 | - $s = ','; |
|
| 1426 | - } |
|
| 1427 | - $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 1428 | - |
|
| 1429 | - // En l'absence de "if not exists" en PG, on neutralise les erreurs |
|
| 1430 | - |
|
| 1431 | - $q = "CREATE $temporary TABLE $nom ($query" . ($prim ? ",$prim" : '') . ')' . |
|
| 1432 | - ($character_set ? " DEFAULT $character_set" : '') |
|
| 1433 | - . "\n"; |
|
| 1434 | - |
|
| 1435 | - if (!$requeter) { |
|
| 1436 | - return $q; |
|
| 1437 | - } |
|
| 1438 | - $connexion['last'] = $q; |
|
| 1439 | - $r = @pg_query($link, $q); |
|
| 1440 | - |
|
| 1441 | - if (!$r) { |
|
| 1442 | - spip_log("Impossible de creer cette table: $q", 'pg.' . _LOG_ERREUR); |
|
| 1443 | - } else { |
|
| 1444 | - foreach ($keys as $index) { |
|
| 1445 | - pg_query($link, $index); |
|
| 1446 | - } |
|
| 1447 | - } |
|
| 1448 | - |
|
| 1449 | - return $r; |
|
| 1369 | + $connexion = $GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
|
| 1370 | + $link = $connexion['link']; |
|
| 1371 | + $nom = prefixer_table_spip($nom, $connexion['prefixe']); |
|
| 1372 | + |
|
| 1373 | + $query = $prim = $prim_name = $v = $s = $p = ''; |
|
| 1374 | + $keys = []; |
|
| 1375 | + |
|
| 1376 | + // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 1377 | + // sans les renseigner (laisse le compilo recuperer la description) |
|
| 1378 | + if (!is_array($champs) || !is_array($cles)) { |
|
| 1379 | + return; |
|
| 1380 | + } |
|
| 1381 | + |
|
| 1382 | + foreach ($cles as $k => $v) { |
|
| 1383 | + if (strpos($k, 'KEY ') === 0) { |
|
| 1384 | + $n = str_replace('`', '', $k); |
|
| 1385 | + $v = str_replace('`', '"', $v); |
|
| 1386 | + $i = $nom . preg_replace('/KEY +/', '_', $n); |
|
| 1387 | + if ($k != $n) { |
|
| 1388 | + $i = "\"$i\""; |
|
| 1389 | + } |
|
| 1390 | + $keys[] = "CREATE INDEX $i ON $nom ($v);"; |
|
| 1391 | + } elseif (strpos($k, 'UNIQUE ') === 0) { |
|
| 1392 | + $k = preg_replace('/^UNIQUE +/', '', $k); |
|
| 1393 | + $prim .= "$s\n\t\tCONSTRAINT " . str_replace('`', '"', $k) . " UNIQUE ($v)"; |
|
| 1394 | + } else { |
|
| 1395 | + $prim .= "$s\n\t\t" . str_replace('`', '"', $k) . " ($v)"; |
|
| 1396 | + } |
|
| 1397 | + if ($k == 'PRIMARY KEY') { |
|
| 1398 | + $prim_name = $v; |
|
| 1399 | + } |
|
| 1400 | + $s = ','; |
|
| 1401 | + } |
|
| 1402 | + $s = ''; |
|
| 1403 | + |
|
| 1404 | + $character_set = ''; |
|
| 1405 | + if (@$GLOBALS['meta']['charset_sql_base']) { |
|
| 1406 | + $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 1407 | + } |
|
| 1408 | + if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
|
| 1409 | + $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 1410 | + } |
|
| 1411 | + |
|
| 1412 | + foreach ($champs as $k => $v) { |
|
| 1413 | + $k = str_replace('`', '"', $k); |
|
| 1414 | + if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
|
| 1415 | + if (preg_match(',(char|text),i', $defs[1]) and !preg_match(',binary,i', $defs[1])) { |
|
| 1416 | + $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 1417 | + } |
|
| 1418 | + } |
|
| 1419 | + |
|
| 1420 | + $query .= "$s\n\t\t$k " |
|
| 1421 | + . (($autoinc && ($prim_name == $k) && preg_match(',\b(big|small|medium|tiny)?int\b,i', $v)) |
|
| 1422 | + ? ' bigserial' |
|
| 1423 | + : mysql2pg_type($v) |
|
| 1424 | + ); |
|
| 1425 | + $s = ','; |
|
| 1426 | + } |
|
| 1427 | + $temporary = $temporary ? 'TEMPORARY' : ''; |
|
| 1428 | + |
|
| 1429 | + // En l'absence de "if not exists" en PG, on neutralise les erreurs |
|
| 1430 | + |
|
| 1431 | + $q = "CREATE $temporary TABLE $nom ($query" . ($prim ? ",$prim" : '') . ')' . |
|
| 1432 | + ($character_set ? " DEFAULT $character_set" : '') |
|
| 1433 | + . "\n"; |
|
| 1434 | + |
|
| 1435 | + if (!$requeter) { |
|
| 1436 | + return $q; |
|
| 1437 | + } |
|
| 1438 | + $connexion['last'] = $q; |
|
| 1439 | + $r = @pg_query($link, $q); |
|
| 1440 | + |
|
| 1441 | + if (!$r) { |
|
| 1442 | + spip_log("Impossible de creer cette table: $q", 'pg.' . _LOG_ERREUR); |
|
| 1443 | + } else { |
|
| 1444 | + foreach ($keys as $index) { |
|
| 1445 | + pg_query($link, $index); |
|
| 1446 | + } |
|
| 1447 | + } |
|
| 1448 | + |
|
| 1449 | + return $r; |
|
| 1450 | 1450 | } |
| 1451 | 1451 | |
| 1452 | 1452 | |
| 1453 | 1453 | function spip_pg_create_base($nom, $serveur = '', $requeter = true) { |
| 1454 | - return spip_pg_query("CREATE DATABASE $nom", $serveur, $requeter); |
|
| 1454 | + return spip_pg_query("CREATE DATABASE $nom", $serveur, $requeter); |
|
| 1455 | 1455 | } |
| 1456 | 1456 | |
| 1457 | 1457 | // Fonction de creation d'une vue SQL nommee $nom |
| 1458 | 1458 | function spip_pg_create_view($nom, $query_select, $serveur = '', $requeter = true) { |
| 1459 | - if (!$query_select) { |
|
| 1460 | - return false; |
|
| 1461 | - } |
|
| 1462 | - // vue deja presente |
|
| 1463 | - if (sql_showtable($nom, false, $serveur)) { |
|
| 1464 | - if ($requeter) { |
|
| 1465 | - spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.' . _LOG_ERREUR); |
|
| 1466 | - } |
|
| 1459 | + if (!$query_select) { |
|
| 1460 | + return false; |
|
| 1461 | + } |
|
| 1462 | + // vue deja presente |
|
| 1463 | + if (sql_showtable($nom, false, $serveur)) { |
|
| 1464 | + if ($requeter) { |
|
| 1465 | + spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.' . _LOG_ERREUR); |
|
| 1466 | + } |
|
| 1467 | 1467 | |
| 1468 | - return false; |
|
| 1469 | - } |
|
| 1468 | + return false; |
|
| 1469 | + } |
|
| 1470 | 1470 | |
| 1471 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 1471 | + $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 1472 | 1472 | |
| 1473 | - return spip_pg_query($query, $serveur, $requeter); |
|
| 1473 | + return spip_pg_query($query, $serveur, $requeter); |
|
| 1474 | 1474 | } |
| 1475 | 1475 | |
| 1476 | 1476 | |
| 1477 | 1477 | function spip_pg_set_connect_charset($charset, $serveur = '', $requeter = true) { |
| 1478 | - spip_log('changement de charset sql a ecrire en PG', 'pg.' . _LOG_ERREUR); |
|
| 1478 | + spip_log('changement de charset sql a ecrire en PG', 'pg.' . _LOG_ERREUR); |
|
| 1479 | 1479 | } |
| 1480 | 1480 | |
| 1481 | 1481 | |
@@ -1488,50 +1488,50 @@ discard block |
||
| 1488 | 1488 | * @return bool|string true / false / requete |
| 1489 | 1489 | **/ |
| 1490 | 1490 | function spip_pg_optimize($table, $serveur = '', $requeter = true) { |
| 1491 | - return spip_pg_query('VACUUM ' . $table, $serveur, $requeter); |
|
| 1491 | + return spip_pg_query('VACUUM ' . $table, $serveur, $requeter); |
|
| 1492 | 1492 | } |
| 1493 | 1493 | |
| 1494 | 1494 | // Selectionner la sous-chaine dans $objet |
| 1495 | 1495 | // correspondant a $lang. Cf balise Multi de Spip |
| 1496 | 1496 | |
| 1497 | 1497 | function spip_pg_multi($objet, $lang) { |
| 1498 | - $r = 'regexp_replace(' |
|
| 1499 | - . $objet |
|
| 1500 | - . ",'<multi>.*[[]" |
|
| 1501 | - . $lang |
|
| 1502 | - . "[]]([^[]*).*</multi>', E'\\\\1') AS multi"; |
|
| 1498 | + $r = 'regexp_replace(' |
|
| 1499 | + . $objet |
|
| 1500 | + . ",'<multi>.*[[]" |
|
| 1501 | + . $lang |
|
| 1502 | + . "[]]([^[]*).*</multi>', E'\\\\1') AS multi"; |
|
| 1503 | 1503 | |
| 1504 | - return $r; |
|
| 1504 | + return $r; |
|
| 1505 | 1505 | } |
| 1506 | 1506 | |
| 1507 | 1507 | // Palanquee d'idiosyncrasies MySQL dans les creations de table |
| 1508 | 1508 | // A completer par les autres, mais essayer de reduire en amont. |
| 1509 | 1509 | |
| 1510 | 1510 | function mysql2pg_type($v) { |
| 1511 | - $remplace = [ |
|
| 1512 | - '/auto_increment/i' => '', // non reconnu |
|
| 1513 | - '/bigint/i' => 'bigint', |
|
| 1514 | - '/mediumint/i' => 'mediumint', |
|
| 1515 | - '/smallint/i' => 'smallint', |
|
| 1516 | - '/tinyint/i' => 'int', |
|
| 1517 | - '/int\s*[(]\s*\d+\s*[)]/i' => 'int', |
|
| 1518 | - '/longtext/i' => 'text', |
|
| 1519 | - '/mediumtext/i' => 'text', |
|
| 1520 | - '/tinytext/i' => 'text', |
|
| 1521 | - '/longblob/i' => 'text', |
|
| 1522 | - '/0000-00-00/' => '0001-01-01', |
|
| 1523 | - '/datetime/i' => 'timestamp', |
|
| 1524 | - '/unsigned/i' => '', |
|
| 1525 | - '/double/i' => 'double precision', |
|
| 1526 | - '/VARCHAR\((\d+)\)\s+BINARY/i' => 'varchar(\1)', |
|
| 1527 | - '/ENUM *[(][^)]*[)]/i' => 'varchar(255)', |
|
| 1528 | - '/(timestamp .* )ON .*$/is' => '\\1', |
|
| 1529 | - ]; |
|
| 1530 | - |
|
| 1531 | - return preg_replace(array_keys($remplace), array_values($remplace), $v); |
|
| 1511 | + $remplace = [ |
|
| 1512 | + '/auto_increment/i' => '', // non reconnu |
|
| 1513 | + '/bigint/i' => 'bigint', |
|
| 1514 | + '/mediumint/i' => 'mediumint', |
|
| 1515 | + '/smallint/i' => 'smallint', |
|
| 1516 | + '/tinyint/i' => 'int', |
|
| 1517 | + '/int\s*[(]\s*\d+\s*[)]/i' => 'int', |
|
| 1518 | + '/longtext/i' => 'text', |
|
| 1519 | + '/mediumtext/i' => 'text', |
|
| 1520 | + '/tinytext/i' => 'text', |
|
| 1521 | + '/longblob/i' => 'text', |
|
| 1522 | + '/0000-00-00/' => '0001-01-01', |
|
| 1523 | + '/datetime/i' => 'timestamp', |
|
| 1524 | + '/unsigned/i' => '', |
|
| 1525 | + '/double/i' => 'double precision', |
|
| 1526 | + '/VARCHAR\((\d+)\)\s+BINARY/i' => 'varchar(\1)', |
|
| 1527 | + '/ENUM *[(][^)]*[)]/i' => 'varchar(255)', |
|
| 1528 | + '/(timestamp .* )ON .*$/is' => '\\1', |
|
| 1529 | + ]; |
|
| 1530 | + |
|
| 1531 | + return preg_replace(array_keys($remplace), array_values($remplace), $v); |
|
| 1532 | 1532 | } |
| 1533 | 1533 | |
| 1534 | 1534 | // Renvoie false si on n'a pas les fonctions pg (pour l'install) |
| 1535 | 1535 | function spip_versions_pg() { |
| 1536 | - return function_exists('pg_connect'); |
|
| 1536 | + return function_exists('pg_connect'); |
|
| 1537 | 1537 | } |
@@ -64,7 +64,7 @@ discard block |
||
| 64 | 64 | if (!$link) { |
| 65 | 65 | $erreurs[] = pg_last_error(); |
| 66 | 66 | foreach ($erreurs as $e) { |
| 67 | - spip_log('Echec pg_connect. Erreur : ' . $e, 'pg.' . _LOG_HS); |
|
| 67 | + spip_log('Echec pg_connect. Erreur : '.$e, 'pg.'._LOG_HS); |
|
| 68 | 68 | } |
| 69 | 69 | |
| 70 | 70 | return false; |
@@ -82,8 +82,8 @@ discard block |
||
| 82 | 82 | } |
| 83 | 83 | |
| 84 | 84 | spip_log( |
| 85 | - "Connexion vers $host, base $db, prefixe $prefixe " . ($link ? 'operationnelle' : 'impossible'), |
|
| 86 | - 'pg.' . _LOG_DEBUG |
|
| 85 | + "Connexion vers $host, base $db, prefixe $prefixe ".($link ? 'operationnelle' : 'impossible'), |
|
| 86 | + 'pg.'._LOG_DEBUG |
|
| 87 | 87 | ); |
| 88 | 88 | |
| 89 | 89 | return !$link ? false : [ |
@@ -171,7 +171,7 @@ discard block |
||
| 171 | 171 | } else { |
| 172 | 172 | $suite = ''; |
| 173 | 173 | } |
| 174 | - $query = preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite; |
|
| 174 | + $query = preg_replace('/([,\s])spip_/', '\1'.$prefixe.'_', $query).$suite; |
|
| 175 | 175 | |
| 176 | 176 | // renvoyer la requete inerte si demandee |
| 177 | 177 | if (!$requeter) { |
@@ -239,7 +239,7 @@ discard block |
||
| 239 | 239 | // ou revoir l'api de sql_alter en creant un |
| 240 | 240 | // sql_alter_table($table,array($actions)); |
| 241 | 241 | if (!preg_match('/\s*((\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) { |
| 242 | - spip_log("$query mal comprise", 'pg.' . _LOG_ERREUR); |
|
| 242 | + spip_log("$query mal comprise", 'pg.'._LOG_ERREUR); |
|
| 243 | 243 | |
| 244 | 244 | return false; |
| 245 | 245 | } |
@@ -252,7 +252,7 @@ discard block |
||
| 252 | 252 | $i = 0; |
| 253 | 253 | $ouverte = false; |
| 254 | 254 | while ($do = array_shift($todo)) { |
| 255 | - $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do; |
|
| 255 | + $todo2[$i] = isset($todo2[$i]) ? $todo2[$i].','.$do : $do; |
|
| 256 | 256 | $o = (str_contains($do, '(')); |
| 257 | 257 | $f = (str_contains($do, ')')); |
| 258 | 258 | if ($o and !$f) { |
@@ -265,33 +265,33 @@ discard block |
||
| 265 | 265 | } |
| 266 | 266 | } |
| 267 | 267 | $todo = $todo2; |
| 268 | - $query = $debut . ' ' . array_shift($todo); |
|
| 268 | + $query = $debut.' '.array_shift($todo); |
|
| 269 | 269 | |
| 270 | 270 | if (!preg_match('/^\s*(IGNORE\s*)?TABLE\s+(\w+)\s+(ADD|DROP|CHANGE|MODIFY|RENAME)\s*(.*)$/is', $query, $r)) { |
| 271 | - spip_log("$query incompris", 'pg.' . _LOG_ERREUR); |
|
| 271 | + spip_log("$query incompris", 'pg.'._LOG_ERREUR); |
|
| 272 | 272 | } else { |
| 273 | 273 | if ($r[1]) { |
| 274 | - spip_log("j'ignore IGNORE dans $query", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 274 | + spip_log("j'ignore IGNORE dans $query", 'pg.'._LOG_AVERTISSEMENT); |
|
| 275 | 275 | } |
| 276 | - $f = 'spip_pg_alter_' . strtolower($r[3]); |
|
| 276 | + $f = 'spip_pg_alter_'.strtolower($r[3]); |
|
| 277 | 277 | if (function_exists($f)) { |
| 278 | 278 | $f($r[2], $r[4], $serveur, $requeter); |
| 279 | 279 | } else { |
| 280 | - spip_log("$query non prevu", 'pg.' . _LOG_ERREUR); |
|
| 280 | + spip_log("$query non prevu", 'pg.'._LOG_ERREUR); |
|
| 281 | 281 | } |
| 282 | 282 | } |
| 283 | 283 | // Alter a plusieurs args. Faudrait optimiser. |
| 284 | 284 | if ($todo) { |
| 285 | - spip_pg_alter("TABLE $table " . join(',', $todo)); |
|
| 285 | + spip_pg_alter("TABLE $table ".join(',', $todo)); |
|
| 286 | 286 | } |
| 287 | 287 | } |
| 288 | 288 | |
| 289 | 289 | function spip_pg_alter_change($table, $arg, $serveur = '', $requeter = true) { |
| 290 | 290 | if (!preg_match('/^`?(\w+)`?\s+`?(\w+)`?\s+(.*?)\s*(DEFAULT .*?)?(NOT\s+NULL)?\s*(DEFAULT .*?)?$/i', $arg, $r)) { |
| 291 | - spip_log("alter change: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 291 | + spip_log("alter change: $arg incompris", 'pg.'._LOG_ERREUR); |
|
| 292 | 292 | } else { |
| 293 | 293 | [, $old, $new, $type, $default, $null, $def2] = $r; |
| 294 | - $actions = ["ALTER $old TYPE " . mysql2pg_type($type)]; |
|
| 294 | + $actions = ["ALTER $old TYPE ".mysql2pg_type($type)]; |
|
| 295 | 295 | if ($null) { |
| 296 | 296 | $actions[] = "ALTER $old SET NOT NULL"; |
| 297 | 297 | } else { |
@@ -304,7 +304,7 @@ discard block |
||
| 304 | 304 | $actions[] = "ALTER $old DROP DEFAULT"; |
| 305 | 305 | } |
| 306 | 306 | |
| 307 | - spip_pg_query("ALTER TABLE $table " . join(', ', $actions)); |
|
| 307 | + spip_pg_query("ALTER TABLE $table ".join(', ', $actions)); |
|
| 308 | 308 | |
| 309 | 309 | if ($old != $new) { |
| 310 | 310 | spip_pg_query("ALTER TABLE $table RENAME $old TO $new", $serveur); |
@@ -315,7 +315,7 @@ discard block |
||
| 315 | 315 | function spip_pg_alter_add($table, $arg, $serveur = '', $requeter = true) { |
| 316 | 316 | $nom_index = null; |
| 317 | 317 | if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*(.*)$/', $arg, $r)) { |
| 318 | - spip_log("alter add $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 318 | + spip_log("alter add $arg incompris", 'pg.'._LOG_ERREUR); |
|
| 319 | 319 | |
| 320 | 320 | return null; |
| 321 | 321 | } |
@@ -325,14 +325,14 @@ discard block |
||
| 325 | 325 | $m[2] = $n[1]; |
| 326 | 326 | } |
| 327 | 327 | |
| 328 | - return spip_pg_query("ALTER TABLE $table ADD " . $m[1] . ' ' . mysql2pg_type($m[2]), $serveur, $requeter); |
|
| 328 | + return spip_pg_query("ALTER TABLE $table ADD ".$m[1].' '.mysql2pg_type($m[2]), $serveur, $requeter); |
|
| 329 | 329 | } elseif ($r[1][0] == 'P') { |
| 330 | 330 | // la primary peut etre sur plusieurs champs |
| 331 | 331 | $r[2] = trim(str_replace('`', '', $r[2])); |
| 332 | 332 | $m = ($r[2][0] == '(') ? substr($r[2], 1, -1) : $r[2]; |
| 333 | 333 | |
| 334 | 334 | return spip_pg_query( |
| 335 | - "ALTER TABLE $table ADD CONSTRAINT $table" . '_pkey PRIMARY KEY (' . $m . ')', |
|
| 335 | + "ALTER TABLE $table ADD CONSTRAINT $table".'_pkey PRIMARY KEY ('.$m.')', |
|
| 336 | 336 | $serveur, |
| 337 | 337 | $requeter |
| 338 | 338 | ); |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | $colonnes = substr($m[1], 1, -1); |
| 352 | 352 | if (str_contains(',', $colonnes)) { |
| 353 | 353 | spip_log('PG : Erreur, impossible de creer un index sur plusieurs colonnes' |
| 354 | - . " sans qu'il ait de nom ($table, ($colonnes))", 'pg.' . _LOG_ERREUR); |
|
| 354 | + . " sans qu'il ait de nom ($table, ($colonnes))", 'pg.'._LOG_ERREUR); |
|
| 355 | 355 | } else { |
| 356 | 356 | $nom_index = $colonnes; |
| 357 | 357 | } |
@@ -367,23 +367,23 @@ discard block |
||
| 367 | 367 | |
| 368 | 368 | function spip_pg_alter_drop($table, $arg, $serveur = '', $requeter = true) { |
| 369 | 369 | if (!preg_match('/^(COLUMN|INDEX|KEY|PRIMARY\s+KEY|)\s*`?(\w*)`?/', $arg, $r)) { |
| 370 | - spip_log("alter drop: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 370 | + spip_log("alter drop: $arg incompris", 'pg.'._LOG_ERREUR); |
|
| 371 | 371 | } else { |
| 372 | 372 | if (!$r[1] or $r[1] == 'COLUMN') { |
| 373 | - return spip_pg_query("ALTER TABLE $table DROP " . $r[2], $serveur); |
|
| 373 | + return spip_pg_query("ALTER TABLE $table DROP ".$r[2], $serveur); |
|
| 374 | 374 | } elseif ($r[1][0] == 'P') { |
| 375 | - return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table" . '_pkey', $serveur); |
|
| 375 | + return spip_pg_query("ALTER TABLE $table DROP CONSTRAINT $table".'_pkey', $serveur); |
|
| 376 | 376 | } else { |
| 377 | - return spip_pg_query('DROP INDEX ' . $table . '_' . $r[2], $serveur); |
|
| 377 | + return spip_pg_query('DROP INDEX '.$table.'_'.$r[2], $serveur); |
|
| 378 | 378 | } |
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | 381 | |
| 382 | 382 | function spip_pg_alter_modify($table, $arg, $serveur = '', $requeter = true) { |
| 383 | 383 | if (!preg_match('/^`?(\w+)`?\s+(.*)$/', $arg, $r)) { |
| 384 | - spip_log("alter modify: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 384 | + spip_log("alter modify: $arg incompris", 'pg.'._LOG_ERREUR); |
|
| 385 | 385 | } else { |
| 386 | - return spip_pg_alter_change($table, $r[1] . ' ' . $arg, $serveur = '', $requeter = true); |
|
| 386 | + return spip_pg_alter_change($table, $r[1].' '.$arg, $serveur = '', $requeter = true); |
|
| 387 | 387 | } |
| 388 | 388 | } |
| 389 | 389 | |
@@ -399,7 +399,7 @@ discard block |
||
| 399 | 399 | } elseif (preg_match('/^(TO)\s*`?(\w*)`?/', $arg, $r)) { |
| 400 | 400 | $rename = $r[2]; |
| 401 | 401 | } else { |
| 402 | - spip_log("alter rename: $arg incompris", 'pg.' . _LOG_ERREUR); |
|
| 402 | + spip_log("alter rename: $arg incompris", 'pg.'._LOG_ERREUR); |
|
| 403 | 403 | } |
| 404 | 404 | |
| 405 | 405 | return $rename ? spip_pg_query("ALTER TABLE $table RENAME TO $rename") : false; |
@@ -420,8 +420,8 @@ discard block |
||
| 420 | 420 | function spip_pg_create_index($nom, $table, $champs, $serveur = '', $requeter = true) { |
| 421 | 421 | if (!($nom or $table or $champs)) { |
| 422 | 422 | spip_log( |
| 423 | - "Champ manquant pour creer un index pg ($nom, $table, (" . @join(',', $champs) . '))', |
|
| 424 | - 'pg.' . _LOG_ERREUR |
|
| 423 | + "Champ manquant pour creer un index pg ($nom, $table, (".@join(',', $champs).'))', |
|
| 424 | + 'pg.'._LOG_ERREUR |
|
| 425 | 425 | ); |
| 426 | 426 | |
| 427 | 427 | return false; |
@@ -432,7 +432,7 @@ discard block |
||
| 432 | 432 | |
| 433 | 433 | // PG ne differentie pas noms des index en fonction des tables |
| 434 | 434 | // il faut donc creer des noms uniques d'index pour une base pg |
| 435 | - $nom = $table . '_' . $nom; |
|
| 435 | + $nom = $table.'_'.$nom; |
|
| 436 | 436 | // enlever d'eventuelles parentheses deja presentes sur champs |
| 437 | 437 | if (!is_array($champs)) { |
| 438 | 438 | if ($champs[0] == '(') { |
@@ -440,7 +440,7 @@ discard block |
||
| 440 | 440 | } |
| 441 | 441 | $champs = [$champs]; |
| 442 | 442 | } |
| 443 | - $query = "CREATE INDEX $nom ON $table (" . join(',', $champs) . ')'; |
|
| 443 | + $query = "CREATE INDEX $nom ON $table (".join(',', $champs).')'; |
|
| 444 | 444 | if (!$requeter) { |
| 445 | 445 | return $query; |
| 446 | 446 | } |
@@ -463,7 +463,7 @@ discard block |
||
| 463 | 463 | } else { |
| 464 | 464 | $suite = ''; |
| 465 | 465 | } |
| 466 | - $query = 'EXPLAIN ' . preg_replace('/([,\s])spip_/', '\1' . $prefixe . '_', $query) . $suite; |
|
| 466 | + $query = 'EXPLAIN '.preg_replace('/([,\s])spip_/', '\1'.$prefixe.'_', $query).$suite; |
|
| 467 | 467 | |
| 468 | 468 | if (!$requeter) { |
| 469 | 469 | return $query; |
@@ -556,16 +556,16 @@ discard block |
||
| 556 | 556 | } |
| 557 | 557 | } |
| 558 | 558 | $from = spip_pg_from($from, $prefixe); |
| 559 | - $query = 'SELECT ' . $select |
|
| 559 | + $query = 'SELECT '.$select |
|
| 560 | 560 | . (!$from ? '' : "\nFROM $from") |
| 561 | - . (!$where ? '' : ("\nWHERE " . (!is_array($where) ? calculer_pg_where($where) : (join( |
|
| 561 | + . (!$where ? '' : ("\nWHERE ".(!is_array($where) ? calculer_pg_where($where) : (join( |
|
| 562 | 562 | "\n\tAND ", |
| 563 | 563 | array_map('calculer_pg_where', $where) |
| 564 | 564 | ))))) |
| 565 | 565 | . spip_pg_groupby($groupby, $from, $select) |
| 566 | 566 | . (!$having ? '' : "\nHAVING $having") |
| 567 | 567 | . ($orderby ? ("\nORDER BY $orderby") : '') |
| 568 | - . (!$limit ? '' : (" LIMIT $count" . (!$offset ? '' : " OFFSET $offset"))); |
|
| 568 | + . (!$limit ? '' : (" LIMIT $count".(!$offset ? '' : " OFFSET $offset"))); |
|
| 569 | 569 | |
| 570 | 570 | // renvoyer la requete inerte si demandee |
| 571 | 571 | if ($requeter === false) { |
@@ -586,7 +586,7 @@ discard block |
||
| 586 | 586 | $from = spip_pg_select_as($from); |
| 587 | 587 | } |
| 588 | 588 | |
| 589 | - return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1' . $prefixe . '_', $from); |
|
| 589 | + return !$prefixe ? $from : preg_replace('/(\b)spip_/', '\1'.$prefixe.'_', $from); |
|
| 590 | 590 | } |
| 591 | 591 | |
| 592 | 592 | function spip_pg_orderby($order, $select) { |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | $arg = (is_array($order) ? $order : preg_split('/\s*,\s*/', $order)); |
| 595 | 595 | |
| 596 | 596 | foreach ($arg as $v) { |
| 597 | - if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+' . $v . '/', $select, $m)) { |
|
| 597 | + if (preg_match('/(case\s+.*?else\s+0\s+end)\s*AS\s+'.$v.'/', $select, $m)) { |
|
| 598 | 598 | $res[] = $m[1]; |
| 599 | 599 | } else { |
| 600 | 600 | $res[] = $v; |
@@ -772,7 +772,7 @@ discard block |
||
| 772 | 772 | $n++; |
| 773 | 773 | $res .= "\nwhen $index=$v then $n"; |
| 774 | 774 | } |
| 775 | - $arg = $m[1] . "case $res else 0 end " |
|
| 775 | + $arg = $m[1]."case $res else 0 end " |
|
| 776 | 776 | . substr($arg, strlen($m[0])); |
| 777 | 777 | } |
| 778 | 778 | |
@@ -815,9 +815,9 @@ discard block |
||
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | if (strtoupper($join) === 'AND') { |
| 818 | - return $exp . join("\n\t$join ", array_map('calculer_pg_where', $v)); |
|
| 818 | + return $exp.join("\n\t$join ", array_map('calculer_pg_where', $v)); |
|
| 819 | 819 | } else { |
| 820 | - return $exp . join($join, $v); |
|
| 820 | + return $exp.join($join, $v); |
|
| 821 | 821 | } |
| 822 | 822 | } |
| 823 | 823 | |
@@ -827,7 +827,7 @@ discard block |
||
| 827 | 827 | if (substr($k, -1) == '@') { |
| 828 | 828 | // c'est une jointure qui se refere au from precedent |
| 829 | 829 | // pas de virgule |
| 830 | - $argsas .= ' ' . $v; |
|
| 830 | + $argsas .= ' '.$v; |
|
| 831 | 831 | } else { |
| 832 | 832 | $as = ''; |
| 833 | 833 | // spip_log("$k : $v", _LOG_DEBUG); |
@@ -837,7 +837,7 @@ discard block |
||
| 837 | 837 | } elseif ($v != $k) { |
| 838 | 838 | $p = strpos($v, ' '); |
| 839 | 839 | if ($p) { |
| 840 | - $v = substr($v, 0, $p) . " AS $k" . substr($v, $p); |
|
| 840 | + $v = substr($v, 0, $p)." AS $k".substr($v, $p); |
|
| 841 | 841 | } else { |
| 842 | 842 | $as = " AS $k"; |
| 843 | 843 | } |
@@ -845,7 +845,7 @@ discard block |
||
| 845 | 845 | } |
| 846 | 846 | // spip_log("subs $k : $v avec $as", _LOG_DEBUG); |
| 847 | 847 | // if (strpos($v, 'JOIN') === false) $argsas .= ', '; |
| 848 | - $argsas .= ', ' . $v . $as; |
|
| 848 | + $argsas .= ', '.$v.$as; |
|
| 849 | 849 | } |
| 850 | 850 | } |
| 851 | 851 | |
@@ -876,7 +876,7 @@ discard block |
||
| 876 | 876 | $serveur = '', |
| 877 | 877 | $requeter = true |
| 878 | 878 | ) { |
| 879 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 879 | + $c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 880 | 880 | $r = spip_pg_select("COUNT($c)", $from, $where, '', '', '', $having, $serveur, $requeter); |
| 881 | 881 | if (!$requeter) { |
| 882 | 882 | return $r; |
@@ -977,8 +977,8 @@ discard block |
||
| 977 | 977 | |
| 978 | 978 | return spip_pg_insert( |
| 979 | 979 | $table, |
| 980 | - '(' . join(',', array_keys($couples)) . ')', |
|
| 981 | - '(' . join(',', $couples) . ')', |
|
| 980 | + '('.join(',', array_keys($couples)).')', |
|
| 981 | + '('.join(',', $couples).')', |
|
| 982 | 982 | $desc, |
| 983 | 983 | $serveur, |
| 984 | 984 | $requeter |
@@ -1001,7 +1001,7 @@ discard block |
||
| 1001 | 1001 | $c = $tab_couples[0] ?? []; |
| 1002 | 1002 | $les_cles = spip_pg_ajouter_champs_timestamp($table, $c, $desc, $serveur); |
| 1003 | 1003 | |
| 1004 | - $cles = '(' . join(',', array_keys($les_cles)) . ')'; |
|
| 1004 | + $cles = '('.join(',', array_keys($les_cles)).')'; |
|
| 1005 | 1005 | $valeurs = []; |
| 1006 | 1006 | foreach ($tab_couples as $couples) { |
| 1007 | 1007 | foreach ($couples as $champ => $val) { |
@@ -1010,7 +1010,7 @@ discard block |
||
| 1010 | 1010 | // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
| 1011 | 1011 | $couples = spip_pg_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
| 1012 | 1012 | |
| 1013 | - $valeurs[] = '(' . join(',', $couples) . ')'; |
|
| 1013 | + $valeurs[] = '('.join(',', $couples).')'; |
|
| 1014 | 1014 | } |
| 1015 | 1015 | $valeurs = implode(', ', $valeurs); |
| 1016 | 1016 | |
@@ -1031,7 +1031,7 @@ discard block |
||
| 1031 | 1031 | |
| 1032 | 1032 | $set = []; |
| 1033 | 1033 | foreach ($couples as $champ => $val) { |
| 1034 | - $set[] = $champ . '=' . $val; |
|
| 1034 | + $set[] = $champ.'='.$val; |
|
| 1035 | 1035 | } |
| 1036 | 1036 | |
| 1037 | 1037 | $query = calculer_pg_expression('UPDATE', $table, ',') |
@@ -1066,7 +1066,7 @@ discard block |
||
| 1066 | 1066 | |
| 1067 | 1067 | function spip_pg_replace($table, $values, $desc, $serveur = '', $requeter = true) { |
| 1068 | 1068 | if (!$values) { |
| 1069 | - spip_log("replace vide $table", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 1069 | + spip_log("replace vide $table", 'pg.'._LOG_AVERTISSEMENT); |
|
| 1070 | 1070 | |
| 1071 | 1071 | return 0; |
| 1072 | 1072 | } |
@@ -1100,8 +1100,8 @@ discard block |
||
| 1100 | 1100 | if (!$where) { |
| 1101 | 1101 | return spip_pg_insert( |
| 1102 | 1102 | $table, |
| 1103 | - '(' . join(',', array_keys($values)) . ')', |
|
| 1104 | - '(' . join(',', $values) . ')', |
|
| 1103 | + '('.join(',', array_keys($values)).')', |
|
| 1104 | + '('.join(',', $values).')', |
|
| 1105 | 1105 | $desc, |
| 1106 | 1106 | $serveur |
| 1107 | 1107 | ); |
@@ -1122,12 +1122,11 @@ discard block |
||
| 1122 | 1122 | $couples = pg_affected_rows($couples); |
| 1123 | 1123 | } |
| 1124 | 1124 | if (!$couples) { |
| 1125 | - $ret = !$seq ? '' : |
|
| 1126 | - (" RETURNING nextval('$seq') < $prim"); |
|
| 1127 | - $connexion['last'] = $q = "INSERT INTO $table (" . join(',', array_keys($values)) . ') VALUES (' . join( |
|
| 1125 | + $ret = !$seq ? '' : (" RETURNING nextval('$seq') < $prim"); |
|
| 1126 | + $connexion['last'] = $q = "INSERT INTO $table (".join(',', array_keys($values)).') VALUES ('.join( |
|
| 1128 | 1127 | ',', |
| 1129 | 1128 | $values |
| 1130 | - ) . ")$ret"; |
|
| 1129 | + ).")$ret"; |
|
| 1131 | 1130 | $couples = spip_pg_query_simple($link, $q); |
| 1132 | 1131 | if (!$couples) { |
| 1133 | 1132 | return false; |
@@ -1175,7 +1174,7 @@ discard block |
||
| 1175 | 1174 | ) { |
| 1176 | 1175 | return ''; |
| 1177 | 1176 | } else { |
| 1178 | - return $raw ? $prim : $table . '_' . $prim . '_seq'; |
|
| 1177 | + return $raw ? $prim : $table.'_'.$prim.'_seq'; |
|
| 1179 | 1178 | } |
| 1180 | 1179 | } |
| 1181 | 1180 | |
@@ -1192,29 +1191,29 @@ discard block |
||
| 1192 | 1191 | return spip_pg_frommysql($v); |
| 1193 | 1192 | } else { |
| 1194 | 1193 | if (strncmp($v, '0000', 4) == 0) { |
| 1195 | - $v = '0001' . substr($v, 4); |
|
| 1194 | + $v = '0001'.substr($v, 4); |
|
| 1196 | 1195 | } |
| 1197 | 1196 | if (strpos($v, '-00-00') === 4) { |
| 1198 | - $v = substr($v, 0, 4) . '-01-01' . substr($v, 10); |
|
| 1197 | + $v = substr($v, 0, 4).'-01-01'.substr($v, 10); |
|
| 1199 | 1198 | } |
| 1200 | 1199 | |
| 1201 | 1200 | return "timestamp '$v'"; |
| 1202 | 1201 | } |
| 1203 | 1202 | } elseif (!sql_test_int($t)) { |
| 1204 | - return ("'" . pg_escape_string($v) . "'"); |
|
| 1203 | + return ("'".pg_escape_string($v)."'"); |
|
| 1205 | 1204 | } elseif (is_numeric($v) or (strpos($v, 'CAST(') === 0)) { |
| 1206 | 1205 | return $v; |
| 1207 | 1206 | } elseif ($v[0] == '0' and $v[1] !== 'x' and ctype_xdigit(substr($v, 1))) { |
| 1208 | 1207 | return substr($v, 1); |
| 1209 | 1208 | } else { |
| 1210 | - spip_log("Warning: '$v' n'est pas de type $t", 'pg.' . _LOG_AVERTISSEMENT); |
|
| 1209 | + spip_log("Warning: '$v' n'est pas de type $t", 'pg.'._LOG_AVERTISSEMENT); |
|
| 1211 | 1210 | |
| 1212 | 1211 | return intval($v); |
| 1213 | 1212 | } |
| 1214 | 1213 | } |
| 1215 | 1214 | |
| 1216 | 1215 | function spip_pg_hex($v) { |
| 1217 | - return "CAST(x'" . $v . "' as bigint)"; |
|
| 1216 | + return "CAST(x'".$v."' as bigint)"; |
|
| 1218 | 1217 | } |
| 1219 | 1218 | |
| 1220 | 1219 | function spip_pg_quote($v, $type = '') { |
@@ -1252,15 +1251,15 @@ discard block |
||
| 1252 | 1251 | return $not ? '0=0' : '0=1'; |
| 1253 | 1252 | } |
| 1254 | 1253 | if (strpos($valeurs, "CAST(x'") !== false) { |
| 1255 | - return "($val=" . join("OR $val=", explode(',', $valeurs)) . ')'; |
|
| 1254 | + return "($val=".join("OR $val=", explode(',', $valeurs)).')'; |
|
| 1256 | 1255 | } |
| 1257 | 1256 | $n = $i = 0; |
| 1258 | 1257 | $in_sql = ''; |
| 1259 | 1258 | while ($n = strpos($valeurs, ',', $n + 1)) { |
| 1260 | 1259 | if ((++$i) >= 255) { |
| 1261 | - $in_sql .= "($val $not IN (" . |
|
| 1262 | - substr($valeurs, 0, $n) . |
|
| 1263 | - "))\n" . |
|
| 1260 | + $in_sql .= "($val $not IN (". |
|
| 1261 | + substr($valeurs, 0, $n). |
|
| 1262 | + "))\n". |
|
| 1264 | 1263 | ($not ? "AND\t" : "OR\t"); |
| 1265 | 1264 | $valeurs = substr($valeurs, $n + 1); |
| 1266 | 1265 | $i = $n = 0; |
@@ -1276,7 +1275,7 @@ discard block |
||
| 1276 | 1275 | $s = $link ? pg_last_error($link) : pg_last_error(); |
| 1277 | 1276 | if ($s) { |
| 1278 | 1277 | $s = str_replace('ERROR', 'errcode: 1000 ', $s); |
| 1279 | - spip_log("$s - $query", 'pg.' . _LOG_ERREUR); |
|
| 1278 | + spip_log("$s - $query", 'pg.'._LOG_ERREUR); |
|
| 1280 | 1279 | } |
| 1281 | 1280 | |
| 1282 | 1281 | return $s; |
@@ -1324,7 +1323,7 @@ discard block |
||
| 1324 | 1323 | function spip_pg_showbase($match, $serveur = '', $requeter = true) { |
| 1325 | 1324 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 1326 | 1325 | $link = $connexion['link']; |
| 1327 | - $connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE ' . _q($match); |
|
| 1326 | + $connexion['last'] = $q = 'SELECT tablename FROM pg_tables WHERE tablename ILIKE '._q($match); |
|
| 1328 | 1327 | |
| 1329 | 1328 | return spip_pg_query_simple($link, $q); |
| 1330 | 1329 | } |
@@ -1332,7 +1331,7 @@ discard block |
||
| 1332 | 1331 | function spip_pg_showtable($nom_table, $serveur = '', $requeter = true) { |
| 1333 | 1332 | $connexion = &$GLOBALS['connexions'][$serveur ? strtolower($serveur) : 0]; |
| 1334 | 1333 | $link = $connexion['link']; |
| 1335 | - $connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE ' . _q($nom_table); |
|
| 1334 | + $connexion['last'] = $q = 'SELECT column_name, column_default, data_type FROM information_schema.columns WHERE table_name ILIKE '._q($nom_table); |
|
| 1336 | 1335 | |
| 1337 | 1336 | $res = spip_pg_query_simple($link, $q); |
| 1338 | 1337 | if (!$res) { |
@@ -1343,15 +1342,15 @@ discard block |
||
| 1343 | 1342 | // il faut en tenir compte dans le return |
| 1344 | 1343 | $fields = []; |
| 1345 | 1344 | while ($field = pg_fetch_array($res, null, PGSQL_NUM)) { |
| 1346 | - $fields[$field[0]] = $field[2] . (!$field[1] ? '' : (' DEFAULT ' . $field[1])); |
|
| 1345 | + $fields[$field[0]] = $field[2].(!$field[1] ? '' : (' DEFAULT '.$field[1])); |
|
| 1347 | 1346 | } |
| 1348 | - $connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE ' . _q($nom_table); |
|
| 1347 | + $connexion['last'] = $q = 'SELECT indexdef FROM pg_indexes WHERE tablename ILIKE '._q($nom_table); |
|
| 1349 | 1348 | $res = spip_pg_query_simple($link, $q); |
| 1350 | 1349 | $keys = []; |
| 1351 | 1350 | while ($index = pg_fetch_array($res, null, PGSQL_NUM)) { |
| 1352 | 1351 | if (preg_match('/CREATE\s+(UNIQUE\s+)?INDEX\s([^\s]+).*\((.*)\)$/', $index[0], $r)) { |
| 1353 | - $nom = str_replace($nom_table . '_', '', $r[2]); |
|
| 1354 | - $keys[($r[1] ? 'PRIMARY KEY' : ('KEY ' . $nom))] = $r[3]; |
|
| 1352 | + $nom = str_replace($nom_table.'_', '', $r[2]); |
|
| 1353 | + $keys[($r[1] ? 'PRIMARY KEY' : ('KEY '.$nom))] = $r[3]; |
|
| 1355 | 1354 | } |
| 1356 | 1355 | } |
| 1357 | 1356 | |
@@ -1383,16 +1382,16 @@ discard block |
||
| 1383 | 1382 | if (strpos($k, 'KEY ') === 0) { |
| 1384 | 1383 | $n = str_replace('`', '', $k); |
| 1385 | 1384 | $v = str_replace('`', '"', $v); |
| 1386 | - $i = $nom . preg_replace('/KEY +/', '_', $n); |
|
| 1385 | + $i = $nom.preg_replace('/KEY +/', '_', $n); |
|
| 1387 | 1386 | if ($k != $n) { |
| 1388 | 1387 | $i = "\"$i\""; |
| 1389 | 1388 | } |
| 1390 | 1389 | $keys[] = "CREATE INDEX $i ON $nom ($v);"; |
| 1391 | 1390 | } elseif (strpos($k, 'UNIQUE ') === 0) { |
| 1392 | 1391 | $k = preg_replace('/^UNIQUE +/', '', $k); |
| 1393 | - $prim .= "$s\n\t\tCONSTRAINT " . str_replace('`', '"', $k) . " UNIQUE ($v)"; |
|
| 1392 | + $prim .= "$s\n\t\tCONSTRAINT ".str_replace('`', '"', $k)." UNIQUE ($v)"; |
|
| 1394 | 1393 | } else { |
| 1395 | - $prim .= "$s\n\t\t" . str_replace('`', '"', $k) . " ($v)"; |
|
| 1394 | + $prim .= "$s\n\t\t".str_replace('`', '"', $k)." ($v)"; |
|
| 1396 | 1395 | } |
| 1397 | 1396 | if ($k == 'PRIMARY KEY') { |
| 1398 | 1397 | $prim_name = $v; |
@@ -1403,17 +1402,17 @@ discard block |
||
| 1403 | 1402 | |
| 1404 | 1403 | $character_set = ''; |
| 1405 | 1404 | if (@$GLOBALS['meta']['charset_sql_base']) { |
| 1406 | - $character_set .= ' CHARACTER SET ' . $GLOBALS['meta']['charset_sql_base']; |
|
| 1405 | + $character_set .= ' CHARACTER SET '.$GLOBALS['meta']['charset_sql_base']; |
|
| 1407 | 1406 | } |
| 1408 | 1407 | if (@$GLOBALS['meta']['charset_collation_sql_base']) { |
| 1409 | - $character_set .= ' COLLATE ' . $GLOBALS['meta']['charset_collation_sql_base']; |
|
| 1408 | + $character_set .= ' COLLATE '.$GLOBALS['meta']['charset_collation_sql_base']; |
|
| 1410 | 1409 | } |
| 1411 | 1410 | |
| 1412 | 1411 | foreach ($champs as $k => $v) { |
| 1413 | 1412 | $k = str_replace('`', '"', $k); |
| 1414 | 1413 | if (preg_match(',([a-z]*\s*(\(\s*[0-9]*\s*\))?(\s*binary)?),i', $v, $defs)) { |
| 1415 | 1414 | if (preg_match(',(char|text),i', $defs[1]) and !preg_match(',binary,i', $defs[1])) { |
| 1416 | - $v = $defs[1] . $character_set . ' ' . substr($v, strlen($defs[1])); |
|
| 1415 | + $v = $defs[1].$character_set.' '.substr($v, strlen($defs[1])); |
|
| 1417 | 1416 | } |
| 1418 | 1417 | } |
| 1419 | 1418 | |
@@ -1428,7 +1427,7 @@ discard block |
||
| 1428 | 1427 | |
| 1429 | 1428 | // En l'absence de "if not exists" en PG, on neutralise les erreurs |
| 1430 | 1429 | |
| 1431 | - $q = "CREATE $temporary TABLE $nom ($query" . ($prim ? ",$prim" : '') . ')' . |
|
| 1430 | + $q = "CREATE $temporary TABLE $nom ($query".($prim ? ",$prim" : '').')'. |
|
| 1432 | 1431 | ($character_set ? " DEFAULT $character_set" : '') |
| 1433 | 1432 | . "\n"; |
| 1434 | 1433 | |
@@ -1439,7 +1438,7 @@ discard block |
||
| 1439 | 1438 | $r = @pg_query($link, $q); |
| 1440 | 1439 | |
| 1441 | 1440 | if (!$r) { |
| 1442 | - spip_log("Impossible de creer cette table: $q", 'pg.' . _LOG_ERREUR); |
|
| 1441 | + spip_log("Impossible de creer cette table: $q", 'pg.'._LOG_ERREUR); |
|
| 1443 | 1442 | } else { |
| 1444 | 1443 | foreach ($keys as $index) { |
| 1445 | 1444 | pg_query($link, $index); |
@@ -1462,20 +1461,20 @@ discard block |
||
| 1462 | 1461 | // vue deja presente |
| 1463 | 1462 | if (sql_showtable($nom, false, $serveur)) { |
| 1464 | 1463 | if ($requeter) { |
| 1465 | - spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.' . _LOG_ERREUR); |
|
| 1464 | + spip_log("Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", 'pg.'._LOG_ERREUR); |
|
| 1466 | 1465 | } |
| 1467 | 1466 | |
| 1468 | 1467 | return false; |
| 1469 | 1468 | } |
| 1470 | 1469 | |
| 1471 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 1470 | + $query = "CREATE VIEW $nom AS ".$query_select; |
|
| 1472 | 1471 | |
| 1473 | 1472 | return spip_pg_query($query, $serveur, $requeter); |
| 1474 | 1473 | } |
| 1475 | 1474 | |
| 1476 | 1475 | |
| 1477 | 1476 | function spip_pg_set_connect_charset($charset, $serveur = '', $requeter = true) { |
| 1478 | - spip_log('changement de charset sql a ecrire en PG', 'pg.' . _LOG_ERREUR); |
|
| 1477 | + spip_log('changement de charset sql a ecrire en PG', 'pg.'._LOG_ERREUR); |
|
| 1479 | 1478 | } |
| 1480 | 1479 | |
| 1481 | 1480 | |
@@ -1488,7 +1487,7 @@ discard block |
||
| 1488 | 1487 | * @return bool|string true / false / requete |
| 1489 | 1488 | **/ |
| 1490 | 1489 | function spip_pg_optimize($table, $serveur = '', $requeter = true) { |
| 1491 | - return spip_pg_query('VACUUM ' . $table, $serveur, $requeter); |
|
| 1490 | + return spip_pg_query('VACUUM '.$table, $serveur, $requeter); |
|
| 1492 | 1491 | } |
| 1493 | 1492 | |
| 1494 | 1493 | // Selectionner la sous-chaine dans $objet |
@@ -20,7 +20,7 @@ discard block |
||
| 20 | 20 | */ |
| 21 | 21 | |
| 22 | 22 | if (!defined('_ECRIRE_INC_VERSION')) { |
| 23 | - return; |
|
| 23 | + return; |
|
| 24 | 24 | } |
| 25 | 25 | |
| 26 | 26 | // TODO: get/set_caracteres ? |
@@ -44,91 +44,91 @@ discard block |
||
| 44 | 44 | */ |
| 45 | 45 | function req_sqlite_dist($addr, $port, $login, $pass, $db = '', $prefixe = '', $sqlite_version = '') |
| 46 | 46 | { |
| 47 | - static $last_connect = []; |
|
| 48 | - |
|
| 49 | - // si provient de selectdb |
|
| 50 | - // un code pour etre sur que l'on vient de select_db() |
|
| 51 | - if (strpos($db, $code = '@selectdb@') !== false) { |
|
| 52 | - foreach (['addr', 'port', 'login', 'pass', 'prefixe'] as $a) { |
|
| 53 | - $$a = $last_connect[$a]; |
|
| 54 | - } |
|
| 55 | - $db = str_replace($code, '', $db); |
|
| 56 | - } |
|
| 57 | - |
|
| 58 | - /* |
|
| 47 | + static $last_connect = []; |
|
| 48 | + |
|
| 49 | + // si provient de selectdb |
|
| 50 | + // un code pour etre sur que l'on vient de select_db() |
|
| 51 | + if (strpos($db, $code = '@selectdb@') !== false) { |
|
| 52 | + foreach (['addr', 'port', 'login', 'pass', 'prefixe'] as $a) { |
|
| 53 | + $$a = $last_connect[$a]; |
|
| 54 | + } |
|
| 55 | + $db = str_replace($code, '', $db); |
|
| 56 | + } |
|
| 57 | + |
|
| 58 | + /* |
|
| 59 | 59 | * En sqlite, seule l'adresse du fichier est importante. |
| 60 | 60 | * Ce sera $db le nom, |
| 61 | 61 | * le path est $addr |
| 62 | 62 | * (_DIR_DB si $addr est vide) |
| 63 | 63 | */ |
| 64 | - _sqlite_init(); |
|
| 65 | - |
|
| 66 | - // determiner le dossier de la base : $addr ou _DIR_DB |
|
| 67 | - $f = _DIR_DB; |
|
| 68 | - if ($addr and str_contains($addr, '/')) { |
|
| 69 | - $f = rtrim($addr, '/') . '/'; |
|
| 70 | - } |
|
| 71 | - |
|
| 72 | - // un nom de base demande et impossible d'obtenir la base, on s'en va : |
|
| 73 | - // il faut que la base existe ou que le repertoire parent soit writable |
|
| 74 | - if ($db and !is_file($f .= $db . '.sqlite') and !is_writable(dirname($f))) { |
|
| 75 | - spip_log("base $f non trouvee ou droits en ecriture manquants", 'sqlite.' . _LOG_HS); |
|
| 76 | - |
|
| 77 | - return false; |
|
| 78 | - } |
|
| 79 | - |
|
| 80 | - // charger les modules sqlite au besoin |
|
| 81 | - if (!_sqlite_charger_version($sqlite_version)) { |
|
| 82 | - spip_log("Impossible de trouver/charger le module SQLite ($sqlite_version)!", 'sqlite.' . _LOG_HS); |
|
| 83 | - |
|
| 84 | - return false; |
|
| 85 | - } |
|
| 86 | - |
|
| 87 | - // chargement des constantes |
|
| 88 | - // il ne faut pas definir les constantes avant d'avoir charge les modules sqlite |
|
| 89 | - $define = 'spip_sqlite' . $sqlite_version . '_constantes'; |
|
| 90 | - $define(); |
|
| 91 | - |
|
| 92 | - $ok = false; |
|
| 93 | - if (!$db) { |
|
| 94 | - // si pas de db -> |
|
| 95 | - // base temporaire tant qu'on ne connait pas son vrai nom |
|
| 96 | - // pour tester la connexion |
|
| 97 | - $db = '_sqlite' . $sqlite_version . '_install'; |
|
| 98 | - $tmp = _DIR_DB . $db . '.sqlite'; |
|
| 99 | - $ok = $link = new \PDO("sqlite:$tmp"); |
|
| 100 | - } else { |
|
| 101 | - // Ouvrir (eventuellement creer la base) |
|
| 102 | - $ok = $link = new \PDO("sqlite:$f"); |
|
| 103 | - } |
|
| 104 | - |
|
| 105 | - if (!$ok) { |
|
| 106 | - $e = _sqlite_last_error_from_link($link); |
|
| 107 | - spip_log("Impossible d'ouvrir la base SQLite($sqlite_version) $f : $e", 'sqlite.' . _LOG_HS); |
|
| 108 | - |
|
| 109 | - return false; |
|
| 110 | - } |
|
| 111 | - |
|
| 112 | - if ($link) { |
|
| 113 | - $last_connect = [ |
|
| 114 | - 'addr' => $addr, |
|
| 115 | - 'port' => $port, |
|
| 116 | - 'login' => $login, |
|
| 117 | - 'pass' => $pass, |
|
| 118 | - 'db' => $db, |
|
| 119 | - 'prefixe' => $prefixe, |
|
| 120 | - ]; |
|
| 121 | - // etre sur qu'on definit bien les fonctions a chaque nouvelle connexion |
|
| 122 | - include_spip('req/sqlite_fonctions'); |
|
| 123 | - _sqlite_init_functions($link); |
|
| 124 | - } |
|
| 125 | - |
|
| 126 | - return [ |
|
| 127 | - 'db' => $db, |
|
| 128 | - 'prefixe' => $prefixe ? $prefixe : $db, |
|
| 129 | - 'link' => $link, |
|
| 130 | - 'total_requetes' => 0, |
|
| 131 | - ]; |
|
| 64 | + _sqlite_init(); |
|
| 65 | + |
|
| 66 | + // determiner le dossier de la base : $addr ou _DIR_DB |
|
| 67 | + $f = _DIR_DB; |
|
| 68 | + if ($addr and str_contains($addr, '/')) { |
|
| 69 | + $f = rtrim($addr, '/') . '/'; |
|
| 70 | + } |
|
| 71 | + |
|
| 72 | + // un nom de base demande et impossible d'obtenir la base, on s'en va : |
|
| 73 | + // il faut que la base existe ou que le repertoire parent soit writable |
|
| 74 | + if ($db and !is_file($f .= $db . '.sqlite') and !is_writable(dirname($f))) { |
|
| 75 | + spip_log("base $f non trouvee ou droits en ecriture manquants", 'sqlite.' . _LOG_HS); |
|
| 76 | + |
|
| 77 | + return false; |
|
| 78 | + } |
|
| 79 | + |
|
| 80 | + // charger les modules sqlite au besoin |
|
| 81 | + if (!_sqlite_charger_version($sqlite_version)) { |
|
| 82 | + spip_log("Impossible de trouver/charger le module SQLite ($sqlite_version)!", 'sqlite.' . _LOG_HS); |
|
| 83 | + |
|
| 84 | + return false; |
|
| 85 | + } |
|
| 86 | + |
|
| 87 | + // chargement des constantes |
|
| 88 | + // il ne faut pas definir les constantes avant d'avoir charge les modules sqlite |
|
| 89 | + $define = 'spip_sqlite' . $sqlite_version . '_constantes'; |
|
| 90 | + $define(); |
|
| 91 | + |
|
| 92 | + $ok = false; |
|
| 93 | + if (!$db) { |
|
| 94 | + // si pas de db -> |
|
| 95 | + // base temporaire tant qu'on ne connait pas son vrai nom |
|
| 96 | + // pour tester la connexion |
|
| 97 | + $db = '_sqlite' . $sqlite_version . '_install'; |
|
| 98 | + $tmp = _DIR_DB . $db . '.sqlite'; |
|
| 99 | + $ok = $link = new \PDO("sqlite:$tmp"); |
|
| 100 | + } else { |
|
| 101 | + // Ouvrir (eventuellement creer la base) |
|
| 102 | + $ok = $link = new \PDO("sqlite:$f"); |
|
| 103 | + } |
|
| 104 | + |
|
| 105 | + if (!$ok) { |
|
| 106 | + $e = _sqlite_last_error_from_link($link); |
|
| 107 | + spip_log("Impossible d'ouvrir la base SQLite($sqlite_version) $f : $e", 'sqlite.' . _LOG_HS); |
|
| 108 | + |
|
| 109 | + return false; |
|
| 110 | + } |
|
| 111 | + |
|
| 112 | + if ($link) { |
|
| 113 | + $last_connect = [ |
|
| 114 | + 'addr' => $addr, |
|
| 115 | + 'port' => $port, |
|
| 116 | + 'login' => $login, |
|
| 117 | + 'pass' => $pass, |
|
| 118 | + 'db' => $db, |
|
| 119 | + 'prefixe' => $prefixe, |
|
| 120 | + ]; |
|
| 121 | + // etre sur qu'on definit bien les fonctions a chaque nouvelle connexion |
|
| 122 | + include_spip('req/sqlite_fonctions'); |
|
| 123 | + _sqlite_init_functions($link); |
|
| 124 | + } |
|
| 125 | + |
|
| 126 | + return [ |
|
| 127 | + 'db' => $db, |
|
| 128 | + 'prefixe' => $prefixe ? $prefixe : $db, |
|
| 129 | + 'link' => $link, |
|
| 130 | + 'total_requetes' => 0, |
|
| 131 | + ]; |
|
| 132 | 132 | } |
| 133 | 133 | |
| 134 | 134 | |
@@ -148,14 +148,14 @@ discard block |
||
| 148 | 148 | */ |
| 149 | 149 | function spip_sqlite_query($query, $serveur = '', $requeter = true) |
| 150 | 150 | { |
| 151 | - #spip_log("spip_sqlite_query() > $query",'sqlite.'._LOG_DEBUG); |
|
| 152 | - #_sqlite_init(); // fait la premiere fois dans spip_sqlite |
|
| 153 | - $query = Sqlite::traduire_requete($query, $serveur); |
|
| 154 | - if (!$requeter) { |
|
| 155 | - return $query; |
|
| 156 | - } |
|
| 157 | - |
|
| 158 | - return Sqlite::executer_requete($query, $serveur); |
|
| 151 | + #spip_log("spip_sqlite_query() > $query",'sqlite.'._LOG_DEBUG); |
|
| 152 | + #_sqlite_init(); // fait la premiere fois dans spip_sqlite |
|
| 153 | + $query = Sqlite::traduire_requete($query, $serveur); |
|
| 154 | + if (!$requeter) { |
|
| 155 | + return $query; |
|
| 156 | + } |
|
| 157 | + |
|
| 158 | + return Sqlite::executer_requete($query, $serveur); |
|
| 159 | 159 | } |
| 160 | 160 | |
| 161 | 161 | |
@@ -173,11 +173,11 @@ discard block |
||
| 173 | 173 | function spip_sqlite_alter($query, $serveur = '', $requeter = true) |
| 174 | 174 | { |
| 175 | 175 | |
| 176 | - $query = spip_sqlite_query("ALTER $query", $serveur, false); |
|
| 177 | - // traduire la requete pour recuperer les bons noms de table |
|
| 178 | - $query = Sqlite::traduire_requete($query, $serveur); |
|
| 176 | + $query = spip_sqlite_query("ALTER $query", $serveur, false); |
|
| 177 | + // traduire la requete pour recuperer les bons noms de table |
|
| 178 | + $query = Sqlite::traduire_requete($query, $serveur); |
|
| 179 | 179 | |
| 180 | - /* |
|
| 180 | + /* |
|
| 181 | 181 | * la il faut faire les transformations |
| 182 | 182 | * si ALTER TABLE x (DROP|CHANGE) y |
| 183 | 183 | * |
@@ -186,251 +186,251 @@ discard block |
||
| 186 | 186 | * 3) faire chaque requete independemment |
| 187 | 187 | */ |
| 188 | 188 | |
| 189 | - // 1 |
|
| 190 | - if (preg_match('/\s*(ALTER(\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) { |
|
| 191 | - $debut = $regs[1]; |
|
| 192 | - $table = $regs[3]; |
|
| 193 | - $suite = $regs[4]; |
|
| 194 | - } else { |
|
| 195 | - spip_log("SQLite : Probleme de ALTER TABLE mal forme dans $query", 'sqlite.' . _LOG_ERREUR); |
|
| 196 | - |
|
| 197 | - return false; |
|
| 198 | - } |
|
| 199 | - |
|
| 200 | - // 2 |
|
| 201 | - // il faudrait une regexp pour eviter de spliter ADD PRIMARY KEY (colA, colB) |
|
| 202 | - // tout en cassant "ADD PRIMARY KEY (colA, colB), ADD INDEX (chose)"... en deux |
|
| 203 | - // ou revoir l'api de sql_alter en creant un |
|
| 204 | - // sql_alter_table($table,array($actions)); |
|
| 205 | - $todo = explode(',', $suite); |
|
| 206 | - |
|
| 207 | - // on remet les morceaux dechires ensembles... que c'est laid ! |
|
| 208 | - $todo2 = []; |
|
| 209 | - $i = 0; |
|
| 210 | - $ouverte = false; |
|
| 211 | - while ($do = array_shift($todo)) { |
|
| 212 | - $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do; |
|
| 213 | - $o = (str_contains($do, '(')); |
|
| 214 | - $f = (str_contains($do, ')')); |
|
| 215 | - if ($o and !$f) { |
|
| 216 | - $ouverte = true; |
|
| 217 | - } elseif ($f) { |
|
| 218 | - $ouverte = false; |
|
| 219 | - } |
|
| 220 | - if (!$ouverte) { |
|
| 221 | - $i++; |
|
| 222 | - } |
|
| 223 | - } |
|
| 224 | - |
|
| 225 | - // 3 |
|
| 226 | - $resultats = []; |
|
| 227 | - foreach ($todo2 as $do) { |
|
| 228 | - $do = trim($do); |
|
| 229 | - if ( |
|
| 230 | - !preg_match('/(DROP PRIMARY KEY|DROP KEY|DROP INDEX|DROP COLUMN|DROP' |
|
| 231 | - . '|CHANGE COLUMN|CHANGE|MODIFY|RENAME TO|RENAME' |
|
| 232 | - . '|ADD PRIMARY KEY|ADD KEY|ADD INDEX|ADD UNIQUE KEY|ADD UNIQUE' |
|
| 233 | - . '|ADD COLUMN|ADD' |
|
| 234 | - . ')\s*([^\s]*)\s*(.*)?/i', $do, $matches) |
|
| 235 | - ) { |
|
| 236 | - spip_log( |
|
| 237 | - "SQLite : Probleme de ALTER TABLE, utilisation non reconnue dans : $do \n(requete d'origine : $query)", |
|
| 238 | - 'sqlite.' . _LOG_ERREUR |
|
| 239 | - ); |
|
| 240 | - |
|
| 241 | - return false; |
|
| 242 | - } |
|
| 243 | - |
|
| 244 | - $cle = strtoupper($matches[1]); |
|
| 245 | - $colonne_origine = $matches[2]; |
|
| 246 | - $colonne_destination = ''; |
|
| 247 | - |
|
| 248 | - $def = $matches[3]; |
|
| 249 | - |
|
| 250 | - // eluder une eventuelle clause before|after|first inutilisable |
|
| 251 | - $defr = rtrim(preg_replace('/(BEFORE|AFTER|FIRST)(.*)$/is', '', $def)); |
|
| 252 | - $defo = $defr; // garder la def d'origine pour certains cas |
|
| 253 | - // remplacer les definitions venant de mysql |
|
| 254 | - $defr = _sqlite_remplacements_definitions_table($defr); |
|
| 255 | - |
|
| 256 | - // reinjecter dans le do |
|
| 257 | - $do = str_replace($def, $defr, $do); |
|
| 258 | - $def = $defr; |
|
| 259 | - |
|
| 260 | - switch ($cle) { |
|
| 261 | - // suppression d'un index |
|
| 262 | - case 'DROP KEY': |
|
| 263 | - case 'DROP INDEX': |
|
| 264 | - $nom_index = $colonne_origine; |
|
| 265 | - spip_sqlite_drop_index($nom_index, $table, $serveur); |
|
| 266 | - break; |
|
| 267 | - |
|
| 268 | - // suppression d'une pk |
|
| 269 | - case 'DROP PRIMARY KEY': |
|
| 270 | - if ( |
|
| 271 | - !_sqlite_modifier_table( |
|
| 272 | - $table, |
|
| 273 | - $colonne_origine, |
|
| 274 | - ['key' => ['PRIMARY KEY' => '']], |
|
| 275 | - $serveur |
|
| 276 | - ) |
|
| 277 | - ) { |
|
| 278 | - return false; |
|
| 279 | - } |
|
| 280 | - break; |
|
| 281 | - // suppression d'une colonne |
|
| 282 | - case 'DROP COLUMN': |
|
| 283 | - case 'DROP': |
|
| 284 | - if ( |
|
| 285 | - !_sqlite_modifier_table( |
|
| 286 | - $table, |
|
| 287 | - [$colonne_origine => ''], |
|
| 288 | - [], |
|
| 289 | - $serveur |
|
| 290 | - ) |
|
| 291 | - ) { |
|
| 292 | - return false; |
|
| 293 | - } |
|
| 294 | - break; |
|
| 295 | - |
|
| 296 | - case 'CHANGE COLUMN': |
|
| 297 | - case 'CHANGE': |
|
| 298 | - // recuperer le nom de la future colonne |
|
| 299 | - // on reprend la def d'origine car _sqlite_modifier_table va refaire la translation |
|
| 300 | - // en tenant compte de la cle primaire (ce qui est mieux) |
|
| 301 | - $def = trim($defo); |
|
| 302 | - $colonne_destination = substr($def, 0, strpos($def, ' ')); |
|
| 303 | - $def = substr($def, strlen($colonne_destination) + 1); |
|
| 304 | - |
|
| 305 | - if ( |
|
| 306 | - !_sqlite_modifier_table( |
|
| 307 | - $table, |
|
| 308 | - [$colonne_origine => $colonne_destination], |
|
| 309 | - ['field' => [$colonne_destination => $def]], |
|
| 310 | - $serveur |
|
| 311 | - ) |
|
| 312 | - ) { |
|
| 313 | - return false; |
|
| 314 | - } |
|
| 315 | - break; |
|
| 316 | - |
|
| 317 | - case 'MODIFY': |
|
| 318 | - // on reprend la def d'origine car _sqlite_modifier_table va refaire la translation |
|
| 319 | - // en tenant compte de la cle primaire (ce qui est mieux) |
|
| 320 | - if ( |
|
| 321 | - !_sqlite_modifier_table( |
|
| 322 | - $table, |
|
| 323 | - $colonne_origine, |
|
| 324 | - ['field' => [$colonne_origine => $defo]], |
|
| 325 | - $serveur |
|
| 326 | - ) |
|
| 327 | - ) { |
|
| 328 | - return false; |
|
| 329 | - } |
|
| 330 | - break; |
|
| 331 | - |
|
| 332 | - // pas geres en sqlite2 |
|
| 333 | - case 'RENAME': |
|
| 334 | - $do = 'RENAME TO' . substr($do, 6); |
|
| 335 | - case 'RENAME TO': |
|
| 336 | - if (!Sqlite::executer_requete("$debut $do", $serveur)) { |
|
| 337 | - spip_log("SQLite : Erreur ALTER TABLE / RENAME : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 338 | - |
|
| 339 | - return false; |
|
| 340 | - } |
|
| 341 | - break; |
|
| 342 | - |
|
| 343 | - // ajout d'une pk |
|
| 344 | - case 'ADD PRIMARY KEY': |
|
| 345 | - $pk = trim(substr($do, 16)); |
|
| 346 | - $pk = ($pk[0] == '(') ? substr($pk, 1, -1) : $pk; |
|
| 347 | - if ( |
|
| 348 | - !_sqlite_modifier_table( |
|
| 349 | - $table, |
|
| 350 | - $colonne_origine, |
|
| 351 | - ['key' => ['PRIMARY KEY' => $pk]], |
|
| 352 | - $serveur |
|
| 353 | - ) |
|
| 354 | - ) { |
|
| 355 | - return false; |
|
| 356 | - } |
|
| 357 | - break; |
|
| 358 | - // ajout d'un index |
|
| 359 | - case 'ADD UNIQUE KEY': |
|
| 360 | - case 'ADD UNIQUE': |
|
| 361 | - $unique = true; |
|
| 362 | - case 'ADD INDEX': |
|
| 363 | - case 'ADD KEY': |
|
| 364 | - if (!isset($unique)) { |
|
| 365 | - $unique = false; |
|
| 366 | - } |
|
| 367 | - // peut etre "(colonne)" ou "nom_index (colonnes)" |
|
| 368 | - // bug potentiel si qqn met "(colonne, colonne)" |
|
| 369 | - // |
|
| 370 | - // nom_index (colonnes) |
|
| 371 | - if ($def) { |
|
| 372 | - $colonnes = substr($def, 1, -1); |
|
| 373 | - $nom_index = $colonne_origine; |
|
| 374 | - } else { |
|
| 375 | - // (colonne) |
|
| 376 | - if ($colonne_origine[0] == '(') { |
|
| 377 | - $colonnes = substr($colonne_origine, 1, -1); |
|
| 378 | - if (str_contains(',', $colonnes)) { |
|
| 379 | - spip_log('SQLite : Erreur, impossible de creer un index sur plusieurs colonnes' |
|
| 380 | - . " sans qu'il ait de nom ($table, ($colonnes))", 'sqlite.' . _LOG_ERREUR); |
|
| 381 | - break; |
|
| 382 | - } else { |
|
| 383 | - $nom_index = $colonnes; |
|
| 384 | - } |
|
| 385 | - } // nom_index |
|
| 386 | - else { |
|
| 387 | - $nom_index = $colonnes = $colonne_origine; |
|
| 388 | - } |
|
| 389 | - } |
|
| 390 | - spip_sqlite_create_index($nom_index, $table, $colonnes, $unique, $serveur); |
|
| 391 | - break; |
|
| 392 | - |
|
| 393 | - // pas geres en sqlite2 |
|
| 394 | - case 'ADD COLUMN': |
|
| 395 | - $do = 'ADD' . substr($do, 10); |
|
| 396 | - case 'ADD': |
|
| 397 | - default: |
|
| 398 | - if (!preg_match(',primary\s+key,i', $do)) { |
|
| 399 | - if (!Sqlite::executer_requete("$debut $do", $serveur)) { |
|
| 400 | - spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 401 | - |
|
| 402 | - return false; |
|
| 403 | - } |
|
| 404 | - break; |
|
| 405 | - } |
|
| 406 | - // ou si la colonne est aussi primary key |
|
| 407 | - // cas du add id_truc int primary key |
|
| 408 | - // ajout d'une colonne qui passe en primary key directe |
|
| 409 | - else { |
|
| 410 | - $def = trim(substr($do, 3)); |
|
| 411 | - $colonne_ajoutee = substr($def, 0, strpos($def, ' ')); |
|
| 412 | - $def = substr($def, strlen($colonne_ajoutee) + 1); |
|
| 413 | - $opts = []; |
|
| 414 | - if (preg_match(',primary\s+key,i', $def)) { |
|
| 415 | - $opts['key'] = ['PRIMARY KEY' => $colonne_ajoutee]; |
|
| 416 | - $def = preg_replace(',primary\s+key,i', '', $def); |
|
| 417 | - } |
|
| 418 | - $opts['field'] = [$colonne_ajoutee => $def]; |
|
| 419 | - if (!_sqlite_modifier_table($table, [$colonne_ajoutee], $opts, $serveur)) { |
|
| 420 | - spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 421 | - |
|
| 422 | - return false; |
|
| 423 | - } |
|
| 424 | - } |
|
| 425 | - break; |
|
| 426 | - } |
|
| 427 | - // tout est bon, ouf ! |
|
| 428 | - spip_log("SQLite ($serveur) : Changements OK : $debut $do", 'sqlite.' . _LOG_INFO); |
|
| 429 | - } |
|
| 430 | - |
|
| 431 | - spip_log("SQLite ($serveur) : fin ALTER TABLE OK !", 'sqlite.' . _LOG_INFO); |
|
| 432 | - |
|
| 433 | - return true; |
|
| 189 | + // 1 |
|
| 190 | + if (preg_match('/\s*(ALTER(\s*IGNORE)?\s*TABLE\s*([^\s]*))\s*(.*)?/is', $query, $regs)) { |
|
| 191 | + $debut = $regs[1]; |
|
| 192 | + $table = $regs[3]; |
|
| 193 | + $suite = $regs[4]; |
|
| 194 | + } else { |
|
| 195 | + spip_log("SQLite : Probleme de ALTER TABLE mal forme dans $query", 'sqlite.' . _LOG_ERREUR); |
|
| 196 | + |
|
| 197 | + return false; |
|
| 198 | + } |
|
| 199 | + |
|
| 200 | + // 2 |
|
| 201 | + // il faudrait une regexp pour eviter de spliter ADD PRIMARY KEY (colA, colB) |
|
| 202 | + // tout en cassant "ADD PRIMARY KEY (colA, colB), ADD INDEX (chose)"... en deux |
|
| 203 | + // ou revoir l'api de sql_alter en creant un |
|
| 204 | + // sql_alter_table($table,array($actions)); |
|
| 205 | + $todo = explode(',', $suite); |
|
| 206 | + |
|
| 207 | + // on remet les morceaux dechires ensembles... que c'est laid ! |
|
| 208 | + $todo2 = []; |
|
| 209 | + $i = 0; |
|
| 210 | + $ouverte = false; |
|
| 211 | + while ($do = array_shift($todo)) { |
|
| 212 | + $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do; |
|
| 213 | + $o = (str_contains($do, '(')); |
|
| 214 | + $f = (str_contains($do, ')')); |
|
| 215 | + if ($o and !$f) { |
|
| 216 | + $ouverte = true; |
|
| 217 | + } elseif ($f) { |
|
| 218 | + $ouverte = false; |
|
| 219 | + } |
|
| 220 | + if (!$ouverte) { |
|
| 221 | + $i++; |
|
| 222 | + } |
|
| 223 | + } |
|
| 224 | + |
|
| 225 | + // 3 |
|
| 226 | + $resultats = []; |
|
| 227 | + foreach ($todo2 as $do) { |
|
| 228 | + $do = trim($do); |
|
| 229 | + if ( |
|
| 230 | + !preg_match('/(DROP PRIMARY KEY|DROP KEY|DROP INDEX|DROP COLUMN|DROP' |
|
| 231 | + . '|CHANGE COLUMN|CHANGE|MODIFY|RENAME TO|RENAME' |
|
| 232 | + . '|ADD PRIMARY KEY|ADD KEY|ADD INDEX|ADD UNIQUE KEY|ADD UNIQUE' |
|
| 233 | + . '|ADD COLUMN|ADD' |
|
| 234 | + . ')\s*([^\s]*)\s*(.*)?/i', $do, $matches) |
|
| 235 | + ) { |
|
| 236 | + spip_log( |
|
| 237 | + "SQLite : Probleme de ALTER TABLE, utilisation non reconnue dans : $do \n(requete d'origine : $query)", |
|
| 238 | + 'sqlite.' . _LOG_ERREUR |
|
| 239 | + ); |
|
| 240 | + |
|
| 241 | + return false; |
|
| 242 | + } |
|
| 243 | + |
|
| 244 | + $cle = strtoupper($matches[1]); |
|
| 245 | + $colonne_origine = $matches[2]; |
|
| 246 | + $colonne_destination = ''; |
|
| 247 | + |
|
| 248 | + $def = $matches[3]; |
|
| 249 | + |
|
| 250 | + // eluder une eventuelle clause before|after|first inutilisable |
|
| 251 | + $defr = rtrim(preg_replace('/(BEFORE|AFTER|FIRST)(.*)$/is', '', $def)); |
|
| 252 | + $defo = $defr; // garder la def d'origine pour certains cas |
|
| 253 | + // remplacer les definitions venant de mysql |
|
| 254 | + $defr = _sqlite_remplacements_definitions_table($defr); |
|
| 255 | + |
|
| 256 | + // reinjecter dans le do |
|
| 257 | + $do = str_replace($def, $defr, $do); |
|
| 258 | + $def = $defr; |
|
| 259 | + |
|
| 260 | + switch ($cle) { |
|
| 261 | + // suppression d'un index |
|
| 262 | + case 'DROP KEY': |
|
| 263 | + case 'DROP INDEX': |
|
| 264 | + $nom_index = $colonne_origine; |
|
| 265 | + spip_sqlite_drop_index($nom_index, $table, $serveur); |
|
| 266 | + break; |
|
| 267 | + |
|
| 268 | + // suppression d'une pk |
|
| 269 | + case 'DROP PRIMARY KEY': |
|
| 270 | + if ( |
|
| 271 | + !_sqlite_modifier_table( |
|
| 272 | + $table, |
|
| 273 | + $colonne_origine, |
|
| 274 | + ['key' => ['PRIMARY KEY' => '']], |
|
| 275 | + $serveur |
|
| 276 | + ) |
|
| 277 | + ) { |
|
| 278 | + return false; |
|
| 279 | + } |
|
| 280 | + break; |
|
| 281 | + // suppression d'une colonne |
|
| 282 | + case 'DROP COLUMN': |
|
| 283 | + case 'DROP': |
|
| 284 | + if ( |
|
| 285 | + !_sqlite_modifier_table( |
|
| 286 | + $table, |
|
| 287 | + [$colonne_origine => ''], |
|
| 288 | + [], |
|
| 289 | + $serveur |
|
| 290 | + ) |
|
| 291 | + ) { |
|
| 292 | + return false; |
|
| 293 | + } |
|
| 294 | + break; |
|
| 295 | + |
|
| 296 | + case 'CHANGE COLUMN': |
|
| 297 | + case 'CHANGE': |
|
| 298 | + // recuperer le nom de la future colonne |
|
| 299 | + // on reprend la def d'origine car _sqlite_modifier_table va refaire la translation |
|
| 300 | + // en tenant compte de la cle primaire (ce qui est mieux) |
|
| 301 | + $def = trim($defo); |
|
| 302 | + $colonne_destination = substr($def, 0, strpos($def, ' ')); |
|
| 303 | + $def = substr($def, strlen($colonne_destination) + 1); |
|
| 304 | + |
|
| 305 | + if ( |
|
| 306 | + !_sqlite_modifier_table( |
|
| 307 | + $table, |
|
| 308 | + [$colonne_origine => $colonne_destination], |
|
| 309 | + ['field' => [$colonne_destination => $def]], |
|
| 310 | + $serveur |
|
| 311 | + ) |
|
| 312 | + ) { |
|
| 313 | + return false; |
|
| 314 | + } |
|
| 315 | + break; |
|
| 316 | + |
|
| 317 | + case 'MODIFY': |
|
| 318 | + // on reprend la def d'origine car _sqlite_modifier_table va refaire la translation |
|
| 319 | + // en tenant compte de la cle primaire (ce qui est mieux) |
|
| 320 | + if ( |
|
| 321 | + !_sqlite_modifier_table( |
|
| 322 | + $table, |
|
| 323 | + $colonne_origine, |
|
| 324 | + ['field' => [$colonne_origine => $defo]], |
|
| 325 | + $serveur |
|
| 326 | + ) |
|
| 327 | + ) { |
|
| 328 | + return false; |
|
| 329 | + } |
|
| 330 | + break; |
|
| 331 | + |
|
| 332 | + // pas geres en sqlite2 |
|
| 333 | + case 'RENAME': |
|
| 334 | + $do = 'RENAME TO' . substr($do, 6); |
|
| 335 | + case 'RENAME TO': |
|
| 336 | + if (!Sqlite::executer_requete("$debut $do", $serveur)) { |
|
| 337 | + spip_log("SQLite : Erreur ALTER TABLE / RENAME : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 338 | + |
|
| 339 | + return false; |
|
| 340 | + } |
|
| 341 | + break; |
|
| 342 | + |
|
| 343 | + // ajout d'une pk |
|
| 344 | + case 'ADD PRIMARY KEY': |
|
| 345 | + $pk = trim(substr($do, 16)); |
|
| 346 | + $pk = ($pk[0] == '(') ? substr($pk, 1, -1) : $pk; |
|
| 347 | + if ( |
|
| 348 | + !_sqlite_modifier_table( |
|
| 349 | + $table, |
|
| 350 | + $colonne_origine, |
|
| 351 | + ['key' => ['PRIMARY KEY' => $pk]], |
|
| 352 | + $serveur |
|
| 353 | + ) |
|
| 354 | + ) { |
|
| 355 | + return false; |
|
| 356 | + } |
|
| 357 | + break; |
|
| 358 | + // ajout d'un index |
|
| 359 | + case 'ADD UNIQUE KEY': |
|
| 360 | + case 'ADD UNIQUE': |
|
| 361 | + $unique = true; |
|
| 362 | + case 'ADD INDEX': |
|
| 363 | + case 'ADD KEY': |
|
| 364 | + if (!isset($unique)) { |
|
| 365 | + $unique = false; |
|
| 366 | + } |
|
| 367 | + // peut etre "(colonne)" ou "nom_index (colonnes)" |
|
| 368 | + // bug potentiel si qqn met "(colonne, colonne)" |
|
| 369 | + // |
|
| 370 | + // nom_index (colonnes) |
|
| 371 | + if ($def) { |
|
| 372 | + $colonnes = substr($def, 1, -1); |
|
| 373 | + $nom_index = $colonne_origine; |
|
| 374 | + } else { |
|
| 375 | + // (colonne) |
|
| 376 | + if ($colonne_origine[0] == '(') { |
|
| 377 | + $colonnes = substr($colonne_origine, 1, -1); |
|
| 378 | + if (str_contains(',', $colonnes)) { |
|
| 379 | + spip_log('SQLite : Erreur, impossible de creer un index sur plusieurs colonnes' |
|
| 380 | + . " sans qu'il ait de nom ($table, ($colonnes))", 'sqlite.' . _LOG_ERREUR); |
|
| 381 | + break; |
|
| 382 | + } else { |
|
| 383 | + $nom_index = $colonnes; |
|
| 384 | + } |
|
| 385 | + } // nom_index |
|
| 386 | + else { |
|
| 387 | + $nom_index = $colonnes = $colonne_origine; |
|
| 388 | + } |
|
| 389 | + } |
|
| 390 | + spip_sqlite_create_index($nom_index, $table, $colonnes, $unique, $serveur); |
|
| 391 | + break; |
|
| 392 | + |
|
| 393 | + // pas geres en sqlite2 |
|
| 394 | + case 'ADD COLUMN': |
|
| 395 | + $do = 'ADD' . substr($do, 10); |
|
| 396 | + case 'ADD': |
|
| 397 | + default: |
|
| 398 | + if (!preg_match(',primary\s+key,i', $do)) { |
|
| 399 | + if (!Sqlite::executer_requete("$debut $do", $serveur)) { |
|
| 400 | + spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 401 | + |
|
| 402 | + return false; |
|
| 403 | + } |
|
| 404 | + break; |
|
| 405 | + } |
|
| 406 | + // ou si la colonne est aussi primary key |
|
| 407 | + // cas du add id_truc int primary key |
|
| 408 | + // ajout d'une colonne qui passe en primary key directe |
|
| 409 | + else { |
|
| 410 | + $def = trim(substr($do, 3)); |
|
| 411 | + $colonne_ajoutee = substr($def, 0, strpos($def, ' ')); |
|
| 412 | + $def = substr($def, strlen($colonne_ajoutee) + 1); |
|
| 413 | + $opts = []; |
|
| 414 | + if (preg_match(',primary\s+key,i', $def)) { |
|
| 415 | + $opts['key'] = ['PRIMARY KEY' => $colonne_ajoutee]; |
|
| 416 | + $def = preg_replace(',primary\s+key,i', '', $def); |
|
| 417 | + } |
|
| 418 | + $opts['field'] = [$colonne_ajoutee => $def]; |
|
| 419 | + if (!_sqlite_modifier_table($table, [$colonne_ajoutee], $opts, $serveur)) { |
|
| 420 | + spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 421 | + |
|
| 422 | + return false; |
|
| 423 | + } |
|
| 424 | + } |
|
| 425 | + break; |
|
| 426 | + } |
|
| 427 | + // tout est bon, ouf ! |
|
| 428 | + spip_log("SQLite ($serveur) : Changements OK : $debut $do", 'sqlite.' . _LOG_INFO); |
|
| 429 | + } |
|
| 430 | + |
|
| 431 | + spip_log("SQLite ($serveur) : fin ALTER TABLE OK !", 'sqlite.' . _LOG_INFO); |
|
| 432 | + |
|
| 433 | + return true; |
|
| 434 | 434 | } |
| 435 | 435 | |
| 436 | 436 | /** |
@@ -452,38 +452,38 @@ discard block |
||
| 452 | 452 | * - true si la requête réussie, false sinon. |
| 453 | 453 | */ |
| 454 | 454 | function spip_sqlite_create( |
| 455 | - $nom, |
|
| 456 | - $champs, |
|
| 457 | - $cles, |
|
| 458 | - $autoinc = false, |
|
| 459 | - $temporary = false, |
|
| 460 | - $serveur = '', |
|
| 461 | - $requeter = true |
|
| 455 | + $nom, |
|
| 456 | + $champs, |
|
| 457 | + $cles, |
|
| 458 | + $autoinc = false, |
|
| 459 | + $temporary = false, |
|
| 460 | + $serveur = '', |
|
| 461 | + $requeter = true |
|
| 462 | 462 | ) { |
| 463 | - $query = _sqlite_requete_create($nom, $champs, $cles, $autoinc, $temporary, $ifnotexists = true, $serveur, $requeter); |
|
| 464 | - if (!$query) { |
|
| 465 | - return false; |
|
| 466 | - } |
|
| 467 | - $res = spip_sqlite_query($query, $serveur, $requeter); |
|
| 468 | - |
|
| 469 | - // SQLite ne cree pas les KEY sur les requetes CREATE TABLE |
|
| 470 | - // il faut donc les faire creer ensuite |
|
| 471 | - if (!$requeter) { |
|
| 472 | - return $res; |
|
| 473 | - } |
|
| 474 | - |
|
| 475 | - $ok = $res ? true : false; |
|
| 476 | - if ($ok) { |
|
| 477 | - foreach ($cles as $k => $v) { |
|
| 478 | - if (preg_match(',^(UNIQUE KEY|KEY|UNIQUE)\s,i', $k, $m)) { |
|
| 479 | - $index = trim(substr($k, strlen($m[1]))); |
|
| 480 | - $unique = (strlen($m[1]) > 3); |
|
| 481 | - $ok &= spip_sqlite_create_index($index, $nom, $v, $unique, $serveur); |
|
| 482 | - } |
|
| 483 | - } |
|
| 484 | - } |
|
| 485 | - |
|
| 486 | - return $ok ? true : false; |
|
| 463 | + $query = _sqlite_requete_create($nom, $champs, $cles, $autoinc, $temporary, $ifnotexists = true, $serveur, $requeter); |
|
| 464 | + if (!$query) { |
|
| 465 | + return false; |
|
| 466 | + } |
|
| 467 | + $res = spip_sqlite_query($query, $serveur, $requeter); |
|
| 468 | + |
|
| 469 | + // SQLite ne cree pas les KEY sur les requetes CREATE TABLE |
|
| 470 | + // il faut donc les faire creer ensuite |
|
| 471 | + if (!$requeter) { |
|
| 472 | + return $res; |
|
| 473 | + } |
|
| 474 | + |
|
| 475 | + $ok = $res ? true : false; |
|
| 476 | + if ($ok) { |
|
| 477 | + foreach ($cles as $k => $v) { |
|
| 478 | + if (preg_match(',^(UNIQUE KEY|KEY|UNIQUE)\s,i', $k, $m)) { |
|
| 479 | + $index = trim(substr($k, strlen($m[1]))); |
|
| 480 | + $unique = (strlen($m[1]) > 3); |
|
| 481 | + $ok &= spip_sqlite_create_index($index, $nom, $v, $unique, $serveur); |
|
| 482 | + } |
|
| 483 | + } |
|
| 484 | + } |
|
| 485 | + |
|
| 486 | + return $ok ? true : false; |
|
| 487 | 487 | } |
| 488 | 488 | |
| 489 | 489 | /** |
@@ -497,21 +497,21 @@ discard block |
||
| 497 | 497 | **/ |
| 498 | 498 | function spip_sqlite_create_base($nom, $serveur = '', $option = true) |
| 499 | 499 | { |
| 500 | - $f = $nom . '.sqlite'; |
|
| 501 | - if (strpos($nom, '/') === false) { |
|
| 502 | - $f = _DIR_DB . $f; |
|
| 503 | - } |
|
| 500 | + $f = $nom . '.sqlite'; |
|
| 501 | + if (strpos($nom, '/') === false) { |
|
| 502 | + $f = _DIR_DB . $f; |
|
| 503 | + } |
|
| 504 | 504 | |
| 505 | - $ok = new \PDO("sqlite:$f"); |
|
| 505 | + $ok = new \PDO("sqlite:$f"); |
|
| 506 | 506 | |
| 507 | - if ($ok) { |
|
| 508 | - unset($ok); |
|
| 507 | + if ($ok) { |
|
| 508 | + unset($ok); |
|
| 509 | 509 | |
| 510 | - return true; |
|
| 511 | - } |
|
| 512 | - unset($ok); |
|
| 510 | + return true; |
|
| 511 | + } |
|
| 512 | + unset($ok); |
|
| 513 | 513 | |
| 514 | - return false; |
|
| 514 | + return false; |
|
| 515 | 515 | } |
| 516 | 516 | |
| 517 | 517 | |
@@ -533,22 +533,22 @@ discard block |
||
| 533 | 533 | */ |
| 534 | 534 | function spip_sqlite_create_view($nom, $query_select, $serveur = '', $requeter = true) |
| 535 | 535 | { |
| 536 | - if (!$query_select) { |
|
| 537 | - return false; |
|
| 538 | - } |
|
| 539 | - // vue deja presente |
|
| 540 | - if (sql_showtable($nom, false, $serveur)) { |
|
| 541 | - spip_log( |
|
| 542 | - "Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", |
|
| 543 | - 'sqlite.' . _LOG_ERREUR |
|
| 544 | - ); |
|
| 545 | - |
|
| 546 | - return false; |
|
| 547 | - } |
|
| 548 | - |
|
| 549 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 550 | - |
|
| 551 | - return spip_sqlite_query($query, $serveur, $requeter); |
|
| 536 | + if (!$query_select) { |
|
| 537 | + return false; |
|
| 538 | + } |
|
| 539 | + // vue deja presente |
|
| 540 | + if (sql_showtable($nom, false, $serveur)) { |
|
| 541 | + spip_log( |
|
| 542 | + "Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", |
|
| 543 | + 'sqlite.' . _LOG_ERREUR |
|
| 544 | + ); |
|
| 545 | + |
|
| 546 | + return false; |
|
| 547 | + } |
|
| 548 | + |
|
| 549 | + $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 550 | + |
|
| 551 | + return spip_sqlite_query($query, $serveur, $requeter); |
|
| 552 | 552 | } |
| 553 | 553 | |
| 554 | 554 | /** |
@@ -571,54 +571,54 @@ discard block |
||
| 571 | 571 | */ |
| 572 | 572 | function spip_sqlite_create_index($nom, $table, $champs, $unique = '', $serveur = '', $requeter = true) |
| 573 | 573 | { |
| 574 | - if (!($nom or $table or $champs)) { |
|
| 575 | - spip_log( |
|
| 576 | - "Champ manquant pour creer un index sqlite ($nom, $table, (" . join(',', $champs) . '))', |
|
| 577 | - 'sqlite.' . _LOG_ERREUR |
|
| 578 | - ); |
|
| 579 | - |
|
| 580 | - return false; |
|
| 581 | - } |
|
| 582 | - |
|
| 583 | - // SQLite ne differentie pas noms des index en fonction des tables |
|
| 584 | - // il faut donc creer des noms uniques d'index pour une base sqlite |
|
| 585 | - $nom = $table . '_' . $nom; |
|
| 586 | - // enlever d'eventuelles parentheses deja presentes sur champs |
|
| 587 | - if (!is_array($champs)) { |
|
| 588 | - if ($champs[0] == '(') { |
|
| 589 | - $champs = substr($champs, 1, -1); |
|
| 590 | - } |
|
| 591 | - $champs = [$champs]; |
|
| 592 | - // supprimer l'info de longueur d'index mysql en fin de champ |
|
| 593 | - $champs = preg_replace(',\(\d+\)$,', '', $champs); |
|
| 594 | - } |
|
| 595 | - |
|
| 596 | - $ifnotexists = ''; |
|
| 597 | - $version = spip_sqlite_fetch(spip_sqlite_query('select sqlite_version() AS sqlite_version', $serveur), '', $serveur); |
|
| 598 | - if (!function_exists('spip_version_compare')) { |
|
| 599 | - include_spip('plugins/installer'); |
|
| 600 | - } |
|
| 601 | - |
|
| 602 | - if ($version and spip_version_compare($version['sqlite_version'], '3.3.0', '>=')) { |
|
| 603 | - $ifnotexists = ' IF NOT EXISTS'; |
|
| 604 | - } else { |
|
| 605 | - /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ |
|
| 606 | - $a = spip_sqlite_showtable($table, $serveur); |
|
| 607 | - if (isset($a['key']['KEY ' . $nom])) { |
|
| 608 | - return true; |
|
| 609 | - } |
|
| 610 | - } |
|
| 611 | - |
|
| 612 | - $query = 'CREATE ' . ($unique ? 'UNIQUE ' : '') . "INDEX$ifnotexists $nom ON $table (" . join(',', $champs) . ')'; |
|
| 613 | - $res = spip_sqlite_query($query, $serveur, $requeter); |
|
| 614 | - if (!$requeter) { |
|
| 615 | - return $res; |
|
| 616 | - } |
|
| 617 | - if ($res) { |
|
| 618 | - return true; |
|
| 619 | - } else { |
|
| 620 | - return false; |
|
| 621 | - } |
|
| 574 | + if (!($nom or $table or $champs)) { |
|
| 575 | + spip_log( |
|
| 576 | + "Champ manquant pour creer un index sqlite ($nom, $table, (" . join(',', $champs) . '))', |
|
| 577 | + 'sqlite.' . _LOG_ERREUR |
|
| 578 | + ); |
|
| 579 | + |
|
| 580 | + return false; |
|
| 581 | + } |
|
| 582 | + |
|
| 583 | + // SQLite ne differentie pas noms des index en fonction des tables |
|
| 584 | + // il faut donc creer des noms uniques d'index pour une base sqlite |
|
| 585 | + $nom = $table . '_' . $nom; |
|
| 586 | + // enlever d'eventuelles parentheses deja presentes sur champs |
|
| 587 | + if (!is_array($champs)) { |
|
| 588 | + if ($champs[0] == '(') { |
|
| 589 | + $champs = substr($champs, 1, -1); |
|
| 590 | + } |
|
| 591 | + $champs = [$champs]; |
|
| 592 | + // supprimer l'info de longueur d'index mysql en fin de champ |
|
| 593 | + $champs = preg_replace(',\(\d+\)$,', '', $champs); |
|
| 594 | + } |
|
| 595 | + |
|
| 596 | + $ifnotexists = ''; |
|
| 597 | + $version = spip_sqlite_fetch(spip_sqlite_query('select sqlite_version() AS sqlite_version', $serveur), '', $serveur); |
|
| 598 | + if (!function_exists('spip_version_compare')) { |
|
| 599 | + include_spip('plugins/installer'); |
|
| 600 | + } |
|
| 601 | + |
|
| 602 | + if ($version and spip_version_compare($version['sqlite_version'], '3.3.0', '>=')) { |
|
| 603 | + $ifnotexists = ' IF NOT EXISTS'; |
|
| 604 | + } else { |
|
| 605 | + /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ |
|
| 606 | + $a = spip_sqlite_showtable($table, $serveur); |
|
| 607 | + if (isset($a['key']['KEY ' . $nom])) { |
|
| 608 | + return true; |
|
| 609 | + } |
|
| 610 | + } |
|
| 611 | + |
|
| 612 | + $query = 'CREATE ' . ($unique ? 'UNIQUE ' : '') . "INDEX$ifnotexists $nom ON $table (" . join(',', $champs) . ')'; |
|
| 613 | + $res = spip_sqlite_query($query, $serveur, $requeter); |
|
| 614 | + if (!$requeter) { |
|
| 615 | + return $res; |
|
| 616 | + } |
|
| 617 | + if ($res) { |
|
| 618 | + return true; |
|
| 619 | + } else { |
|
| 620 | + return false; |
|
| 621 | + } |
|
| 622 | 622 | } |
| 623 | 623 | |
| 624 | 624 | /** |
@@ -636,31 +636,31 @@ discard block |
||
| 636 | 636 | */ |
| 637 | 637 | function spip_sqlite_count($r, $serveur = '', $requeter = true) |
| 638 | 638 | { |
| 639 | - if (!$r) { |
|
| 640 | - return 0; |
|
| 641 | - } |
|
| 642 | - |
|
| 643 | - // select ou autre (insert, update,...) ? |
|
| 644 | - // (link,requete) a compter |
|
| 645 | - if (is_array($r->spipSqliteRowCount)) { |
|
| 646 | - list($link, $query) = $r->spipSqliteRowCount; |
|
| 647 | - // amelioration possible a tester intensivement : pas de order by pour compter ! |
|
| 648 | - // $query = preg_replace(",ORDER BY .+(LIMIT\s|HAVING\s|GROUP BY\s|$),Uims","\\1",$query); |
|
| 649 | - $query = "SELECT count(*) as zzzzsqlitecount FROM ($query)"; |
|
| 650 | - $l = $link->query($query); |
|
| 651 | - $i = 0; |
|
| 652 | - if ($l and $z = $l->fetch()) { |
|
| 653 | - $i = $z['zzzzsqlitecount']; |
|
| 654 | - } |
|
| 655 | - $r->spipSqliteRowCount = $i; |
|
| 656 | - } |
|
| 657 | - if (isset($r->spipSqliteRowCount)) { |
|
| 658 | - // Ce compte est faux s'il y a des limit dans la requete :( |
|
| 659 | - // il retourne le nombre d'enregistrements sans le limit |
|
| 660 | - return $r->spipSqliteRowCount; |
|
| 661 | - } else { |
|
| 662 | - return $r->rowCount(); |
|
| 663 | - } |
|
| 639 | + if (!$r) { |
|
| 640 | + return 0; |
|
| 641 | + } |
|
| 642 | + |
|
| 643 | + // select ou autre (insert, update,...) ? |
|
| 644 | + // (link,requete) a compter |
|
| 645 | + if (is_array($r->spipSqliteRowCount)) { |
|
| 646 | + list($link, $query) = $r->spipSqliteRowCount; |
|
| 647 | + // amelioration possible a tester intensivement : pas de order by pour compter ! |
|
| 648 | + // $query = preg_replace(",ORDER BY .+(LIMIT\s|HAVING\s|GROUP BY\s|$),Uims","\\1",$query); |
|
| 649 | + $query = "SELECT count(*) as zzzzsqlitecount FROM ($query)"; |
|
| 650 | + $l = $link->query($query); |
|
| 651 | + $i = 0; |
|
| 652 | + if ($l and $z = $l->fetch()) { |
|
| 653 | + $i = $z['zzzzsqlitecount']; |
|
| 654 | + } |
|
| 655 | + $r->spipSqliteRowCount = $i; |
|
| 656 | + } |
|
| 657 | + if (isset($r->spipSqliteRowCount)) { |
|
| 658 | + // Ce compte est faux s'il y a des limit dans la requete :( |
|
| 659 | + // il retourne le nombre d'enregistrements sans le limit |
|
| 660 | + return $r->spipSqliteRowCount; |
|
| 661 | + } else { |
|
| 662 | + return $r->rowCount(); |
|
| 663 | + } |
|
| 664 | 664 | } |
| 665 | 665 | |
| 666 | 666 | |
@@ -679,30 +679,30 @@ discard block |
||
| 679 | 679 | * - false si la requête a échouée |
| 680 | 680 | **/ |
| 681 | 681 | function spip_sqlite_countsel( |
| 682 | - $from = [], |
|
| 683 | - $where = [], |
|
| 684 | - $groupby = '', |
|
| 685 | - $having = [], |
|
| 686 | - $serveur = '', |
|
| 687 | - $requeter = true |
|
| 682 | + $from = [], |
|
| 683 | + $where = [], |
|
| 684 | + $groupby = '', |
|
| 685 | + $having = [], |
|
| 686 | + $serveur = '', |
|
| 687 | + $requeter = true |
|
| 688 | 688 | ) { |
| 689 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 690 | - $r = spip_sqlite_select( |
|
| 691 | - "COUNT($c)", |
|
| 692 | - $from, |
|
| 693 | - $where, |
|
| 694 | - '', |
|
| 695 | - '', |
|
| 696 | - '', |
|
| 697 | - $having, |
|
| 698 | - $serveur, |
|
| 699 | - $requeter |
|
| 700 | - ); |
|
| 701 | - if ((is_resource($r) or is_object($r)) && $requeter) { // ressource : sqlite2, object : sqlite3 |
|
| 702 | - list($r) = spip_sqlite_fetch($r, SPIP_SQLITE3_NUM, $serveur); |
|
| 703 | - } |
|
| 704 | - |
|
| 705 | - return $r; |
|
| 689 | + $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 690 | + $r = spip_sqlite_select( |
|
| 691 | + "COUNT($c)", |
|
| 692 | + $from, |
|
| 693 | + $where, |
|
| 694 | + '', |
|
| 695 | + '', |
|
| 696 | + '', |
|
| 697 | + $having, |
|
| 698 | + $serveur, |
|
| 699 | + $requeter |
|
| 700 | + ); |
|
| 701 | + if ((is_resource($r) or is_object($r)) && $requeter) { // ressource : sqlite2, object : sqlite3 |
|
| 702 | + list($r) = spip_sqlite_fetch($r, SPIP_SQLITE3_NUM, $serveur); |
|
| 703 | + } |
|
| 704 | + |
|
| 705 | + return $r; |
|
| 706 | 706 | } |
| 707 | 707 | |
| 708 | 708 | |
@@ -720,24 +720,24 @@ discard block |
||
| 720 | 720 | **/ |
| 721 | 721 | function spip_sqlite_delete($table, $where = '', $serveur = '', $requeter = true) |
| 722 | 722 | { |
| 723 | - $res = spip_sqlite_query( |
|
| 724 | - _sqlite_calculer_expression('DELETE FROM', $table, ',') |
|
| 725 | - . _sqlite_calculer_expression('WHERE', $where), |
|
| 726 | - $serveur, |
|
| 727 | - $requeter |
|
| 728 | - ); |
|
| 729 | - |
|
| 730 | - // renvoyer la requete inerte si demandee |
|
| 731 | - if (!$requeter) { |
|
| 732 | - return $res; |
|
| 733 | - } |
|
| 734 | - |
|
| 735 | - if ($res) { |
|
| 736 | - $link = _sqlite_link($serveur); |
|
| 737 | - return $res->rowCount(); |
|
| 738 | - } else { |
|
| 739 | - return false; |
|
| 740 | - } |
|
| 723 | + $res = spip_sqlite_query( |
|
| 724 | + _sqlite_calculer_expression('DELETE FROM', $table, ',') |
|
| 725 | + . _sqlite_calculer_expression('WHERE', $where), |
|
| 726 | + $serveur, |
|
| 727 | + $requeter |
|
| 728 | + ); |
|
| 729 | + |
|
| 730 | + // renvoyer la requete inerte si demandee |
|
| 731 | + if (!$requeter) { |
|
| 732 | + return $res; |
|
| 733 | + } |
|
| 734 | + |
|
| 735 | + if ($res) { |
|
| 736 | + $link = _sqlite_link($serveur); |
|
| 737 | + return $res->rowCount(); |
|
| 738 | + } else { |
|
| 739 | + return false; |
|
| 740 | + } |
|
| 741 | 741 | } |
| 742 | 742 | |
| 743 | 743 | |
@@ -754,15 +754,15 @@ discard block |
||
| 754 | 754 | */ |
| 755 | 755 | function spip_sqlite_drop_table($table, $exist = '', $serveur = '', $requeter = true) |
| 756 | 756 | { |
| 757 | - if ($exist) { |
|
| 758 | - $exist = ' IF EXISTS'; |
|
| 759 | - } |
|
| 760 | - |
|
| 761 | - if (spip_sqlite_query("DROP TABLE$exist $table", $serveur, $requeter)) { |
|
| 762 | - return true; |
|
| 763 | - } else { |
|
| 764 | - return false; |
|
| 765 | - } |
|
| 757 | + if ($exist) { |
|
| 758 | + $exist = ' IF EXISTS'; |
|
| 759 | + } |
|
| 760 | + |
|
| 761 | + if (spip_sqlite_query("DROP TABLE$exist $table", $serveur, $requeter)) { |
|
| 762 | + return true; |
|
| 763 | + } else { |
|
| 764 | + return false; |
|
| 765 | + } |
|
| 766 | 766 | } |
| 767 | 767 | |
| 768 | 768 | |
@@ -779,11 +779,11 @@ discard block |
||
| 779 | 779 | */ |
| 780 | 780 | function spip_sqlite_drop_view($view, $exist = '', $serveur = '', $requeter = true) |
| 781 | 781 | { |
| 782 | - if ($exist) { |
|
| 783 | - $exist = ' IF EXISTS'; |
|
| 784 | - } |
|
| 782 | + if ($exist) { |
|
| 783 | + $exist = ' IF EXISTS'; |
|
| 784 | + } |
|
| 785 | 785 | |
| 786 | - return spip_sqlite_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 786 | + return spip_sqlite_query("DROP VIEW$exist $view", $serveur, $requeter); |
|
| 787 | 787 | } |
| 788 | 788 | |
| 789 | 789 | /** |
@@ -798,20 +798,20 @@ discard block |
||
| 798 | 798 | */ |
| 799 | 799 | function spip_sqlite_drop_index($nom, $table, $serveur = '', $requeter = true) |
| 800 | 800 | { |
| 801 | - if (!($nom or $table)) { |
|
| 802 | - spip_log("Champ manquant pour supprimer un index sqlite ($nom, $table)", 'sqlite.' . _LOG_ERREUR); |
|
| 801 | + if (!($nom or $table)) { |
|
| 802 | + spip_log("Champ manquant pour supprimer un index sqlite ($nom, $table)", 'sqlite.' . _LOG_ERREUR); |
|
| 803 | 803 | |
| 804 | - return false; |
|
| 805 | - } |
|
| 804 | + return false; |
|
| 805 | + } |
|
| 806 | 806 | |
| 807 | - // SQLite ne differentie pas noms des index en fonction des tables |
|
| 808 | - // il faut donc creer des noms uniques d'index pour une base sqlite |
|
| 809 | - $index = $table . '_' . $nom; |
|
| 810 | - $exist = ' IF EXISTS'; |
|
| 807 | + // SQLite ne differentie pas noms des index en fonction des tables |
|
| 808 | + // il faut donc creer des noms uniques d'index pour une base sqlite |
|
| 809 | + $index = $table . '_' . $nom; |
|
| 810 | + $exist = ' IF EXISTS'; |
|
| 811 | 811 | |
| 812 | - $query = "DROP INDEX$exist $index"; |
|
| 812 | + $query = "DROP INDEX$exist $index"; |
|
| 813 | 813 | |
| 814 | - return spip_sqlite_query($query, $serveur, $requeter); |
|
| 814 | + return spip_sqlite_query($query, $serveur, $requeter); |
|
| 815 | 815 | } |
| 816 | 816 | |
| 817 | 817 | /** |
@@ -828,29 +828,29 @@ discard block |
||
| 828 | 828 | **/ |
| 829 | 829 | function spip_sqlite_error($query = '', $serveur = '') |
| 830 | 830 | { |
| 831 | - $link = _sqlite_link($serveur); |
|
| 832 | - |
|
| 833 | - if ($link) { |
|
| 834 | - $errs = $link->errorInfo(); |
|
| 835 | - $s = _sqlite_last_error_from_link($link); |
|
| 836 | - } else { |
|
| 837 | - $s = ': aucune ressource sqlite (link)'; |
|
| 838 | - } |
|
| 839 | - if ($s) { |
|
| 840 | - $trace = debug_backtrace(); |
|
| 841 | - if ($trace[0]['function'] != 'spip_sqlite_error') { |
|
| 842 | - spip_log("$s - $query - " . sql_error_backtrace(), 'sqlite.' . _LOG_ERREUR); |
|
| 843 | - } |
|
| 844 | - } |
|
| 845 | - |
|
| 846 | - return $s; |
|
| 831 | + $link = _sqlite_link($serveur); |
|
| 832 | + |
|
| 833 | + if ($link) { |
|
| 834 | + $errs = $link->errorInfo(); |
|
| 835 | + $s = _sqlite_last_error_from_link($link); |
|
| 836 | + } else { |
|
| 837 | + $s = ': aucune ressource sqlite (link)'; |
|
| 838 | + } |
|
| 839 | + if ($s) { |
|
| 840 | + $trace = debug_backtrace(); |
|
| 841 | + if ($trace[0]['function'] != 'spip_sqlite_error') { |
|
| 842 | + spip_log("$s - $query - " . sql_error_backtrace(), 'sqlite.' . _LOG_ERREUR); |
|
| 843 | + } |
|
| 844 | + } |
|
| 845 | + |
|
| 846 | + return $s; |
|
| 847 | 847 | } |
| 848 | 848 | |
| 849 | 849 | function _sqlite_last_error_from_link($link) |
| 850 | 850 | { |
| 851 | - if ($link) { |
|
| 852 | - $errs = $link->errorInfo(); |
|
| 853 | - /* |
|
| 851 | + if ($link) { |
|
| 852 | + $errs = $link->errorInfo(); |
|
| 853 | + /* |
|
| 854 | 854 | $errs[0] |
| 855 | 855 | numero SQLState ('HY000' souvent lors d'une erreur) |
| 856 | 856 | http://www.easysoft.com/developer/interfaces/odbc/sqlstate_status_return_codes.html |
@@ -860,11 +860,11 @@ discard block |
||
| 860 | 860 | $errs[2] |
| 861 | 861 | Le texte du message d'erreur |
| 862 | 862 | */ |
| 863 | - if (ltrim($errs[0], '0')) { // 00000 si pas d'erreur |
|
| 864 | - return "$errs[2]"; |
|
| 865 | - } |
|
| 866 | - } |
|
| 867 | - return ''; |
|
| 863 | + if (ltrim($errs[0], '0')) { // 00000 si pas d'erreur |
|
| 864 | + return "$errs[2]"; |
|
| 865 | + } |
|
| 866 | + } |
|
| 867 | + return ''; |
|
| 868 | 868 | } |
| 869 | 869 | |
| 870 | 870 | /** |
@@ -882,23 +882,23 @@ discard block |
||
| 882 | 882 | **/ |
| 883 | 883 | function spip_sqlite_errno($serveur = '') |
| 884 | 884 | { |
| 885 | - $link = _sqlite_link($serveur); |
|
| 886 | - |
|
| 887 | - if ($link) { |
|
| 888 | - $t = $link->errorInfo(); |
|
| 889 | - $s = ltrim($t[0], '0'); // 00000 si pas d'erreur |
|
| 890 | - if ($s) { |
|
| 891 | - $s .= ' / ' . $t[1]; |
|
| 892 | - } // ajoute l'erreur du moteur SQLite |
|
| 893 | - } else { |
|
| 894 | - $s = ': aucune ressource sqlite (link)'; |
|
| 895 | - } |
|
| 896 | - |
|
| 897 | - if ($s) { |
|
| 898 | - spip_log("Erreur sqlite $s", 'sqlite.' . _LOG_ERREUR); |
|
| 899 | - } |
|
| 900 | - |
|
| 901 | - return $s ? $s : 0; |
|
| 885 | + $link = _sqlite_link($serveur); |
|
| 886 | + |
|
| 887 | + if ($link) { |
|
| 888 | + $t = $link->errorInfo(); |
|
| 889 | + $s = ltrim($t[0], '0'); // 00000 si pas d'erreur |
|
| 890 | + if ($s) { |
|
| 891 | + $s .= ' / ' . $t[1]; |
|
| 892 | + } // ajoute l'erreur du moteur SQLite |
|
| 893 | + } else { |
|
| 894 | + $s = ': aucune ressource sqlite (link)'; |
|
| 895 | + } |
|
| 896 | + |
|
| 897 | + if ($s) { |
|
| 898 | + spip_log("Erreur sqlite $s", 'sqlite.' . _LOG_ERREUR); |
|
| 899 | + } |
|
| 900 | + |
|
| 901 | + return $s ? $s : 0; |
|
| 902 | 902 | } |
| 903 | 903 | |
| 904 | 904 | |
@@ -915,19 +915,19 @@ discard block |
||
| 915 | 915 | */ |
| 916 | 916 | function spip_sqlite_explain($query, $serveur = '', $requeter = true) |
| 917 | 917 | { |
| 918 | - if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 919 | - return []; |
|
| 920 | - } |
|
| 921 | - |
|
| 922 | - $query = Sqlite::traduire_requete($query, $serveur); |
|
| 923 | - $query = 'EXPLAIN ' . $query; |
|
| 924 | - if (!$requeter) { |
|
| 925 | - return $query; |
|
| 926 | - } |
|
| 927 | - // on ne trace pas ces requetes, sinon on obtient un tracage sans fin... |
|
| 928 | - $r = Sqlite::executer_requete($query, $serveur, false); |
|
| 929 | - |
|
| 930 | - return $r ? spip_sqlite_fetch($r, null, $serveur) : false; // hum ? etrange ca... a verifier |
|
| 918 | + if (strpos(ltrim($query), 'SELECT') !== 0) { |
|
| 919 | + return []; |
|
| 920 | + } |
|
| 921 | + |
|
| 922 | + $query = Sqlite::traduire_requete($query, $serveur); |
|
| 923 | + $query = 'EXPLAIN ' . $query; |
|
| 924 | + if (!$requeter) { |
|
| 925 | + return $query; |
|
| 926 | + } |
|
| 927 | + // on ne trace pas ces requetes, sinon on obtient un tracage sans fin... |
|
| 928 | + $r = Sqlite::executer_requete($query, $serveur, false); |
|
| 929 | + |
|
| 930 | + return $r ? spip_sqlite_fetch($r, null, $serveur) : false; // hum ? etrange ca... a verifier |
|
| 931 | 931 | } |
| 932 | 932 | |
| 933 | 933 | |
@@ -948,35 +948,35 @@ discard block |
||
| 948 | 948 | function spip_sqlite_fetch($r, $t = '', $serveur = '', $requeter = true) |
| 949 | 949 | { |
| 950 | 950 | |
| 951 | - $link = _sqlite_link($serveur); |
|
| 952 | - $t = $t ? $t : SPIP_SQLITE3_ASSOC; |
|
| 953 | - |
|
| 954 | - if (!$r) { |
|
| 955 | - return false; |
|
| 956 | - } |
|
| 957 | - |
|
| 958 | - $retour = $r->fetch($t); |
|
| 959 | - |
|
| 960 | - if (!$retour) { |
|
| 961 | - if ($r->errorCode() === '00000') { |
|
| 962 | - return null; |
|
| 963 | - } |
|
| 964 | - return false; |
|
| 965 | - } |
|
| 966 | - |
|
| 967 | - // Renvoie des 'table.titre' au lieu de 'titre' tout court ! pff ! |
|
| 968 | - // suppression de 'table.' pour toutes les cles (c'est un peu violent !) |
|
| 969 | - // c'est couteux : on ne verifie que la premiere ligne pour voir si on le fait ou non |
|
| 970 | - if (str_contains(implode('', array_keys($retour)), '.')) { |
|
| 971 | - foreach ($retour as $cle => $val) { |
|
| 972 | - if (($pos = strpos($cle, '.')) !== false) { |
|
| 973 | - $retour[substr($cle, $pos + 1)] = &$retour[$cle]; |
|
| 974 | - unset($retour[$cle]); |
|
| 975 | - } |
|
| 976 | - } |
|
| 977 | - } |
|
| 978 | - |
|
| 979 | - return $retour; |
|
| 951 | + $link = _sqlite_link($serveur); |
|
| 952 | + $t = $t ? $t : SPIP_SQLITE3_ASSOC; |
|
| 953 | + |
|
| 954 | + if (!$r) { |
|
| 955 | + return false; |
|
| 956 | + } |
|
| 957 | + |
|
| 958 | + $retour = $r->fetch($t); |
|
| 959 | + |
|
| 960 | + if (!$retour) { |
|
| 961 | + if ($r->errorCode() === '00000') { |
|
| 962 | + return null; |
|
| 963 | + } |
|
| 964 | + return false; |
|
| 965 | + } |
|
| 966 | + |
|
| 967 | + // Renvoie des 'table.titre' au lieu de 'titre' tout court ! pff ! |
|
| 968 | + // suppression de 'table.' pour toutes les cles (c'est un peu violent !) |
|
| 969 | + // c'est couteux : on ne verifie que la premiere ligne pour voir si on le fait ou non |
|
| 970 | + if (str_contains(implode('', array_keys($retour)), '.')) { |
|
| 971 | + foreach ($retour as $cle => $val) { |
|
| 972 | + if (($pos = strpos($cle, '.')) !== false) { |
|
| 973 | + $retour[substr($cle, $pos + 1)] = &$retour[$cle]; |
|
| 974 | + unset($retour[$cle]); |
|
| 975 | + } |
|
| 976 | + } |
|
| 977 | + } |
|
| 978 | + |
|
| 979 | + return $retour; |
|
| 980 | 980 | } |
| 981 | 981 | |
| 982 | 982 | /** |
@@ -990,8 +990,8 @@ discard block |
||
| 990 | 990 | **/ |
| 991 | 991 | function spip_sqlite_seek($r, $row_number, $serveur = '', $requeter = true) |
| 992 | 992 | { |
| 993 | - // encore un truc de bien fichu : PDO ne PEUT PAS faire de seek ou de rewind... |
|
| 994 | - return false; |
|
| 993 | + // encore un truc de bien fichu : PDO ne PEUT PAS faire de seek ou de rewind... |
|
| 994 | + return false; |
|
| 995 | 995 | } |
| 996 | 996 | |
| 997 | 997 | |
@@ -1008,10 +1008,10 @@ discard block |
||
| 1008 | 1008 | */ |
| 1009 | 1009 | function spip_sqlite_free(&$r, $serveur = '', $requeter = true) |
| 1010 | 1010 | { |
| 1011 | - unset($r); |
|
| 1011 | + unset($r); |
|
| 1012 | 1012 | |
| 1013 | - return true; |
|
| 1014 | - //return sqlite_free_result($r); |
|
| 1013 | + return true; |
|
| 1014 | + //return sqlite_free_result($r); |
|
| 1015 | 1015 | } |
| 1016 | 1016 | |
| 1017 | 1017 | |
@@ -1027,8 +1027,8 @@ discard block |
||
| 1027 | 1027 | */ |
| 1028 | 1028 | function spip_sqlite_get_charset($charset = [], $serveur = '', $requeter = true) |
| 1029 | 1029 | { |
| 1030 | - //$c = !$charset ? '' : (" LIKE "._q($charset['charset'])); |
|
| 1031 | - //return spip_sqlite_fetch(sqlite_query(_sqlite_link($serveur), "SHOW CHARACTER SET$c"), NULL, $serveur); |
|
| 1030 | + //$c = !$charset ? '' : (" LIKE "._q($charset['charset'])); |
|
| 1031 | + //return spip_sqlite_fetch(sqlite_query(_sqlite_link($serveur), "SHOW CHARACTER SET$c"), NULL, $serveur); |
|
| 1032 | 1032 | } |
| 1033 | 1033 | |
| 1034 | 1034 | |
@@ -1044,7 +1044,7 @@ discard block |
||
| 1044 | 1044 | **/ |
| 1045 | 1045 | function spip_sqlite_hex($v) |
| 1046 | 1046 | { |
| 1047 | - return hexdec($v); |
|
| 1047 | + return hexdec($v); |
|
| 1048 | 1048 | } |
| 1049 | 1049 | |
| 1050 | 1050 | |
@@ -1067,7 +1067,7 @@ discard block |
||
| 1067 | 1067 | **/ |
| 1068 | 1068 | function spip_sqlite_in($val, $valeurs, $not = '', $serveur = '', $requeter = true) |
| 1069 | 1069 | { |
| 1070 | - return "($val $not IN ($valeurs))"; |
|
| 1070 | + return "($val $not IN ($valeurs))"; |
|
| 1071 | 1071 | } |
| 1072 | 1072 | |
| 1073 | 1073 | |
@@ -1096,20 +1096,20 @@ discard block |
||
| 1096 | 1096 | function spip_sqlite_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) |
| 1097 | 1097 | { |
| 1098 | 1098 | |
| 1099 | - $query = "INSERT INTO $table " . ($champs ? "$champs VALUES $valeurs" : 'DEFAULT VALUES'); |
|
| 1100 | - if ($r = spip_sqlite_query($query, $serveur, $requeter)) { |
|
| 1101 | - if (!$requeter) { |
|
| 1102 | - return $r; |
|
| 1103 | - } |
|
| 1104 | - $nb = Sqlite::last_insert_id($serveur); |
|
| 1105 | - } else { |
|
| 1106 | - $nb = false; |
|
| 1107 | - } |
|
| 1099 | + $query = "INSERT INTO $table " . ($champs ? "$champs VALUES $valeurs" : 'DEFAULT VALUES'); |
|
| 1100 | + if ($r = spip_sqlite_query($query, $serveur, $requeter)) { |
|
| 1101 | + if (!$requeter) { |
|
| 1102 | + return $r; |
|
| 1103 | + } |
|
| 1104 | + $nb = Sqlite::last_insert_id($serveur); |
|
| 1105 | + } else { |
|
| 1106 | + $nb = false; |
|
| 1107 | + } |
|
| 1108 | 1108 | |
| 1109 | - $err = spip_sqlite_error($query, $serveur); |
|
| 1109 | + $err = spip_sqlite_error($query, $serveur); |
|
| 1110 | 1110 | |
| 1111 | - // cas particulier : ne pas substituer la reponse spip_sqlite_query si on est en profilage |
|
| 1112 | - return isset($_GET['var_profile']) ? $r : $nb; |
|
| 1111 | + // cas particulier : ne pas substituer la reponse spip_sqlite_query si on est en profilage |
|
| 1112 | + return isset($_GET['var_profile']) ? $r : $nb; |
|
| 1113 | 1113 | } |
| 1114 | 1114 | |
| 1115 | 1115 | |
@@ -1135,28 +1135,28 @@ discard block |
||
| 1135 | 1135 | **/ |
| 1136 | 1136 | function spip_sqlite_insertq($table, $couples = [], $desc = [], $serveur = '', $requeter = true) |
| 1137 | 1137 | { |
| 1138 | - if (!$desc) { |
|
| 1139 | - $desc = description_table($table, $serveur); |
|
| 1140 | - } |
|
| 1141 | - if (!$desc) { |
|
| 1142 | - die("$table insertion sans description"); |
|
| 1143 | - } |
|
| 1144 | - $fields = isset($desc['field']) ? $desc['field'] : []; |
|
| 1145 | - |
|
| 1146 | - foreach ($couples as $champ => $val) { |
|
| 1147 | - $couples[$champ] = _sqlite_calculer_cite($val, $fields[$champ]); |
|
| 1148 | - } |
|
| 1149 | - |
|
| 1150 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1151 | - $couples = _sqlite_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1152 | - |
|
| 1153 | - $cles = $valeurs = ''; |
|
| 1154 | - if (count($couples)) { |
|
| 1155 | - $cles = '(' . join(',', array_keys($couples)) . ')'; |
|
| 1156 | - $valeurs = '(' . join(',', $couples) . ')'; |
|
| 1157 | - } |
|
| 1158 | - |
|
| 1159 | - return spip_sqlite_insert($table, $cles, $valeurs, $desc, $serveur, $requeter); |
|
| 1138 | + if (!$desc) { |
|
| 1139 | + $desc = description_table($table, $serveur); |
|
| 1140 | + } |
|
| 1141 | + if (!$desc) { |
|
| 1142 | + die("$table insertion sans description"); |
|
| 1143 | + } |
|
| 1144 | + $fields = isset($desc['field']) ? $desc['field'] : []; |
|
| 1145 | + |
|
| 1146 | + foreach ($couples as $champ => $val) { |
|
| 1147 | + $couples[$champ] = _sqlite_calculer_cite($val, $fields[$champ]); |
|
| 1148 | + } |
|
| 1149 | + |
|
| 1150 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1151 | + $couples = _sqlite_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1152 | + |
|
| 1153 | + $cles = $valeurs = ''; |
|
| 1154 | + if (count($couples)) { |
|
| 1155 | + $cles = '(' . join(',', array_keys($couples)) . ')'; |
|
| 1156 | + $valeurs = '(' . join(',', $couples) . ')'; |
|
| 1157 | + } |
|
| 1158 | + |
|
| 1159 | + return spip_sqlite_insert($table, $cles, $valeurs, $desc, $serveur, $requeter); |
|
| 1160 | 1160 | } |
| 1161 | 1161 | |
| 1162 | 1162 | |
@@ -1181,70 +1181,70 @@ discard block |
||
| 1181 | 1181 | **/ |
| 1182 | 1182 | function spip_sqlite_insertq_multi($table, $tab_couples = [], $desc = [], $serveur = '', $requeter = true) |
| 1183 | 1183 | { |
| 1184 | - if (!$desc) { |
|
| 1185 | - $desc = description_table($table, $serveur); |
|
| 1186 | - } |
|
| 1187 | - if (!$desc) { |
|
| 1188 | - die("$table insertion sans description"); |
|
| 1189 | - } |
|
| 1190 | - if (!isset($desc['field'])) { |
|
| 1191 | - $desc['field'] = []; |
|
| 1192 | - } |
|
| 1193 | - |
|
| 1194 | - // recuperer les champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1195 | - $maj = _sqlite_ajouter_champs_timestamp($table, [], $desc, $serveur); |
|
| 1196 | - |
|
| 1197 | - // seul le nom de la table est a traduire ici : |
|
| 1198 | - // le faire une seule fois au debut |
|
| 1199 | - $query_start = "INSERT INTO $table "; |
|
| 1200 | - $query_start = Sqlite::traduire_requete($query_start, $serveur); |
|
| 1201 | - |
|
| 1202 | - // ouvrir une transaction |
|
| 1203 | - if ($requeter) { |
|
| 1204 | - Sqlite::demarrer_transaction($serveur); |
|
| 1205 | - } |
|
| 1206 | - |
|
| 1207 | - while ($couples = array_shift($tab_couples)) { |
|
| 1208 | - foreach ($couples as $champ => $val) { |
|
| 1209 | - $couples[$champ] = _sqlite_calculer_cite($val, $desc['field'][$champ]); |
|
| 1210 | - } |
|
| 1211 | - |
|
| 1212 | - // inserer les champs timestamp par defaut |
|
| 1213 | - $couples = array_merge($maj, $couples); |
|
| 1214 | - |
|
| 1215 | - $champs = $valeurs = ''; |
|
| 1216 | - if (count($couples)) { |
|
| 1217 | - $champs = '(' . join(',', array_keys($couples)) . ')'; |
|
| 1218 | - $valeurs = '(' . join(',', $couples) . ')'; |
|
| 1219 | - $query = $query_start . "$champs VALUES $valeurs"; |
|
| 1220 | - } else { |
|
| 1221 | - $query = $query_start . 'DEFAULT VALUES'; |
|
| 1222 | - } |
|
| 1223 | - |
|
| 1224 | - if ($requeter) { |
|
| 1225 | - $retour = Sqlite::executer_requete($query, $serveur); |
|
| 1226 | - } |
|
| 1227 | - |
|
| 1228 | - // sur le dernier couple uniquement |
|
| 1229 | - if (!count($tab_couples)) { |
|
| 1230 | - $nb = 0; |
|
| 1231 | - if ($requeter) { |
|
| 1232 | - $nb = Sqlite::last_insert_id($serveur); |
|
| 1233 | - } else { |
|
| 1234 | - return $query; |
|
| 1235 | - } |
|
| 1236 | - } |
|
| 1237 | - |
|
| 1238 | - $err = spip_sqlite_error($query, $serveur); |
|
| 1239 | - } |
|
| 1240 | - |
|
| 1241 | - if ($requeter) { |
|
| 1242 | - Sqlite::finir_transaction($serveur); |
|
| 1243 | - } |
|
| 1244 | - |
|
| 1245 | - // renvoie le dernier id d'autoincrement ajoute |
|
| 1246 | - // cas particulier : ne pas substituer la reponse spip_sqlite_query si on est en profilage |
|
| 1247 | - return isset($_GET['var_profile']) ? $retour : $nb; |
|
| 1184 | + if (!$desc) { |
|
| 1185 | + $desc = description_table($table, $serveur); |
|
| 1186 | + } |
|
| 1187 | + if (!$desc) { |
|
| 1188 | + die("$table insertion sans description"); |
|
| 1189 | + } |
|
| 1190 | + if (!isset($desc['field'])) { |
|
| 1191 | + $desc['field'] = []; |
|
| 1192 | + } |
|
| 1193 | + |
|
| 1194 | + // recuperer les champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1195 | + $maj = _sqlite_ajouter_champs_timestamp($table, [], $desc, $serveur); |
|
| 1196 | + |
|
| 1197 | + // seul le nom de la table est a traduire ici : |
|
| 1198 | + // le faire une seule fois au debut |
|
| 1199 | + $query_start = "INSERT INTO $table "; |
|
| 1200 | + $query_start = Sqlite::traduire_requete($query_start, $serveur); |
|
| 1201 | + |
|
| 1202 | + // ouvrir une transaction |
|
| 1203 | + if ($requeter) { |
|
| 1204 | + Sqlite::demarrer_transaction($serveur); |
|
| 1205 | + } |
|
| 1206 | + |
|
| 1207 | + while ($couples = array_shift($tab_couples)) { |
|
| 1208 | + foreach ($couples as $champ => $val) { |
|
| 1209 | + $couples[$champ] = _sqlite_calculer_cite($val, $desc['field'][$champ]); |
|
| 1210 | + } |
|
| 1211 | + |
|
| 1212 | + // inserer les champs timestamp par defaut |
|
| 1213 | + $couples = array_merge($maj, $couples); |
|
| 1214 | + |
|
| 1215 | + $champs = $valeurs = ''; |
|
| 1216 | + if (count($couples)) { |
|
| 1217 | + $champs = '(' . join(',', array_keys($couples)) . ')'; |
|
| 1218 | + $valeurs = '(' . join(',', $couples) . ')'; |
|
| 1219 | + $query = $query_start . "$champs VALUES $valeurs"; |
|
| 1220 | + } else { |
|
| 1221 | + $query = $query_start . 'DEFAULT VALUES'; |
|
| 1222 | + } |
|
| 1223 | + |
|
| 1224 | + if ($requeter) { |
|
| 1225 | + $retour = Sqlite::executer_requete($query, $serveur); |
|
| 1226 | + } |
|
| 1227 | + |
|
| 1228 | + // sur le dernier couple uniquement |
|
| 1229 | + if (!count($tab_couples)) { |
|
| 1230 | + $nb = 0; |
|
| 1231 | + if ($requeter) { |
|
| 1232 | + $nb = Sqlite::last_insert_id($serveur); |
|
| 1233 | + } else { |
|
| 1234 | + return $query; |
|
| 1235 | + } |
|
| 1236 | + } |
|
| 1237 | + |
|
| 1238 | + $err = spip_sqlite_error($query, $serveur); |
|
| 1239 | + } |
|
| 1240 | + |
|
| 1241 | + if ($requeter) { |
|
| 1242 | + Sqlite::finir_transaction($serveur); |
|
| 1243 | + } |
|
| 1244 | + |
|
| 1245 | + // renvoie le dernier id d'autoincrement ajoute |
|
| 1246 | + // cas particulier : ne pas substituer la reponse spip_sqlite_query si on est en profilage |
|
| 1247 | + return isset($_GET['var_profile']) ? $retour : $nb; |
|
| 1248 | 1248 | } |
| 1249 | 1249 | |
| 1250 | 1250 | |
@@ -1260,7 +1260,7 @@ discard block |
||
| 1260 | 1260 | **/ |
| 1261 | 1261 | function spip_sqlite_preferer_transaction($serveur = '', $requeter = true) |
| 1262 | 1262 | { |
| 1263 | - return true; |
|
| 1263 | + return true; |
|
| 1264 | 1264 | } |
| 1265 | 1265 | |
| 1266 | 1266 | /** |
@@ -1278,12 +1278,12 @@ discard block |
||
| 1278 | 1278 | **/ |
| 1279 | 1279 | function spip_sqlite_demarrer_transaction($serveur = '', $requeter = true) |
| 1280 | 1280 | { |
| 1281 | - if (!$requeter) { |
|
| 1282 | - return 'BEGIN TRANSACTION'; |
|
| 1283 | - } |
|
| 1284 | - Sqlite::demarrer_transaction($serveur); |
|
| 1281 | + if (!$requeter) { |
|
| 1282 | + return 'BEGIN TRANSACTION'; |
|
| 1283 | + } |
|
| 1284 | + Sqlite::demarrer_transaction($serveur); |
|
| 1285 | 1285 | |
| 1286 | - return true; |
|
| 1286 | + return true; |
|
| 1287 | 1287 | } |
| 1288 | 1288 | |
| 1289 | 1289 | /** |
@@ -1298,12 +1298,12 @@ discard block |
||
| 1298 | 1298 | **/ |
| 1299 | 1299 | function spip_sqlite_terminer_transaction($serveur = '', $requeter = true) |
| 1300 | 1300 | { |
| 1301 | - if (!$requeter) { |
|
| 1302 | - return 'COMMIT'; |
|
| 1303 | - } |
|
| 1304 | - Sqlite::finir_transaction($serveur); |
|
| 1301 | + if (!$requeter) { |
|
| 1302 | + return 'COMMIT'; |
|
| 1303 | + } |
|
| 1304 | + Sqlite::finir_transaction($serveur); |
|
| 1305 | 1305 | |
| 1306 | - return true; |
|
| 1306 | + return true; |
|
| 1307 | 1307 | } |
| 1308 | 1308 | |
| 1309 | 1309 | |
@@ -1319,27 +1319,27 @@ discard block |
||
| 1319 | 1319 | **/ |
| 1320 | 1320 | function spip_sqlite_listdbs($serveur = '', $requeter = true) |
| 1321 | 1321 | { |
| 1322 | - _sqlite_init(); |
|
| 1323 | - |
|
| 1324 | - if (!is_dir($d = substr(_DIR_DB, 0, -1))) { |
|
| 1325 | - return []; |
|
| 1326 | - } |
|
| 1327 | - |
|
| 1328 | - include_spip('inc/flock'); |
|
| 1329 | - $bases = preg_files($d, $pattern = '(.*)\.sqlite$'); |
|
| 1330 | - $bds = []; |
|
| 1331 | - |
|
| 1332 | - foreach ($bases as $b) { |
|
| 1333 | - // pas de bases commencant pas sqlite |
|
| 1334 | - // (on s'en sert pour l'installation pour simuler la presence d'un serveur) |
|
| 1335 | - // les bases sont de la forme _sqliteX_tmp_spip_install.sqlite |
|
| 1336 | - if (strpos($b, '_sqlite')) { |
|
| 1337 | - continue; |
|
| 1338 | - } |
|
| 1339 | - $bds[] = preg_replace(";.*/$pattern;iS", '$1', $b); |
|
| 1340 | - } |
|
| 1341 | - |
|
| 1342 | - return $bds; |
|
| 1322 | + _sqlite_init(); |
|
| 1323 | + |
|
| 1324 | + if (!is_dir($d = substr(_DIR_DB, 0, -1))) { |
|
| 1325 | + return []; |
|
| 1326 | + } |
|
| 1327 | + |
|
| 1328 | + include_spip('inc/flock'); |
|
| 1329 | + $bases = preg_files($d, $pattern = '(.*)\.sqlite$'); |
|
| 1330 | + $bds = []; |
|
| 1331 | + |
|
| 1332 | + foreach ($bases as $b) { |
|
| 1333 | + // pas de bases commencant pas sqlite |
|
| 1334 | + // (on s'en sert pour l'installation pour simuler la presence d'un serveur) |
|
| 1335 | + // les bases sont de la forme _sqliteX_tmp_spip_install.sqlite |
|
| 1336 | + if (strpos($b, '_sqlite')) { |
|
| 1337 | + continue; |
|
| 1338 | + } |
|
| 1339 | + $bds[] = preg_replace(";.*/$pattern;iS", '$1', $b); |
|
| 1340 | + } |
|
| 1341 | + |
|
| 1342 | + return $bds; |
|
| 1343 | 1343 | } |
| 1344 | 1344 | |
| 1345 | 1345 | |
@@ -1355,9 +1355,9 @@ discard block |
||
| 1355 | 1355 | */ |
| 1356 | 1356 | function spip_sqlite_multi($objet, $lang) |
| 1357 | 1357 | { |
| 1358 | - $r = 'EXTRAIRE_MULTI(' . $objet . ", '" . $lang . "') AS multi"; |
|
| 1358 | + $r = 'EXTRAIRE_MULTI(' . $objet . ", '" . $lang . "') AS multi"; |
|
| 1359 | 1359 | |
| 1360 | - return $r; |
|
| 1360 | + return $r; |
|
| 1361 | 1361 | } |
| 1362 | 1362 | |
| 1363 | 1363 | |
@@ -1375,15 +1375,15 @@ discard block |
||
| 1375 | 1375 | **/ |
| 1376 | 1376 | function spip_sqlite_optimize($table, $serveur = '', $requeter = true) |
| 1377 | 1377 | { |
| 1378 | - static $do = false; |
|
| 1379 | - if ($requeter and $do) { |
|
| 1380 | - return true; |
|
| 1381 | - } |
|
| 1382 | - if ($requeter) { |
|
| 1383 | - $do = true; |
|
| 1384 | - } |
|
| 1385 | - |
|
| 1386 | - return spip_sqlite_query('VACUUM', $serveur, $requeter); |
|
| 1378 | + static $do = false; |
|
| 1379 | + if ($requeter and $do) { |
|
| 1380 | + return true; |
|
| 1381 | + } |
|
| 1382 | + if ($requeter) { |
|
| 1383 | + $do = true; |
|
| 1384 | + } |
|
| 1385 | + |
|
| 1386 | + return spip_sqlite_query('VACUUM', $serveur, $requeter); |
|
| 1387 | 1387 | } |
| 1388 | 1388 | |
| 1389 | 1389 | |
@@ -1401,15 +1401,15 @@ discard block |
||
| 1401 | 1401 | */ |
| 1402 | 1402 | function spip_sqlite_quote($v, $type = '') |
| 1403 | 1403 | { |
| 1404 | - if (!is_array($v)) { |
|
| 1405 | - return _sqlite_calculer_cite($v, $type); |
|
| 1406 | - } |
|
| 1407 | - // si c'est un tableau, le parcourir en propageant le type |
|
| 1408 | - foreach ($v as $k => $r) { |
|
| 1409 | - $v[$k] = spip_sqlite_quote($r, $type); |
|
| 1410 | - } |
|
| 1411 | - |
|
| 1412 | - return join(',', $v); |
|
| 1404 | + if (!is_array($v)) { |
|
| 1405 | + return _sqlite_calculer_cite($v, $type); |
|
| 1406 | + } |
|
| 1407 | + // si c'est un tableau, le parcourir en propageant le type |
|
| 1408 | + foreach ($v as $k => $r) { |
|
| 1409 | + $v[$k] = spip_sqlite_quote($r, $type); |
|
| 1410 | + } |
|
| 1411 | + |
|
| 1412 | + return join(',', $v); |
|
| 1413 | 1413 | } |
| 1414 | 1414 | |
| 1415 | 1415 | |
@@ -1427,9 +1427,9 @@ discard block |
||
| 1427 | 1427 | **/ |
| 1428 | 1428 | function spip_sqlite_date_proche($champ, $interval, $unite) |
| 1429 | 1429 | { |
| 1430 | - $op = (($interval <= 0) ? '>' : '<'); |
|
| 1430 | + $op = (($interval <= 0) ? '>' : '<'); |
|
| 1431 | 1431 | |
| 1432 | - return "($champ $op datetime('" . date('Y-m-d H:i:s') . "', '$interval $unite'))"; |
|
| 1432 | + return "($champ $op datetime('" . date('Y-m-d H:i:s') . "', '$interval $unite'))"; |
|
| 1433 | 1433 | } |
| 1434 | 1434 | |
| 1435 | 1435 | |
@@ -1448,48 +1448,48 @@ discard block |
||
| 1448 | 1448 | */ |
| 1449 | 1449 | function spip_sqlite_repair($table, $serveur = '', $requeter = true) |
| 1450 | 1450 | { |
| 1451 | - if ( |
|
| 1452 | - $desc = spip_sqlite_showtable($table, $serveur) |
|
| 1453 | - and isset($desc['field']) |
|
| 1454 | - and is_array($desc['field']) |
|
| 1455 | - ) { |
|
| 1456 | - foreach ($desc['field'] as $c => $d) { |
|
| 1457 | - if ( |
|
| 1458 | - preg_match(',^(tinytext|mediumtext|text|longtext|varchar|char),i', $d) |
|
| 1459 | - and stripos($d, 'NOT NULL') !== false |
|
| 1460 | - and stripos($d, 'DEFAULT') === false |
|
| 1461 | - /* pas touche aux cles primaires */ |
|
| 1462 | - and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
|
| 1463 | - ) { |
|
| 1464 | - spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT ''", $serveur); |
|
| 1465 | - spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1466 | - } |
|
| 1467 | - if ( |
|
| 1468 | - preg_match(',^(INTEGER),i', $d) |
|
| 1469 | - and stripos($d, 'NOT NULL') !== false |
|
| 1470 | - and stripos($d, 'DEFAULT') === false |
|
| 1471 | - /* pas touche aux cles primaires */ |
|
| 1472 | - and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
|
| 1473 | - ) { |
|
| 1474 | - spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT '0'", $serveur); |
|
| 1475 | - spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1476 | - } |
|
| 1477 | - if ( |
|
| 1478 | - preg_match(',^(datetime),i', $d) |
|
| 1479 | - and stripos($d, 'NOT NULL') !== false |
|
| 1480 | - and stripos($d, 'DEFAULT') === false |
|
| 1481 | - /* pas touche aux cles primaires */ |
|
| 1482 | - and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
|
| 1483 | - ) { |
|
| 1484 | - spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT '0000-00-00 00:00:00'", $serveur); |
|
| 1485 | - spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1486 | - } |
|
| 1487 | - } |
|
| 1488 | - |
|
| 1489 | - return [' OK ']; |
|
| 1490 | - } |
|
| 1491 | - |
|
| 1492 | - return [' ERROR ']; |
|
| 1451 | + if ( |
|
| 1452 | + $desc = spip_sqlite_showtable($table, $serveur) |
|
| 1453 | + and isset($desc['field']) |
|
| 1454 | + and is_array($desc['field']) |
|
| 1455 | + ) { |
|
| 1456 | + foreach ($desc['field'] as $c => $d) { |
|
| 1457 | + if ( |
|
| 1458 | + preg_match(',^(tinytext|mediumtext|text|longtext|varchar|char),i', $d) |
|
| 1459 | + and stripos($d, 'NOT NULL') !== false |
|
| 1460 | + and stripos($d, 'DEFAULT') === false |
|
| 1461 | + /* pas touche aux cles primaires */ |
|
| 1462 | + and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
|
| 1463 | + ) { |
|
| 1464 | + spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT ''", $serveur); |
|
| 1465 | + spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1466 | + } |
|
| 1467 | + if ( |
|
| 1468 | + preg_match(',^(INTEGER),i', $d) |
|
| 1469 | + and stripos($d, 'NOT NULL') !== false |
|
| 1470 | + and stripos($d, 'DEFAULT') === false |
|
| 1471 | + /* pas touche aux cles primaires */ |
|
| 1472 | + and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
|
| 1473 | + ) { |
|
| 1474 | + spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT '0'", $serveur); |
|
| 1475 | + spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1476 | + } |
|
| 1477 | + if ( |
|
| 1478 | + preg_match(',^(datetime),i', $d) |
|
| 1479 | + and stripos($d, 'NOT NULL') !== false |
|
| 1480 | + and stripos($d, 'DEFAULT') === false |
|
| 1481 | + /* pas touche aux cles primaires */ |
|
| 1482 | + and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
|
| 1483 | + ) { |
|
| 1484 | + spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT '0000-00-00 00:00:00'", $serveur); |
|
| 1485 | + spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1486 | + } |
|
| 1487 | + } |
|
| 1488 | + |
|
| 1489 | + return [' OK ']; |
|
| 1490 | + } |
|
| 1491 | + |
|
| 1492 | + return [' ERROR ']; |
|
| 1493 | 1493 | } |
| 1494 | 1494 | |
| 1495 | 1495 | |
@@ -1519,25 +1519,25 @@ discard block |
||
| 1519 | 1519 | **/ |
| 1520 | 1520 | function spip_sqlite_replace($table, $couples, $desc = [], $serveur = '', $requeter = true) |
| 1521 | 1521 | { |
| 1522 | - if (!$desc) { |
|
| 1523 | - $desc = description_table($table, $serveur); |
|
| 1524 | - } |
|
| 1525 | - if (!$desc) { |
|
| 1526 | - die("$table insertion sans description"); |
|
| 1527 | - } |
|
| 1528 | - $fields = isset($desc['field']) ? $desc['field'] : []; |
|
| 1529 | - |
|
| 1530 | - foreach ($couples as $champ => $val) { |
|
| 1531 | - $couples[$champ] = _sqlite_calculer_cite($val, $fields[$champ]); |
|
| 1532 | - } |
|
| 1533 | - |
|
| 1534 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1535 | - $couples = _sqlite_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1536 | - |
|
| 1537 | - return spip_sqlite_query("REPLACE INTO $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1538 | - ',', |
|
| 1539 | - $couples |
|
| 1540 | - ) . ')', $serveur); |
|
| 1522 | + if (!$desc) { |
|
| 1523 | + $desc = description_table($table, $serveur); |
|
| 1524 | + } |
|
| 1525 | + if (!$desc) { |
|
| 1526 | + die("$table insertion sans description"); |
|
| 1527 | + } |
|
| 1528 | + $fields = isset($desc['field']) ? $desc['field'] : []; |
|
| 1529 | + |
|
| 1530 | + foreach ($couples as $champ => $val) { |
|
| 1531 | + $couples[$champ] = _sqlite_calculer_cite($val, $fields[$champ]); |
|
| 1532 | + } |
|
| 1533 | + |
|
| 1534 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1535 | + $couples = _sqlite_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
|
| 1536 | + |
|
| 1537 | + return spip_sqlite_query("REPLACE INTO $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1538 | + ',', |
|
| 1539 | + $couples |
|
| 1540 | + ) . ')', $serveur); |
|
| 1541 | 1541 | } |
| 1542 | 1542 | |
| 1543 | 1543 | |
@@ -1568,13 +1568,13 @@ discard block |
||
| 1568 | 1568 | function spip_sqlite_replace_multi($table, $tab_couples, $desc = [], $serveur = '', $requeter = true) |
| 1569 | 1569 | { |
| 1570 | 1570 | |
| 1571 | - // boucler pour trainter chaque requete independemment |
|
| 1572 | - foreach ($tab_couples as $couples) { |
|
| 1573 | - $retour = spip_sqlite_replace($table, $couples, $desc, $serveur, $requeter); |
|
| 1574 | - } |
|
| 1571 | + // boucler pour trainter chaque requete independemment |
|
| 1572 | + foreach ($tab_couples as $couples) { |
|
| 1573 | + $retour = spip_sqlite_replace($table, $couples, $desc, $serveur, $requeter); |
|
| 1574 | + } |
|
| 1575 | 1575 | |
| 1576 | - // renvoie le dernier id |
|
| 1577 | - return $retour; |
|
| 1576 | + // renvoie le dernier id |
|
| 1577 | + return $retour; |
|
| 1578 | 1578 | } |
| 1579 | 1579 | |
| 1580 | 1580 | |
@@ -1601,44 +1601,44 @@ discard block |
||
| 1601 | 1601 | * - array : Tableau décrivant requête et temps d'exécution si var_profile actif pour tracer. |
| 1602 | 1602 | */ |
| 1603 | 1603 | function spip_sqlite_select( |
| 1604 | - $select, |
|
| 1605 | - $from, |
|
| 1606 | - $where = '', |
|
| 1607 | - $groupby = '', |
|
| 1608 | - $orderby = '', |
|
| 1609 | - $limit = '', |
|
| 1610 | - $having = '', |
|
| 1611 | - $serveur = '', |
|
| 1612 | - $requeter = true |
|
| 1604 | + $select, |
|
| 1605 | + $from, |
|
| 1606 | + $where = '', |
|
| 1607 | + $groupby = '', |
|
| 1608 | + $orderby = '', |
|
| 1609 | + $limit = '', |
|
| 1610 | + $having = '', |
|
| 1611 | + $serveur = '', |
|
| 1612 | + $requeter = true |
|
| 1613 | 1613 | ) { |
| 1614 | 1614 | |
| 1615 | - // version() n'est pas connu de sqlite |
|
| 1616 | - $select = str_replace('version()', 'sqlite_version()', $select); |
|
| 1617 | - |
|
| 1618 | - // recomposer from |
|
| 1619 | - $from = (!is_array($from) ? $from : _sqlite_calculer_select_as($from)); |
|
| 1620 | - |
|
| 1621 | - $query = |
|
| 1622 | - _sqlite_calculer_expression('SELECT', $select, ', ') |
|
| 1623 | - . _sqlite_calculer_expression('FROM', $from, ', ') |
|
| 1624 | - . _sqlite_calculer_expression('WHERE', $where) |
|
| 1625 | - . _sqlite_calculer_expression('GROUP BY', $groupby, ',') |
|
| 1626 | - . _sqlite_calculer_expression('HAVING', $having) |
|
| 1627 | - . ($orderby ? ("\nORDER BY " . _sqlite_calculer_order($orderby)) : '') |
|
| 1628 | - . ($limit ? "\nLIMIT $limit" : ''); |
|
| 1629 | - |
|
| 1630 | - // dans un select, on doit renvoyer la requête en cas d'erreur |
|
| 1631 | - $res = spip_sqlite_query($query, $serveur, $requeter); |
|
| 1632 | - // texte de la requete demande ? |
|
| 1633 | - if (!$requeter) { |
|
| 1634 | - return $res; |
|
| 1635 | - } |
|
| 1636 | - // erreur survenue ? |
|
| 1637 | - if ($res === false) { |
|
| 1638 | - return Sqlite::traduire_requete($query, $serveur); |
|
| 1639 | - } |
|
| 1640 | - |
|
| 1641 | - return $res; |
|
| 1615 | + // version() n'est pas connu de sqlite |
|
| 1616 | + $select = str_replace('version()', 'sqlite_version()', $select); |
|
| 1617 | + |
|
| 1618 | + // recomposer from |
|
| 1619 | + $from = (!is_array($from) ? $from : _sqlite_calculer_select_as($from)); |
|
| 1620 | + |
|
| 1621 | + $query = |
|
| 1622 | + _sqlite_calculer_expression('SELECT', $select, ', ') |
|
| 1623 | + . _sqlite_calculer_expression('FROM', $from, ', ') |
|
| 1624 | + . _sqlite_calculer_expression('WHERE', $where) |
|
| 1625 | + . _sqlite_calculer_expression('GROUP BY', $groupby, ',') |
|
| 1626 | + . _sqlite_calculer_expression('HAVING', $having) |
|
| 1627 | + . ($orderby ? ("\nORDER BY " . _sqlite_calculer_order($orderby)) : '') |
|
| 1628 | + . ($limit ? "\nLIMIT $limit" : ''); |
|
| 1629 | + |
|
| 1630 | + // dans un select, on doit renvoyer la requête en cas d'erreur |
|
| 1631 | + $res = spip_sqlite_query($query, $serveur, $requeter); |
|
| 1632 | + // texte de la requete demande ? |
|
| 1633 | + if (!$requeter) { |
|
| 1634 | + return $res; |
|
| 1635 | + } |
|
| 1636 | + // erreur survenue ? |
|
| 1637 | + if ($res === false) { |
|
| 1638 | + return Sqlite::traduire_requete($query, $serveur); |
|
| 1639 | + } |
|
| 1640 | + |
|
| 1641 | + return $res; |
|
| 1642 | 1642 | } |
| 1643 | 1643 | |
| 1644 | 1644 | |
@@ -1658,32 +1658,32 @@ discard block |
||
| 1658 | 1658 | **/ |
| 1659 | 1659 | function spip_sqlite_selectdb($db, $serveur = '', $requeter = true) |
| 1660 | 1660 | { |
| 1661 | - _sqlite_init(); |
|
| 1662 | - |
|
| 1663 | - // interdire la creation d'une nouvelle base, |
|
| 1664 | - // sauf si on est dans l'installation |
|
| 1665 | - if ( |
|
| 1666 | - !is_file($f = _DIR_DB . $db . '.sqlite') |
|
| 1667 | - && (!defined('_ECRIRE_INSTALL') || !_ECRIRE_INSTALL) |
|
| 1668 | - ) { |
|
| 1669 | - spip_log("Il est interdit de creer la base $db", 'sqlite.' . _LOG_HS); |
|
| 1670 | - |
|
| 1671 | - return false; |
|
| 1672 | - } |
|
| 1673 | - |
|
| 1674 | - // se connecter a la base indiquee |
|
| 1675 | - // avec les identifiants connus |
|
| 1676 | - $index = $serveur ? $serveur : 0; |
|
| 1677 | - |
|
| 1678 | - if ($link = spip_connect_db('', '', '', '', '@selectdb@' . $db, $serveur, '', '')) { |
|
| 1679 | - if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) { |
|
| 1680 | - return $db; |
|
| 1681 | - } |
|
| 1682 | - } else { |
|
| 1683 | - spip_log("Impossible de selectionner la base $db", 'sqlite.' . _LOG_HS); |
|
| 1684 | - |
|
| 1685 | - return false; |
|
| 1686 | - } |
|
| 1661 | + _sqlite_init(); |
|
| 1662 | + |
|
| 1663 | + // interdire la creation d'une nouvelle base, |
|
| 1664 | + // sauf si on est dans l'installation |
|
| 1665 | + if ( |
|
| 1666 | + !is_file($f = _DIR_DB . $db . '.sqlite') |
|
| 1667 | + && (!defined('_ECRIRE_INSTALL') || !_ECRIRE_INSTALL) |
|
| 1668 | + ) { |
|
| 1669 | + spip_log("Il est interdit de creer la base $db", 'sqlite.' . _LOG_HS); |
|
| 1670 | + |
|
| 1671 | + return false; |
|
| 1672 | + } |
|
| 1673 | + |
|
| 1674 | + // se connecter a la base indiquee |
|
| 1675 | + // avec les identifiants connus |
|
| 1676 | + $index = $serveur ? $serveur : 0; |
|
| 1677 | + |
|
| 1678 | + if ($link = spip_connect_db('', '', '', '', '@selectdb@' . $db, $serveur, '', '')) { |
|
| 1679 | + if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) { |
|
| 1680 | + return $db; |
|
| 1681 | + } |
|
| 1682 | + } else { |
|
| 1683 | + spip_log("Impossible de selectionner la base $db", 'sqlite.' . _LOG_HS); |
|
| 1684 | + |
|
| 1685 | + return false; |
|
| 1686 | + } |
|
| 1687 | 1687 | } |
| 1688 | 1688 | |
| 1689 | 1689 | |
@@ -1699,8 +1699,8 @@ discard block |
||
| 1699 | 1699 | */ |
| 1700 | 1700 | function spip_sqlite_set_charset($charset, $serveur = '', $requeter = true) |
| 1701 | 1701 | { |
| 1702 | - # spip_log("Gestion charset sql a ecrire : "."SET NAMES "._q($charset), 'sqlite.'._LOG_ERREUR); |
|
| 1703 | - # return spip_sqlite_query("SET NAMES ". spip_sqlite_quote($charset), $serveur); //<-- Passe pas ! |
|
| 1702 | + # spip_log("Gestion charset sql a ecrire : "."SET NAMES "._q($charset), 'sqlite.'._LOG_ERREUR); |
|
| 1703 | + # return spip_sqlite_query("SET NAMES ". spip_sqlite_quote($charset), $serveur); //<-- Passe pas ! |
|
| 1704 | 1704 | } |
| 1705 | 1705 | |
| 1706 | 1706 | |
@@ -1719,24 +1719,24 @@ discard block |
||
| 1719 | 1719 | **/ |
| 1720 | 1720 | function spip_sqlite_showbase($match, $serveur = '', $requeter = true) |
| 1721 | 1721 | { |
| 1722 | - // type est le type d'entrée : table / index / view |
|
| 1723 | - // on ne retourne que les tables (?) et non les vues... |
|
| 1724 | - # ESCAPE non supporte par les versions sqlite <3 |
|
| 1725 | - # return spip_sqlite_query("SELECT name FROM sqlite_master WHERE type='table' AND tbl_name LIKE "._q($match)." ESCAPE '\'", $serveur, $requeter); |
|
| 1726 | - $match = preg_quote($match); |
|
| 1727 | - $match = str_replace('\\\_', '[[TIRETBAS]]', $match); |
|
| 1728 | - $match = str_replace('\\\%', '[[POURCENT]]', $match); |
|
| 1729 | - $match = str_replace('_', '.', $match); |
|
| 1730 | - $match = str_replace('%', '.*', $match); |
|
| 1731 | - $match = str_replace('[[TIRETBAS]]', '_', $match); |
|
| 1732 | - $match = str_replace('[[POURCENT]]', '%', $match); |
|
| 1733 | - $match = "^$match$"; |
|
| 1734 | - |
|
| 1735 | - return spip_sqlite_query( |
|
| 1736 | - "SELECT name FROM sqlite_master WHERE type='table' AND tbl_name REGEXP " . _q($match), |
|
| 1737 | - $serveur, |
|
| 1738 | - $requeter |
|
| 1739 | - ); |
|
| 1722 | + // type est le type d'entrée : table / index / view |
|
| 1723 | + // on ne retourne que les tables (?) et non les vues... |
|
| 1724 | + # ESCAPE non supporte par les versions sqlite <3 |
|
| 1725 | + # return spip_sqlite_query("SELECT name FROM sqlite_master WHERE type='table' AND tbl_name LIKE "._q($match)." ESCAPE '\'", $serveur, $requeter); |
|
| 1726 | + $match = preg_quote($match); |
|
| 1727 | + $match = str_replace('\\\_', '[[TIRETBAS]]', $match); |
|
| 1728 | + $match = str_replace('\\\%', '[[POURCENT]]', $match); |
|
| 1729 | + $match = str_replace('_', '.', $match); |
|
| 1730 | + $match = str_replace('%', '.*', $match); |
|
| 1731 | + $match = str_replace('[[TIRETBAS]]', '_', $match); |
|
| 1732 | + $match = str_replace('[[POURCENT]]', '%', $match); |
|
| 1733 | + $match = "^$match$"; |
|
| 1734 | + |
|
| 1735 | + return spip_sqlite_query( |
|
| 1736 | + "SELECT name FROM sqlite_master WHERE type='table' AND tbl_name REGEXP " . _q($match), |
|
| 1737 | + $serveur, |
|
| 1738 | + $requeter |
|
| 1739 | + ); |
|
| 1740 | 1740 | } |
| 1741 | 1741 | |
| 1742 | 1742 | /** |
@@ -1755,19 +1755,19 @@ discard block |
||
| 1755 | 1755 | **/ |
| 1756 | 1756 | function spip_sqlite_table_exists(string $table, $serveur = '', $requeter = true) |
| 1757 | 1757 | { |
| 1758 | - $r = spip_sqlite_query( |
|
| 1759 | - 'SELECT name FROM sqlite_master WHERE' |
|
| 1760 | - . ' type=\'table\'' |
|
| 1761 | - . ' AND name=' . spip_sqlite_quote($table, 'string') |
|
| 1762 | - . ' AND name NOT LIKE \'sqlite_%\'', |
|
| 1763 | - $serveur, |
|
| 1764 | - $requeter |
|
| 1765 | - ); |
|
| 1766 | - if (!$requeter) { |
|
| 1767 | - return $r; |
|
| 1768 | - } |
|
| 1769 | - $res = spip_sqlite_fetch($r); |
|
| 1770 | - return (bool) $res; |
|
| 1758 | + $r = spip_sqlite_query( |
|
| 1759 | + 'SELECT name FROM sqlite_master WHERE' |
|
| 1760 | + . ' type=\'table\'' |
|
| 1761 | + . ' AND name=' . spip_sqlite_quote($table, 'string') |
|
| 1762 | + . ' AND name NOT LIKE \'sqlite_%\'', |
|
| 1763 | + $serveur, |
|
| 1764 | + $requeter |
|
| 1765 | + ); |
|
| 1766 | + if (!$requeter) { |
|
| 1767 | + return $r; |
|
| 1768 | + } |
|
| 1769 | + $res = spip_sqlite_fetch($r); |
|
| 1770 | + return (bool) $res; |
|
| 1771 | 1771 | } |
| 1772 | 1772 | |
| 1773 | 1773 | define('_SQLITE_RE_SHOW_TABLE', '/^[^(),]*\(((?:[^()]*\((?:[^()]*\([^()]*\))?[^()]*\)[^()]*)*[^()]*)\)[^()]*$/'); |
@@ -1791,129 +1791,129 @@ discard block |
||
| 1791 | 1791 | */ |
| 1792 | 1792 | function spip_sqlite_showtable($nom_table, $serveur = '', $requeter = true) |
| 1793 | 1793 | { |
| 1794 | - $query = |
|
| 1795 | - 'SELECT sql, type FROM' |
|
| 1796 | - . ' (SELECT * FROM sqlite_master UNION ALL' |
|
| 1797 | - . ' SELECT * FROM sqlite_temp_master)' |
|
| 1798 | - . " WHERE tbl_name LIKE '$nom_table'" |
|
| 1799 | - . " AND type!='meta' AND sql NOT NULL AND name NOT LIKE 'sqlite_%'" |
|
| 1800 | - . ' ORDER BY substr(type,2,1), name'; |
|
| 1801 | - |
|
| 1802 | - $a = spip_sqlite_query($query, $serveur, $requeter); |
|
| 1803 | - if (!$a) { |
|
| 1804 | - return ''; |
|
| 1805 | - } |
|
| 1806 | - if (!$requeter) { |
|
| 1807 | - return $a; |
|
| 1808 | - } |
|
| 1809 | - if (!($a = spip_sqlite_fetch($a, null, $serveur))) { |
|
| 1810 | - return ''; |
|
| 1811 | - } |
|
| 1812 | - $vue = ($a['type'] == 'view'); // table | vue |
|
| 1813 | - |
|
| 1814 | - // c'est une table |
|
| 1815 | - // il faut parser le create |
|
| 1816 | - if (!$vue) { |
|
| 1817 | - if (!preg_match(_SQLITE_RE_SHOW_TABLE, array_shift($a), $r)) { |
|
| 1818 | - return ''; |
|
| 1819 | - } else { |
|
| 1820 | - $desc = $r[1]; |
|
| 1821 | - // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 1822 | - // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 1823 | - if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 1824 | - $namedkeys = $r[2]; |
|
| 1825 | - $desc = $r[1]; |
|
| 1826 | - } else { |
|
| 1827 | - $namedkeys = ''; |
|
| 1828 | - } |
|
| 1829 | - |
|
| 1830 | - $fields = []; |
|
| 1831 | - $keys = []; |
|
| 1832 | - |
|
| 1833 | - // enlever les contenus des valeurs DEFAULT 'xxx' qui pourraient perturber |
|
| 1834 | - // par exemple s'il contiennent une virgule. |
|
| 1835 | - // /!\ cela peut aussi echapper le nom des champs si la table a eu des operations avec SQLite Manager ! |
|
| 1836 | - list($desc, $echaps) = query_echappe_textes($desc); |
|
| 1837 | - |
|
| 1838 | - // separer toutes les descriptions de champs, separes par des virgules |
|
| 1839 | - # /!\ explode peut exploser aussi DECIMAL(10,2) ! |
|
| 1840 | - $k_precedent = null; |
|
| 1841 | - foreach (explode(',', $desc) as $v) { |
|
| 1842 | - preg_match('/^\s*([^\s]+)\s+(.*)/', $v, $r); |
|
| 1843 | - // Les cles de champs peuvent etre entourees |
|
| 1844 | - // de guillements doubles " , simples ', graves ` ou de crochets [ ], ou rien. |
|
| 1845 | - // http://www.sqlite.org/lang_keywords.html |
|
| 1846 | - $k = strtolower(query_reinjecte_textes($r[1], $echaps)); // champ, "champ", [champ]... |
|
| 1847 | - if ($char = strpbrk($k[0], '\'"[`')) { |
|
| 1848 | - $k = trim($k, $char); |
|
| 1849 | - if ($char == '[') { |
|
| 1850 | - $k = rtrim($k, ']'); |
|
| 1851 | - } |
|
| 1852 | - } |
|
| 1853 | - $def = query_reinjecte_textes($r[2], $echaps); // valeur du champ |
|
| 1854 | - |
|
| 1855 | - // rustine pour DECIMAL(10,2) |
|
| 1856 | - // s'il y a une parenthèse fermante dans la clé |
|
| 1857 | - // ou dans la définition sans qu'il n'y ait une ouverture avant |
|
| 1858 | - if (str_contains($k, ')') or preg_match('/^[^\(]*\)/', $def)) { |
|
| 1859 | - $fields[$k_precedent] .= ',' . $k . ' ' . $def; |
|
| 1860 | - continue; |
|
| 1861 | - } |
|
| 1862 | - |
|
| 1863 | - // la primary key peut etre dans une des descriptions de champs |
|
| 1864 | - // et non en fin de table, cas encore decouvert avec Sqlite Manager |
|
| 1865 | - if (stripos($r[2], 'PRIMARY KEY') !== false) { |
|
| 1866 | - $keys['PRIMARY KEY'] = $k; |
|
| 1867 | - } |
|
| 1868 | - |
|
| 1869 | - $fields[$k] = $def; |
|
| 1870 | - $k_precedent = $k; |
|
| 1871 | - } |
|
| 1872 | - // key inclues dans la requete |
|
| 1873 | - foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 1874 | - if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 1875 | - $k = str_replace('`', '', trim($r[1])); |
|
| 1876 | - $t = trim(strtolower(str_replace('`', '', $r[2])), '"'); |
|
| 1877 | - if ($k && !isset($keys[$k])) { |
|
| 1878 | - $keys[$k] = $t; |
|
| 1879 | - } else { |
|
| 1880 | - $keys[] = $t; |
|
| 1881 | - } |
|
| 1882 | - } |
|
| 1883 | - } |
|
| 1884 | - // sinon ajouter les key index |
|
| 1885 | - $query = |
|
| 1886 | - 'SELECT name,sql FROM' |
|
| 1887 | - . ' (SELECT * FROM sqlite_master UNION ALL' |
|
| 1888 | - . ' SELECT * FROM sqlite_temp_master)' |
|
| 1889 | - . " WHERE tbl_name LIKE '$nom_table'" |
|
| 1890 | - . " AND type='index' AND name NOT LIKE 'sqlite_%'" |
|
| 1891 | - . 'ORDER BY substr(type,2,1), name'; |
|
| 1892 | - $a = spip_sqlite_query($query, $serveur, $requeter); |
|
| 1893 | - while ($r = spip_sqlite_fetch($a, null, $serveur)) { |
|
| 1894 | - $key = str_replace($nom_table . '_', '', $r['name']); // enlever le nom de la table ajoute a l'index |
|
| 1895 | - $keytype = 'KEY'; |
|
| 1896 | - if (strpos($r['sql'], 'UNIQUE INDEX') !== false) { |
|
| 1897 | - $keytype = 'UNIQUE KEY'; |
|
| 1898 | - } |
|
| 1899 | - $colonnes = preg_replace(',.*\((.*)\).*,', '$1', $r['sql']); |
|
| 1900 | - $keys[$keytype . ' ' . $key] = $colonnes; |
|
| 1901 | - } |
|
| 1902 | - } |
|
| 1903 | - } // c'est une vue, on liste les champs disponibles simplement |
|
| 1904 | - else { |
|
| 1905 | - if ($res = sql_fetsel('*', $nom_table, '', '', '', '1', '', $serveur)) { // limit 1 |
|
| 1906 | - $fields = []; |
|
| 1907 | - foreach ($res as $c => $v) { |
|
| 1908 | - $fields[$c] = ''; |
|
| 1909 | - } |
|
| 1910 | - $keys = []; |
|
| 1911 | - } else { |
|
| 1912 | - return ''; |
|
| 1913 | - } |
|
| 1914 | - } |
|
| 1915 | - |
|
| 1916 | - return ['field' => $fields, 'key' => $keys]; |
|
| 1794 | + $query = |
|
| 1795 | + 'SELECT sql, type FROM' |
|
| 1796 | + . ' (SELECT * FROM sqlite_master UNION ALL' |
|
| 1797 | + . ' SELECT * FROM sqlite_temp_master)' |
|
| 1798 | + . " WHERE tbl_name LIKE '$nom_table'" |
|
| 1799 | + . " AND type!='meta' AND sql NOT NULL AND name NOT LIKE 'sqlite_%'" |
|
| 1800 | + . ' ORDER BY substr(type,2,1), name'; |
|
| 1801 | + |
|
| 1802 | + $a = spip_sqlite_query($query, $serveur, $requeter); |
|
| 1803 | + if (!$a) { |
|
| 1804 | + return ''; |
|
| 1805 | + } |
|
| 1806 | + if (!$requeter) { |
|
| 1807 | + return $a; |
|
| 1808 | + } |
|
| 1809 | + if (!($a = spip_sqlite_fetch($a, null, $serveur))) { |
|
| 1810 | + return ''; |
|
| 1811 | + } |
|
| 1812 | + $vue = ($a['type'] == 'view'); // table | vue |
|
| 1813 | + |
|
| 1814 | + // c'est une table |
|
| 1815 | + // il faut parser le create |
|
| 1816 | + if (!$vue) { |
|
| 1817 | + if (!preg_match(_SQLITE_RE_SHOW_TABLE, array_shift($a), $r)) { |
|
| 1818 | + return ''; |
|
| 1819 | + } else { |
|
| 1820 | + $desc = $r[1]; |
|
| 1821 | + // extraction d'une KEY éventuelle en prenant garde de ne pas |
|
| 1822 | + // relever un champ dont le nom contient KEY (ex. ID_WHISKEY) |
|
| 1823 | + if (preg_match('/^(.*?),([^,]*\sKEY[ (].*)$/s', $desc, $r)) { |
|
| 1824 | + $namedkeys = $r[2]; |
|
| 1825 | + $desc = $r[1]; |
|
| 1826 | + } else { |
|
| 1827 | + $namedkeys = ''; |
|
| 1828 | + } |
|
| 1829 | + |
|
| 1830 | + $fields = []; |
|
| 1831 | + $keys = []; |
|
| 1832 | + |
|
| 1833 | + // enlever les contenus des valeurs DEFAULT 'xxx' qui pourraient perturber |
|
| 1834 | + // par exemple s'il contiennent une virgule. |
|
| 1835 | + // /!\ cela peut aussi echapper le nom des champs si la table a eu des operations avec SQLite Manager ! |
|
| 1836 | + list($desc, $echaps) = query_echappe_textes($desc); |
|
| 1837 | + |
|
| 1838 | + // separer toutes les descriptions de champs, separes par des virgules |
|
| 1839 | + # /!\ explode peut exploser aussi DECIMAL(10,2) ! |
|
| 1840 | + $k_precedent = null; |
|
| 1841 | + foreach (explode(',', $desc) as $v) { |
|
| 1842 | + preg_match('/^\s*([^\s]+)\s+(.*)/', $v, $r); |
|
| 1843 | + // Les cles de champs peuvent etre entourees |
|
| 1844 | + // de guillements doubles " , simples ', graves ` ou de crochets [ ], ou rien. |
|
| 1845 | + // http://www.sqlite.org/lang_keywords.html |
|
| 1846 | + $k = strtolower(query_reinjecte_textes($r[1], $echaps)); // champ, "champ", [champ]... |
|
| 1847 | + if ($char = strpbrk($k[0], '\'"[`')) { |
|
| 1848 | + $k = trim($k, $char); |
|
| 1849 | + if ($char == '[') { |
|
| 1850 | + $k = rtrim($k, ']'); |
|
| 1851 | + } |
|
| 1852 | + } |
|
| 1853 | + $def = query_reinjecte_textes($r[2], $echaps); // valeur du champ |
|
| 1854 | + |
|
| 1855 | + // rustine pour DECIMAL(10,2) |
|
| 1856 | + // s'il y a une parenthèse fermante dans la clé |
|
| 1857 | + // ou dans la définition sans qu'il n'y ait une ouverture avant |
|
| 1858 | + if (str_contains($k, ')') or preg_match('/^[^\(]*\)/', $def)) { |
|
| 1859 | + $fields[$k_precedent] .= ',' . $k . ' ' . $def; |
|
| 1860 | + continue; |
|
| 1861 | + } |
|
| 1862 | + |
|
| 1863 | + // la primary key peut etre dans une des descriptions de champs |
|
| 1864 | + // et non en fin de table, cas encore decouvert avec Sqlite Manager |
|
| 1865 | + if (stripos($r[2], 'PRIMARY KEY') !== false) { |
|
| 1866 | + $keys['PRIMARY KEY'] = $k; |
|
| 1867 | + } |
|
| 1868 | + |
|
| 1869 | + $fields[$k] = $def; |
|
| 1870 | + $k_precedent = $k; |
|
| 1871 | + } |
|
| 1872 | + // key inclues dans la requete |
|
| 1873 | + foreach (preg_split('/\)\s*(,|$)/', $namedkeys) as $v) { |
|
| 1874 | + if (preg_match('/^\s*([^(]*)\(([^(]*(\(\d+\))?)$/', $v, $r)) { |
|
| 1875 | + $k = str_replace('`', '', trim($r[1])); |
|
| 1876 | + $t = trim(strtolower(str_replace('`', '', $r[2])), '"'); |
|
| 1877 | + if ($k && !isset($keys[$k])) { |
|
| 1878 | + $keys[$k] = $t; |
|
| 1879 | + } else { |
|
| 1880 | + $keys[] = $t; |
|
| 1881 | + } |
|
| 1882 | + } |
|
| 1883 | + } |
|
| 1884 | + // sinon ajouter les key index |
|
| 1885 | + $query = |
|
| 1886 | + 'SELECT name,sql FROM' |
|
| 1887 | + . ' (SELECT * FROM sqlite_master UNION ALL' |
|
| 1888 | + . ' SELECT * FROM sqlite_temp_master)' |
|
| 1889 | + . " WHERE tbl_name LIKE '$nom_table'" |
|
| 1890 | + . " AND type='index' AND name NOT LIKE 'sqlite_%'" |
|
| 1891 | + . 'ORDER BY substr(type,2,1), name'; |
|
| 1892 | + $a = spip_sqlite_query($query, $serveur, $requeter); |
|
| 1893 | + while ($r = spip_sqlite_fetch($a, null, $serveur)) { |
|
| 1894 | + $key = str_replace($nom_table . '_', '', $r['name']); // enlever le nom de la table ajoute a l'index |
|
| 1895 | + $keytype = 'KEY'; |
|
| 1896 | + if (strpos($r['sql'], 'UNIQUE INDEX') !== false) { |
|
| 1897 | + $keytype = 'UNIQUE KEY'; |
|
| 1898 | + } |
|
| 1899 | + $colonnes = preg_replace(',.*\((.*)\).*,', '$1', $r['sql']); |
|
| 1900 | + $keys[$keytype . ' ' . $key] = $colonnes; |
|
| 1901 | + } |
|
| 1902 | + } |
|
| 1903 | + } // c'est une vue, on liste les champs disponibles simplement |
|
| 1904 | + else { |
|
| 1905 | + if ($res = sql_fetsel('*', $nom_table, '', '', '', '1', '', $serveur)) { // limit 1 |
|
| 1906 | + $fields = []; |
|
| 1907 | + foreach ($res as $c => $v) { |
|
| 1908 | + $fields[$c] = ''; |
|
| 1909 | + } |
|
| 1910 | + $keys = []; |
|
| 1911 | + } else { |
|
| 1912 | + return ''; |
|
| 1913 | + } |
|
| 1914 | + } |
|
| 1915 | + |
|
| 1916 | + return ['field' => $fields, 'key' => $keys]; |
|
| 1917 | 1917 | } |
| 1918 | 1918 | |
| 1919 | 1919 | |
@@ -1940,22 +1940,22 @@ discard block |
||
| 1940 | 1940 | */ |
| 1941 | 1941 | function spip_sqlite_update($table, $champs, $where = '', $desc = '', $serveur = '', $requeter = true) |
| 1942 | 1942 | { |
| 1943 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1944 | - $champs = _sqlite_ajouter_champs_timestamp($table, $champs, $desc, $serveur); |
|
| 1945 | - |
|
| 1946 | - $set = []; |
|
| 1947 | - foreach ($champs as $champ => $val) { |
|
| 1948 | - $set[] = $champ . "=$val"; |
|
| 1949 | - } |
|
| 1950 | - if (!empty($set)) { |
|
| 1951 | - return spip_sqlite_query( |
|
| 1952 | - _sqlite_calculer_expression('UPDATE', $table, ',') |
|
| 1953 | - . _sqlite_calculer_expression('SET', $set, ',') |
|
| 1954 | - . _sqlite_calculer_expression('WHERE', $where), |
|
| 1955 | - $serveur, |
|
| 1956 | - $requeter |
|
| 1957 | - ); |
|
| 1958 | - } |
|
| 1943 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 1944 | + $champs = _sqlite_ajouter_champs_timestamp($table, $champs, $desc, $serveur); |
|
| 1945 | + |
|
| 1946 | + $set = []; |
|
| 1947 | + foreach ($champs as $champ => $val) { |
|
| 1948 | + $set[] = $champ . "=$val"; |
|
| 1949 | + } |
|
| 1950 | + if (!empty($set)) { |
|
| 1951 | + return spip_sqlite_query( |
|
| 1952 | + _sqlite_calculer_expression('UPDATE', $table, ',') |
|
| 1953 | + . _sqlite_calculer_expression('SET', $set, ',') |
|
| 1954 | + . _sqlite_calculer_expression('WHERE', $where), |
|
| 1955 | + $serveur, |
|
| 1956 | + $requeter |
|
| 1957 | + ); |
|
| 1958 | + } |
|
| 1959 | 1959 | } |
| 1960 | 1960 | |
| 1961 | 1961 | |
@@ -1986,38 +1986,38 @@ discard block |
||
| 1986 | 1986 | function spip_sqlite_updateq($table, $champs, $where = '', $desc = [], $serveur = '', $requeter = true) |
| 1987 | 1987 | { |
| 1988 | 1988 | |
| 1989 | - if (!$champs) { |
|
| 1990 | - return; |
|
| 1991 | - } |
|
| 1992 | - if (!$desc) { |
|
| 1993 | - $desc = description_table($table, $serveur); |
|
| 1994 | - } |
|
| 1995 | - if (!$desc) { |
|
| 1996 | - die("$table insertion sans description"); |
|
| 1997 | - } |
|
| 1998 | - $fields = $desc['field']; |
|
| 1999 | - |
|
| 2000 | - $set = []; |
|
| 2001 | - foreach ($champs as $champ => $val) { |
|
| 2002 | - $set[$champ] = $champ . '=' . _sqlite_calculer_cite($val, isset($fields[$champ]) ? $fields[$champ] : ''); |
|
| 2003 | - } |
|
| 2004 | - |
|
| 2005 | - // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 2006 | - // attention ils sont deja quotes |
|
| 2007 | - $maj = _sqlite_ajouter_champs_timestamp($table, [], $desc, $serveur); |
|
| 2008 | - foreach ($maj as $champ => $val) { |
|
| 2009 | - if (!isset($set[$champ])) { |
|
| 2010 | - $set[$champ] = $champ . '=' . $val; |
|
| 2011 | - } |
|
| 2012 | - } |
|
| 2013 | - |
|
| 2014 | - return spip_sqlite_query( |
|
| 2015 | - _sqlite_calculer_expression('UPDATE', $table, ',') |
|
| 2016 | - . _sqlite_calculer_expression('SET', $set, ',') |
|
| 2017 | - . _sqlite_calculer_expression('WHERE', $where), |
|
| 2018 | - $serveur, |
|
| 2019 | - $requeter |
|
| 2020 | - ); |
|
| 1989 | + if (!$champs) { |
|
| 1990 | + return; |
|
| 1991 | + } |
|
| 1992 | + if (!$desc) { |
|
| 1993 | + $desc = description_table($table, $serveur); |
|
| 1994 | + } |
|
| 1995 | + if (!$desc) { |
|
| 1996 | + die("$table insertion sans description"); |
|
| 1997 | + } |
|
| 1998 | + $fields = $desc['field']; |
|
| 1999 | + |
|
| 2000 | + $set = []; |
|
| 2001 | + foreach ($champs as $champ => $val) { |
|
| 2002 | + $set[$champ] = $champ . '=' . _sqlite_calculer_cite($val, isset($fields[$champ]) ? $fields[$champ] : ''); |
|
| 2003 | + } |
|
| 2004 | + |
|
| 2005 | + // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
|
| 2006 | + // attention ils sont deja quotes |
|
| 2007 | + $maj = _sqlite_ajouter_champs_timestamp($table, [], $desc, $serveur); |
|
| 2008 | + foreach ($maj as $champ => $val) { |
|
| 2009 | + if (!isset($set[$champ])) { |
|
| 2010 | + $set[$champ] = $champ . '=' . $val; |
|
| 2011 | + } |
|
| 2012 | + } |
|
| 2013 | + |
|
| 2014 | + return spip_sqlite_query( |
|
| 2015 | + _sqlite_calculer_expression('UPDATE', $table, ',') |
|
| 2016 | + . _sqlite_calculer_expression('SET', $set, ',') |
|
| 2017 | + . _sqlite_calculer_expression('WHERE', $where), |
|
| 2018 | + $serveur, |
|
| 2019 | + $requeter |
|
| 2020 | + ); |
|
| 2021 | 2021 | } |
| 2022 | 2022 | |
| 2023 | 2023 | |
@@ -2036,17 +2036,17 @@ discard block |
||
| 2036 | 2036 | */ |
| 2037 | 2037 | function _sqlite_init() |
| 2038 | 2038 | { |
| 2039 | - if (!defined('_DIR_DB')) { |
|
| 2040 | - define('_DIR_DB', _DIR_ETC . 'bases/'); |
|
| 2041 | - } |
|
| 2042 | - if (!defined('_SQLITE_CHMOD')) { |
|
| 2043 | - define('_SQLITE_CHMOD', _SPIP_CHMOD); |
|
| 2044 | - } |
|
| 2045 | - |
|
| 2046 | - if (!is_dir($d = _DIR_DB)) { |
|
| 2047 | - include_spip('inc/flock'); |
|
| 2048 | - sous_repertoire($d); |
|
| 2049 | - } |
|
| 2039 | + if (!defined('_DIR_DB')) { |
|
| 2040 | + define('_DIR_DB', _DIR_ETC . 'bases/'); |
|
| 2041 | + } |
|
| 2042 | + if (!defined('_SQLITE_CHMOD')) { |
|
| 2043 | + define('_SQLITE_CHMOD', _SPIP_CHMOD); |
|
| 2044 | + } |
|
| 2045 | + |
|
| 2046 | + if (!is_dir($d = _DIR_DB)) { |
|
| 2047 | + include_spip('inc/flock'); |
|
| 2048 | + sous_repertoire($d); |
|
| 2049 | + } |
|
| 2050 | 2050 | } |
| 2051 | 2051 | |
| 2052 | 2052 | |
@@ -2061,20 +2061,20 @@ discard block |
||
| 2061 | 2061 | */ |
| 2062 | 2062 | function _sqlite_is_version($version = '', $link = '', $serveur = '', $requeter = true) |
| 2063 | 2063 | { |
| 2064 | - if ($link === '') { |
|
| 2065 | - $link = _sqlite_link($serveur); |
|
| 2066 | - } |
|
| 2067 | - if (!$link) { |
|
| 2068 | - return false; |
|
| 2069 | - } |
|
| 2064 | + if ($link === '') { |
|
| 2065 | + $link = _sqlite_link($serveur); |
|
| 2066 | + } |
|
| 2067 | + if (!$link) { |
|
| 2068 | + return false; |
|
| 2069 | + } |
|
| 2070 | 2070 | |
| 2071 | - $v = 3; |
|
| 2071 | + $v = 3; |
|
| 2072 | 2072 | |
| 2073 | - if (!$version) { |
|
| 2074 | - return $v; |
|
| 2075 | - } |
|
| 2073 | + if (!$version) { |
|
| 2074 | + return $v; |
|
| 2075 | + } |
|
| 2076 | 2076 | |
| 2077 | - return ($version == $v); |
|
| 2077 | + return ($version == $v); |
|
| 2078 | 2078 | } |
| 2079 | 2079 | |
| 2080 | 2080 | |
@@ -2086,9 +2086,9 @@ discard block |
||
| 2086 | 2086 | */ |
| 2087 | 2087 | function _sqlite_link($serveur = '') |
| 2088 | 2088 | { |
| 2089 | - $link = &$GLOBALS['connexions'][$serveur ? $serveur : 0]['link']; |
|
| 2089 | + $link = &$GLOBALS['connexions'][$serveur ? $serveur : 0]['link']; |
|
| 2090 | 2090 | |
| 2091 | - return $link; |
|
| 2091 | + return $link; |
|
| 2092 | 2092 | } |
| 2093 | 2093 | |
| 2094 | 2094 | |
@@ -2104,54 +2104,54 @@ discard block |
||
| 2104 | 2104 | */ |
| 2105 | 2105 | function _sqlite_calculer_cite($v, $type) |
| 2106 | 2106 | { |
| 2107 | - if ($type) { |
|
| 2108 | - if ( |
|
| 2109 | - is_null($v) |
|
| 2110 | - and stripos($type, 'NOT NULL') === false |
|
| 2111 | - ) { |
|
| 2112 | - // null php se traduit en NULL SQL |
|
| 2113 | - return 'NULL'; |
|
| 2114 | - } |
|
| 2115 | - |
|
| 2116 | - if (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 2117 | - return $v; |
|
| 2118 | - } |
|
| 2119 | - if (sql_test_int($type)) { |
|
| 2120 | - if (is_numeric($v)) { |
|
| 2121 | - return $v; |
|
| 2122 | - } elseif ($v === null) { |
|
| 2123 | - return 0; |
|
| 2124 | - } elseif (ctype_xdigit(substr($v, 2)) and strncmp($v, '0x', 2) === 0) { |
|
| 2125 | - return hexdec(substr($v, 2)); |
|
| 2126 | - } else { |
|
| 2127 | - return intval($v); |
|
| 2128 | - } |
|
| 2129 | - } |
|
| 2130 | - } else { |
|
| 2131 | - // si on ne connait pas le type on le deduit de $v autant que possible |
|
| 2132 | - if (is_bool($v)) { |
|
| 2133 | - return strval(intval($v)); |
|
| 2134 | - } elseif (is_numeric($v)) { |
|
| 2135 | - return strval($v); |
|
| 2136 | - } |
|
| 2137 | - } |
|
| 2138 | - |
|
| 2139 | - // trouver un link sqlite pour faire l'echappement |
|
| 2140 | - foreach ($GLOBALS['connexions'] as $s) { |
|
| 2141 | - if ( |
|
| 2142 | - $l = $s['link'] |
|
| 2143 | - and is_object($l) |
|
| 2144 | - and $l instanceof \PDO |
|
| 2145 | - and $l->getAttribute(\PDO::ATTR_DRIVER_NAME) === 'sqlite' |
|
| 2146 | - ) { |
|
| 2147 | - return $l->quote($v ?? ''); |
|
| 2148 | - } |
|
| 2149 | - } |
|
| 2150 | - |
|
| 2151 | - // echapper les ' en '' |
|
| 2152 | - spip_log('Pas de methode ->quote pour echapper', 'sqlite.' . _LOG_INFO_IMPORTANTE); |
|
| 2153 | - |
|
| 2154 | - return ("'" . str_replace("'", "''", $v) . "'"); |
|
| 2107 | + if ($type) { |
|
| 2108 | + if ( |
|
| 2109 | + is_null($v) |
|
| 2110 | + and stripos($type, 'NOT NULL') === false |
|
| 2111 | + ) { |
|
| 2112 | + // null php se traduit en NULL SQL |
|
| 2113 | + return 'NULL'; |
|
| 2114 | + } |
|
| 2115 | + |
|
| 2116 | + if (sql_test_date($type) and preg_match('/^\w+\(/', $v)) { |
|
| 2117 | + return $v; |
|
| 2118 | + } |
|
| 2119 | + if (sql_test_int($type)) { |
|
| 2120 | + if (is_numeric($v)) { |
|
| 2121 | + return $v; |
|
| 2122 | + } elseif ($v === null) { |
|
| 2123 | + return 0; |
|
| 2124 | + } elseif (ctype_xdigit(substr($v, 2)) and strncmp($v, '0x', 2) === 0) { |
|
| 2125 | + return hexdec(substr($v, 2)); |
|
| 2126 | + } else { |
|
| 2127 | + return intval($v); |
|
| 2128 | + } |
|
| 2129 | + } |
|
| 2130 | + } else { |
|
| 2131 | + // si on ne connait pas le type on le deduit de $v autant que possible |
|
| 2132 | + if (is_bool($v)) { |
|
| 2133 | + return strval(intval($v)); |
|
| 2134 | + } elseif (is_numeric($v)) { |
|
| 2135 | + return strval($v); |
|
| 2136 | + } |
|
| 2137 | + } |
|
| 2138 | + |
|
| 2139 | + // trouver un link sqlite pour faire l'echappement |
|
| 2140 | + foreach ($GLOBALS['connexions'] as $s) { |
|
| 2141 | + if ( |
|
| 2142 | + $l = $s['link'] |
|
| 2143 | + and is_object($l) |
|
| 2144 | + and $l instanceof \PDO |
|
| 2145 | + and $l->getAttribute(\PDO::ATTR_DRIVER_NAME) === 'sqlite' |
|
| 2146 | + ) { |
|
| 2147 | + return $l->quote($v ?? ''); |
|
| 2148 | + } |
|
| 2149 | + } |
|
| 2150 | + |
|
| 2151 | + // echapper les ' en '' |
|
| 2152 | + spip_log('Pas de methode ->quote pour echapper', 'sqlite.' . _LOG_INFO_IMPORTANTE); |
|
| 2153 | + |
|
| 2154 | + return ("'" . str_replace("'", "''", $v) . "'"); |
|
| 2155 | 2155 | } |
| 2156 | 2156 | |
| 2157 | 2157 | |
@@ -2168,21 +2168,21 @@ discard block |
||
| 2168 | 2168 | */ |
| 2169 | 2169 | function _sqlite_calculer_expression($expression, $v, $join = 'AND') |
| 2170 | 2170 | { |
| 2171 | - if (empty($v)) { |
|
| 2172 | - return ''; |
|
| 2173 | - } |
|
| 2174 | - |
|
| 2175 | - $exp = "\n$expression "; |
|
| 2176 | - |
|
| 2177 | - if (!is_array($v)) { |
|
| 2178 | - return $exp . $v; |
|
| 2179 | - } else { |
|
| 2180 | - if (strtoupper($join) === 'AND') { |
|
| 2181 | - return $exp . join("\n\t$join ", array_map('_sqlite_calculer_where', $v)); |
|
| 2182 | - } else { |
|
| 2183 | - return $exp . join($join, $v); |
|
| 2184 | - } |
|
| 2185 | - } |
|
| 2171 | + if (empty($v)) { |
|
| 2172 | + return ''; |
|
| 2173 | + } |
|
| 2174 | + |
|
| 2175 | + $exp = "\n$expression "; |
|
| 2176 | + |
|
| 2177 | + if (!is_array($v)) { |
|
| 2178 | + return $exp . $v; |
|
| 2179 | + } else { |
|
| 2180 | + if (strtoupper($join) === 'AND') { |
|
| 2181 | + return $exp . join("\n\t$join ", array_map('_sqlite_calculer_where', $v)); |
|
| 2182 | + } else { |
|
| 2183 | + return $exp . join($join, $v); |
|
| 2184 | + } |
|
| 2185 | + } |
|
| 2186 | 2186 | } |
| 2187 | 2187 | |
| 2188 | 2188 | |
@@ -2199,7 +2199,7 @@ discard block |
||
| 2199 | 2199 | */ |
| 2200 | 2200 | function _sqlite_calculer_order($orderby) |
| 2201 | 2201 | { |
| 2202 | - return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 2202 | + return (is_array($orderby)) ? join(', ', $orderby) : $orderby; |
|
| 2203 | 2203 | } |
| 2204 | 2204 | |
| 2205 | 2205 | |
@@ -2211,26 +2211,26 @@ discard block |
||
| 2211 | 2211 | */ |
| 2212 | 2212 | function _sqlite_calculer_select_as($args) |
| 2213 | 2213 | { |
| 2214 | - $res = ''; |
|
| 2215 | - foreach ($args as $k => $v) { |
|
| 2216 | - if (substr($k, -1) == '@') { |
|
| 2217 | - // c'est une jointure qui se refere au from precedent |
|
| 2218 | - // pas de virgule |
|
| 2219 | - $res .= ' ' . $v; |
|
| 2220 | - } else { |
|
| 2221 | - if (!is_numeric($k)) { |
|
| 2222 | - $p = strpos($v, ' '); |
|
| 2223 | - if ($p) { |
|
| 2224 | - $v = substr($v, 0, $p) . " AS '$k'" . substr($v, $p); |
|
| 2225 | - } else { |
|
| 2226 | - $v .= " AS '$k'"; |
|
| 2227 | - } |
|
| 2228 | - } |
|
| 2229 | - $res .= ', ' . $v; |
|
| 2230 | - } |
|
| 2231 | - } |
|
| 2232 | - |
|
| 2233 | - return substr($res, 2); |
|
| 2214 | + $res = ''; |
|
| 2215 | + foreach ($args as $k => $v) { |
|
| 2216 | + if (substr($k, -1) == '@') { |
|
| 2217 | + // c'est une jointure qui se refere au from precedent |
|
| 2218 | + // pas de virgule |
|
| 2219 | + $res .= ' ' . $v; |
|
| 2220 | + } else { |
|
| 2221 | + if (!is_numeric($k)) { |
|
| 2222 | + $p = strpos($v, ' '); |
|
| 2223 | + if ($p) { |
|
| 2224 | + $v = substr($v, 0, $p) . " AS '$k'" . substr($v, $p); |
|
| 2225 | + } else { |
|
| 2226 | + $v .= " AS '$k'"; |
|
| 2227 | + } |
|
| 2228 | + } |
|
| 2229 | + $res .= ', ' . $v; |
|
| 2230 | + } |
|
| 2231 | + } |
|
| 2232 | + |
|
| 2233 | + return substr($res, 2); |
|
| 2234 | 2234 | } |
| 2235 | 2235 | |
| 2236 | 2236 | |
@@ -2254,26 +2254,26 @@ discard block |
||
| 2254 | 2254 | */ |
| 2255 | 2255 | function _sqlite_calculer_where($v) |
| 2256 | 2256 | { |
| 2257 | - if (!is_array($v)) { |
|
| 2258 | - return $v; |
|
| 2259 | - } |
|
| 2260 | - |
|
| 2261 | - $op = array_shift($v); |
|
| 2262 | - if (!($n = count($v))) { |
|
| 2263 | - return $op; |
|
| 2264 | - } else { |
|
| 2265 | - $arg = _sqlite_calculer_where(array_shift($v)); |
|
| 2266 | - if ($n == 1) { |
|
| 2267 | - return "$op($arg)"; |
|
| 2268 | - } else { |
|
| 2269 | - $arg2 = _sqlite_calculer_where(array_shift($v)); |
|
| 2270 | - if ($n == 2) { |
|
| 2271 | - return "($arg $op $arg2)"; |
|
| 2272 | - } else { |
|
| 2273 | - return "($arg $op ($arg2) : $v[0])"; |
|
| 2274 | - } |
|
| 2275 | - } |
|
| 2276 | - } |
|
| 2257 | + if (!is_array($v)) { |
|
| 2258 | + return $v; |
|
| 2259 | + } |
|
| 2260 | + |
|
| 2261 | + $op = array_shift($v); |
|
| 2262 | + if (!($n = count($v))) { |
|
| 2263 | + return $op; |
|
| 2264 | + } else { |
|
| 2265 | + $arg = _sqlite_calculer_where(array_shift($v)); |
|
| 2266 | + if ($n == 1) { |
|
| 2267 | + return "$op($arg)"; |
|
| 2268 | + } else { |
|
| 2269 | + $arg2 = _sqlite_calculer_where(array_shift($v)); |
|
| 2270 | + if ($n == 2) { |
|
| 2271 | + return "($arg $op $arg2)"; |
|
| 2272 | + } else { |
|
| 2273 | + return "($arg $op ($arg2) : $v[0])"; |
|
| 2274 | + } |
|
| 2275 | + } |
|
| 2276 | + } |
|
| 2277 | 2277 | } |
| 2278 | 2278 | |
| 2279 | 2279 | |
@@ -2289,19 +2289,19 @@ discard block |
||
| 2289 | 2289 | */ |
| 2290 | 2290 | function _sqlite_charger_version($version = '') |
| 2291 | 2291 | { |
| 2292 | - $versions = []; |
|
| 2293 | - |
|
| 2294 | - // version 3 |
|
| 2295 | - if (!$version || $version == 3) { |
|
| 2296 | - if (extension_loaded('pdo') && extension_loaded('pdo_sqlite')) { |
|
| 2297 | - $versions[] = 3; |
|
| 2298 | - } |
|
| 2299 | - } |
|
| 2300 | - if ($version) { |
|
| 2301 | - return in_array($version, $versions); |
|
| 2302 | - } |
|
| 2303 | - |
|
| 2304 | - return $versions; |
|
| 2292 | + $versions = []; |
|
| 2293 | + |
|
| 2294 | + // version 3 |
|
| 2295 | + if (!$version || $version == 3) { |
|
| 2296 | + if (extension_loaded('pdo') && extension_loaded('pdo_sqlite')) { |
|
| 2297 | + $versions[] = 3; |
|
| 2298 | + } |
|
| 2299 | + } |
|
| 2300 | + if ($version) { |
|
| 2301 | + return in_array($version, $versions); |
|
| 2302 | + } |
|
| 2303 | + |
|
| 2304 | + return $versions; |
|
| 2305 | 2305 | } |
| 2306 | 2306 | |
| 2307 | 2307 | |
@@ -2340,147 +2340,147 @@ discard block |
||
| 2340 | 2340 | function _sqlite_modifier_table($table, $colonne, $opt = [], $serveur = '') |
| 2341 | 2341 | { |
| 2342 | 2342 | |
| 2343 | - if (is_array($table)) { |
|
| 2344 | - $table_destination = reset($table); |
|
| 2345 | - $table_origine = key($table); |
|
| 2346 | - } else { |
|
| 2347 | - $table_origine = $table_destination = $table; |
|
| 2348 | - } |
|
| 2349 | - // ne prend actuellement qu'un changement |
|
| 2350 | - // mais pourra etre adapte pour changer plus qu'une colonne a la fois |
|
| 2351 | - if (is_array($colonne)) { |
|
| 2352 | - $colonne_destination = reset($colonne); |
|
| 2353 | - $colonne_origine = key($colonne); |
|
| 2354 | - } else { |
|
| 2355 | - $colonne_origine = $colonne_destination = $colonne; |
|
| 2356 | - } |
|
| 2357 | - if (!isset($opt['field'])) { |
|
| 2358 | - $opt['field'] = []; |
|
| 2359 | - } |
|
| 2360 | - if (!isset($opt['key'])) { |
|
| 2361 | - $opt['key'] = []; |
|
| 2362 | - } |
|
| 2363 | - |
|
| 2364 | - // si les noms de tables sont differents, pas besoin de table temporaire |
|
| 2365 | - // on prendra directement le nom de la future table |
|
| 2366 | - $meme_table = ($table_origine == $table_destination); |
|
| 2367 | - |
|
| 2368 | - $def_origine = sql_showtable($table_origine, false, $serveur); |
|
| 2369 | - if (!$def_origine or !isset($def_origine['field'])) { |
|
| 2370 | - spip_log("Alter table impossible sur $table_origine : table non trouvee", 'sqlite' . _LOG_ERREUR); |
|
| 2371 | - |
|
| 2372 | - return false; |
|
| 2373 | - } |
|
| 2374 | - |
|
| 2375 | - |
|
| 2376 | - $table_tmp = $table_origine . '_tmp'; |
|
| 2377 | - |
|
| 2378 | - // 1) creer une table temporaire avec les modifications |
|
| 2379 | - // - DROP : suppression de la colonne |
|
| 2380 | - // - CHANGE : modification de la colonne |
|
| 2381 | - // (foreach pour conserver l'ordre des champs) |
|
| 2382 | - |
|
| 2383 | - // field |
|
| 2384 | - $fields = []; |
|
| 2385 | - // pour le INSERT INTO plus loin |
|
| 2386 | - // stocker la correspondance nouvelles->anciennes colonnes |
|
| 2387 | - $fields_correspondances = []; |
|
| 2388 | - foreach ($def_origine['field'] as $c => $d) { |
|
| 2389 | - if ($colonne_origine && ($c == $colonne_origine)) { |
|
| 2390 | - // si pas DROP |
|
| 2391 | - if ($colonne_destination) { |
|
| 2392 | - $fields[$colonne_destination] = $opt['field'][$colonne_destination]; |
|
| 2393 | - $fields_correspondances[$colonne_destination] = $c; |
|
| 2394 | - } |
|
| 2395 | - } else { |
|
| 2396 | - $fields[$c] = $d; |
|
| 2397 | - $fields_correspondances[$c] = $c; |
|
| 2398 | - } |
|
| 2399 | - } |
|
| 2400 | - // cas de ADD sqlite2 (ajout du champ en fin de table): |
|
| 2401 | - if (!$colonne_origine && $colonne_destination) { |
|
| 2402 | - $fields[$colonne_destination] = $opt['field'][$colonne_destination]; |
|
| 2403 | - } |
|
| 2404 | - |
|
| 2405 | - // key... |
|
| 2406 | - $keys = []; |
|
| 2407 | - foreach ($def_origine['key'] as $c => $d) { |
|
| 2408 | - $c = str_replace($colonne_origine, $colonne_destination, $c); |
|
| 2409 | - $d = str_replace($colonne_origine, $colonne_destination, $d); |
|
| 2410 | - // seulement si on ne supprime pas la colonne ! |
|
| 2411 | - if ($d) { |
|
| 2412 | - $keys[$c] = $d; |
|
| 2413 | - } |
|
| 2414 | - } |
|
| 2415 | - |
|
| 2416 | - // autres keys, on merge |
|
| 2417 | - $keys = array_merge($keys, $opt['key']); |
|
| 2418 | - $queries = []; |
|
| 2419 | - |
|
| 2420 | - // copier dans destination (si differente de origine), sinon tmp |
|
| 2421 | - $table_copie = ($meme_table) ? $table_tmp : $table_destination; |
|
| 2422 | - $autoinc = (isset($keys['PRIMARY KEY']) |
|
| 2423 | - and $keys['PRIMARY KEY'] |
|
| 2424 | - and stripos($keys['PRIMARY KEY'], ',') === false |
|
| 2425 | - and stripos($fields[$keys['PRIMARY KEY']], 'default') === false); |
|
| 2426 | - |
|
| 2427 | - if ( |
|
| 2428 | - $q = _sqlite_requete_create( |
|
| 2429 | - $table_copie, |
|
| 2430 | - $fields, |
|
| 2431 | - $keys, |
|
| 2432 | - $autoinc, |
|
| 2433 | - $temporary = false, |
|
| 2434 | - $ifnotexists = true, |
|
| 2435 | - $serveur |
|
| 2436 | - ) |
|
| 2437 | - ) { |
|
| 2438 | - $queries[] = $q; |
|
| 2439 | - } |
|
| 2440 | - |
|
| 2441 | - |
|
| 2442 | - // 2) y copier les champs qui vont bien |
|
| 2443 | - $champs_dest = join(', ', array_keys($fields_correspondances)); |
|
| 2444 | - $champs_ori = join(', ', $fields_correspondances); |
|
| 2445 | - $queries[] = "INSERT INTO $table_copie ($champs_dest) SELECT $champs_ori FROM $table_origine"; |
|
| 2446 | - |
|
| 2447 | - // 3) supprimer la table d'origine |
|
| 2448 | - $queries[] = "DROP TABLE $table_origine"; |
|
| 2449 | - |
|
| 2450 | - // 4) renommer la table temporaire |
|
| 2451 | - // avec le nom de la table destination |
|
| 2452 | - // si necessaire |
|
| 2453 | - if ($meme_table) { |
|
| 2454 | - $queries[] = "ALTER TABLE $table_copie RENAME TO $table_destination"; |
|
| 2455 | - } |
|
| 2456 | - |
|
| 2457 | - // 5) remettre les index ! |
|
| 2458 | - foreach ($keys as $k => $v) { |
|
| 2459 | - if ($k == 'PRIMARY KEY') { |
|
| 2460 | - } else { |
|
| 2461 | - // enlever KEY |
|
| 2462 | - $k = substr($k, 4); |
|
| 2463 | - $queries[] = "CREATE INDEX $table_destination" . "_$k ON $table_destination ($v)"; |
|
| 2464 | - } |
|
| 2465 | - } |
|
| 2466 | - |
|
| 2467 | - |
|
| 2468 | - if (count($queries)) { |
|
| 2469 | - Sqlite::demarrer_transaction($serveur); |
|
| 2470 | - // il faut les faire une par une car $query = join('; ', $queries).";"; ne fonctionne pas |
|
| 2471 | - foreach ($queries as $q) { |
|
| 2472 | - if (!Sqlite::executer_requete($q, $serveur)) { |
|
| 2473 | - spip_log('SQLite : ALTER TABLE table :' |
|
| 2474 | - . " Erreur a l'execution de la requete : $q", 'sqlite.' . _LOG_ERREUR); |
|
| 2475 | - Sqlite::annuler_transaction($serveur); |
|
| 2476 | - |
|
| 2477 | - return false; |
|
| 2478 | - } |
|
| 2479 | - } |
|
| 2480 | - Sqlite::finir_transaction($serveur); |
|
| 2481 | - } |
|
| 2482 | - |
|
| 2483 | - return true; |
|
| 2343 | + if (is_array($table)) { |
|
| 2344 | + $table_destination = reset($table); |
|
| 2345 | + $table_origine = key($table); |
|
| 2346 | + } else { |
|
| 2347 | + $table_origine = $table_destination = $table; |
|
| 2348 | + } |
|
| 2349 | + // ne prend actuellement qu'un changement |
|
| 2350 | + // mais pourra etre adapte pour changer plus qu'une colonne a la fois |
|
| 2351 | + if (is_array($colonne)) { |
|
| 2352 | + $colonne_destination = reset($colonne); |
|
| 2353 | + $colonne_origine = key($colonne); |
|
| 2354 | + } else { |
|
| 2355 | + $colonne_origine = $colonne_destination = $colonne; |
|
| 2356 | + } |
|
| 2357 | + if (!isset($opt['field'])) { |
|
| 2358 | + $opt['field'] = []; |
|
| 2359 | + } |
|
| 2360 | + if (!isset($opt['key'])) { |
|
| 2361 | + $opt['key'] = []; |
|
| 2362 | + } |
|
| 2363 | + |
|
| 2364 | + // si les noms de tables sont differents, pas besoin de table temporaire |
|
| 2365 | + // on prendra directement le nom de la future table |
|
| 2366 | + $meme_table = ($table_origine == $table_destination); |
|
| 2367 | + |
|
| 2368 | + $def_origine = sql_showtable($table_origine, false, $serveur); |
|
| 2369 | + if (!$def_origine or !isset($def_origine['field'])) { |
|
| 2370 | + spip_log("Alter table impossible sur $table_origine : table non trouvee", 'sqlite' . _LOG_ERREUR); |
|
| 2371 | + |
|
| 2372 | + return false; |
|
| 2373 | + } |
|
| 2374 | + |
|
| 2375 | + |
|
| 2376 | + $table_tmp = $table_origine . '_tmp'; |
|
| 2377 | + |
|
| 2378 | + // 1) creer une table temporaire avec les modifications |
|
| 2379 | + // - DROP : suppression de la colonne |
|
| 2380 | + // - CHANGE : modification de la colonne |
|
| 2381 | + // (foreach pour conserver l'ordre des champs) |
|
| 2382 | + |
|
| 2383 | + // field |
|
| 2384 | + $fields = []; |
|
| 2385 | + // pour le INSERT INTO plus loin |
|
| 2386 | + // stocker la correspondance nouvelles->anciennes colonnes |
|
| 2387 | + $fields_correspondances = []; |
|
| 2388 | + foreach ($def_origine['field'] as $c => $d) { |
|
| 2389 | + if ($colonne_origine && ($c == $colonne_origine)) { |
|
| 2390 | + // si pas DROP |
|
| 2391 | + if ($colonne_destination) { |
|
| 2392 | + $fields[$colonne_destination] = $opt['field'][$colonne_destination]; |
|
| 2393 | + $fields_correspondances[$colonne_destination] = $c; |
|
| 2394 | + } |
|
| 2395 | + } else { |
|
| 2396 | + $fields[$c] = $d; |
|
| 2397 | + $fields_correspondances[$c] = $c; |
|
| 2398 | + } |
|
| 2399 | + } |
|
| 2400 | + // cas de ADD sqlite2 (ajout du champ en fin de table): |
|
| 2401 | + if (!$colonne_origine && $colonne_destination) { |
|
| 2402 | + $fields[$colonne_destination] = $opt['field'][$colonne_destination]; |
|
| 2403 | + } |
|
| 2404 | + |
|
| 2405 | + // key... |
|
| 2406 | + $keys = []; |
|
| 2407 | + foreach ($def_origine['key'] as $c => $d) { |
|
| 2408 | + $c = str_replace($colonne_origine, $colonne_destination, $c); |
|
| 2409 | + $d = str_replace($colonne_origine, $colonne_destination, $d); |
|
| 2410 | + // seulement si on ne supprime pas la colonne ! |
|
| 2411 | + if ($d) { |
|
| 2412 | + $keys[$c] = $d; |
|
| 2413 | + } |
|
| 2414 | + } |
|
| 2415 | + |
|
| 2416 | + // autres keys, on merge |
|
| 2417 | + $keys = array_merge($keys, $opt['key']); |
|
| 2418 | + $queries = []; |
|
| 2419 | + |
|
| 2420 | + // copier dans destination (si differente de origine), sinon tmp |
|
| 2421 | + $table_copie = ($meme_table) ? $table_tmp : $table_destination; |
|
| 2422 | + $autoinc = (isset($keys['PRIMARY KEY']) |
|
| 2423 | + and $keys['PRIMARY KEY'] |
|
| 2424 | + and stripos($keys['PRIMARY KEY'], ',') === false |
|
| 2425 | + and stripos($fields[$keys['PRIMARY KEY']], 'default') === false); |
|
| 2426 | + |
|
| 2427 | + if ( |
|
| 2428 | + $q = _sqlite_requete_create( |
|
| 2429 | + $table_copie, |
|
| 2430 | + $fields, |
|
| 2431 | + $keys, |
|
| 2432 | + $autoinc, |
|
| 2433 | + $temporary = false, |
|
| 2434 | + $ifnotexists = true, |
|
| 2435 | + $serveur |
|
| 2436 | + ) |
|
| 2437 | + ) { |
|
| 2438 | + $queries[] = $q; |
|
| 2439 | + } |
|
| 2440 | + |
|
| 2441 | + |
|
| 2442 | + // 2) y copier les champs qui vont bien |
|
| 2443 | + $champs_dest = join(', ', array_keys($fields_correspondances)); |
|
| 2444 | + $champs_ori = join(', ', $fields_correspondances); |
|
| 2445 | + $queries[] = "INSERT INTO $table_copie ($champs_dest) SELECT $champs_ori FROM $table_origine"; |
|
| 2446 | + |
|
| 2447 | + // 3) supprimer la table d'origine |
|
| 2448 | + $queries[] = "DROP TABLE $table_origine"; |
|
| 2449 | + |
|
| 2450 | + // 4) renommer la table temporaire |
|
| 2451 | + // avec le nom de la table destination |
|
| 2452 | + // si necessaire |
|
| 2453 | + if ($meme_table) { |
|
| 2454 | + $queries[] = "ALTER TABLE $table_copie RENAME TO $table_destination"; |
|
| 2455 | + } |
|
| 2456 | + |
|
| 2457 | + // 5) remettre les index ! |
|
| 2458 | + foreach ($keys as $k => $v) { |
|
| 2459 | + if ($k == 'PRIMARY KEY') { |
|
| 2460 | + } else { |
|
| 2461 | + // enlever KEY |
|
| 2462 | + $k = substr($k, 4); |
|
| 2463 | + $queries[] = "CREATE INDEX $table_destination" . "_$k ON $table_destination ($v)"; |
|
| 2464 | + } |
|
| 2465 | + } |
|
| 2466 | + |
|
| 2467 | + |
|
| 2468 | + if (count($queries)) { |
|
| 2469 | + Sqlite::demarrer_transaction($serveur); |
|
| 2470 | + // il faut les faire une par une car $query = join('; ', $queries).";"; ne fonctionne pas |
|
| 2471 | + foreach ($queries as $q) { |
|
| 2472 | + if (!Sqlite::executer_requete($q, $serveur)) { |
|
| 2473 | + spip_log('SQLite : ALTER TABLE table :' |
|
| 2474 | + . " Erreur a l'execution de la requete : $q", 'sqlite.' . _LOG_ERREUR); |
|
| 2475 | + Sqlite::annuler_transaction($serveur); |
|
| 2476 | + |
|
| 2477 | + return false; |
|
| 2478 | + } |
|
| 2479 | + } |
|
| 2480 | + Sqlite::finir_transaction($serveur); |
|
| 2481 | + } |
|
| 2482 | + |
|
| 2483 | + return true; |
|
| 2484 | 2484 | } |
| 2485 | 2485 | |
| 2486 | 2486 | |
@@ -2491,61 +2491,61 @@ discard block |
||
| 2491 | 2491 | */ |
| 2492 | 2492 | function _sqlite_ref_fonctions() |
| 2493 | 2493 | { |
| 2494 | - $fonctions = [ |
|
| 2495 | - 'alter' => 'spip_sqlite_alter', |
|
| 2496 | - 'count' => 'spip_sqlite_count', |
|
| 2497 | - 'countsel' => 'spip_sqlite_countsel', |
|
| 2498 | - 'create' => 'spip_sqlite_create', |
|
| 2499 | - 'create_base' => 'spip_sqlite_create_base', |
|
| 2500 | - 'create_view' => 'spip_sqlite_create_view', |
|
| 2501 | - 'date_proche' => 'spip_sqlite_date_proche', |
|
| 2502 | - 'delete' => 'spip_sqlite_delete', |
|
| 2503 | - 'drop_table' => 'spip_sqlite_drop_table', |
|
| 2504 | - 'drop_view' => 'spip_sqlite_drop_view', |
|
| 2505 | - 'errno' => 'spip_sqlite_errno', |
|
| 2506 | - 'error' => 'spip_sqlite_error', |
|
| 2507 | - 'explain' => 'spip_sqlite_explain', |
|
| 2508 | - 'fetch' => 'spip_sqlite_fetch', |
|
| 2509 | - 'seek' => 'spip_sqlite_seek', |
|
| 2510 | - 'free' => 'spip_sqlite_free', |
|
| 2511 | - 'hex' => 'spip_sqlite_hex', |
|
| 2512 | - 'in' => 'spip_sqlite_in', |
|
| 2513 | - 'insert' => 'spip_sqlite_insert', |
|
| 2514 | - 'insertq' => 'spip_sqlite_insertq', |
|
| 2515 | - 'insertq_multi' => 'spip_sqlite_insertq_multi', |
|
| 2516 | - 'listdbs' => 'spip_sqlite_listdbs', |
|
| 2517 | - 'multi' => 'spip_sqlite_multi', |
|
| 2518 | - 'optimize' => 'spip_sqlite_optimize', |
|
| 2519 | - 'query' => 'spip_sqlite_query', |
|
| 2520 | - 'quote' => 'spip_sqlite_quote', |
|
| 2521 | - 'repair' => 'spip_sqlite_repair', |
|
| 2522 | - 'replace' => 'spip_sqlite_replace', |
|
| 2523 | - 'replace_multi' => 'spip_sqlite_replace_multi', |
|
| 2524 | - 'select' => 'spip_sqlite_select', |
|
| 2525 | - 'selectdb' => 'spip_sqlite_selectdb', |
|
| 2526 | - 'set_charset' => 'spip_sqlite_set_charset', |
|
| 2527 | - 'get_charset' => 'spip_sqlite_get_charset', |
|
| 2528 | - 'showbase' => 'spip_sqlite_showbase', |
|
| 2529 | - 'showtable' => 'spip_sqlite_showtable', |
|
| 2530 | - 'table_exists' => 'spip_sqlite_table_exists', |
|
| 2531 | - 'update' => 'spip_sqlite_update', |
|
| 2532 | - 'updateq' => 'spip_sqlite_updateq', |
|
| 2533 | - 'preferer_transaction' => 'spip_sqlite_preferer_transaction', |
|
| 2534 | - 'demarrer_transaction' => 'spip_sqlite_demarrer_transaction', |
|
| 2535 | - 'terminer_transaction' => 'spip_sqlite_terminer_transaction', |
|
| 2536 | - ]; |
|
| 2537 | - |
|
| 2538 | - // association de chaque nom http d'un charset aux couples sqlite |
|
| 2539 | - // SQLite supporte utf-8 et utf-16 uniquement. |
|
| 2540 | - $charsets = [ |
|
| 2541 | - 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'], |
|
| 2542 | - //'utf-16be'=>array('charset'=>'utf16be','collation'=>'UTF-16BE'),// aucune idee de quoi il faut remplir dans es champs la |
|
| 2543 | - //'utf-16le'=>array('charset'=>'utf16le','collation'=>'UTF-16LE') |
|
| 2544 | - ]; |
|
| 2545 | - |
|
| 2546 | - $fonctions['charsets'] = $charsets; |
|
| 2547 | - |
|
| 2548 | - return $fonctions; |
|
| 2494 | + $fonctions = [ |
|
| 2495 | + 'alter' => 'spip_sqlite_alter', |
|
| 2496 | + 'count' => 'spip_sqlite_count', |
|
| 2497 | + 'countsel' => 'spip_sqlite_countsel', |
|
| 2498 | + 'create' => 'spip_sqlite_create', |
|
| 2499 | + 'create_base' => 'spip_sqlite_create_base', |
|
| 2500 | + 'create_view' => 'spip_sqlite_create_view', |
|
| 2501 | + 'date_proche' => 'spip_sqlite_date_proche', |
|
| 2502 | + 'delete' => 'spip_sqlite_delete', |
|
| 2503 | + 'drop_table' => 'spip_sqlite_drop_table', |
|
| 2504 | + 'drop_view' => 'spip_sqlite_drop_view', |
|
| 2505 | + 'errno' => 'spip_sqlite_errno', |
|
| 2506 | + 'error' => 'spip_sqlite_error', |
|
| 2507 | + 'explain' => 'spip_sqlite_explain', |
|
| 2508 | + 'fetch' => 'spip_sqlite_fetch', |
|
| 2509 | + 'seek' => 'spip_sqlite_seek', |
|
| 2510 | + 'free' => 'spip_sqlite_free', |
|
| 2511 | + 'hex' => 'spip_sqlite_hex', |
|
| 2512 | + 'in' => 'spip_sqlite_in', |
|
| 2513 | + 'insert' => 'spip_sqlite_insert', |
|
| 2514 | + 'insertq' => 'spip_sqlite_insertq', |
|
| 2515 | + 'insertq_multi' => 'spip_sqlite_insertq_multi', |
|
| 2516 | + 'listdbs' => 'spip_sqlite_listdbs', |
|
| 2517 | + 'multi' => 'spip_sqlite_multi', |
|
| 2518 | + 'optimize' => 'spip_sqlite_optimize', |
|
| 2519 | + 'query' => 'spip_sqlite_query', |
|
| 2520 | + 'quote' => 'spip_sqlite_quote', |
|
| 2521 | + 'repair' => 'spip_sqlite_repair', |
|
| 2522 | + 'replace' => 'spip_sqlite_replace', |
|
| 2523 | + 'replace_multi' => 'spip_sqlite_replace_multi', |
|
| 2524 | + 'select' => 'spip_sqlite_select', |
|
| 2525 | + 'selectdb' => 'spip_sqlite_selectdb', |
|
| 2526 | + 'set_charset' => 'spip_sqlite_set_charset', |
|
| 2527 | + 'get_charset' => 'spip_sqlite_get_charset', |
|
| 2528 | + 'showbase' => 'spip_sqlite_showbase', |
|
| 2529 | + 'showtable' => 'spip_sqlite_showtable', |
|
| 2530 | + 'table_exists' => 'spip_sqlite_table_exists', |
|
| 2531 | + 'update' => 'spip_sqlite_update', |
|
| 2532 | + 'updateq' => 'spip_sqlite_updateq', |
|
| 2533 | + 'preferer_transaction' => 'spip_sqlite_preferer_transaction', |
|
| 2534 | + 'demarrer_transaction' => 'spip_sqlite_demarrer_transaction', |
|
| 2535 | + 'terminer_transaction' => 'spip_sqlite_terminer_transaction', |
|
| 2536 | + ]; |
|
| 2537 | + |
|
| 2538 | + // association de chaque nom http d'un charset aux couples sqlite |
|
| 2539 | + // SQLite supporte utf-8 et utf-16 uniquement. |
|
| 2540 | + $charsets = [ |
|
| 2541 | + 'utf-8' => ['charset' => 'utf8', 'collation' => 'utf8_general_ci'], |
|
| 2542 | + //'utf-16be'=>array('charset'=>'utf16be','collation'=>'UTF-16BE'),// aucune idee de quoi il faut remplir dans es champs la |
|
| 2543 | + //'utf-16le'=>array('charset'=>'utf16le','collation'=>'UTF-16LE') |
|
| 2544 | + ]; |
|
| 2545 | + |
|
| 2546 | + $fonctions['charsets'] = $charsets; |
|
| 2547 | + |
|
| 2548 | + return $fonctions; |
|
| 2549 | 2549 | } |
| 2550 | 2550 | |
| 2551 | 2551 | |
@@ -2558,56 +2558,56 @@ discard block |
||
| 2558 | 2558 | */ |
| 2559 | 2559 | function _sqlite_remplacements_definitions_table($query, $autoinc = false) |
| 2560 | 2560 | { |
| 2561 | - // quelques remplacements |
|
| 2562 | - $num = '(\s*\([0-9]*\))?'; |
|
| 2563 | - $enum = '(\s*\([^\)]*\))?'; |
|
| 2564 | - |
|
| 2565 | - $remplace = [ |
|
| 2566 | - '/enum' . $enum . '/is' => 'VARCHAR(255)', |
|
| 2567 | - '/COLLATE \w+_bin/is' => 'COLLATE BINARY', |
|
| 2568 | - '/COLLATE \w+_ci/is' => 'COLLATE NOCASE', |
|
| 2569 | - '/auto_increment/is' => '', |
|
| 2570 | - '/current_timestamp\(\)/is' => 'CURRENT_TIMESTAMP', // Fix export depuis mariaDB #4374 |
|
| 2571 | - '/(timestamp .* )ON .*$/is' => '\\1', |
|
| 2572 | - '/character set \w+/is' => '', |
|
| 2573 | - '/((big|small|medium|tiny)?int(eger)?)' . $num . '\s*unsigned/is' => '\\1 UNSIGNED', |
|
| 2574 | - '/(text\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
|
| 2575 | - '/((char|varchar)' . $num . '\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
|
| 2576 | - '/(datetime\s+not\s+null)\s*$/is' => "\\1 DEFAULT '0000-00-00 00:00:00'", |
|
| 2577 | - '/(date\s+not\s+null)\s*$/is' => "\\1 DEFAULT '0000-00-00'", |
|
| 2578 | - ]; |
|
| 2579 | - |
|
| 2580 | - // pour l'autoincrement, il faut des INTEGER NOT NULL PRIMARY KEY |
|
| 2581 | - $remplace_autocinc = [ |
|
| 2582 | - '/(big|small|medium|tiny)?int(eger)?' . $num . '/is' => 'INTEGER' |
|
| 2583 | - ]; |
|
| 2584 | - // pour les int non autoincrement, il faut un DEFAULT |
|
| 2585 | - $remplace_nonautocinc = [ |
|
| 2586 | - '/((big|small|medium|tiny)?int(eger)?' . $num . '\s+not\s+null)\s*$/is' => "\\1 DEFAULT 0", |
|
| 2587 | - ]; |
|
| 2588 | - |
|
| 2589 | - if (is_string($query)) { |
|
| 2590 | - $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 2591 | - if ($autoinc or preg_match(',AUTO_INCREMENT,is', $query)) { |
|
| 2592 | - $query = preg_replace(array_keys($remplace_autocinc), $remplace_autocinc, $query); |
|
| 2593 | - } else { |
|
| 2594 | - $query = preg_replace(array_keys($remplace_nonautocinc), $remplace_nonautocinc, $query); |
|
| 2595 | - $query = _sqlite_collate_ci($query); |
|
| 2596 | - } |
|
| 2597 | - } elseif (is_array($query)) { |
|
| 2598 | - foreach ($query as $k => $q) { |
|
| 2599 | - $ai = ($autoinc ? $k == $autoinc : preg_match(',AUTO_INCREMENT,is', $q)); |
|
| 2600 | - $query[$k] = preg_replace(array_keys($remplace), $remplace, $query[$k]); |
|
| 2601 | - if ($ai) { |
|
| 2602 | - $query[$k] = preg_replace(array_keys($remplace_autocinc), $remplace_autocinc, $query[$k]); |
|
| 2603 | - } else { |
|
| 2604 | - $query[$k] = preg_replace(array_keys($remplace_nonautocinc), $remplace_nonautocinc, $query[$k]); |
|
| 2605 | - $query[$k] = _sqlite_collate_ci($query[$k]); |
|
| 2606 | - } |
|
| 2607 | - } |
|
| 2608 | - } |
|
| 2609 | - |
|
| 2610 | - return $query; |
|
| 2561 | + // quelques remplacements |
|
| 2562 | + $num = '(\s*\([0-9]*\))?'; |
|
| 2563 | + $enum = '(\s*\([^\)]*\))?'; |
|
| 2564 | + |
|
| 2565 | + $remplace = [ |
|
| 2566 | + '/enum' . $enum . '/is' => 'VARCHAR(255)', |
|
| 2567 | + '/COLLATE \w+_bin/is' => 'COLLATE BINARY', |
|
| 2568 | + '/COLLATE \w+_ci/is' => 'COLLATE NOCASE', |
|
| 2569 | + '/auto_increment/is' => '', |
|
| 2570 | + '/current_timestamp\(\)/is' => 'CURRENT_TIMESTAMP', // Fix export depuis mariaDB #4374 |
|
| 2571 | + '/(timestamp .* )ON .*$/is' => '\\1', |
|
| 2572 | + '/character set \w+/is' => '', |
|
| 2573 | + '/((big|small|medium|tiny)?int(eger)?)' . $num . '\s*unsigned/is' => '\\1 UNSIGNED', |
|
| 2574 | + '/(text\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
|
| 2575 | + '/((char|varchar)' . $num . '\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
|
| 2576 | + '/(datetime\s+not\s+null)\s*$/is' => "\\1 DEFAULT '0000-00-00 00:00:00'", |
|
| 2577 | + '/(date\s+not\s+null)\s*$/is' => "\\1 DEFAULT '0000-00-00'", |
|
| 2578 | + ]; |
|
| 2579 | + |
|
| 2580 | + // pour l'autoincrement, il faut des INTEGER NOT NULL PRIMARY KEY |
|
| 2581 | + $remplace_autocinc = [ |
|
| 2582 | + '/(big|small|medium|tiny)?int(eger)?' . $num . '/is' => 'INTEGER' |
|
| 2583 | + ]; |
|
| 2584 | + // pour les int non autoincrement, il faut un DEFAULT |
|
| 2585 | + $remplace_nonautocinc = [ |
|
| 2586 | + '/((big|small|medium|tiny)?int(eger)?' . $num . '\s+not\s+null)\s*$/is' => "\\1 DEFAULT 0", |
|
| 2587 | + ]; |
|
| 2588 | + |
|
| 2589 | + if (is_string($query)) { |
|
| 2590 | + $query = preg_replace(array_keys($remplace), $remplace, $query); |
|
| 2591 | + if ($autoinc or preg_match(',AUTO_INCREMENT,is', $query)) { |
|
| 2592 | + $query = preg_replace(array_keys($remplace_autocinc), $remplace_autocinc, $query); |
|
| 2593 | + } else { |
|
| 2594 | + $query = preg_replace(array_keys($remplace_nonautocinc), $remplace_nonautocinc, $query); |
|
| 2595 | + $query = _sqlite_collate_ci($query); |
|
| 2596 | + } |
|
| 2597 | + } elseif (is_array($query)) { |
|
| 2598 | + foreach ($query as $k => $q) { |
|
| 2599 | + $ai = ($autoinc ? $k == $autoinc : preg_match(',AUTO_INCREMENT,is', $q)); |
|
| 2600 | + $query[$k] = preg_replace(array_keys($remplace), $remplace, $query[$k]); |
|
| 2601 | + if ($ai) { |
|
| 2602 | + $query[$k] = preg_replace(array_keys($remplace_autocinc), $remplace_autocinc, $query[$k]); |
|
| 2603 | + } else { |
|
| 2604 | + $query[$k] = preg_replace(array_keys($remplace_nonautocinc), $remplace_nonautocinc, $query[$k]); |
|
| 2605 | + $query[$k] = _sqlite_collate_ci($query[$k]); |
|
| 2606 | + } |
|
| 2607 | + } |
|
| 2608 | + } |
|
| 2609 | + |
|
| 2610 | + return $query; |
|
| 2611 | 2611 | } |
| 2612 | 2612 | |
| 2613 | 2613 | /** |
@@ -2619,17 +2619,17 @@ discard block |
||
| 2619 | 2619 | */ |
| 2620 | 2620 | function _sqlite_collate_ci($champ) |
| 2621 | 2621 | { |
| 2622 | - if (stripos($champ, 'COLLATE') !== false) { |
|
| 2623 | - return $champ; |
|
| 2624 | - } |
|
| 2625 | - if (stripos($champ, 'BINARY') !== false) { |
|
| 2626 | - return str_ireplace('BINARY', 'COLLATE BINARY', $champ); |
|
| 2627 | - } |
|
| 2628 | - if (preg_match(',^(char|varchar|(long|small|medium|tiny)?text),i', $champ)) { |
|
| 2629 | - return $champ . ' COLLATE NOCASE'; |
|
| 2630 | - } |
|
| 2631 | - |
|
| 2632 | - return $champ; |
|
| 2622 | + if (stripos($champ, 'COLLATE') !== false) { |
|
| 2623 | + return $champ; |
|
| 2624 | + } |
|
| 2625 | + if (stripos($champ, 'BINARY') !== false) { |
|
| 2626 | + return str_ireplace('BINARY', 'COLLATE BINARY', $champ); |
|
| 2627 | + } |
|
| 2628 | + if (preg_match(',^(char|varchar|(long|small|medium|tiny)?text),i', $champ)) { |
|
| 2629 | + return $champ . ' COLLATE NOCASE'; |
|
| 2630 | + } |
|
| 2631 | + |
|
| 2632 | + return $champ; |
|
| 2633 | 2633 | } |
| 2634 | 2634 | |
| 2635 | 2635 | |
@@ -2648,84 +2648,84 @@ discard block |
||
| 2648 | 2648 | * @return bool|string |
| 2649 | 2649 | */ |
| 2650 | 2650 | function _sqlite_requete_create( |
| 2651 | - $nom, |
|
| 2652 | - $champs, |
|
| 2653 | - $cles, |
|
| 2654 | - $autoinc = false, |
|
| 2655 | - $temporary = false, |
|
| 2656 | - $_ifnotexists = true, |
|
| 2657 | - $serveur = '', |
|
| 2658 | - $requeter = true |
|
| 2651 | + $nom, |
|
| 2652 | + $champs, |
|
| 2653 | + $cles, |
|
| 2654 | + $autoinc = false, |
|
| 2655 | + $temporary = false, |
|
| 2656 | + $_ifnotexists = true, |
|
| 2657 | + $serveur = '', |
|
| 2658 | + $requeter = true |
|
| 2659 | 2659 | ) { |
| 2660 | - $query = $keys = $s = $p = ''; |
|
| 2661 | - |
|
| 2662 | - // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 2663 | - // sans les renseigner (laisse le compilo recuperer la description) |
|
| 2664 | - if (!is_array($champs) || !is_array($cles)) { |
|
| 2665 | - return; |
|
| 2666 | - } |
|
| 2667 | - |
|
| 2668 | - // sqlite ne gere pas KEY tout court dans une requete CREATE TABLE |
|
| 2669 | - // il faut passer par des create index |
|
| 2670 | - // Il gere par contre primary key ! |
|
| 2671 | - // Soit la PK est definie dans les cles, soit dans un champs |
|
| 2672 | - // soit faussement dans les 2 (et dans ce cas, il faut l’enlever à un des 2 endroits !) |
|
| 2673 | - $pk = 'PRIMARY KEY'; |
|
| 2674 | - // le champ de cle primaire |
|
| 2675 | - $champ_pk = !empty($cles[$pk]) ? $cles[$pk] : ''; |
|
| 2676 | - |
|
| 2677 | - foreach ($champs as $k => $v) { |
|
| 2678 | - if (false !== stripos($v, $pk)) { |
|
| 2679 | - $champ_pk = $k; |
|
| 2680 | - // on n'en a plus besoin dans field, vu que defini dans key |
|
| 2681 | - $champs[$k] = preg_replace("/$pk/is", '', $champs[$k]); |
|
| 2682 | - break; |
|
| 2683 | - } |
|
| 2684 | - } |
|
| 2685 | - |
|
| 2686 | - if ($champ_pk) { |
|
| 2687 | - $keys = "\n\t\t$pk ($champ_pk)"; |
|
| 2688 | - } |
|
| 2689 | - // Pas de DEFAULT 0 sur les cles primaires en auto-increment |
|
| 2690 | - if ( |
|
| 2691 | - isset($champs[$champ_pk]) |
|
| 2692 | - and stripos($champs[$champ_pk], 'default 0') !== false |
|
| 2693 | - ) { |
|
| 2694 | - $champs[$champ_pk] = trim(str_ireplace('default 0', '', $champs[$champ_pk])); |
|
| 2695 | - } |
|
| 2696 | - |
|
| 2697 | - $champs = _sqlite_remplacements_definitions_table($champs, $autoinc ? $champ_pk : false); |
|
| 2698 | - foreach ($champs as $k => $v) { |
|
| 2699 | - $query .= "$s\n\t\t$k $v"; |
|
| 2700 | - $s = ','; |
|
| 2701 | - } |
|
| 2702 | - |
|
| 2703 | - $ifnotexists = ''; |
|
| 2704 | - if ($_ifnotexists) { |
|
| 2705 | - $version = spip_sqlite_fetch( |
|
| 2706 | - spip_sqlite_query('select sqlite_version() AS sqlite_version', $serveur), |
|
| 2707 | - '', |
|
| 2708 | - $serveur |
|
| 2709 | - ); |
|
| 2710 | - if (!function_exists('spip_version_compare')) { |
|
| 2711 | - include_spip('plugins/installer'); |
|
| 2712 | - } |
|
| 2713 | - |
|
| 2714 | - if ($version and spip_version_compare($version['sqlite_version'], '3.3.0', '>=')) { |
|
| 2715 | - $ifnotexists = ' IF NOT EXISTS'; |
|
| 2716 | - } else { |
|
| 2717 | - /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ |
|
| 2718 | - $a = spip_sqlite_showtable($nom, $serveur); |
|
| 2719 | - if (isset($a['key']['KEY ' . $nom])) { |
|
| 2720 | - return true; |
|
| 2721 | - } |
|
| 2722 | - } |
|
| 2723 | - } |
|
| 2724 | - |
|
| 2725 | - $temporary = $temporary ? ' TEMPORARY' : ''; |
|
| 2726 | - $q = "CREATE$temporary TABLE$ifnotexists $nom ($query" . ($keys ? ",$keys" : '') . ")\n"; |
|
| 2727 | - |
|
| 2728 | - return $q; |
|
| 2660 | + $query = $keys = $s = $p = ''; |
|
| 2661 | + |
|
| 2662 | + // certains plugins declarent les tables (permet leur inclusion dans le dump) |
|
| 2663 | + // sans les renseigner (laisse le compilo recuperer la description) |
|
| 2664 | + if (!is_array($champs) || !is_array($cles)) { |
|
| 2665 | + return; |
|
| 2666 | + } |
|
| 2667 | + |
|
| 2668 | + // sqlite ne gere pas KEY tout court dans une requete CREATE TABLE |
|
| 2669 | + // il faut passer par des create index |
|
| 2670 | + // Il gere par contre primary key ! |
|
| 2671 | + // Soit la PK est definie dans les cles, soit dans un champs |
|
| 2672 | + // soit faussement dans les 2 (et dans ce cas, il faut l’enlever à un des 2 endroits !) |
|
| 2673 | + $pk = 'PRIMARY KEY'; |
|
| 2674 | + // le champ de cle primaire |
|
| 2675 | + $champ_pk = !empty($cles[$pk]) ? $cles[$pk] : ''; |
|
| 2676 | + |
|
| 2677 | + foreach ($champs as $k => $v) { |
|
| 2678 | + if (false !== stripos($v, $pk)) { |
|
| 2679 | + $champ_pk = $k; |
|
| 2680 | + // on n'en a plus besoin dans field, vu que defini dans key |
|
| 2681 | + $champs[$k] = preg_replace("/$pk/is", '', $champs[$k]); |
|
| 2682 | + break; |
|
| 2683 | + } |
|
| 2684 | + } |
|
| 2685 | + |
|
| 2686 | + if ($champ_pk) { |
|
| 2687 | + $keys = "\n\t\t$pk ($champ_pk)"; |
|
| 2688 | + } |
|
| 2689 | + // Pas de DEFAULT 0 sur les cles primaires en auto-increment |
|
| 2690 | + if ( |
|
| 2691 | + isset($champs[$champ_pk]) |
|
| 2692 | + and stripos($champs[$champ_pk], 'default 0') !== false |
|
| 2693 | + ) { |
|
| 2694 | + $champs[$champ_pk] = trim(str_ireplace('default 0', '', $champs[$champ_pk])); |
|
| 2695 | + } |
|
| 2696 | + |
|
| 2697 | + $champs = _sqlite_remplacements_definitions_table($champs, $autoinc ? $champ_pk : false); |
|
| 2698 | + foreach ($champs as $k => $v) { |
|
| 2699 | + $query .= "$s\n\t\t$k $v"; |
|
| 2700 | + $s = ','; |
|
| 2701 | + } |
|
| 2702 | + |
|
| 2703 | + $ifnotexists = ''; |
|
| 2704 | + if ($_ifnotexists) { |
|
| 2705 | + $version = spip_sqlite_fetch( |
|
| 2706 | + spip_sqlite_query('select sqlite_version() AS sqlite_version', $serveur), |
|
| 2707 | + '', |
|
| 2708 | + $serveur |
|
| 2709 | + ); |
|
| 2710 | + if (!function_exists('spip_version_compare')) { |
|
| 2711 | + include_spip('plugins/installer'); |
|
| 2712 | + } |
|
| 2713 | + |
|
| 2714 | + if ($version and spip_version_compare($version['sqlite_version'], '3.3.0', '>=')) { |
|
| 2715 | + $ifnotexists = ' IF NOT EXISTS'; |
|
| 2716 | + } else { |
|
| 2717 | + /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ |
|
| 2718 | + $a = spip_sqlite_showtable($nom, $serveur); |
|
| 2719 | + if (isset($a['key']['KEY ' . $nom])) { |
|
| 2720 | + return true; |
|
| 2721 | + } |
|
| 2722 | + } |
|
| 2723 | + } |
|
| 2724 | + |
|
| 2725 | + $temporary = $temporary ? ' TEMPORARY' : ''; |
|
| 2726 | + $q = "CREATE$temporary TABLE$ifnotexists $nom ($query" . ($keys ? ",$keys" : '') . ")\n"; |
|
| 2727 | + |
|
| 2728 | + return $q; |
|
| 2729 | 2729 | } |
| 2730 | 2730 | |
| 2731 | 2731 | |
@@ -2745,40 +2745,40 @@ discard block |
||
| 2745 | 2745 | */ |
| 2746 | 2746 | function _sqlite_ajouter_champs_timestamp($table, $couples, $desc = '', $serveur = '') |
| 2747 | 2747 | { |
| 2748 | - static $tables = []; |
|
| 2749 | - |
|
| 2750 | - if (!isset($tables[$table])) { |
|
| 2751 | - if (!$desc) { |
|
| 2752 | - $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 2753 | - $desc = $trouver_table($table, $serveur); |
|
| 2754 | - // si pas de description, on ne fait rien, ou on die() ? |
|
| 2755 | - if (!$desc) { |
|
| 2756 | - return $couples; |
|
| 2757 | - } |
|
| 2758 | - } |
|
| 2759 | - |
|
| 2760 | - // recherche des champs avec simplement 'TIMESTAMP' |
|
| 2761 | - // cependant, il faudra peut etre etendre |
|
| 2762 | - // avec la gestion de DEFAULT et ON UPDATE |
|
| 2763 | - // mais ceux-ci ne sont pas utilises dans le core |
|
| 2764 | - $tables[$table] = ['valeur' => [], 'cite' => [], 'desc' => []]; |
|
| 2765 | - |
|
| 2766 | - $now = _sqlite_func_now(true); |
|
| 2767 | - foreach ($desc['field'] as $k => $v) { |
|
| 2768 | - if (strpos(strtolower(ltrim($v)), 'timestamp') === 0) { |
|
| 2769 | - $tables[$table]['desc'][$k] = $v; |
|
| 2770 | - $tables[$table]['valeur'][$k] = _sqlite_calculer_cite($now, $tables[$table]['desc'][$k]); |
|
| 2771 | - } |
|
| 2772 | - } |
|
| 2773 | - } else { |
|
| 2774 | - $now = _sqlite_func_now(true); |
|
| 2775 | - foreach (array_keys($tables[$table]['desc']) as $k) { |
|
| 2776 | - $tables[$table]['valeur'][$k] = _sqlite_calculer_cite($now, $tables[$table]['desc'][$k]); |
|
| 2777 | - } |
|
| 2778 | - } |
|
| 2779 | - |
|
| 2780 | - // ajout des champs type 'timestamp' absents |
|
| 2781 | - return array_merge($tables[$table]['valeur'], $couples); |
|
| 2748 | + static $tables = []; |
|
| 2749 | + |
|
| 2750 | + if (!isset($tables[$table])) { |
|
| 2751 | + if (!$desc) { |
|
| 2752 | + $trouver_table = charger_fonction('trouver_table', 'base'); |
|
| 2753 | + $desc = $trouver_table($table, $serveur); |
|
| 2754 | + // si pas de description, on ne fait rien, ou on die() ? |
|
| 2755 | + if (!$desc) { |
|
| 2756 | + return $couples; |
|
| 2757 | + } |
|
| 2758 | + } |
|
| 2759 | + |
|
| 2760 | + // recherche des champs avec simplement 'TIMESTAMP' |
|
| 2761 | + // cependant, il faudra peut etre etendre |
|
| 2762 | + // avec la gestion de DEFAULT et ON UPDATE |
|
| 2763 | + // mais ceux-ci ne sont pas utilises dans le core |
|
| 2764 | + $tables[$table] = ['valeur' => [], 'cite' => [], 'desc' => []]; |
|
| 2765 | + |
|
| 2766 | + $now = _sqlite_func_now(true); |
|
| 2767 | + foreach ($desc['field'] as $k => $v) { |
|
| 2768 | + if (strpos(strtolower(ltrim($v)), 'timestamp') === 0) { |
|
| 2769 | + $tables[$table]['desc'][$k] = $v; |
|
| 2770 | + $tables[$table]['valeur'][$k] = _sqlite_calculer_cite($now, $tables[$table]['desc'][$k]); |
|
| 2771 | + } |
|
| 2772 | + } |
|
| 2773 | + } else { |
|
| 2774 | + $now = _sqlite_func_now(true); |
|
| 2775 | + foreach (array_keys($tables[$table]['desc']) as $k) { |
|
| 2776 | + $tables[$table]['valeur'][$k] = _sqlite_calculer_cite($now, $tables[$table]['desc'][$k]); |
|
| 2777 | + } |
|
| 2778 | + } |
|
| 2779 | + |
|
| 2780 | + // ajout des champs type 'timestamp' absents |
|
| 2781 | + return array_merge($tables[$table]['valeur'], $couples); |
|
| 2782 | 2782 | } |
| 2783 | 2783 | |
| 2784 | 2784 | |
@@ -2790,5 +2790,5 @@ discard block |
||
| 2790 | 2790 | */ |
| 2791 | 2791 | function spip_versions_sqlite() |
| 2792 | 2792 | { |
| 2793 | - return _sqlite_charger_version(); |
|
| 2793 | + return _sqlite_charger_version(); |
|
| 2794 | 2794 | } |
@@ -66,27 +66,27 @@ discard block |
||
| 66 | 66 | // determiner le dossier de la base : $addr ou _DIR_DB |
| 67 | 67 | $f = _DIR_DB; |
| 68 | 68 | if ($addr and str_contains($addr, '/')) { |
| 69 | - $f = rtrim($addr, '/') . '/'; |
|
| 69 | + $f = rtrim($addr, '/').'/'; |
|
| 70 | 70 | } |
| 71 | 71 | |
| 72 | 72 | // un nom de base demande et impossible d'obtenir la base, on s'en va : |
| 73 | 73 | // il faut que la base existe ou que le repertoire parent soit writable |
| 74 | - if ($db and !is_file($f .= $db . '.sqlite') and !is_writable(dirname($f))) { |
|
| 75 | - spip_log("base $f non trouvee ou droits en ecriture manquants", 'sqlite.' . _LOG_HS); |
|
| 74 | + if ($db and !is_file($f .= $db.'.sqlite') and !is_writable(dirname($f))) { |
|
| 75 | + spip_log("base $f non trouvee ou droits en ecriture manquants", 'sqlite.'._LOG_HS); |
|
| 76 | 76 | |
| 77 | 77 | return false; |
| 78 | 78 | } |
| 79 | 79 | |
| 80 | 80 | // charger les modules sqlite au besoin |
| 81 | 81 | if (!_sqlite_charger_version($sqlite_version)) { |
| 82 | - spip_log("Impossible de trouver/charger le module SQLite ($sqlite_version)!", 'sqlite.' . _LOG_HS); |
|
| 82 | + spip_log("Impossible de trouver/charger le module SQLite ($sqlite_version)!", 'sqlite.'._LOG_HS); |
|
| 83 | 83 | |
| 84 | 84 | return false; |
| 85 | 85 | } |
| 86 | 86 | |
| 87 | 87 | // chargement des constantes |
| 88 | 88 | // il ne faut pas definir les constantes avant d'avoir charge les modules sqlite |
| 89 | - $define = 'spip_sqlite' . $sqlite_version . '_constantes'; |
|
| 89 | + $define = 'spip_sqlite'.$sqlite_version.'_constantes'; |
|
| 90 | 90 | $define(); |
| 91 | 91 | |
| 92 | 92 | $ok = false; |
@@ -94,8 +94,8 @@ discard block |
||
| 94 | 94 | // si pas de db -> |
| 95 | 95 | // base temporaire tant qu'on ne connait pas son vrai nom |
| 96 | 96 | // pour tester la connexion |
| 97 | - $db = '_sqlite' . $sqlite_version . '_install'; |
|
| 98 | - $tmp = _DIR_DB . $db . '.sqlite'; |
|
| 97 | + $db = '_sqlite'.$sqlite_version.'_install'; |
|
| 98 | + $tmp = _DIR_DB.$db.'.sqlite'; |
|
| 99 | 99 | $ok = $link = new \PDO("sqlite:$tmp"); |
| 100 | 100 | } else { |
| 101 | 101 | // Ouvrir (eventuellement creer la base) |
@@ -104,7 +104,7 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | if (!$ok) { |
| 106 | 106 | $e = _sqlite_last_error_from_link($link); |
| 107 | - spip_log("Impossible d'ouvrir la base SQLite($sqlite_version) $f : $e", 'sqlite.' . _LOG_HS); |
|
| 107 | + spip_log("Impossible d'ouvrir la base SQLite($sqlite_version) $f : $e", 'sqlite.'._LOG_HS); |
|
| 108 | 108 | |
| 109 | 109 | return false; |
| 110 | 110 | } |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | $table = $regs[3]; |
| 193 | 193 | $suite = $regs[4]; |
| 194 | 194 | } else { |
| 195 | - spip_log("SQLite : Probleme de ALTER TABLE mal forme dans $query", 'sqlite.' . _LOG_ERREUR); |
|
| 195 | + spip_log("SQLite : Probleme de ALTER TABLE mal forme dans $query", 'sqlite.'._LOG_ERREUR); |
|
| 196 | 196 | |
| 197 | 197 | return false; |
| 198 | 198 | } |
@@ -209,7 +209,7 @@ discard block |
||
| 209 | 209 | $i = 0; |
| 210 | 210 | $ouverte = false; |
| 211 | 211 | while ($do = array_shift($todo)) { |
| 212 | - $todo2[$i] = isset($todo2[$i]) ? $todo2[$i] . ',' . $do : $do; |
|
| 212 | + $todo2[$i] = isset($todo2[$i]) ? $todo2[$i].','.$do : $do; |
|
| 213 | 213 | $o = (str_contains($do, '(')); |
| 214 | 214 | $f = (str_contains($do, ')')); |
| 215 | 215 | if ($o and !$f) { |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | ) { |
| 236 | 236 | spip_log( |
| 237 | 237 | "SQLite : Probleme de ALTER TABLE, utilisation non reconnue dans : $do \n(requete d'origine : $query)", |
| 238 | - 'sqlite.' . _LOG_ERREUR |
|
| 238 | + 'sqlite.'._LOG_ERREUR |
|
| 239 | 239 | ); |
| 240 | 240 | |
| 241 | 241 | return false; |
@@ -331,10 +331,10 @@ discard block |
||
| 331 | 331 | |
| 332 | 332 | // pas geres en sqlite2 |
| 333 | 333 | case 'RENAME': |
| 334 | - $do = 'RENAME TO' . substr($do, 6); |
|
| 334 | + $do = 'RENAME TO'.substr($do, 6); |
|
| 335 | 335 | case 'RENAME TO': |
| 336 | 336 | if (!Sqlite::executer_requete("$debut $do", $serveur)) { |
| 337 | - spip_log("SQLite : Erreur ALTER TABLE / RENAME : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 337 | + spip_log("SQLite : Erreur ALTER TABLE / RENAME : $query", 'sqlite.'._LOG_ERREUR); |
|
| 338 | 338 | |
| 339 | 339 | return false; |
| 340 | 340 | } |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | $colonnes = substr($colonne_origine, 1, -1); |
| 378 | 378 | if (str_contains(',', $colonnes)) { |
| 379 | 379 | spip_log('SQLite : Erreur, impossible de creer un index sur plusieurs colonnes' |
| 380 | - . " sans qu'il ait de nom ($table, ($colonnes))", 'sqlite.' . _LOG_ERREUR); |
|
| 380 | + . " sans qu'il ait de nom ($table, ($colonnes))", 'sqlite.'._LOG_ERREUR); |
|
| 381 | 381 | break; |
| 382 | 382 | } else { |
| 383 | 383 | $nom_index = $colonnes; |
@@ -392,12 +392,12 @@ discard block |
||
| 392 | 392 | |
| 393 | 393 | // pas geres en sqlite2 |
| 394 | 394 | case 'ADD COLUMN': |
| 395 | - $do = 'ADD' . substr($do, 10); |
|
| 395 | + $do = 'ADD'.substr($do, 10); |
|
| 396 | 396 | case 'ADD': |
| 397 | 397 | default: |
| 398 | 398 | if (!preg_match(',primary\s+key,i', $do)) { |
| 399 | 399 | if (!Sqlite::executer_requete("$debut $do", $serveur)) { |
| 400 | - spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 400 | + spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.'._LOG_ERREUR); |
|
| 401 | 401 | |
| 402 | 402 | return false; |
| 403 | 403 | } |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | } |
| 418 | 418 | $opts['field'] = [$colonne_ajoutee => $def]; |
| 419 | 419 | if (!_sqlite_modifier_table($table, [$colonne_ajoutee], $opts, $serveur)) { |
| 420 | - spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.' . _LOG_ERREUR); |
|
| 420 | + spip_log("SQLite : Erreur ALTER TABLE / ADD : $query", 'sqlite.'._LOG_ERREUR); |
|
| 421 | 421 | |
| 422 | 422 | return false; |
| 423 | 423 | } |
@@ -425,10 +425,10 @@ discard block |
||
| 425 | 425 | break; |
| 426 | 426 | } |
| 427 | 427 | // tout est bon, ouf ! |
| 428 | - spip_log("SQLite ($serveur) : Changements OK : $debut $do", 'sqlite.' . _LOG_INFO); |
|
| 428 | + spip_log("SQLite ($serveur) : Changements OK : $debut $do", 'sqlite.'._LOG_INFO); |
|
| 429 | 429 | } |
| 430 | 430 | |
| 431 | - spip_log("SQLite ($serveur) : fin ALTER TABLE OK !", 'sqlite.' . _LOG_INFO); |
|
| 431 | + spip_log("SQLite ($serveur) : fin ALTER TABLE OK !", 'sqlite.'._LOG_INFO); |
|
| 432 | 432 | |
| 433 | 433 | return true; |
| 434 | 434 | } |
@@ -497,9 +497,9 @@ discard block |
||
| 497 | 497 | **/ |
| 498 | 498 | function spip_sqlite_create_base($nom, $serveur = '', $option = true) |
| 499 | 499 | { |
| 500 | - $f = $nom . '.sqlite'; |
|
| 500 | + $f = $nom.'.sqlite'; |
|
| 501 | 501 | if (strpos($nom, '/') === false) { |
| 502 | - $f = _DIR_DB . $f; |
|
| 502 | + $f = _DIR_DB.$f; |
|
| 503 | 503 | } |
| 504 | 504 | |
| 505 | 505 | $ok = new \PDO("sqlite:$f"); |
@@ -540,13 +540,13 @@ discard block |
||
| 540 | 540 | if (sql_showtable($nom, false, $serveur)) { |
| 541 | 541 | spip_log( |
| 542 | 542 | "Echec creation d'une vue sql ($nom) car celle-ci existe deja (serveur:$serveur)", |
| 543 | - 'sqlite.' . _LOG_ERREUR |
|
| 543 | + 'sqlite.'._LOG_ERREUR |
|
| 544 | 544 | ); |
| 545 | 545 | |
| 546 | 546 | return false; |
| 547 | 547 | } |
| 548 | 548 | |
| 549 | - $query = "CREATE VIEW $nom AS " . $query_select; |
|
| 549 | + $query = "CREATE VIEW $nom AS ".$query_select; |
|
| 550 | 550 | |
| 551 | 551 | return spip_sqlite_query($query, $serveur, $requeter); |
| 552 | 552 | } |
@@ -573,8 +573,8 @@ discard block |
||
| 573 | 573 | { |
| 574 | 574 | if (!($nom or $table or $champs)) { |
| 575 | 575 | spip_log( |
| 576 | - "Champ manquant pour creer un index sqlite ($nom, $table, (" . join(',', $champs) . '))', |
|
| 577 | - 'sqlite.' . _LOG_ERREUR |
|
| 576 | + "Champ manquant pour creer un index sqlite ($nom, $table, (".join(',', $champs).'))', |
|
| 577 | + 'sqlite.'._LOG_ERREUR |
|
| 578 | 578 | ); |
| 579 | 579 | |
| 580 | 580 | return false; |
@@ -582,7 +582,7 @@ discard block |
||
| 582 | 582 | |
| 583 | 583 | // SQLite ne differentie pas noms des index en fonction des tables |
| 584 | 584 | // il faut donc creer des noms uniques d'index pour une base sqlite |
| 585 | - $nom = $table . '_' . $nom; |
|
| 585 | + $nom = $table.'_'.$nom; |
|
| 586 | 586 | // enlever d'eventuelles parentheses deja presentes sur champs |
| 587 | 587 | if (!is_array($champs)) { |
| 588 | 588 | if ($champs[0] == '(') { |
@@ -604,12 +604,12 @@ discard block |
||
| 604 | 604 | } else { |
| 605 | 605 | /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ |
| 606 | 606 | $a = spip_sqlite_showtable($table, $serveur); |
| 607 | - if (isset($a['key']['KEY ' . $nom])) { |
|
| 607 | + if (isset($a['key']['KEY '.$nom])) { |
|
| 608 | 608 | return true; |
| 609 | 609 | } |
| 610 | 610 | } |
| 611 | 611 | |
| 612 | - $query = 'CREATE ' . ($unique ? 'UNIQUE ' : '') . "INDEX$ifnotexists $nom ON $table (" . join(',', $champs) . ')'; |
|
| 612 | + $query = 'CREATE '.($unique ? 'UNIQUE ' : '')."INDEX$ifnotexists $nom ON $table (".join(',', $champs).')'; |
|
| 613 | 613 | $res = spip_sqlite_query($query, $serveur, $requeter); |
| 614 | 614 | if (!$requeter) { |
| 615 | 615 | return $res; |
@@ -686,7 +686,7 @@ discard block |
||
| 686 | 686 | $serveur = '', |
| 687 | 687 | $requeter = true |
| 688 | 688 | ) { |
| 689 | - $c = !$groupby ? '*' : ('DISTINCT ' . (is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 689 | + $c = !$groupby ? '*' : ('DISTINCT '.(is_string($groupby) ? $groupby : join(',', $groupby))); |
|
| 690 | 690 | $r = spip_sqlite_select( |
| 691 | 691 | "COUNT($c)", |
| 692 | 692 | $from, |
@@ -799,14 +799,14 @@ discard block |
||
| 799 | 799 | function spip_sqlite_drop_index($nom, $table, $serveur = '', $requeter = true) |
| 800 | 800 | { |
| 801 | 801 | if (!($nom or $table)) { |
| 802 | - spip_log("Champ manquant pour supprimer un index sqlite ($nom, $table)", 'sqlite.' . _LOG_ERREUR); |
|
| 802 | + spip_log("Champ manquant pour supprimer un index sqlite ($nom, $table)", 'sqlite.'._LOG_ERREUR); |
|
| 803 | 803 | |
| 804 | 804 | return false; |
| 805 | 805 | } |
| 806 | 806 | |
| 807 | 807 | // SQLite ne differentie pas noms des index en fonction des tables |
| 808 | 808 | // il faut donc creer des noms uniques d'index pour une base sqlite |
| 809 | - $index = $table . '_' . $nom; |
|
| 809 | + $index = $table.'_'.$nom; |
|
| 810 | 810 | $exist = ' IF EXISTS'; |
| 811 | 811 | |
| 812 | 812 | $query = "DROP INDEX$exist $index"; |
@@ -839,7 +839,7 @@ discard block |
||
| 839 | 839 | if ($s) { |
| 840 | 840 | $trace = debug_backtrace(); |
| 841 | 841 | if ($trace[0]['function'] != 'spip_sqlite_error') { |
| 842 | - spip_log("$s - $query - " . sql_error_backtrace(), 'sqlite.' . _LOG_ERREUR); |
|
| 842 | + spip_log("$s - $query - ".sql_error_backtrace(), 'sqlite.'._LOG_ERREUR); |
|
| 843 | 843 | } |
| 844 | 844 | } |
| 845 | 845 | |
@@ -888,14 +888,14 @@ discard block |
||
| 888 | 888 | $t = $link->errorInfo(); |
| 889 | 889 | $s = ltrim($t[0], '0'); // 00000 si pas d'erreur |
| 890 | 890 | if ($s) { |
| 891 | - $s .= ' / ' . $t[1]; |
|
| 891 | + $s .= ' / '.$t[1]; |
|
| 892 | 892 | } // ajoute l'erreur du moteur SQLite |
| 893 | 893 | } else { |
| 894 | 894 | $s = ': aucune ressource sqlite (link)'; |
| 895 | 895 | } |
| 896 | 896 | |
| 897 | 897 | if ($s) { |
| 898 | - spip_log("Erreur sqlite $s", 'sqlite.' . _LOG_ERREUR); |
|
| 898 | + spip_log("Erreur sqlite $s", 'sqlite.'._LOG_ERREUR); |
|
| 899 | 899 | } |
| 900 | 900 | |
| 901 | 901 | return $s ? $s : 0; |
@@ -920,7 +920,7 @@ discard block |
||
| 920 | 920 | } |
| 921 | 921 | |
| 922 | 922 | $query = Sqlite::traduire_requete($query, $serveur); |
| 923 | - $query = 'EXPLAIN ' . $query; |
|
| 923 | + $query = 'EXPLAIN '.$query; |
|
| 924 | 924 | if (!$requeter) { |
| 925 | 925 | return $query; |
| 926 | 926 | } |
@@ -1096,7 +1096,7 @@ discard block |
||
| 1096 | 1096 | function spip_sqlite_insert($table, $champs, $valeurs, $desc = [], $serveur = '', $requeter = true) |
| 1097 | 1097 | { |
| 1098 | 1098 | |
| 1099 | - $query = "INSERT INTO $table " . ($champs ? "$champs VALUES $valeurs" : 'DEFAULT VALUES'); |
|
| 1099 | + $query = "INSERT INTO $table ".($champs ? "$champs VALUES $valeurs" : 'DEFAULT VALUES'); |
|
| 1100 | 1100 | if ($r = spip_sqlite_query($query, $serveur, $requeter)) { |
| 1101 | 1101 | if (!$requeter) { |
| 1102 | 1102 | return $r; |
@@ -1152,8 +1152,8 @@ discard block |
||
| 1152 | 1152 | |
| 1153 | 1153 | $cles = $valeurs = ''; |
| 1154 | 1154 | if (count($couples)) { |
| 1155 | - $cles = '(' . join(',', array_keys($couples)) . ')'; |
|
| 1156 | - $valeurs = '(' . join(',', $couples) . ')'; |
|
| 1155 | + $cles = '('.join(',', array_keys($couples)).')'; |
|
| 1156 | + $valeurs = '('.join(',', $couples).')'; |
|
| 1157 | 1157 | } |
| 1158 | 1158 | |
| 1159 | 1159 | return spip_sqlite_insert($table, $cles, $valeurs, $desc, $serveur, $requeter); |
@@ -1214,11 +1214,11 @@ discard block |
||
| 1214 | 1214 | |
| 1215 | 1215 | $champs = $valeurs = ''; |
| 1216 | 1216 | if (count($couples)) { |
| 1217 | - $champs = '(' . join(',', array_keys($couples)) . ')'; |
|
| 1218 | - $valeurs = '(' . join(',', $couples) . ')'; |
|
| 1219 | - $query = $query_start . "$champs VALUES $valeurs"; |
|
| 1217 | + $champs = '('.join(',', array_keys($couples)).')'; |
|
| 1218 | + $valeurs = '('.join(',', $couples).')'; |
|
| 1219 | + $query = $query_start."$champs VALUES $valeurs"; |
|
| 1220 | 1220 | } else { |
| 1221 | - $query = $query_start . 'DEFAULT VALUES'; |
|
| 1221 | + $query = $query_start.'DEFAULT VALUES'; |
|
| 1222 | 1222 | } |
| 1223 | 1223 | |
| 1224 | 1224 | if ($requeter) { |
@@ -1355,7 +1355,7 @@ discard block |
||
| 1355 | 1355 | */ |
| 1356 | 1356 | function spip_sqlite_multi($objet, $lang) |
| 1357 | 1357 | { |
| 1358 | - $r = 'EXTRAIRE_MULTI(' . $objet . ", '" . $lang . "') AS multi"; |
|
| 1358 | + $r = 'EXTRAIRE_MULTI('.$objet.", '".$lang."') AS multi"; |
|
| 1359 | 1359 | |
| 1360 | 1360 | return $r; |
| 1361 | 1361 | } |
@@ -1429,7 +1429,7 @@ discard block |
||
| 1429 | 1429 | { |
| 1430 | 1430 | $op = (($interval <= 0) ? '>' : '<'); |
| 1431 | 1431 | |
| 1432 | - return "($champ $op datetime('" . date('Y-m-d H:i:s') . "', '$interval $unite'))"; |
|
| 1432 | + return "($champ $op datetime('".date('Y-m-d H:i:s')."', '$interval $unite'))"; |
|
| 1433 | 1433 | } |
| 1434 | 1434 | |
| 1435 | 1435 | |
@@ -1462,7 +1462,7 @@ discard block |
||
| 1462 | 1462 | and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
| 1463 | 1463 | ) { |
| 1464 | 1464 | spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT ''", $serveur); |
| 1465 | - spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1465 | + spip_log("ALTER $q", 'repair'._LOG_INFO_IMPORTANTE); |
|
| 1466 | 1466 | } |
| 1467 | 1467 | if ( |
| 1468 | 1468 | preg_match(',^(INTEGER),i', $d) |
@@ -1472,7 +1472,7 @@ discard block |
||
| 1472 | 1472 | and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
| 1473 | 1473 | ) { |
| 1474 | 1474 | spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT '0'", $serveur); |
| 1475 | - spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1475 | + spip_log("ALTER $q", 'repair'._LOG_INFO_IMPORTANTE); |
|
| 1476 | 1476 | } |
| 1477 | 1477 | if ( |
| 1478 | 1478 | preg_match(',^(datetime),i', $d) |
@@ -1482,7 +1482,7 @@ discard block |
||
| 1482 | 1482 | and (!isset($desc['key']['PRIMARY KEY']) or $desc['key']['PRIMARY KEY'] !== $c) |
| 1483 | 1483 | ) { |
| 1484 | 1484 | spip_sqlite_alter($q = "TABLE $table CHANGE $c $c $d DEFAULT '0000-00-00 00:00:00'", $serveur); |
| 1485 | - spip_log("ALTER $q", 'repair' . _LOG_INFO_IMPORTANTE); |
|
| 1485 | + spip_log("ALTER $q", 'repair'._LOG_INFO_IMPORTANTE); |
|
| 1486 | 1486 | } |
| 1487 | 1487 | } |
| 1488 | 1488 | |
@@ -1534,10 +1534,10 @@ discard block |
||
| 1534 | 1534 | // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
| 1535 | 1535 | $couples = _sqlite_ajouter_champs_timestamp($table, $couples, $desc, $serveur); |
| 1536 | 1536 | |
| 1537 | - return spip_sqlite_query("REPLACE INTO $table (" . join(',', array_keys($couples)) . ') VALUES (' . join( |
|
| 1537 | + return spip_sqlite_query("REPLACE INTO $table (".join(',', array_keys($couples)).') VALUES ('.join( |
|
| 1538 | 1538 | ',', |
| 1539 | 1539 | $couples |
| 1540 | - ) . ')', $serveur); |
|
| 1540 | + ).')', $serveur); |
|
| 1541 | 1541 | } |
| 1542 | 1542 | |
| 1543 | 1543 | |
@@ -1624,7 +1624,7 @@ discard block |
||
| 1624 | 1624 | . _sqlite_calculer_expression('WHERE', $where) |
| 1625 | 1625 | . _sqlite_calculer_expression('GROUP BY', $groupby, ',') |
| 1626 | 1626 | . _sqlite_calculer_expression('HAVING', $having) |
| 1627 | - . ($orderby ? ("\nORDER BY " . _sqlite_calculer_order($orderby)) : '') |
|
| 1627 | + . ($orderby ? ("\nORDER BY "._sqlite_calculer_order($orderby)) : '') |
|
| 1628 | 1628 | . ($limit ? "\nLIMIT $limit" : ''); |
| 1629 | 1629 | |
| 1630 | 1630 | // dans un select, on doit renvoyer la requête en cas d'erreur |
@@ -1663,10 +1663,10 @@ discard block |
||
| 1663 | 1663 | // interdire la creation d'une nouvelle base, |
| 1664 | 1664 | // sauf si on est dans l'installation |
| 1665 | 1665 | if ( |
| 1666 | - !is_file($f = _DIR_DB . $db . '.sqlite') |
|
| 1666 | + !is_file($f = _DIR_DB.$db.'.sqlite') |
|
| 1667 | 1667 | && (!defined('_ECRIRE_INSTALL') || !_ECRIRE_INSTALL) |
| 1668 | 1668 | ) { |
| 1669 | - spip_log("Il est interdit de creer la base $db", 'sqlite.' . _LOG_HS); |
|
| 1669 | + spip_log("Il est interdit de creer la base $db", 'sqlite.'._LOG_HS); |
|
| 1670 | 1670 | |
| 1671 | 1671 | return false; |
| 1672 | 1672 | } |
@@ -1675,12 +1675,12 @@ discard block |
||
| 1675 | 1675 | // avec les identifiants connus |
| 1676 | 1676 | $index = $serveur ? $serveur : 0; |
| 1677 | 1677 | |
| 1678 | - if ($link = spip_connect_db('', '', '', '', '@selectdb@' . $db, $serveur, '', '')) { |
|
| 1678 | + if ($link = spip_connect_db('', '', '', '', '@selectdb@'.$db, $serveur, '', '')) { |
|
| 1679 | 1679 | if (($db == $link['db']) && $GLOBALS['connexions'][$index] = $link) { |
| 1680 | 1680 | return $db; |
| 1681 | 1681 | } |
| 1682 | 1682 | } else { |
| 1683 | - spip_log("Impossible de selectionner la base $db", 'sqlite.' . _LOG_HS); |
|
| 1683 | + spip_log("Impossible de selectionner la base $db", 'sqlite.'._LOG_HS); |
|
| 1684 | 1684 | |
| 1685 | 1685 | return false; |
| 1686 | 1686 | } |
@@ -1733,7 +1733,7 @@ discard block |
||
| 1733 | 1733 | $match = "^$match$"; |
| 1734 | 1734 | |
| 1735 | 1735 | return spip_sqlite_query( |
| 1736 | - "SELECT name FROM sqlite_master WHERE type='table' AND tbl_name REGEXP " . _q($match), |
|
| 1736 | + "SELECT name FROM sqlite_master WHERE type='table' AND tbl_name REGEXP "._q($match), |
|
| 1737 | 1737 | $serveur, |
| 1738 | 1738 | $requeter |
| 1739 | 1739 | ); |
@@ -1758,7 +1758,7 @@ discard block |
||
| 1758 | 1758 | $r = spip_sqlite_query( |
| 1759 | 1759 | 'SELECT name FROM sqlite_master WHERE' |
| 1760 | 1760 | . ' type=\'table\'' |
| 1761 | - . ' AND name=' . spip_sqlite_quote($table, 'string') |
|
| 1761 | + . ' AND name='.spip_sqlite_quote($table, 'string') |
|
| 1762 | 1762 | . ' AND name NOT LIKE \'sqlite_%\'', |
| 1763 | 1763 | $serveur, |
| 1764 | 1764 | $requeter |
@@ -1856,7 +1856,7 @@ discard block |
||
| 1856 | 1856 | // s'il y a une parenthèse fermante dans la clé |
| 1857 | 1857 | // ou dans la définition sans qu'il n'y ait une ouverture avant |
| 1858 | 1858 | if (str_contains($k, ')') or preg_match('/^[^\(]*\)/', $def)) { |
| 1859 | - $fields[$k_precedent] .= ',' . $k . ' ' . $def; |
|
| 1859 | + $fields[$k_precedent] .= ','.$k.' '.$def; |
|
| 1860 | 1860 | continue; |
| 1861 | 1861 | } |
| 1862 | 1862 | |
@@ -1891,13 +1891,13 @@ discard block |
||
| 1891 | 1891 | . 'ORDER BY substr(type,2,1), name'; |
| 1892 | 1892 | $a = spip_sqlite_query($query, $serveur, $requeter); |
| 1893 | 1893 | while ($r = spip_sqlite_fetch($a, null, $serveur)) { |
| 1894 | - $key = str_replace($nom_table . '_', '', $r['name']); // enlever le nom de la table ajoute a l'index |
|
| 1894 | + $key = str_replace($nom_table.'_', '', $r['name']); // enlever le nom de la table ajoute a l'index |
|
| 1895 | 1895 | $keytype = 'KEY'; |
| 1896 | 1896 | if (strpos($r['sql'], 'UNIQUE INDEX') !== false) { |
| 1897 | 1897 | $keytype = 'UNIQUE KEY'; |
| 1898 | 1898 | } |
| 1899 | 1899 | $colonnes = preg_replace(',.*\((.*)\).*,', '$1', $r['sql']); |
| 1900 | - $keys[$keytype . ' ' . $key] = $colonnes; |
|
| 1900 | + $keys[$keytype.' '.$key] = $colonnes; |
|
| 1901 | 1901 | } |
| 1902 | 1902 | } |
| 1903 | 1903 | } // c'est une vue, on liste les champs disponibles simplement |
@@ -1945,7 +1945,7 @@ discard block |
||
| 1945 | 1945 | |
| 1946 | 1946 | $set = []; |
| 1947 | 1947 | foreach ($champs as $champ => $val) { |
| 1948 | - $set[] = $champ . "=$val"; |
|
| 1948 | + $set[] = $champ."=$val"; |
|
| 1949 | 1949 | } |
| 1950 | 1950 | if (!empty($set)) { |
| 1951 | 1951 | return spip_sqlite_query( |
@@ -1999,7 +1999,7 @@ discard block |
||
| 1999 | 1999 | |
| 2000 | 2000 | $set = []; |
| 2001 | 2001 | foreach ($champs as $champ => $val) { |
| 2002 | - $set[$champ] = $champ . '=' . _sqlite_calculer_cite($val, isset($fields[$champ]) ? $fields[$champ] : ''); |
|
| 2002 | + $set[$champ] = $champ.'='._sqlite_calculer_cite($val, isset($fields[$champ]) ? $fields[$champ] : ''); |
|
| 2003 | 2003 | } |
| 2004 | 2004 | |
| 2005 | 2005 | // recherche de champs 'timestamp' pour mise a jour auto de ceux-ci |
@@ -2007,7 +2007,7 @@ discard block |
||
| 2007 | 2007 | $maj = _sqlite_ajouter_champs_timestamp($table, [], $desc, $serveur); |
| 2008 | 2008 | foreach ($maj as $champ => $val) { |
| 2009 | 2009 | if (!isset($set[$champ])) { |
| 2010 | - $set[$champ] = $champ . '=' . $val; |
|
| 2010 | + $set[$champ] = $champ.'='.$val; |
|
| 2011 | 2011 | } |
| 2012 | 2012 | } |
| 2013 | 2013 | |
@@ -2037,7 +2037,7 @@ discard block |
||
| 2037 | 2037 | function _sqlite_init() |
| 2038 | 2038 | { |
| 2039 | 2039 | if (!defined('_DIR_DB')) { |
| 2040 | - define('_DIR_DB', _DIR_ETC . 'bases/'); |
|
| 2040 | + define('_DIR_DB', _DIR_ETC.'bases/'); |
|
| 2041 | 2041 | } |
| 2042 | 2042 | if (!defined('_SQLITE_CHMOD')) { |
| 2043 | 2043 | define('_SQLITE_CHMOD', _SPIP_CHMOD); |
@@ -2149,9 +2149,9 @@ discard block |
||
| 2149 | 2149 | } |
| 2150 | 2150 | |
| 2151 | 2151 | // echapper les ' en '' |
| 2152 | - spip_log('Pas de methode ->quote pour echapper', 'sqlite.' . _LOG_INFO_IMPORTANTE); |
|
| 2152 | + spip_log('Pas de methode ->quote pour echapper', 'sqlite.'._LOG_INFO_IMPORTANTE); |
|
| 2153 | 2153 | |
| 2154 | - return ("'" . str_replace("'", "''", $v) . "'"); |
|
| 2154 | + return ("'".str_replace("'", "''", $v)."'"); |
|
| 2155 | 2155 | } |
| 2156 | 2156 | |
| 2157 | 2157 | |
@@ -2175,12 +2175,12 @@ discard block |
||
| 2175 | 2175 | $exp = "\n$expression "; |
| 2176 | 2176 | |
| 2177 | 2177 | if (!is_array($v)) { |
| 2178 | - return $exp . $v; |
|
| 2178 | + return $exp.$v; |
|
| 2179 | 2179 | } else { |
| 2180 | 2180 | if (strtoupper($join) === 'AND') { |
| 2181 | - return $exp . join("\n\t$join ", array_map('_sqlite_calculer_where', $v)); |
|
| 2181 | + return $exp.join("\n\t$join ", array_map('_sqlite_calculer_where', $v)); |
|
| 2182 | 2182 | } else { |
| 2183 | - return $exp . join($join, $v); |
|
| 2183 | + return $exp.join($join, $v); |
|
| 2184 | 2184 | } |
| 2185 | 2185 | } |
| 2186 | 2186 | } |
@@ -2216,17 +2216,17 @@ discard block |
||
| 2216 | 2216 | if (substr($k, -1) == '@') { |
| 2217 | 2217 | // c'est une jointure qui se refere au from precedent |
| 2218 | 2218 | // pas de virgule |
| 2219 | - $res .= ' ' . $v; |
|
| 2219 | + $res .= ' '.$v; |
|
| 2220 | 2220 | } else { |
| 2221 | 2221 | if (!is_numeric($k)) { |
| 2222 | 2222 | $p = strpos($v, ' '); |
| 2223 | 2223 | if ($p) { |
| 2224 | - $v = substr($v, 0, $p) . " AS '$k'" . substr($v, $p); |
|
| 2224 | + $v = substr($v, 0, $p)." AS '$k'".substr($v, $p); |
|
| 2225 | 2225 | } else { |
| 2226 | 2226 | $v .= " AS '$k'"; |
| 2227 | 2227 | } |
| 2228 | 2228 | } |
| 2229 | - $res .= ', ' . $v; |
|
| 2229 | + $res .= ', '.$v; |
|
| 2230 | 2230 | } |
| 2231 | 2231 | } |
| 2232 | 2232 | |
@@ -2367,13 +2367,13 @@ discard block |
||
| 2367 | 2367 | |
| 2368 | 2368 | $def_origine = sql_showtable($table_origine, false, $serveur); |
| 2369 | 2369 | if (!$def_origine or !isset($def_origine['field'])) { |
| 2370 | - spip_log("Alter table impossible sur $table_origine : table non trouvee", 'sqlite' . _LOG_ERREUR); |
|
| 2370 | + spip_log("Alter table impossible sur $table_origine : table non trouvee", 'sqlite'._LOG_ERREUR); |
|
| 2371 | 2371 | |
| 2372 | 2372 | return false; |
| 2373 | 2373 | } |
| 2374 | 2374 | |
| 2375 | 2375 | |
| 2376 | - $table_tmp = $table_origine . '_tmp'; |
|
| 2376 | + $table_tmp = $table_origine.'_tmp'; |
|
| 2377 | 2377 | |
| 2378 | 2378 | // 1) creer une table temporaire avec les modifications |
| 2379 | 2379 | // - DROP : suppression de la colonne |
@@ -2460,7 +2460,7 @@ discard block |
||
| 2460 | 2460 | } else { |
| 2461 | 2461 | // enlever KEY |
| 2462 | 2462 | $k = substr($k, 4); |
| 2463 | - $queries[] = "CREATE INDEX $table_destination" . "_$k ON $table_destination ($v)"; |
|
| 2463 | + $queries[] = "CREATE INDEX $table_destination"."_$k ON $table_destination ($v)"; |
|
| 2464 | 2464 | } |
| 2465 | 2465 | } |
| 2466 | 2466 | |
@@ -2471,7 +2471,7 @@ discard block |
||
| 2471 | 2471 | foreach ($queries as $q) { |
| 2472 | 2472 | if (!Sqlite::executer_requete($q, $serveur)) { |
| 2473 | 2473 | spip_log('SQLite : ALTER TABLE table :' |
| 2474 | - . " Erreur a l'execution de la requete : $q", 'sqlite.' . _LOG_ERREUR); |
|
| 2474 | + . " Erreur a l'execution de la requete : $q", 'sqlite.'._LOG_ERREUR); |
|
| 2475 | 2475 | Sqlite::annuler_transaction($serveur); |
| 2476 | 2476 | |
| 2477 | 2477 | return false; |
@@ -2563,27 +2563,27 @@ discard block |
||
| 2563 | 2563 | $enum = '(\s*\([^\)]*\))?'; |
| 2564 | 2564 | |
| 2565 | 2565 | $remplace = [ |
| 2566 | - '/enum' . $enum . '/is' => 'VARCHAR(255)', |
|
| 2566 | + '/enum'.$enum.'/is' => 'VARCHAR(255)', |
|
| 2567 | 2567 | '/COLLATE \w+_bin/is' => 'COLLATE BINARY', |
| 2568 | 2568 | '/COLLATE \w+_ci/is' => 'COLLATE NOCASE', |
| 2569 | 2569 | '/auto_increment/is' => '', |
| 2570 | 2570 | '/current_timestamp\(\)/is' => 'CURRENT_TIMESTAMP', // Fix export depuis mariaDB #4374 |
| 2571 | 2571 | '/(timestamp .* )ON .*$/is' => '\\1', |
| 2572 | 2572 | '/character set \w+/is' => '', |
| 2573 | - '/((big|small|medium|tiny)?int(eger)?)' . $num . '\s*unsigned/is' => '\\1 UNSIGNED', |
|
| 2573 | + '/((big|small|medium|tiny)?int(eger)?)'.$num.'\s*unsigned/is' => '\\1 UNSIGNED', |
|
| 2574 | 2574 | '/(text\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
| 2575 | - '/((char|varchar)' . $num . '\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
|
| 2575 | + '/((char|varchar)'.$num.'\s+not\s+null(\s+collate\s+\w+)?)\s*$/is' => "\\1 DEFAULT ''", |
|
| 2576 | 2576 | '/(datetime\s+not\s+null)\s*$/is' => "\\1 DEFAULT '0000-00-00 00:00:00'", |
| 2577 | 2577 | '/(date\s+not\s+null)\s*$/is' => "\\1 DEFAULT '0000-00-00'", |
| 2578 | 2578 | ]; |
| 2579 | 2579 | |
| 2580 | 2580 | // pour l'autoincrement, il faut des INTEGER NOT NULL PRIMARY KEY |
| 2581 | 2581 | $remplace_autocinc = [ |
| 2582 | - '/(big|small|medium|tiny)?int(eger)?' . $num . '/is' => 'INTEGER' |
|
| 2582 | + '/(big|small|medium|tiny)?int(eger)?'.$num.'/is' => 'INTEGER' |
|
| 2583 | 2583 | ]; |
| 2584 | 2584 | // pour les int non autoincrement, il faut un DEFAULT |
| 2585 | 2585 | $remplace_nonautocinc = [ |
| 2586 | - '/((big|small|medium|tiny)?int(eger)?' . $num . '\s+not\s+null)\s*$/is' => "\\1 DEFAULT 0", |
|
| 2586 | + '/((big|small|medium|tiny)?int(eger)?'.$num.'\s+not\s+null)\s*$/is' => "\\1 DEFAULT 0", |
|
| 2587 | 2587 | ]; |
| 2588 | 2588 | |
| 2589 | 2589 | if (is_string($query)) { |
@@ -2626,7 +2626,7 @@ discard block |
||
| 2626 | 2626 | return str_ireplace('BINARY', 'COLLATE BINARY', $champ); |
| 2627 | 2627 | } |
| 2628 | 2628 | if (preg_match(',^(char|varchar|(long|small|medium|tiny)?text),i', $champ)) { |
| 2629 | - return $champ . ' COLLATE NOCASE'; |
|
| 2629 | + return $champ.' COLLATE NOCASE'; |
|
| 2630 | 2630 | } |
| 2631 | 2631 | |
| 2632 | 2632 | return $champ; |
@@ -2716,14 +2716,14 @@ discard block |
||
| 2716 | 2716 | } else { |
| 2717 | 2717 | /* simuler le IF EXISTS - version 2 et sqlite < 3.3a */ |
| 2718 | 2718 | $a = spip_sqlite_showtable($nom, $serveur); |
| 2719 | - if (isset($a['key']['KEY ' . $nom])) { |
|
| 2719 | + if (isset($a['key']['KEY '.$nom])) { |
|
| 2720 | 2720 | return true; |
| 2721 | 2721 | } |
| 2722 | 2722 | } |
| 2723 | 2723 | } |
| 2724 | 2724 | |
| 2725 | 2725 | $temporary = $temporary ? ' TEMPORARY' : ''; |
| 2726 | - $q = "CREATE$temporary TABLE$ifnotexists $nom ($query" . ($keys ? ",$keys" : '') . ")\n"; |
|
| 2726 | + $q = "CREATE$temporary TABLE$ifnotexists $nom ($query".($keys ? ",$keys" : '').")\n"; |
|
| 2727 | 2727 | |
| 2728 | 2728 | return $q; |
| 2729 | 2729 | } |
