namespace Friendica\Database;
use Exception;
-use Friendica\Core\Config;
use Friendica\Core\Hook;
-use Friendica\Core\L10n;
use Friendica\Core\Logger;
+use Friendica\DI;
use Friendica\Util\DateTimeFormat;
-require_once 'include/dba.php';
+require_once __DIR__ . '/../../include/dba.php';
/**
- * @brief This class contain functions for the database management
- *
* This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
*/
class DBStructure
*/
private static $definition = [];
- /*
+ /**
* Converts all tables from MyISAM to InnoDB
*/
public static function convertToInnoDB()
{
- $r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
- DBA::escape(DBA::databaseName()));
-
- if (!DBA::isResult($r)) {
- echo L10n::t('There are no tables on MyISAM.') . "\n";
+ $tables = DBA::selectToArray(
+ ['information_schema' => 'tables'],
+ ['table_name'],
+ ['engine' => 'MyISAM', 'table_schema' => DBA::databaseName()]
+ );
+
+ if (!DBA::isResult($tables)) {
+ echo DI::l10n()->t('There are no tables on MyISAM.') . "\n";
return;
}
- foreach ($r AS $table) {
- $sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", DBA::escape($table['TABLE_NAME']));
+ foreach ($tables AS $table) {
+ $sql = "ALTER TABLE " . DBA::quoteIdentifier($table['table_name']) . " engine=InnoDB;";
echo $sql . "\n";
$result = DBA::e($sql);
}
/**
- * @brief Print out database error messages
+ * Print out database error messages
*
* @param string $message Message to be added to the error message
*
*/
private static function printUpdateError($message)
{
- echo L10n::t("\nError %d occurred during database update:\n%s\n",
+ echo DI::l10n()->t("\nError %d occurred during database update:\n%s\n",
DBA::errorNo(), DBA::errorMessage());
- return L10n::t('Errors encountered performing database changes: ') . $message . EOL;
+ return DI::l10n()->t('Errors encountered performing database changes: ') . $message . EOL;
}
public static function printStructure($basePath)
* Loads the database structure definition from the config/dbstructure.config.php file.
* On first pass, defines DB_UPDATE_VERSION constant.
*
- * @see config/dbstructure.config.php
+ * @see static/dbstructure.config.php
* @param boolean $with_addons_structure Whether to tack on addons additional tables
* @param string $basePath The base path of this application
* @return array
{
if (!self::$definition) {
- $filename = $basePath . '/config/dbstructure.config.php';
+ $filename = $basePath . '/static/dbstructure.config.php';
if (!is_readable($filename)) {
- throw new Exception('Missing database structure config file config/dbstructure.config.php');
+ throw new Exception('Missing database structure config file static/dbstructure.config.php');
}
$definition = require $filename;
if (!$definition) {
- throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
+ throw new Exception('Corrupted database structure config file static/dbstructure.config.php');
}
self::$definition = $definition;
public static function update($basePath, $verbose, $action, $install = false, array $tables = null, array $definition = null)
{
if ($action && !$install) {
- Config::set('system', 'maintenance', 1);
- Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
+ DI::config()->set('system', 'maintenance', 1);
+ DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
}
$errors = '';
}
if (isset($database[$name]["table_status"]["Comment"])) {
- $structurecomment = defaults($structure, "comment", "");
+ $structurecomment = $structure["comment"] ?? '';
if ($database[$name]["table_status"]["Comment"] != $structurecomment) {
$sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'";
// Compare the field structure field by field
foreach ($structure["fields"] AS $fieldname => $parameters) {
// Compare the field definition
- $field_definition = defaults($database[$name]["fields"], $fieldname, ['Collation' => '']);
+ $field_definition = ($database[$name]["fields"][$fieldname] ?? '') ?: ['Collation' => ''];
// Define the default collation if not given
if (!isset($parameters['Collation']) && !empty($field_definition['Collation'])) {
if ($action) {
if (!$install) {
- Config::set('system', 'maintenance_reason', L10n::t('%s: updating %s table.', DateTimeFormat::utcNow() . ' ' . date('e'), $name));
+ DI::config()->set('system', 'maintenance_reason', DI::l10n()->t('%s: updating %s table.', DateTimeFormat::utcNow() . ' ' . date('e'), $name));
}
// Ensure index conversion to unique removes duplicates
}
if ($action && !$install) {
- Config::set('system', 'maintenance', 0);
- Config::set('system', 'maintenance_reason', '');
+ DI::config()->set('system', 'maintenance', 0);
+ DI::config()->set('system', 'maintenance_reason', '');
if ($errors) {
- Config::set('system', 'dbupdate', self::UPDATE_FAILED);
+ DI::config()->set('system', 'dbupdate', self::UPDATE_FAILED);
} else {
- Config::set('system', 'dbupdate', self::UPDATE_SUCCESSFUL);
+ DI::config()->set('system', 'dbupdate', self::UPDATE_SUCCESSFUL);
}
}
* @todo You cannot rename a primary key if "auto increment" is set
*
* @param string $table Table name
- * @param array $columns Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ] )
- * Syntax for Primary Key: [ $col1, $col2, ...] )
+ * @param array $columns Columns Syntax for Rename: [ $old1 => [ $new1, $type1 ], $old2 => [ $new2, $type2 ], ... ]
+ * Syntax for Primary Key: [ $col1, $col2, ...]
* @param int $type The type of renaming (Default is Column)
*
* @return boolean Was the renaming successful?
/**
* Check if a table exists
*
- * @param string $table Table name
+ * @param string|array $table Table name
*
* @return boolean Does the table exist?
* @throws Exception
return false;
}
- $table = DBA::escape($table);
-
- $sql = "SHOW TABLES LIKE '" . $table . "';";
-
- $stmt = DBA::p($sql);
-
- if (is_bool($stmt)) {
- $retval = $stmt;
+ if (is_array($table)) {
+ $condition = ['table_schema' => key($table), 'table_name' => current($table)];
} else {
- $retval = (DBA::numRows($stmt) > 0);
+ $condition = ['table_schema' => DBA::databaseName(), 'table_name' => $table];
}
- DBA::close($stmt);
+ $result = DBA::exists(['information_schema' => 'tables'], $condition);
- return $retval;
+ return $result;
}
/**
projects / friendica.git / blobdiff