GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

[DATABASE] Make unprefixed schema.php a bit more DBMS-neutral

This commit is contained in:
Alexei Sorokin 2020-07-23 18:12:01 +03:00 committed by Diogo Peralta Cordeiro
parent 452f05512f
commit 65b6a924bd
3 changed files with 64 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/database/mysqlschema.php
View File

@ -379,6 +379,25 @@ class MysqlSchema extends Schema
return "{$tableName}_{$columnName}_idx"; return "{$tableName}_{$columnName}_idx";
} }
/**
* Append phrase(s) to an array of partial ALTER TABLE chunks in order
* to alter the given column from its old state to a new one.
*
* @param array $phrase
* @param string $columnName
* @param array $old previous column definition as found in DB
* @param array $cd current column definition
*/
public function appendAlterModifyColumn(
array &$phrase,
string $columnName,
array $old,
array $cd
): void {
$phrase[] = 'MODIFY COLUMN ' . $this->quoteIdentifier($columnName)
. ' ' . $this->columnSql($columnName, $cd);
}
/** /**
* MySQL doesn't take 'DROP CONSTRAINT', need to treat primary keys as * MySQL doesn't take 'DROP CONSTRAINT', need to treat primary keys as
* if they were indexes here, but can use 'PRIMARY KEY' special name. * if they were indexes here, but can use 'PRIMARY KEY' special name.
@ -427,6 +446,19 @@ class MysqlSchema extends Schema
} }
} }
/**
* Append an SQL statement to drop an index from a table.
* Note that in MariaDB index names are relation-specific.
*
* @param array $statements
* @param string $table
* @param string $name
*/
public function appendDropIndex(array &$statements, $table, $name)
{
$statements[] = "DROP INDEX {$name} ON {$this->quoteIdentifier($table)}";
}
private function isNumericType(array $cd): bool private function isNumericType(array $cd): bool
{ {
$ints = array_map( $ints = array_map(

45
lib/database/pgsqlschema.php
View File

@ -316,57 +316,12 @@ class PgsqlSchema extends Schema
return implode(' ', $line); return implode(' ', $line);
} }
/**
* Append phrase(s) to an array of partial ALTER TABLE chunks in order
* to alter the given column from its old state to a new one.
*
* @param array $phrase
* @param string $columnName
* @param array $old previous column definition as found in DB
* @param array $cd current column definition
*/
public function appendAlterModifyColumn(array &$phrase, $columnName, array $old, array $cd)
{
$prefix = 'ALTER COLUMN ' . $this->quoteIdentifier($columnName) . ' ';
$oldType = $this->typeAndSize($columnName, $old);
$newType = $this->typeAndSize($columnName, $cd);
if ($oldType != $newType) {
$phrase[] = $prefix . 'TYPE ' . $newType;
}
if (!empty($old['not null']) && empty($cd['not null'])) {
$phrase[] = $prefix . 'DROP NOT NULL';
} elseif (empty($old['not null']) && !empty($cd['not null'])) {
$phrase[] = $prefix . 'SET NOT NULL';
}
if (isset($old['default']) && !isset($cd['default'])) {
$phrase[] = $prefix . 'DROP DEFAULT';
} elseif (!isset($old['default']) && isset($cd['default'])) {
$phrase[] = $prefix . 'SET DEFAULT ' . $this->quoteDefaultValue($cd);
}
}
public function appendAlterDropPrimary(array &$phrase, string $tableName) public function appendAlterDropPrimary(array &$phrase, string $tableName)
{ {
// name hack -- is this reliable? // name hack -- is this reliable?
$phrase[] = 'DROP CONSTRAINT ' . $this->quoteIdentifier($tableName . '_pkey'); $phrase[] = 'DROP CONSTRAINT ' . $this->quoteIdentifier($tableName . '_pkey');
} }
/**
* Append an SQL statement to drop an index from a table.
* Note that in PostgreSQL, index names are DB-unique.
*
* @param array $statements
* @param string $table
* @param string $name
*/
public function appendDropIndex(array &$statements, $table, $name)
{
$statements[] = "DROP INDEX $name";
}
public function mapType($column) public function mapType($column)
{ {
$map = [ $map = [

43
lib/database/schema.php
View File

@ -311,7 +311,7 @@ class Schema
*/ */
public function appendDropIndex(array &$statements, $table, $name) public function appendDropIndex(array &$statements, $table, $name)
{ {
$statements[] = "DROP INDEX $name ON " . $this->quoteIdentifier($table); $statements[] = "DROP INDEX {$name}";
} }
public function buildIndexList(array $def) public function buildIndexList(array $def)
@ -406,10 +406,10 @@ class Schema
{ {
global $_PEAR; global $_PEAR;
$res = $this->conn->query( $statements = [];
'ALTER TABLE ' . $this->quoteIdentifier($table) . $this->appendDropIndex($statements, $table, $name);
' DROP INDEX ' . $name
); $res = $this->conn->query(implode(";\n", $statements));
if ($_PEAR->isError($res)) { if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res); PEAR_ErrorToPEAR_Exception($res);
@ -448,6 +448,7 @@ class Schema
* Modifies a column in the schema. * Modifies a column in the schema.
* *
* The name must match an existing column and table. * The name must match an existing column and table.
* @fixme Relies on MODIFY COLUMN, which is specific to MariaDB/MySQL
* *
* @param string $table name of the table * @param string $table name of the table
* @param ColumnDef $columndef new definition of the column. * @param ColumnDef $columndef new definition of the column.
@ -724,12 +725,32 @@ class Schema
* @param array $old previous column definition as found in DB * @param array $old previous column definition as found in DB
* @param array $cd current column definition * @param array $cd current column definition
*/ */
public function appendAlterModifyColumn(array &$phrase, string $columnName, array $old, array $cd) public function appendAlterModifyColumn(
{ array &$phrase,
$phrase[] = 'MODIFY COLUMN ' . string $columnName,
$this->quoteIdentifier($columnName) . array $old,
' ' . array $cd
$this->columnSql($columnName, $cd); ): void {
$prefix = 'ALTER COLUMN ' . $this->quoteIdentifier($columnName);
// @fixme TYPE is a PostgreSQL extension
$oldType = $this->typeAndSize($columnName, $old);
$newType = $this->typeAndSize($columnName, $cd);
if ($oldType !== $newType) {
$phrase[] = $prefix . ' TYPE ' . $newType;
}
if (!($old['not null'] ?? false) && ($cd['not null'] ?? false)) {
$phrase[] = $prefix . ' SET NOT NULL';
} elseif (($old['not null'] ?? false) && !($cd['not null'] ?? false)) {
$phrase[] = $prefix . ' DROP NOT NULL';
}
if (!($old['default'] ?? false) && ($cd['default'] ?? false)) {
$phrase[] = $prefix . ' SET DEFAULT ' . $this->quoteDefaultValue($cd);
} elseif (($old['default'] ?? false) && !($cd['default'] ?? false)) {
$phrase[] = $prefix . ' DROP DEFAULT';
}
} }
/** /**