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

[DATABASE] Re-introduce the enum type abstraction

Browse Source
This commit is contained in:
Alexei Sorokin
2019-09-11 12:48:28 +03:00
committed by Diogo Peralta Cordeiro
parent 6b4344968d
commit 0e0c375e65
4 changed files with 52 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/database/schema.php
View File

@@ -709,7 +709,7 @@ class Schema
$phrase[] = 'ADD COLUMN ' .
$this->quoteIdentifier($columnName) .
' ' .
$this->columnSql($cd);
$this->columnSql($columnName, $cd);
}
/**
@@ -726,7 +726,7 @@ class Schema
$phrase[] = 'MODIFY COLUMN ' .
$this->quoteIdentifier($columnName) .
' ' .
$this->columnSql($cd);
$this->columnSql($columnName, $cd);
}
/**
@@ -870,15 +870,15 @@ class Schema
* Appropriate for use in CREATE TABLE or
* ALTER TABLE statements.
*
* @param string $name column name to create
* @param array $cd column to create
*
* @return string correct SQL for that column
*/
public function columnSql(array $cd)
public function columnSql(string $name, array $cd)
{
$line = [];
$line[] = $this->typeAndSize($cd);
$line[] = $this->typeAndSize($name, $cd);
if (isset($cd['default'])) {
$line[] = 'default';
@@ -901,7 +901,7 @@ class Schema
return $column;
}
public function typeAndSize(array $column)
public function typeAndSize(string $name, array $column)
{
//$type = $this->mapType($column)['type'];
$type = $column['type'];