Fix formatting in Database\DBStructure

This commit is contained in:
Hypolite Petovan 2018-12-23 15:32:23 -05:00
parent d7d685ad6b
commit 48a356dba2

View file

@ -2,6 +2,7 @@
/** /**
* @file src/Database/DBStructure.php * @file src/Database/DBStructure.php
*/ */
namespace Friendica\Database; namespace Friendica\Database;
use Exception; use Exception;
@ -27,6 +28,9 @@ class DBStructure
const UPDATE_SUCCESSFUL = 1; // Database check was successful const UPDATE_SUCCESSFUL = 1; // Database check was successful
const UPDATE_FAILED = 2; // Database check failed const UPDATE_FAILED = 2; // Database check failed
const RENAME_COLUMN = 0;
const RENAME_PRIMARY_KEY = 1;
/** /**
* Database structure definition loaded from config/dbstructure.config.php * Database structure definition loaded from config/dbstructure.config.php
* *
@ -37,7 +41,8 @@ class DBStructure
/* /*
* Converts all tables from MyISAM to InnoDB * Converts all tables from MyISAM to InnoDB
*/ */
public static function convertToInnoDB() { public static function convertToInnoDB()
{
$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'", $r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
DBA::escape(DBA::databaseName())); DBA::escape(DBA::databaseName()));
@ -57,75 +62,23 @@ class DBStructure
} }
} }
private static function tableStructure($table) { /**
$structures = q("DESCRIBE `%s`", $table); * @brief Print out database error messages
*
* @param string $message Message to be added to the error message
*
* @return string Error message
*/
private static function printUpdateError($message)
{
echo L10n::t("\nError %d occurred during database update:\n%s\n",
DBA::errorNo(), DBA::errorMessage());
$full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table); return L10n::t('Errors encountered performing database changes: ') . $message . EOL;
$indexes = q("SHOW INDEX FROM `%s`", $table);
$table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
if (DBA::isResult($table_status)) {
$table_status = $table_status[0];
} else {
$table_status = [];
} }
$fielddata = []; public static function printStructure()
$indexdata = []; {
if (DBA::isResult($indexes)) {
foreach ($indexes AS $index) {
if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ['UNIQUE'];
}
$column = $index["Column_name"];
if ($index["Sub_part"] != "") {
$column .= "(".$index["Sub_part"].")";
}
$indexdata[$index["Key_name"]][] = $column;
}
}
if (DBA::isResult($structures)) {
foreach ($structures AS $field) {
// Replace the default size values so that we don't have to define them
$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["Type"] = str_replace($search, $replace, $field["Type"]);
$fielddata[$field["Field"]]["type"] = $field["Type"];
if ($field["Null"] == "NO") {
$fielddata[$field["Field"]]["not null"] = true;
}
if (isset($field["Default"])) {
$fielddata[$field["Field"]]["default"] = $field["Default"];
}
if ($field["Extra"] != "") {
$fielddata[$field["Field"]]["extra"] = $field["Extra"];
}
if ($field["Key"] == "PRI") {
$fielddata[$field["Field"]]["primary"] = true;
}
}
}
if (DBA::isResult($full_columns)) {
foreach ($full_columns AS $column) {
$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
$fielddata[$column["Field"]]["comment"] = $column["Comment"];
}
}
return ["fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status];
}
public static function printStructure() {
$database = self::definition(false); $database = self::definition(false);
echo "-- ------------------------------------------\n"; echo "-- ------------------------------------------\n";
@ -143,17 +96,155 @@ class DBStructure
} }
/** /**
* @brief Print out database error messages * Loads the database structure definition from the config/dbstructure.config.php file.
* On first pass, defines DB_UPDATE_VERSION constant.
* *
* @param string $message Message to be added to the error message * @see config/dbstructure.config.php
* * @param boolean $with_addons_structure Whether to tack on addons additional tables
* @return string Error message * @return array
* @throws Exception
*/ */
private static function printUpdateError($message) { public static function definition($with_addons_structure = true)
echo L10n::t("\nError %d occurred during database update:\n%s\n", {
DBA::errorNo(), DBA::errorMessage()); if (!self::$definition) {
$a = \Friendica\BaseObject::getApp();
return L10n::t('Errors encountered performing database changes: ').$message.EOL; $filename = $a->getBasePath() . '/config/dbstructure.config.php';
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.config.php');
}
$definition = require $filename;
if (!$definition) {
throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
}
self::$definition = $definition;
} else {
$definition = self::$definition;
}
if ($with_addons_structure) {
Hook::callAll('dbstructure_definition', $definition);
}
return $definition;
}
private static function createTable($name, $structure, $verbose, $action)
{
$r = true;
$engine = "";
$comment = "";
$sql_rows = [];
$primary_keys = [];
foreach ($structure["fields"] AS $fieldname => $field) {
$sql_rows[] = "`" . DBA::escape($fieldname) . "` " . self::FieldCommand($field);
if (!empty($field['primary'])) {
$primary_keys[] = $fieldname;
}
}
if (!empty($structure["indexes"])) {
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
$sql_index = self::createIndex($indexname, $fieldnames, "");
if (!is_null($sql_index)) {
$sql_rows[] = $sql_index;
}
}
}
if (isset($structure["engine"])) {
$engine = " ENGINE=" . $structure["engine"];
}
if (isset($structure["comment"])) {
$comment = " COMMENT='" . DBA::escape($structure["comment"]) . "'";
}
$sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", DBA::escape($name)) . $sql .
"\n)" . $engine . " DEFAULT COLLATE utf8mb4_general_ci" . $comment;
if ($verbose) {
echo $sql . ";\n";
}
if ($action) {
$r = DBA::e($sql);
}
return $r;
}
private static function FieldCommand($parameters, $create = true)
{
$fieldstruct = $parameters["type"];
if (isset($parameters["Collation"])) {
$fieldstruct .= " COLLATE " . $parameters["Collation"];
}
if (isset($parameters["not null"])) {
$fieldstruct .= " NOT NULL";
}
if (isset($parameters["default"])) {
if (strpos(strtolower($parameters["type"]), "int") !== false) {
$fieldstruct .= " DEFAULT " . $parameters["default"];
} else {
$fieldstruct .= " DEFAULT '" . $parameters["default"] . "'";
}
}
if (isset($parameters["extra"])) {
$fieldstruct .= " " . $parameters["extra"];
}
if (isset($parameters["comment"])) {
$fieldstruct .= " COMMENT '" . DBA::escape($parameters["comment"]) . "'";
}
/*if (($parameters["primary"] != "") && $create)
$fieldstruct .= " PRIMARY KEY";*/
return ($fieldstruct);
}
private static function createIndex($indexname, $fieldnames, $method = "ADD")
{
$method = strtoupper(trim($method));
if ($method != "" && $method != "ADD") {
throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
}
if ($fieldnames[0] == "UNIQUE") {
array_shift($fieldnames);
$method .= ' UNIQUE';
}
$names = "";
foreach ($fieldnames AS $fieldname) {
if ($names != "") {
$names .= ",";
}
if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
$names .= "`" . DBA::escape($matches[1]) . "`(" . intval($matches[2]) . ")";
} else {
$names .= "`" . DBA::escape($fieldname) . "`";
}
}
if ($indexname == "PRIMARY") {
return sprintf("%s PRIMARY KEY(%s)", $method, $names);
}
$sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
return ($sql);
} }
/** /**
@ -166,7 +257,8 @@ class DBStructure
* @param array $definition An array of the definition tables * @param array $definition An array of the definition tables
* @return string Empty string if the update is successful, error messages otherwise * @return string Empty string if the update is successful, error messages otherwise
*/ */
public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null) { public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null)
{
if ($action && !$install) { if ($action && !$install) {
Config::set('system', 'maintenance', 1); Config::set('system', 'maintenance', 1);
Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e'))); Config::set('system', 'maintenance_reason', L10n::t('%s: Database update', DateTimeFormat::utcNow() . ' ' . date('e')));
@ -497,133 +589,95 @@ class DBStructure
return $errors; return $errors;
} }
private static function FieldCommand($parameters, $create = true) { private static function tableStructure($table)
$fieldstruct = $parameters["type"]; {
$structures = q("DESCRIBE `%s`", $table);
if (isset($parameters["Collation"])) { $full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table);
$fieldstruct .= " COLLATE ".$parameters["Collation"];
}
if (isset($parameters["not null"])) { $indexes = q("SHOW INDEX FROM `%s`", $table);
$fieldstruct .= " NOT NULL";
}
if (isset($parameters["default"])) { $table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table);
if (strpos(strtolower($parameters["type"]),"int")!==false) {
$fieldstruct .= " DEFAULT ".$parameters["default"]; if (DBA::isResult($table_status)) {
$table_status = $table_status[0];
} else { } else {
$fieldstruct .= " DEFAULT '".$parameters["default"]."'"; $table_status = [];
}
}
if (isset($parameters["extra"])) {
$fieldstruct .= " ".$parameters["extra"];
} }
if (isset($parameters["comment"])) { $fielddata = [];
$fieldstruct .= " COMMENT '".DBA::escape($parameters["comment"])."'"; $indexdata = [];
if (DBA::isResult($indexes)) {
foreach ($indexes AS $index) {
if ($index['Key_name'] != 'PRIMARY' && $index['Non_unique'] == '0' && !isset($indexdata[$index["Key_name"]])) {
$indexdata[$index["Key_name"]] = ['UNIQUE'];
} }
/*if (($parameters["primary"] != "") && $create) $column = $index["Column_name"];
$fieldstruct .= " PRIMARY KEY";*/
return($fieldstruct); if ($index["Sub_part"] != "") {
$column .= "(" . $index["Sub_part"] . ")";
} }
private static function createTable($name, $structure, $verbose, $action) { $indexdata[$index["Key_name"]][] = $column;
$r = true; }
}
if (DBA::isResult($structures)) {
foreach ($structures AS $field) {
// Replace the default size values so that we don't have to define them
$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["Type"] = str_replace($search, $replace, $field["Type"]);
$engine = ""; $fielddata[$field["Field"]]["type"] = $field["Type"];
$comment = ""; if ($field["Null"] == "NO") {
$sql_rows = []; $fielddata[$field["Field"]]["not null"] = true;
$primary_keys = []; }
foreach ($structure["fields"] AS $fieldname => $field) {
$sql_rows[] = "`".DBA::escape($fieldname)."` ".self::FieldCommand($field); if (isset($field["Default"])) {
if (!empty($field['primary'])) { $fielddata[$field["Field"]]["default"] = $field["Default"];
$primary_keys[] = $fieldname; }
if ($field["Extra"] != "") {
$fielddata[$field["Field"]]["extra"] = $field["Extra"];
}
if ($field["Key"] == "PRI") {
$fielddata[$field["Field"]]["primary"] = true;
}
}
}
if (DBA::isResult($full_columns)) {
foreach ($full_columns AS $column) {
$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
$fielddata[$column["Field"]]["comment"] = $column["Comment"];
} }
} }
if (!empty($structure["indexes"])) { return ["fields" => $fielddata, "indexes" => $indexdata, "table_status" => $table_status];
foreach ($structure["indexes"] AS $indexname => $fieldnames) {
$sql_index = self::createIndex($indexname, $fieldnames, "");
if (!is_null($sql_index)) {
$sql_rows[] = $sql_index;
}
}
} }
if (isset($structure["engine"])) { private static function dropIndex($indexname)
$engine = " ENGINE=" . $structure["engine"]; {
}
if (isset($structure["comment"])) {
$comment = " COMMENT='" . DBA::escape($structure["comment"]) . "'";
}
$sql = implode(",\n\t", $sql_rows);
$sql = sprintf("CREATE TABLE IF NOT EXISTS `%s` (\n\t", DBA::escape($name)).$sql.
"\n)" . $engine . " DEFAULT COLLATE utf8mb4_general_ci" . $comment;
if ($verbose) {
echo $sql.";\n";
}
if ($action) {
$r = DBA::e($sql);
}
return $r;
}
private static function addTableField($fieldname, $parameters) {
$sql = sprintf("ADD `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters));
return($sql);
}
private static function modifyTableField($fieldname, $parameters) {
$sql = sprintf("MODIFY `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters, false));
return($sql);
}
private static function dropIndex($indexname) {
$sql = sprintf("DROP INDEX `%s`", DBA::escape($indexname)); $sql = sprintf("DROP INDEX `%s`", DBA::escape($indexname));
return ($sql); return ($sql);
} }
private static function createIndex($indexname, $fieldnames, $method = "ADD") { private static function addTableField($fieldname, $parameters)
$method = strtoupper(trim($method)); {
if ($method!="" && $method!="ADD") { $sql = sprintf("ADD `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters));
throw new Exception("Invalid parameter 'method' in self::createIndex(): '$method'");
}
if ($fieldnames[0] == "UNIQUE") {
array_shift($fieldnames);
$method .= ' UNIQUE';
}
$names = "";
foreach ($fieldnames AS $fieldname) {
if ($names != "") {
$names .= ",";
}
if (preg_match('|(.+)\((\d+)\)|', $fieldname, $matches)) {
$names .= "`".DBA::escape($matches[1])."`(".intval($matches[2]).")";
} else {
$names .= "`".DBA::escape($fieldname)."`";
}
}
if ($indexname == "PRIMARY") {
return sprintf("%s PRIMARY KEY(%s)", $method, $names);
}
$sql = sprintf("%s INDEX `%s` (%s)", $method, DBA::escape($indexname), $names);
return ($sql); return ($sql);
} }
private static function groupBy($indexname, $fieldnames) { private static function modifyTableField($fieldname, $parameters)
{
$sql = sprintf("MODIFY `%s` %s", DBA::escape($fieldname), self::FieldCommand($parameters, false));
return ($sql);
}
private static function groupBy($indexname, $fieldnames)
{
if ($fieldnames[0] != "UNIQUE") { if ($fieldnames[0] != "UNIQUE") {
return ""; return "";
} }
@ -647,81 +701,9 @@ class DBStructure
return $sql; return $sql;
} }
/**
* Check if a table exists
*
* @param string $table Table name
*
* @return boolean Does the table exist?
*/
public static function existsTable($table)
{
if (empty($table)) {
return false;
}
$table = DBA::escape($table);
$sql = "SHOW TABLES LIKE '" . $table . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
return $retval;
}
/**
* Check if the columns of the table exists
*
* @param string $table Table name
* @param array $columns Columns to check ( Syntax: [ $col1, $col2, .. ] )
*
* @return boolean Does the table exist?
*/
public static function existsColumn($table, $columns = []) {
if (empty($table)) {
return false;
}
if (is_null($columns) || empty($columns)) {
return self::existsTable($table);
}
$table = DBA::escape($table);
foreach ($columns AS $column) {
$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
if (!$retval) {
return false;
}
}
return true;
}
const RENAME_COLUMN = 0;
const RENAME_PRIMARY_KEY = 1;
/** /**
* Renames columns or the primary key of a table * Renames columns or the primary key of a table
*
* @todo You cannot rename a primary key if "auto increment" is set * @todo You cannot rename a primary key if "auto increment" is set
* *
* @param string $table Table name * @param string $table Table name
@ -732,7 +714,8 @@ class DBStructure
* @return boolean Was the renaming successful? * @return boolean Was the renaming successful?
* *
*/ */
public static function rename($table, $columns, $type = self::RENAME_COLUMN) { public static function rename($table, $columns, $type = self::RENAME_COLUMN)
{
if (empty($table) || empty($columns)) { if (empty($table) || empty($columns)) {
return false; return false;
} }
@ -783,40 +766,73 @@ class DBStructure
} }
/** /**
* Loads the database structure definition from the config/dbstructure.config.php file. * Check if the columns of the table exists
* On first pass, defines DB_UPDATE_VERSION constant.
* *
* @see config/dbstructure.config.php * @param string $table Table name
* @param boolean $with_addons_structure Whether to tack on addons additional tables * @param array $columns Columns to check ( Syntax: [ $col1, $col2, .. ] )
* @return array *
* @throws Exception * @return boolean Does the table exist?
*/ */
public static function definition($with_addons_structure = true) public static function existsColumn($table, $columns = [])
{ {
if (!self::$definition) { if (empty($table)) {
$a = \Friendica\BaseObject::getApp(); return false;
$filename = $a->getBasePath() . '/config/dbstructure.config.php';
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.config.php');
} }
$definition = require $filename; if (is_null($columns) || empty($columns)) {
return self::existsTable($table);
if (!$definition) {
throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
} }
self::$definition = $definition; $table = DBA::escape($table);
foreach ($columns AS $column) {
$sql = "SHOW COLUMNS FROM `" . $table . "` LIKE '" . $column . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else { } else {
$definition = self::$definition; $retval = (DBA::numRows($stmt) > 0);
} }
if ($with_addons_structure) { DBA::close($stmt);
Hook::callAll('dbstructure_definition', $definition);
if (!$retval) {
return false;
}
} }
return $definition; return true;
}
/**
* Check if a table exists
*
* @param string $table Table name
*
* @return boolean Does the table exist?
*/
public static function existsTable($table)
{
if (empty($table)) {
return false;
}
$table = DBA::escape($table);
$sql = "SHOW TABLES LIKE '" . $table . "';";
$stmt = DBA::p($sql);
if (is_bool($stmt)) {
$retval = $stmt;
} else {
$retval = (DBA::numRows($stmt) > 0);
}
DBA::close($stmt);
return $retval;
} }
} }