diff --git a/ecrire/req/pg.php b/ecrire/req/pg.php index dbfe96d6a51657805624c172e4e527f0c499d932..a2a882c717351d79f647ca2b62ebce1366d36c5b 100644 --- a/ecrire/req/pg.php +++ b/ecrire/req/pg.php @@ -164,8 +164,7 @@ function spip_pg_alter($query, $serveur='',$requeter=true) { $o=(false!==strpos($do,"(")); $f=(false!==strpos($do,")")); if ($o AND !$f) $ouverte=true; - elseif (!$o AND $f) $ouverte=false; - elseif ($o AND $f) $ouverte=false; + elseif ($f) $ouverte=false; if (!$ouverte) $i++; } $todo=$todo2; diff --git a/ecrire/req/sqlite_generique.php b/ecrire/req/sqlite_generique.php index 16881bfefa8617a7540e5dca274bbc9d136b9aed..e78d59859c2147dd9acfa649ca6d5d0760b04fb9 100644 --- a/ecrire/req/sqlite_generique.php +++ b/ecrire/req/sqlite_generique.php @@ -165,8 +165,7 @@ function spip_sqlite_alter($query, $serveur='',$requeter=true){ $o=(false!==strpos($do,"(")); $f=(false!==strpos($do,")")); if ($o AND !$f) $ouverte=true; - elseif (!$o AND $f) $ouverte=false; - elseif ($o AND $f) $ouverte=false; + elseif ($f) $ouverte=false; if (!$ouverte) $i++; } @@ -1236,8 +1235,8 @@ function _sqlite_modifier_table($table, $colonne, $opt=array(), $serveur=''){ // pour le INSERT INTO plus loin // stocker la correspondance nouvelles->anciennes colonnes $fields_correspondances = array(); - foreach ($def_origine['field'] as $c=>$d){ + if ($colonne_origine && ($c == $colonne_origine)) { // si pas DROP if ($colonne_destination){