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

[DATABASE] Switch from PEAR DB to MDB2

Browse Source
This commit is contained in:
Alexei Sorokin
2020-09-14 22:46:29 +03:00
parent 96f1cc1a5c
commit fde929b151
97 changed files with 48799 additions and 16730 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/database/mysqlschema.php
View File

@@ -220,8 +220,8 @@ class MysqlSchema extends Schema
*/
public function fetchMetaInfo($table, $infoTable, $orderBy = null)
{
$schema = $this->conn->dsn['database'];
return $this->fetchQueryData(sprintf(
$schema = $this->conn->getDatabase();
$info = $this->fetchQueryData(sprintf(
<<<'END'
SELECT * FROM INFORMATION_SCHEMA.%1$s
WHERE TABLE_SCHEMA = '%2$s' AND TABLE_NAME = '%3$s'%4$s;
@@ -231,6 +231,10 @@ class MysqlSchema extends Schema
$table,
($orderBy ? " ORDER BY {$orderBy}" : '')
));
return array_map(function (array $cols): array {
return array_change_key_case($cols, CASE_UPPER);
}, $info);
}
/**
@@ -242,7 +246,7 @@ class MysqlSchema extends Schema
*/
private function fetchKeyInfo(string $table): array
{
$schema = $this->conn->dsn['database'];
$schema = $this->conn->getDatabase();
$data = $this->fetchQueryData(
<<<EOT
SELECT INDEX_NAME AS `key_name`,
@@ -290,7 +294,7 @@ class MysqlSchema extends Schema
*/
private function fetchForeignKeyInfo(string $table): array
{
$schema = $this->conn->dsn['database'];
$schema = $this->conn->getDatabase();
$data = $this->fetchQueryData(
<<<END
SELECT CONSTRAINT_NAME AS `key_name`,

8
lib/database/pgsqlschema.php
View File

@@ -193,8 +193,8 @@ class PgsqlSchema extends Schema
*/
public function fetchMetaInfo($table, $infoTable, $orderBy = null)
{
$catalog = $this->conn->dsn['database'];
return $this->fetchQueryData(sprintf(
$catalog = $this->conn->getDatabase();
$info = $this->fetchQueryData(sprintf(
<<<'END'
SELECT * FROM information_schema.%1$s
WHERE table_catalog = '%2$s' AND table_name = '%3$s'%4$s;
@@ -204,6 +204,10 @@ class PgsqlSchema extends Schema
$table,
($orderBy ? " ORDER BY {$orderBy}" : '')
));
return array_map(function (array $cols): array {
return array_change_key_case($cols, CASE_LOWER);
}, $info);
}
/**

60
lib/database/schema.php
View File

@@ -72,7 +72,7 @@ class Schema
if (is_null($conn)) {
$key = 'default';
} else {
$key = md5(serialize($conn->dsn));
$key = hash('md5', $conn->getDSN('string'));
}
if (is_null($dbtype)) {
@@ -343,7 +343,7 @@ class Schema
{
global $_PEAR;
$res = $this->conn->query('DROP TABLE ' . $this->quoteIdentifier($name));
$res = $this->conn->exec('DROP TABLE ' . $this->quoteIdentifier($name));
if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res);
@@ -372,7 +372,7 @@ class Schema
{
global $_PEAR;
$qry = [];
$statements = [];
if (!is_array($columnNames)) {
$columnNames = [$columnNames];
@@ -382,14 +382,20 @@ class Schema
$name = "{$table}_" . implode("_", $columnNames) . "_idx";
}
$this->appendCreateIndex($qry, $table, $name, $columnNames);
$this->appendCreateIndex($statements, $table, $name, $columnNames);
$res = $this->conn->query(implode('; ', $qry));
$this->conn->beginTransaction();
if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res);
foreach ($statements as $sql) {
$res = $this->conn->exec($sql);
if ($_PEAR->isError($res)) {
$this->conn->rollback();
PEAR_ErrorToPEAR_Exception($res);
}
}
$this->conn->commit();
return true;
}
@@ -409,12 +415,18 @@ class Schema
$statements = [];
$this->appendDropIndex($statements, $table, $name);
$res = $this->conn->query(implode(";\n", $statements));
$this->conn->beginTransaction();
if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res);
foreach ($statements as $sql) {
$res = $this->conn->exec($sql);
if ($_PEAR->isError($res)) {
$this->conn->rollback();
PEAR_ErrorToPEAR_Exception($res);
}
}
$this->conn->commit();
return true;
}
@@ -435,7 +447,7 @@ class Schema
$sql = 'ALTER TABLE ' . $this->quoteIdentifier($table) .
' ADD COLUMN ' . $this->columnSql($name, $columndef);
$res = $this->conn->query($sql);
$res = $this->conn->exec($sql);
if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res);
@@ -463,7 +475,7 @@ class Schema
$sql = 'ALTER TABLE ' . $this->quoteIdentifier($table) .
' MODIFY COLUMN ' . $this->columnSql($name, $columndef);
$res = $this->conn->query($sql);
$res = $this->conn->exec($sql);
if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res);
@@ -490,7 +502,7 @@ class Schema
$sql = 'ALTER TABLE ' . $this->quoteIdentifier($table) .
' DROP COLUMN ' . $columnName;
$res = $this->conn->query($sql);
$res = $this->conn->exec($sql);
if ($_PEAR->isError($res)) {
PEAR_ErrorToPEAR_Exception($res);
@@ -532,19 +544,24 @@ class Schema
{
global $_PEAR;
$ok = true;
$this->conn->beginTransaction();
foreach ($statements as $sql) {
if (defined('DEBUG_INSTALLER')) {
echo "<code>" . htmlspecialchars($sql) . "</code><br/>\n";
}
$res = $this->conn->query($sql);
$res = $this->conn->exec($sql);
if ($_PEAR->isError($res)) {
$this->conn->rollback();
common_debug('PEAR exception on query: ' . $sql);
PEAR_ErrorToPEAR_Exception($res);
}
}
return $ok;
$this->conn->commit();
return true;
}
/**
@@ -849,7 +866,11 @@ class Schema
public function quoteValue($val)
{
return $this->conn->quoteSmart($val);
// MDB2_Driver_Common::quote changes empty strings to "NULL".
if ($val === '') {
return '';
}
return $this->conn->quote($val);
}
/**
@@ -1190,7 +1211,7 @@ class Schema
* @return array of arrays
* @throws PEAR_Exception
*/
protected function fetchQueryData($sql)
protected function fetchQueryData(string $sql): array
{
global $_PEAR;
@@ -1200,8 +1221,7 @@ class Schema
}
$out = [];
$row = [];
while ($res->fetchInto($row, DB_FETCHMODE_ASSOC)) {
while (!empty($row = $res->fetchRow(MDB2_FETCHMODE_ASSOC))) {
$out[] = $row;
}
$res->free();