clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

dbstructure: Delete indexes before the database structure is changed

This commit is contained in:
Michael Vogel 2014-09-01 23:41:21 +02:00
parent 2b182b2dcf
commit 150310ea3a
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
include/dbstructure.php
View File

@ -117,6 +117,16 @@ function update_structure($verbose, $action) {
if(false === $r) if(false === $r)
$errors .= t('Errors encountered creating database tables.').$name.EOL; $errors .= t('Errors encountered creating database tables.').$name.EOL;
} else { } else {
// Drop the index if it isn't present in the definition
foreach ($database[$name]["indexes"] AS $indexname => $fieldnames)
if (!isset($structure["indexes"][$indexname])) {
$sql2=db_drop_index($indexname);
if ($sql3 == "")
$sql3 = "ALTER TABLE `".$name."` ".$sql2;
else
$sql3 .= ", ".$sql2;
}
// Compare the field structure field by field // Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) { foreach ($structure["fields"] AS $fieldname => $parameters) {
if (!isset($database[$name]["fields"][$fieldname])) { if (!isset($database[$name]["fields"][$fieldname])) {
@ -140,16 +150,6 @@ function update_structure($verbose, $action) {
} }
} }
} }
// Drop the index if it isn't present in the definition
if (isset($database[$name]))
foreach ($database[$name]["indexes"] AS $indexname => $fieldnames)
if (!isset($structure["indexes"][$indexname])) {
$sql2=db_drop_index($indexname);
if ($sql3 == "")
$sql3 = "ALTER TABLE `".$name."` ".$sql2;
else
$sql3 .= ", ".$sql2;
}
// Create the index // Create the index
foreach ($structure["indexes"] AS $indexname => $fieldnames) { foreach ($structure["indexes"] AS $indexname => $fieldnames) {
@ -354,7 +354,7 @@ function db_definition() {
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
"access" => array("cat(30)","k(30)"), "cat_k" => array("cat(30)","k(30)"),
) )
); );
$database["contact"] = array( $database["contact"] = array(
@ -890,7 +890,7 @@ function db_definition() {
), ),
"indexes" => array( "indexes" => array(
"PRIMARY" => array("id"), "PRIMARY" => array("id"),
"access" => array("uid","cat(30)","k(30)"), "uid_cat_k" => array("uid","cat(30)","k(30)"),
) )
); );
$database["photo"] = array( $database["photo"] = array(