<?php
use Friendica\App;
+use Friendica\Core\System;
use Friendica\Core\Config;
-require_once("boot.php");
-require_once("include/text.php");
+require_once "boot.php";
+require_once "include/text.php";
define('NEW_UPDATE_ROUTINE_VERSION', 1170);
* Converts all tables from MyISAM to InnoDB
*/
function convert_to_innodb() {
- global $db;
-
$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
- dbesc($db->database_name()));
+ dbesc(dba::database_name()));
if (!dbm::is_result($r)) {
echo t('There are no tables on MyISAM.')."\n";
$sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME']));
echo $sql."\n";
- $result = @$db->q($sql);
+ $result = dba::e($sql);
if (!dbm::is_result($result)) {
- print_update_error($db, $sql);
+ print_update_error($sql);
}
}
}
// No valid result?
if (!dbm::is_result($adminlist)) {
- logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_WARNING);
+ logger(sprintf('Cannot notify administrators about update_id=%d, error_message=%s', $update_id, $error_message), LOGGER_NORMAL);
// Don't continue
return;
$body = sprintf($body, $error_message);
notification(array(
- 'type' => "SYSTEM_EMAIL",
+ 'type' => SYSTEM_EMAIL,
'to_email' => $admin['email'],
'preamble' => $preamble,
'body' => $body,
/*
+ @TODO deprecated code?
$email_tpl = get_intltext_template("update_fail_eml.tpl");
$email_msg = replace_macros($email_tpl, array(
'$sitename' => $a->config['sitename'],
- '$siteurl' => App::get_baseurl(),
+ '$siteurl' => System::baseUrl(),
'$update' => DB_UPDATE_VERSION,
'$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
));
- $subject=sprintf(t('Update Error at %s'), App::get_baseurl());
+ $subject=sprintf(t('Update Error at %s'), System::baseUrl());
require_once('include/email.php');
$subject = email_header_encode($subject,'UTF-8');
mail($a->config['admin_email'], $subject, $email_msg,
}
$column = $index["Column_name"];
- // On utf8mb4 a varchar index can only have a length of 191
- // The "show index" command sometimes returns this value although this value wasn't added manually.
- // Because we don't want to add this number to every index, we ignore bigger numbers
- if (($index["Sub_part"] != "") AND (($index["Sub_part"] < 191) OR ($index["Key_name"] == "PRIMARY"))) {
+
+ if (($index["Sub_part"] != "")) {
$column .= "(".$index["Sub_part"].")";
}
/**
* @brief Print out database error messages
*
- * @param object $db Database object
* @param string $message Message to be added to the error message
*
* @return string Error message
*/
-function print_update_error($db, $message) {
+function print_update_error($message) {
echo sprintf(t("\nError %d occurred during database update:\n%s\n"),
- $db->errorno, $db->error);
+ dba::errorNo(), dba::errorMessage());
return t('Errors encountered performing database changes: ').$message.EOL;
}
function update_structure($verbose, $action, $tables=null, $definition=null) {
- global $a, $db;
+ global $a;
if ($action) {
Config::set('system', 'maintenance', 1);
}
// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
- if ((version_compare($db->server_info(), '5.7.4') >= 0) AND
- !(strpos($db->server_info(), 'MariaDB') !== false)) {
+ if ((version_compare(dba::server_info(), '5.7.4') >= 0) &&
+ !(strpos(dba::server_info(), 'MariaDB') !== false)) {
$ignore = '';
} else {
$ignore = ' IGNORE';
if (!isset($database[$name])) {
$r = db_create_table($name, $structure["fields"], $verbose, $action, $structure['indexes']);
if (!dbm::is_result($r)) {
- $errors .= print_update_error($db, $name);
+ $errors .= print_update_error($name);
}
$is_new_table = True;
} else {
$field_definition = $database[$name]["fields"][$fieldname];
// Define the default collation if not given
- if (!isset($parameters['Collation']) AND !is_null($field_definition['Collation'])) {
+ if (!isset($parameters['Collation']) && !is_null($field_definition['Collation'])) {
$parameters['Collation'] = 'utf8mb4_general_ci';
} else {
$parameters['Collation'] = null;
if ($field_definition['Collation'] != $parameters['Collation']) {
$sql2 = db_modify_table_field($fieldname, $parameters);
- if (($sql3 == "") OR (substr($sql3, -2, 2) == "; ")) {
+ if (($sql3 == "") || (substr($sql3, -2, 2) == "; ")) {
$sql3 .= "ALTER" . $ignore . " TABLE `".$temp_name."` ".$sql2;
} else {
$sql3 .= ", ".$sql2;
if ($verbose) {
// Ensure index conversion to unique removes duplicates
- if ($is_unique) {
+ if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
echo "SET session old_alter_table=1;\n";
} else {
+ echo "DROP TABLE IF EXISTS `".$temp_name."`;\n";
echo "CREATE TABLE `".$temp_name."` LIKE `".$name."`;\n";
}
}
echo $sql3."\n";
- if ($is_unique) {
+ if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
echo "SET session old_alter_table=0;\n";
} else {
Config::set('system', 'maintenance_reason', sprintf(t('%s: updating %s table.'), dbm::date().' '.date('e'), $name));
// Ensure index conversion to unique removes duplicates
- if ($is_unique) {
+ if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
- $db->q("SET session old_alter_table=1;");
+ dba::e("SET session old_alter_table=1;");
} else {
- $r = $db->q("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
+ dba::e("DROP TABLE IF EXISTS `".$temp_name."`;");
+ if (!dbm::is_result($r)) {
+ $errors .= print_update_error($sql3);
+ return $errors;
+ }
+
+ $r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
if (!dbm::is_result($r)) {
- $errors .= print_update_error($db, $sql3);
+ $errors .= print_update_error($sql3);
return $errors;
}
}
}
- $r = @$db->q($sql3);
+ $r = @dba::e($sql3);
if (!dbm::is_result($r)) {
- $errors .= print_update_error($db, $sql3);
+ $errors .= print_update_error($sql3);
}
- if ($is_unique) {
+ if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
- $db->q("SET session old_alter_table=0;");
+ dba::e("SET session old_alter_table=0;");
} else {
- $r = $db->q("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
+ $r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
if (!dbm::is_result($r)) {
- $errors .= print_update_error($db, $sql3);
+ $errors .= print_update_error($sql3);
return $errors;
}
- $r = $db->q("DROP TABLE `".$name."`;");
+ $r = dba::e("DROP TABLE `".$name."`;");
if (!dbm::is_result($r)) {
- $errors .= print_update_error($db, $sql3);
+ $errors .= print_update_error($sql3);
return $errors;
}
- $r = $db->q("RENAME TABLE `".$temp_name."` TO `".$name."`;");
+ $r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
if (!dbm::is_result($r)) {
- $errors .= print_update_error($db, $sql3);
+ $errors .= print_update_error($sql3);
return $errors;
}
}
if ($parameters["extra"] != "")
$fieldstruct .= " ".$parameters["extra"];
- /*if (($parameters["primary"] != "") AND $create)
+ /*if (($parameters["primary"] != "") && $create)
$fieldstruct .= " PRIMARY KEY";*/
return($fieldstruct);
}
function db_create_table($name, $fields, $verbose, $action, $indexes=null) {
- global $a, $db;
+ global $a;
$r = true;
$primary_keys = array();
foreach ($fields AS $fieldname => $field) {
$sql_rows[] = "`".dbesc($fieldname)."` ".db_field_command($field);
- if (x($field,'primary') and $field['primary']!='') {
+ if (x($field,'primary') && $field['primary']!='') {
$primary_keys[] = $fieldname;
}
}
echo $sql.";\n";
if ($action)
- $r = @$db->q($sql);
+ $r = @dba::e($sql);
return $r;
}
"addr_uid" => array("addr(32)", "uid"),
"nurl_uid" => array("nurl(32)", "uid"),
"nick_uid" => array("nick(32)", "uid"),
- "dfrn-id" => array("dfrn-id"),
- "issued-id" => array("issued-id"),
+ "dfrn-id" => array("dfrn-id(64)"),
+ "issued-id" => array("issued-id(64)"),
)
);
$database["conv"] = array(
),
"indexes" => array(
"PRIMARY" => array("id"),
- "guid" => array("guid"),
- "uri" => array("uri"),
+ "guid" => array("guid(191)"),
+ "uri" => array("uri(191)"),
"parent" => array("parent"),
- "parent-uri" => array("parent-uri"),
- "extid" => array("extid"),
+ "parent-uri" => array("parent-uri(191)"),
+ "extid" => array("extid(191)"),
"uid_id" => array("uid","id"),
"uid_contactid_id" => array("uid","contact-id","id"),
"uid_created" => array("uid","created"),
"authorid_created" => array("author-id","created"),
"ownerid" => array("owner-id"),
"uid_uri" => array("uid", "uri(190)"),
- "resource-id" => array("resource-id"),
+ "resource-id" => array("resource-id(191)"),
"contactid_allowcid_allowpid_denycid_denygid" => array("contact-id","allow_cid(10)","allow_gid(10)","deny_cid(10)","deny_gid(10)"), //
"uid_type_changed" => array("uid","type(190)","changed"),
"contactid_verb" => array("contact-id","verb(190)"),
"indexes" => array(
"PRIMARY" => array("id"),
"uid" => array("uid"),
- "sid" => array("sid"),
+ "sid" => array("sid(32)"),
"service" => array("service(32)"),
"iid" => array("iid"),
)
"id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
"name" => array("type" => "varchar(128)", "not null" => "1", "default" => ""),
"locked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
- "created" => array("type" => "datetime", "default" => NULL_DATE),
+ "pid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"convid" => array("convid"),
"uri" => array("uri(64)"),
"parent-uri" => array("parent-uri(64)"),
- "contactid" => array("contact-id"),
+ "contactid" => array("contact-id(32)"),
)
);
$database["mailacct"] = array(
),
"indexes" => array(
"PRIMARY" => array("id"),
- "iid" => array("iid"),
+ "iid" => array("UNIQUE", "iid"),
)
);
$database["spam"] = array(
"uid" => array("uid"),
"spam" => array("spam"),
"ham" => array("ham"),
- "term" => array("term"),
+ "term" => array("term(32)"),
)
);
$database["term"] = array(
"uid_created" => array("uid","created"),
"uid_commented" => array("uid","commented"),
"uid_wall_created" => array("uid","wall","created"),
+ "private_wall_received" => array("private","wall","received"),
)
);
$database["tokens"] = array(
"account_expired" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
"account_expires_on" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
"expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
- "service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
"def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"allow_cid" => array("type" => "mediumtext"),
"allow_gid" => array("type" => "mediumtext"),
"created" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
"pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
"executed" => array("type" => "datetime", "not null" => "1", "default" => NULL_DATE),
+ "done" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
),
"indexes" => array(
"PRIMARY" => array("id"),
"pid" => array("pid"),
+ "parameter" => array("parameter(64)"),
"priority_created" => array("priority", "created"),
+ "executed" => array("executed"),
)
);
* run from command line
*/
function dbstructure_run(&$argv, &$argc) {
- global $a, $db;
+ global $a;
- if (is_null($a)) {
+ if (empty($a)) {
$a = new App(dirname(__DIR__));
}
- if (is_null($db)) {
- @include(".htconfig.php");
- require_once("include/dba.php");
- $db = new dba($db_host, $db_user, $db_pass, $db_data);
- unset($db_host, $db_user, $db_pass, $db_data);
- }
+ @include ".htconfig.php";
+ require_once "include/dba.php";
+ dba::connect($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
- if ($argc==2) {
+ if ($argc == 2) {
switch ($argv[1]) {
case "dryrun":
update_structure(true, false);
$build = get_config('system','build');
if (!x($build)) {
- set_config('system','build',DB_UPDATE_VERSION);
+ set_config('system', 'build', DB_UPDATE_VERSION);
$build = DB_UPDATE_VERSION;
}
// run any left update_nnnn functions in update.php
for ($x = $stored; $x < $current; $x ++) {
$r = run_update_function($x);
- if (!$r) break;
+ if (!$r) {
+ break;
+ }
}
set_config('system','build',DB_UPDATE_VERSION);
}
-if (array_search(__file__,get_included_files())===0) {
+if (array_search(__FILE__,get_included_files())===0) {
dbstructure_run($_SERVER["argv"],$_SERVER["argc"]);
killme();
}
projects / friendica.git / blobdiff