throw new \Asika\SimpleConsole\CommandArgsException('The version number must be numeric');
}
- DI::config()->set('system', 'build', $version);
+ DI::keyValue()->set( 'build', $version);
echo DI::l10n()->t('The database version had been set to %s.', $version);
}
*/
public static function dropTables(bool $execute)
{
- $postupdate = DI::config()->get('system', 'post_update_version', PostUpdate::VERSION);
+ $postupdate = DI::keyValue()->get('post_update_version') ?? PostUpdate::VERSION;
if ($postupdate < PostUpdate::VERSION) {
echo DI::l10n()->t('The post update is at version %d, it has to be at %d to safely drop the tables.', $postupdate, PostUpdate::VERSION);
return;
$old_tables = ['fserver', 'gcign', 'gcontact', 'gcontact-relation', 'gfollower' ,'glink', 'item-delivery-data',
'item-activity', 'item-content', 'item_id', 'participation', 'poll', 'poll_result', 'queue', 'retriever_rule',
'deliverq', 'dsprphotoq', 'ffinder', 'sign', 'spam', 'term', 'user-item', 'thread', 'item', 'challenge',
- 'auth_codes', 'tokens', 'clients', 'profile_check', 'host'];
+ 'auth_codes', 'tokens', 'clients', 'profile_check', 'host', 'conversation', 'fcontact'];
$tables = DBA::selectToArray('INFORMATION_SCHEMA.TABLES', ['TABLE_NAME'],
['TABLE_SCHEMA' => DBA::databaseName(), 'TABLE_TYPE' => 'BASE TABLE']);
* Print out database error messages
*
* @param string $message Message to be added to the error message
+ *
* @return string Error message
*/
private static function printUpdateError(string $message): string
echo DI::l10n()->t("\nError %d occurred during database update:\n%s\n",
DBA::errorNo(), DBA::errorMessage());
- return DI::l10n()->t('Errors encountered performing database changes: ') . $message . EOL;
+ return DI::l10n()->t('Errors encountered performing database changes: ') . $message . '<br />';
}
/**
* Perform a database structure dryrun (means: just simulating)
*
+ * @return string Empty string if the update is successful, error messages otherwise
* @throws Exception
*/
public static function dryRun(): string
public static function performUpdate(bool $enable_maintenance_mode = true, bool $verbose = false): string
{
if ($enable_maintenance_mode) {
- DI::config()->set('system', 'maintenance', 1);
+ DI::keyValue()->set( 'maintenance', 1);
}
$status = self::update($verbose, true);
if ($enable_maintenance_mode) {
- DI::config()->set('system', 'maintenance', 0);
- DI::config()->set('system', 'maintenance_reason', '');
+ DI::keyValue()->set( 'maintenance', 0);
+ DI::keyValue()->set( 'maintenance_reason', '');
}
return $status;
*/
private static function update(bool $verbose, bool $action, bool $install = false, array $tables = null, array $definition = null): string
{
- $in_maintenance_mode = DI::config()->get('system', 'maintenance');
+ $in_maintenance_mode = DI::keyValue()->get('system', 'maintenance');
if ($action && !$install && self::isUpdating()) {
return DI::l10n()->t('Another database update is currently running.');
// Get the definition
if (is_null($definition)) {
- $definition = DI::dbaDefinition()->getAll();
+ // just for Update purpose, reload the DBA definition with addons to explicit get the whole definition
+ $definition = DI::dbaDefinition()->load(true)->getAll();
}
// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
if ($action && !$install) {
if ($errors) {
- DI::config()->set('system', 'dbupdate', self::UPDATE_FAILED);
+ DI::config()->set('system', 'dbupdate', self::UPDATE_FAILED);
} else {
- DI::config()->set('system', 'dbupdate', self::UPDATE_SUCCESSFUL);
+ DI::config()->set( 'system', 'dbupdate', self::UPDATE_SUCCESSFUL);
}
}
$fields = DBA::selectToArray('INFORMATION_SCHEMA.COLUMNS',
['COLUMN_NAME', 'COLUMN_TYPE', 'IS_NULLABLE', 'COLUMN_DEFAULT', 'EXTRA',
- 'COLUMN_KEY', 'COLLATION_NAME', 'COLUMN_COMMENT'],
+ 'COLUMN_KEY', 'COLLATION_NAME', 'COLUMN_COMMENT'],
["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ?",
- DBA::databaseName(), $table]);
+ DBA::databaseName(), $table]);
$foreign_keys = DBA::selectToArray('INFORMATION_SCHEMA.KEY_COLUMN_USAGE',
['COLUMN_NAME', 'CONSTRAINT_NAME', 'REFERENCED_TABLE_NAME', 'REFERENCED_COLUMN_NAME'],
["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `REFERENCED_TABLE_SCHEMA` IS NOT NULL",
- DBA::databaseName(), $table]);
+ DBA::databaseName(), $table]);
$table_status = DBA::selectFirst('INFORMATION_SCHEMA.TABLES',
['ENGINE', 'TABLE_COLLATION', 'TABLE_COMMENT'],
["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ?",
- DBA::databaseName(), $table]);
+ DBA::databaseName(), $table]);
- $fielddata = [];
- $indexdata = [];
+ $fielddata = [];
+ $indexdata = [];
$foreigndata = [];
if (DBA::isResult($foreign_keys)) {
foreach ($foreign_keys as $foreign_key) {
- $parameters = ['foreign' => [$foreign_key['REFERENCED_TABLE_NAME'] => $foreign_key['REFERENCED_COLUMN_NAME']]];
- $constraint = self::getConstraintName($table, $foreign_key['COLUMN_NAME'], $parameters);
+ $parameters = ['foreign' => [$foreign_key['REFERENCED_TABLE_NAME'] => $foreign_key['REFERENCED_COLUMN_NAME']]];
+ $constraint = self::getConstraintName($table, $foreign_key['COLUMN_NAME'], $parameters);
$foreigndata[$constraint] = $foreign_key;
}
}
$fielddata = [];
if (DBA::isResult($fields)) {
foreach ($fields as $field) {
- $search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
- $replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
+ $search = ['tinyint(1)', 'tinyint(3) unsigned', 'tinyint(4)', 'smallint(5) unsigned', 'smallint(6)', 'mediumint(8) unsigned', 'mediumint(9)', 'bigint(20)', 'int(10) unsigned', 'int(11)'];
+ $replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
$field['COLUMN_TYPE'] = str_replace($search, $replace, $field['COLUMN_TYPE']);
$fielddata[$field['COLUMN_NAME']]['type'] = $field['COLUMN_TYPE'];
}
$fielddata[$field['COLUMN_NAME']]['Collation'] = $field['COLLATION_NAME'];
- $fielddata[$field['COLUMN_NAME']]['comment'] = $field['COLUMN_COMMENT'];
+ $fielddata[$field['COLUMN_NAME']]['comment'] = $field['COLUMN_COMMENT'];
}
}
return [
- 'fields' => $fielddata,
- 'indexes' => $indexdata,
+ 'fields' => $fielddata,
+ 'indexes' => $indexdata,
'foreign_keys' => $foreigndata,
'table_status' => $table_status
];
{
return DBA::exists('INFORMATION_SCHEMA.KEY_COLUMN_USAGE',
["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `COLUMN_NAME` = ? AND `REFERENCED_TABLE_SCHEMA` IS NOT NULL",
- DBA::databaseName(), $table, $field]);
+ DBA::databaseName(), $table, $field]);
}
/**
if (self::existsTable('user') && !DBA::exists('user', ['uid' => 0])) {
$user = [
- 'verified' => true,
- 'page-flags' => User::PAGE_FLAGS_SOAPBOX,
+ 'verified' => true,
+ 'page-flags' => User::PAGE_FLAGS_SOAPBOX,
'account-type' => User::ACCOUNT_TYPE_RELAY,
];
DBA::insert('user', $user);
$permission = '';
}
$fields = ['id' => $set['psid'], 'uid' => $set['uid'], 'allow_cid' => $permission,
- 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
+ 'allow_gid' => '', 'deny_cid' => '', 'deny_gid' => ''];
DBA::insert('permissionset', $fields);
}
DBA::close($sets);
$isUpdate = false;
$processes = DBA::select('information_schema.processlist', ['info'], [
- 'db' => DBA::databaseName(),
+ 'db' => DBA::databaseName(),
'command' => ['Query', 'Execute']
]);