nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #8620 from annando/dbstructure

Browse source 
DBStructure is now using "q(" nevermore
This commit is contained in:
Hypolite Petovan 2020-05-11 15:08:15 -04:00 committed by GitHub
parent 953fc78691 faaf3d89e3
commit 1d9394d409
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
src/Database/DBStructure.php
View file

@ -27,8 +27,6 @@ use Friendica\Core\Logger;
use Friendica\DI; use Friendica\DI;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
require_once __DIR__ . '/../../include/dba.php';
/** /**
* This class contains functions that doesn't need to know if pdo, mysqli or whatever is used. * This class contains functions that doesn't need to know if pdo, mysqli or whatever is used.
*/ */
@ -485,9 +483,9 @@ class DBStructure
} }
} }
if (isset($database[$name]["table_status"]["Comment"])) { if (isset($database[$name]["table_status"]["TABLE_COMMENT"])) {
$structurecomment = $structure["comment"] ?? ''; $structurecomment = $structure["comment"] ?? '';
if ($database[$name]["table_status"]["Comment"] != $structurecomment) { if ($database[$name]["table_status"]["TABLE_COMMENT"] != $structurecomment) {
$sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'"; $sql2 = "COMMENT = '" . DBA::escape($structurecomment) . "'";
if ($sql3 == "") { if ($sql3 == "") {
@ -498,8 +496,8 @@ class DBStructure
} }
} }
if (isset($database[$name]["table_status"]["Engine"]) && isset($structure['engine'])) { if (isset($database[$name]["table_status"]["ENGINE"]) && isset($structure['engine'])) {
if ($database[$name]["table_status"]["Engine"] != $structure['engine']) { if ($database[$name]["table_status"]["ENGINE"] != $structure['engine']) {
$sql2 = "ENGINE = '" . DBA::escape($structure['engine']) . "'"; $sql2 = "ENGINE = '" . DBA::escape($structure['engine']) . "'";
if ($sql3 == "") { if ($sql3 == "") {
@ -510,8 +508,8 @@ class DBStructure
} }
} }
if (isset($database[$name]["table_status"]["Collation"])) { if (isset($database[$name]["table_status"]["TABLE_COLLATION"])) {
if ($database[$name]["table_status"]["Collation"] != 'utf8mb4_general_ci') { if ($database[$name]["table_status"]["TABLE_COLLATION"] != 'utf8mb4_general_ci') {
$sql2 = "DEFAULT COLLATE utf8mb4_general_ci"; $sql2 = "DEFAULT COLLATE utf8mb4_general_ci";
if ($sql3 == "") { if ($sql3 == "") {
@ -658,24 +656,24 @@ class DBStructure
private static function tableStructure($table) private static function tableStructure($table)
{ {
$structures = q("DESCRIBE `%s`", $table); // This query doesn't seem to be executable as a prepared statement
$indexes = DBA::toArray(DBA::p("SHOW INDEX FROM " . DBA::quoteIdentifier($table)));
$full_columns = q("SHOW FULL COLUMNS FROM `%s`", $table); $fields = DBA::selectToArray(['INFORMATION_SCHEMA' => 'COLUMNS'],
['COLUMN_NAME', 'COLUMN_TYPE', 'IS_NULLABLE', 'COLUMN_DEFAULT', 'EXTRA',
$indexes = q("SHOW INDEX FROM `%s`", $table); 'COLUMN_KEY', 'COLLATION_NAME', 'COLUMN_COMMENT'],
["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ?",
DBA::databaseName(), $table]);
$foreign_keys = DBA::selectToArray(['INFORMATION_SCHEMA' => 'KEY_COLUMN_USAGE'], $foreign_keys = DBA::selectToArray(['INFORMATION_SCHEMA' => 'KEY_COLUMN_USAGE'],
['COLUMN_NAME', 'CONSTRAINT_NAME', 'REFERENCED_TABLE_NAME', 'REFERENCED_COLUMN_NAME'], ['COLUMN_NAME', 'CONSTRAINT_NAME', 'REFERENCED_TABLE_NAME', 'REFERENCED_COLUMN_NAME'],
["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `REFERENCED_TABLE_SCHEMA` IS NOT NULL", ["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ? AND `REFERENCED_TABLE_SCHEMA` IS NOT NULL",
DBA::databaseName(), $table]); DBA::databaseName(), $table]);
$table_status = q("SHOW TABLE STATUS WHERE `name` = '%s'", $table); $table_status = DBA::selectFirst(['INFORMATION_SCHEMA' => 'TABLES'],
['ENGINE', 'TABLE_COLLATION', 'TABLE_COMMENT'],
if (DBA::isResult($table_status)) { ["`TABLE_SCHEMA` = ? AND `TABLE_NAME` = ?",
$table_status = $table_status[0]; DBA::databaseName(), $table]);
} else {
$table_status = [];
}
$fielddata = []; $fielddata = [];
$indexdata = []; $indexdata = [];
@ -708,35 +706,34 @@ class DBStructure
$indexdata[$index["Key_name"]][] = $column; $indexdata[$index["Key_name"]][] = $column;
} }
} }
if (DBA::isResult($structures)) {
foreach ($structures AS $field) { $fielddata = [];
// Replace the default size values so that we don't have to define them 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)']; $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']; $replace = ['boolean', 'tinyint unsigned', 'tinyint', 'smallint unsigned', 'smallint', 'mediumint unsigned', 'mediumint', 'bigint', 'int unsigned', 'int'];
$field["Type"] = str_replace($search, $replace, $field["Type"]); $field['COLUMN_TYPE'] = str_replace($search, $replace, $field['COLUMN_TYPE']);
$fielddata[$field["Field"]]["type"] = $field["Type"]; $fielddata[$field['COLUMN_NAME']]['type'] = $field['COLUMN_TYPE'];
if ($field["Null"] == "NO") {
$fielddata[$field["Field"]]["not null"] = true; if ($field['IS_NULLABLE'] == 'NO') {
$fielddata[$field['COLUMN_NAME']]['not null'] = true;
} }
if (isset($field["Default"])) { if (isset($field['COLUMN_DEFAULT'])) {
$fielddata[$field["Field"]]["default"] = $field["Default"]; $fielddata[$field['COLUMN_NAME']]['default'] = $field['COLUMN_DEFAULT'];
} }
if ($field["Extra"] != "") { if (!empty($field['EXTRA'])) {
$fielddata[$field["Field"]]["extra"] = $field["Extra"]; $fielddata[$field['COLUMN_NAME']]['extra'] = $field['EXTRA'];
} }
if ($field["Key"] == "PRI") { if ($field['COLUMN_KEY'] == 'PRI') {
$fielddata[$field["Field"]]["primary"] = true; $fielddata[$field['COLUMN_NAME']]['primary'] = true;
} }
}
} $fielddata[$field['COLUMN_NAME']]['Collation'] = $field['COLLATION_NAME'];
if (DBA::isResult($full_columns)) { $fielddata[$field['COLUMN_NAME']]['comment'] = $field['COLUMN_COMMENT'];
foreach ($full_columns AS $column) {
$fielddata[$column["Field"]]["Collation"] = $column["Collation"];
$fielddata[$column["Field"]]["comment"] = $column["Comment"];
} }
} }