0ct0pu5/forkbb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update DB drivers

Browse source
This commit is contained in:
Visman 2021-12-28 18:50:13 +07:00
parent 00ff34f9c7
commit 7e04d6acc2
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/Core/DB/Mysql.php
View file

@ -336,7 +336,7 @@ class Mysql
/**
* Добавляет поле в таблицу
*/
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $collate = null, string $after = null): bool
{
$table = $this->tName($table);
@ -344,7 +344,7 @@ class Mysql
return true;
}
$query = "ALTER TABLE `{$table}` ADD " . $this->buildColumn($field, [$type, $allowNull, $default]);
$query = "ALTER TABLE `{$table}` ADD " . $this->buildColumn($field, [$type, $allowNull, $default, $collate]);
if (null !== $after) {
$this->nameCheck($after);
@ -358,10 +358,10 @@ class Mysql
/**
* Модифицирует поле в таблице
*/
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $collate = null, string $after = null): bool
{
$table = $this->tName($table);
$query = "ALTER TABLE `{$table}` MODIFY " . $this->buildColumn($field, [$type, $allowNull, $default]);
$query = "ALTER TABLE `{$table}` MODIFY " . $this->buildColumn($field, [$type, $allowNull, $default, $collate]);
if (null !== $after) {
$this->nameCheck($after);
@ -408,7 +408,7 @@ class Mysql
':tname' => $table,
':fname' => $old,
];
$query = 'SELECT COLUMN_DEFAULT, IS_NULLABLE, COLUMN_TYPE
$query = 'SELECT COLUMN_DEFAULT, IS_NULLABLE, COLUMN_TYPE, COLLATION_NAME
FROM INFORMATION_SCHEMA.COLUMNS
WHERE TABLE_SCHEMA = DATABASE() AND TABLE_NAME = ?s:tname AND COLUMN_NAME = ?s:fname';
@ -420,8 +420,13 @@ class Mysql
$type = $result['COLUMN_TYPE'];
$allowNull = 'YES' == $result['IS_NULLABLE'];
$default = $result['COLUMN_DEFAULT'];
$collate = \str_replace('utf8mb4_', '', $result['COLLATION_NAME'], $count);
$query = "ALTER TABLE `{$table}` CHANGE COLUMN `{$old}` " . $this->buildColumn($new, [$type, $allowNull, $default]);
if (1 !== $count) {
throw new PDOException("Table - '{$table}', column - '{$old}', collate - '{$result['COLLATION_NAME']}'");
}
$query = "ALTER TABLE `{$table}` CHANGE COLUMN `{$old}` " . $this->buildColumn($new, [$type, $allowNull, $default, $collate]);
return false !== $this->db->exec($query);
}
@ -469,16 +474,16 @@ class Mysql
return true;
}
$query = "ALTER TABLE `{$table}` ";
$query = "ALTER TABLE `{$table}` DROP ";
if ('PRIMARY' == $index) {
$query .= "DROP PRIMARY KEY";
$query .= "PRIMARY KEY";
} else {
$index = $table . '_' . $index;
$this->nameCheck($index);
$query .= "DROP INDEX `{$index}`";
$query .= "INDEX `{$index}`";
}
return false !== $this->db->exec($query);

6
app/Core/DB/Pgsql.php
View file

@ -318,7 +318,7 @@ class Pgsql
/**
* Добавляет поле в таблицу
*/
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $collate = null, string $after = null): bool
{
$table = $this->tName($table);
@ -326,7 +326,7 @@ class Pgsql
return true;
}
$query = "ALTER TABLE \"{$table}\" ADD " . $this->buildColumn($field, [$type, $allowNull, $default]);
$query = "ALTER TABLE \"{$table}\" ADD " . $this->buildColumn($field, [$type, $allowNull, $default, $collate]);
return false !== $this->db->exec($query);
}
@ -334,7 +334,7 @@ class Pgsql
/**
* Модифицирует поле в таблице
*/
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $collate = null, string $after = null): bool
{
$this->nameCheck($field);

6
app/Core/DB/Sqlite.php
View file

@ -305,7 +305,7 @@ class Sqlite
/**
* Добавляет поле в таблицу // ???? нет COLLATE
*/
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $collate = null, string $after = null): bool
{
$table = $this->tName($table);
@ -313,7 +313,7 @@ class Sqlite
return true;
}
$query = "ALTER TABLE \"{$table}\" ADD COLUMN " . $this->buildColumn($field, [$type, $allowNull, $default]);
$query = "ALTER TABLE \"{$table}\" ADD COLUMN " . $this->buildColumn($field, [$type, $allowNull, $default, $collate]);
return false !== $this->db->exec($query);
}
@ -321,7 +321,7 @@ class Sqlite
/**
* Модифицирует поле в таблице
*/
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $collate = null, string $after = null): bool
{
$this->nameCheck($field);