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

Update DB drivers

Browse source 
Pass the prefix of the database tables by their name. Similar to sql queries.
This commit is contained in:
Visman 2021-12-28 17:47:38 +07:00
parent 15d81858ff
commit 2cb9f34dcd
3 changed files with 157 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -82,6 +82,20 @@ class Mysql
}
}
/**
* Обрабатывает имя таблицы с одновременной проверкой
*/
protected function tName(string $name): string
{
if ('::' === \substr($name, 0, 2)) {
$name = $this->dbPrefix . \substr($name, 2);
}
$this->nameCheck($name);
return $name;
}
/**
* Операции над полями индексов: проверка, замена
*/
@ -166,10 +180,10 @@ class Mysql
/**
* Проверяет наличие таблицы в базе
*/
public function tableExists(string $table, bool $noPrefix = false): bool
public function tableExists(string $table): bool
{
$vars = [
':tname' => ($noPrefix ? '' : $this->dbPrefix) . $table,
':tname' => $this->tName($table),
];
$query = 'SELECT 1
FROM INFORMATION_SCHEMA.TABLES
@ -186,10 +200,10 @@ class Mysql
/**
* Проверяет наличие поля в таблице
*/
public function fieldExists(string $table, string $field, bool $noPrefix = false): bool
public function fieldExists(string $table, string $field): bool
{
$vars = [
':tname' => ($noPrefix ? '' : $this->dbPrefix) . $table,
':tname' => $this->tName($table),
':fname' => $field,
];
$query = 'SELECT 1
@ -207,11 +221,10 @@ class Mysql
/**
* Проверяет наличие индекса в таблице
*/
public function indexExists(string $table, string $index, bool $noPrefix = false): bool
public function indexExists(string $table, string $index): bool
{
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$vars = [
$table = $this->tName($table);
$vars = [
':tname' => $table,
':index' => 'PRIMARY' == $index ? $index : $table . '_' . $index,
];
@ -230,11 +243,9 @@ class Mysql
/**
* Создает таблицу
*/
public function createTable(string $table, array $schema, bool $noPrefix = false): bool
public function createTable(string $table, array $schema): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
$query = "CREATE TABLE IF NOT EXISTS `{$table}` (";
foreach ($schema['FIELDS'] as $field => $data) {
@ -297,11 +308,9 @@ class Mysql
/**
* Удаляет таблицу
*/
public function dropTable(string $table, bool $noPrefix = false): bool
public function dropTable(string $table): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
return false !== $this->db->exec("DROP TABLE IF EXISTS `{$table}`");
}
@ -309,36 +318,32 @@ class Mysql
/**
* Переименовывает таблицу
*/
public function renameTable(string $old, string $new, bool $noPrefix = false): bool
public function renameTable(string $old, string $new): bool
{
$this->nameCheck($old);
$this->nameCheck($new);
$old = $this->tName($old);
$new = $this->tName($new);
if (
$this->tableExists($new, $noPrefix)
&& ! $this->tableExists($old, $noPrefix)
$this->tableExists($new)
&& ! $this->tableExists($old)
) {
return true;
}
$old = ($noPrefix ? '' : $this->dbPrefix) . $old;
$new = ($noPrefix ? '' : $this->dbPrefix) . $new;
return false !== $this->db->exec("ALTER TABLE `{$old}` RENAME TO `{$new}`");
}
/**
* Добавляет поле в таблицу
*/
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null, bool $noPrefix = false): bool
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if ($this->fieldExists($table, $field, $noPrefix)) {
if ($this->fieldExists($table, $field)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$query = "ALTER TABLE `{$table}` ADD " . $this->buildColumn($field, [$type, $allowNull, $default]);
if (null !== $after) {
@ -353,11 +358,9 @@ class Mysql
/**
* Модифицирует поле в таблице
*/
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null, bool $noPrefix = false): bool
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
$query = "ALTER TABLE `{$table}` MODIFY " . $this->buildColumn($field, [$type, $allowNull, $default]);
if (null !== $after) {
@ -372,37 +375,35 @@ class Mysql
/**
* Удаляет поле из таблицы
*/
public function dropField(string $table, string $field, bool $noPrefix = false): bool
public function dropField(string $table, string $field): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
$this->nameCheck($field);
if (! $this->fieldExists($table, $field, $noPrefix)) {
if (! $this->fieldExists($table, $field)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
return false !== $this->db->exec("ALTER TABLE `{$table}` DROP COLUMN `{$field}`");
}
/**
* Переименование поля в таблице
*/
public function renameField(string $table, string $old, string $new, bool $noPrefix = false): bool
public function renameField(string $table, string $old, string $new): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
$this->nameCheck($old);
if (
$this->fieldExists($table, $new, $noPrefix)
&& ! $this->fieldExists($table, $old, $noPrefix)
$this->fieldExists($table, $new)
&& ! $this->fieldExists($table, $old)
) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$vars = [
':tname' => $table,
':fname' => $old,
@ -428,15 +429,14 @@ class Mysql
/**
* Добавляет индекс в таблицу
*/
public function addIndex(string $table, string $index, array $fields, bool $unique = false, bool $noPrefix = false): bool
public function addIndex(string $table, string $index, array $fields, bool $unique = false): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if ($this->indexExists($table, $index, $noPrefix)) {
if ($this->indexExists($table, $index)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$query = "ALTER TABLE `{$table}` ADD ";
if ('PRIMARY' == $index) {
@ -461,15 +461,14 @@ class Mysql
/**
* Удаляет индекс из таблицы
*/
public function dropIndex(string $table, string $index, bool $noPrefix = false): bool
public function dropIndex(string $table, string $index): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if (! $this->indexExists($table, $index, $noPrefix)) {
if (! $this->indexExists($table, $index)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$query = "ALTER TABLE `{$table}` ";
if ('PRIMARY' == $index) {
@ -488,11 +487,9 @@ class Mysql
/**
* Очищает таблицу
*/
public function truncateTable(string $table, bool $noPrefix = false): bool
public function truncateTable(string $table): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
return false !== $this->db->exec("TRUNCATE TABLE `{$table}`");
}

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

@ -89,6 +89,20 @@ class Pgsql
}
}
/**
* Обрабатывает имя таблицы с одновременной проверкой
*/
protected function tName(string $name): string
{
if ('::' === \substr($name, 0, 2)) {
$name = $this->dbPrefix . \substr($name, 2);
}
$this->nameCheck($name);
return $name;
}
/**
* Операции над полями индексов: проверка, замена
*/
@ -161,11 +175,11 @@ class Pgsql
/**
* Проверяет наличие таблицы в базе
*/
public function tableExists(string $table, bool $noPrefix = false): bool
public function tableExists(string $table): bool
{
$vars = [
':schema' => 'public',
':tname' => ($noPrefix ? '' : $this->dbPrefix) . $table,
':tname' => $this->tName($table),
':ttype' => 'r',
];
$query = 'SELECT 1
@ -184,11 +198,11 @@ class Pgsql
/**
* Проверяет наличие поля в таблице
*/
public function fieldExists(string $table, string $field, bool $noPrefix = false): bool
public function fieldExists(string $table, string $field): bool
{
$vars = [
':schema' => 'public',
':tname' => ($noPrefix ? '' : $this->dbPrefix) . $table,
':tname' => $this->tName($table),
':ttype' => 'r',
':fname' => $field,
];
@ -209,11 +223,10 @@ class Pgsql
/**
* Проверяет наличие индекса в таблице
*/
public function indexExists(string $table, string $index, bool $noPrefix = false): bool
public function indexExists(string $table, string $index): bool
{
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$vars = [
$table = $this->tName($table);
$vars = [
':schema' => 'public',
':tname' => $table,
':ttype' => 'r',
@ -242,11 +255,9 @@ class Pgsql
/**
* Создает таблицу
*/
public function createTable(string $table, array $schema, bool $noPrefix = false): bool
public function createTable(string $table, array $schema): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
$query = "CREATE TABLE IF NOT EXISTS \"{$table}\" (";
foreach ($schema['FIELDS'] as $field => $data) {
@ -279,11 +290,9 @@ class Pgsql
/**
* Удаляет таблицу
*/
public function dropTable(string $table, bool $noPrefix = false): bool
public function dropTable(string $table): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
return false !== $this->db->exec("DROP TABLE IF EXISTS \"{$table}\"");
}
@ -291,36 +300,32 @@ class Pgsql
/**
* Переименовывает таблицу
*/
public function renameTable(string $old, string $new, bool $noPrefix = false): bool
public function renameTable(string $old, string $new): bool
{
$this->nameCheck($old);
$this->nameCheck($new);
$old = $this->tName($old);
$new = $this->tName($new);
if (
$this->tableExists($new, $noPrefix)
&& ! $this->tableExists($old, $noPrefix)
$this->tableExists($new)
&& ! $this->tableExists($old)
) {
return true;
}
$old = ($noPrefix ? '' : $this->dbPrefix) . $old;
$new = ($noPrefix ? '' : $this->dbPrefix) . $new;
return false !== $this->db->exec("ALTER TABLE \"{$old}\" RENAME TO \"{$new}\"");
}
/**
* Добавляет поле в таблицу
*/
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null, bool $noPrefix = false): bool
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if ($this->fieldExists($table, $field, $noPrefix)) {
if ($this->fieldExists($table, $field)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$query = "ALTER TABLE \"{$table}\" ADD " . $this->buildColumn($field, [$type, $allowNull, $default]);
return false !== $this->db->exec($query);
@ -329,12 +334,11 @@ class Pgsql
/**
* Модифицирует поле в таблице
*/
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null, bool $noPrefix = false): bool
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
{
$this->nameCheck($table);
$this->nameCheck($field);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
$query = "ALTER TABLE \"{$table}\"";
if ('SERIAL' === \strtoupper($type) || $allowNull) {
@ -363,54 +367,50 @@ class Pgsql
/**
* Удаляет поле из таблицы
*/
public function dropField(string $table, string $field, bool $noPrefix = false): bool
public function dropField(string $table, string $field): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
$this->nameCheck($field);
if (! $this->fieldExists($table, $field, $noPrefix)) {
if (! $this->fieldExists($table, $field)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
return false !== $this->db->exec("ALTER TABLE \"{$table}\" DROP COLUMN \"{$field}\"");
}
/**
* Переименование поля в таблице
*/
public function renameField(string $table, string $old, string $new, bool $noPrefix = false): bool
public function renameField(string $table, string $old, string $new): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
$this->nameCheck($old);
$this->nameCheck($new);
if (
$this->fieldExists($table, $new, $noPrefix)
&& ! $this->fieldExists($table, $old, $noPrefix)
$this->fieldExists($table, $new)
&& ! $this->fieldExists($table, $old)
) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
return false !== $this->db->exec("ALTER TABLE \"{$table}\" RENAME COLUMN \"{$old}\" TO \"{$new}\"");
}
/**
* Добавляет индекс в таблицу
*/
public function addIndex(string $table, string $index, array $fields, bool $unique = false, bool $noPrefix = false): bool
public function addIndex(string $table, string $index, array $fields, bool $unique = false): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if ($this->indexExists($table, $index, $noPrefix)) {
if ($this->indexExists($table, $index)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
if ('PRIMARY' === $index) {
$query = "ALTER TABLE \"{$table}\" ADD PRIMARY KEY (" . $this->replIdxs($fields) . ')';
} else {
@ -426,16 +426,14 @@ class Pgsql
/**
* Удаляет индекс из таблицы
*/
public function dropIndex(string $table, string $index, bool $noPrefix = false): bool
public function dropIndex(string $table, string $index): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if (! $this->indexExists($table, $index, $noPrefix)) {
if (! $this->indexExists($table, $index)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
if ('PRIMARY' === $index) {
$query = "ALTER TABLE \"{$table}\" DROP CONSTRAINT \"{$table}_pkey\"";
} else {
@ -450,11 +448,9 @@ class Pgsql
/**
* Очищает таблицу
*/
public function truncateTable(string $table, bool $noPrefix = false): bool
public function truncateTable(string $table): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
return false !== $this->db->exec("TRUNCATE TABLE ONLY \"{$table}\" RESTART IDENTITY");
}

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

@ -80,6 +80,20 @@ class Sqlite
}
}
/**
* Обрабатывает имя таблицы с одновременной проверкой
*/
protected function tName(string $name): string
{
if ('::' === \substr($name, 0, 2)) {
$name = $this->dbPrefix . \substr($name, 2);
}
$this->nameCheck($name);
return $name;
}
/**
* Операции над полями индексов: проверка, замена
*/
@ -166,11 +180,11 @@ class Sqlite
/**
* Проверяет наличие таблицы в базе
*/
public function tableExists(string $table, bool $noPrefix = false): bool
public function tableExists(string $table): bool
{
$vars = [
':tname' => ($noPrefix ? '' : $this->dbPrefix) . $table,
':ttype' => 'table',
':tname' => $this->tName($table),
':ttype' => 'table',
];
$query = 'SELECT 1 FROM sqlite_master WHERE tbl_name=?s:tname AND type=?s:ttype';
@ -185,11 +199,9 @@ class Sqlite
/**
* Проверяет наличие поля в таблице
*/
public function fieldExists(string $table, string $field, bool $noPrefix = false): bool
public function fieldExists(string $table, string $field): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table),
$stmt = $this->db->query("PRAGMA table_info({$table})");
while ($row = $stmt->fetch()) {
@ -206,11 +218,10 @@ class Sqlite
/**
* Проверяет наличие индекса в таблице
*/
public function indexExists(string $table, string $index, bool $noPrefix = false): bool
public function indexExists(string $table, string $index): bool
{
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$vars = [
$table = $this->tName($table);
$vars = [
':tname' => $table,
':iname' => $table . '_' . $index, // ???? PRIMARY KEY искать нужно не в sqlite_master!
':itype' => 'index',
@ -228,11 +239,9 @@ class Sqlite
/**
* Создает таблицу
*/
public function createTable(string $table, array $schema, bool $noPrefix = false): bool
public function createTable(string $table, array $schema): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
$query = "CREATE TABLE IF NOT EXISTS \"{$table}\" (";
foreach ($schema['FIELDS'] as $field => $data) {
@ -268,11 +277,9 @@ class Sqlite
/**
* Удаляет таблицу
*/
public function dropTable(string $table, bool $noPrefix = false): bool
public function dropTable(string $table): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
return false !== $this->db->exec("DROP TABLE IF EXISTS \"{$table}\"");
}
@ -280,36 +287,32 @@ class Sqlite
/**
* Переименовывает таблицу
*/
public function renameTable(string $old, string $new, bool $noPrefix = false): bool
public function renameTable(string $old, string $new): bool
{
$this->nameCheck($old);
$this->nameCheck($new);
$old = $this->tName($old);
$new = $this->tName($new);
if (
$this->tableExists($new, $noPrefix)
&& ! $this->tableExists($old, $noPrefix)
$this->tableExists($new)
&& ! $this->tableExists($old)
) {
return true;
}
$old = ($noPrefix ? '' : $this->dbPrefix) . $old;
$new = ($noPrefix ? '' : $this->dbPrefix) . $new;
return false !== $this->db->exec("ALTER TABLE \"{$old}\" RENAME TO \"{$new}\"");
}
/**
* Добавляет поле в таблицу // ???? нет COLLATE
*/
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null, bool $noPrefix = false): bool
public function addField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if ($this->fieldExists($table, $field, $noPrefix)) {
if ($this->fieldExists($table, $field)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$query = "ALTER TABLE \"{$table}\" ADD COLUMN " . $this->buildColumn($field, [$type, $allowNull, $default]);
return false !== $this->db->exec($query);
@ -318,12 +321,11 @@ class Sqlite
/**
* Модифицирует поле в таблице
*/
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null, bool $noPrefix = false): bool
public function alterField(string $table, string $field, string $type, bool $allowNull, /* mixed */ $default = null, string $after = null): bool
{
$this->nameCheck($table);
$this->nameCheck($field);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
return true; // ???????????????????????????????????????
}
@ -331,17 +333,16 @@ class Sqlite
/**
* Удаляет поле из таблицы
*/
public function dropField(string $table, string $field, bool $noPrefix = false): bool
public function dropField(string $table, string $field): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
$this->nameCheck($field);
if (! $this->fieldExists($table, $field, $noPrefix)) {
if (! $this->fieldExists($table, $field)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
if (\version_compare($this->db->getAttribute(PDO::ATTR_SERVER_VERSION), '3.36.0', '>=')) { // 3.35.1 and 3.35.5 have fixes
return false !== $this->db->exec("ALTER TABLE \"{$table}\" DROP COLUMN \"{$field}\""); // add 2021-03-12 (3.35.0)
}
@ -427,37 +428,34 @@ class Sqlite
/**
* Переименование поля в таблице
*/
public function renameField(string $table, string $old, string $new, bool $noPrefix = false): bool
public function renameField(string $table, string $old, string $new): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
$this->nameCheck($old);
$this->nameCheck($new);
if (
$this->fieldExists($table, $new, $noPrefix)
&& ! $this->fieldExists($table, $old, $noPrefix)
$this->fieldExists($table, $new)
&& ! $this->fieldExists($table, $old)
) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
return false !== $this->db->exec("ALTER TABLE \"{$table}\" RENAME COLUMN \"{$old}\" TO \"{$new}\""); // add 2018-09-15 (3.25.0)
}
/**
* Добавляет индекс в таблицу
*/
public function addIndex(string $table, string $index, array $fields, bool $unique = false, bool $noPrefix = false): bool
public function addIndex(string $table, string $index, array $fields, bool $unique = false): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if ($this->indexExists($table, $index, $noPrefix)) {
if ($this->indexExists($table, $index)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
if ('PRIMARY' === $index) {
// ?????
} else {
@ -475,15 +473,14 @@ class Sqlite
/**
* Удаляет индекс из таблицы
*/
public function dropIndex(string $table, string $index, bool $noPrefix = false): bool
public function dropIndex(string $table, string $index): bool
{
$this->nameCheck($table);
$table = $this->tName($table);
if (! $this->indexExists($table, $index, $noPrefix)) {
if (! $this->indexExists($table, $index)) {
return true;
}
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$index = $table . '_' . ('PRIMARY' === $index ? 'pkey' : $index);
$this->nameCheck($index);
@ -494,11 +491,9 @@ class Sqlite
/**
* Очищает таблицу
*/
public function truncateTable(string $table, bool $noPrefix = false): bool
public function truncateTable(string $table): bool
{
$this->nameCheck($table);
$table = ($noPrefix ? '' : $this->dbPrefix) . $table;
$table = $this->tName($table);
if (false !== $this->db->exec("DELETE FROM \"{$table}\"")) {
$vars = [