Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-05-01 09:04:24 +02:00
Code Issues Projects Releases Packages Wiki Activity

Rename Friendica\Database\dba to Friendica\Database\DBA

Browse source
This commit is contained in:
Hypolite Petovan 2018-07-20 08:19:26 -04:00
parent b6a1df0598
commit af6dbc654f
127 changed files with 1169 additions and 1169 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Database/DBA.php
View file

@ -17,7 +17,7 @@ use PDOStatement;
*
* This class is for the low level database stuff that does driver specific things.
*/
class dba
class DBA
{
public static $connected = false;

2
src/Database/DBM.php
View file

@ -64,7 +64,7 @@ class DBM
}
if (is_object($array)) {
return dba::num_rows($array) > 0;
return DBA::num_rows($array) > 0;
}
return (is_array($array) && (count($array) > 0));

34
src/Database/DBStructure.php
View file

@ -26,7 +26,7 @@ class DBStructure
*/
public static function convertToInnoDB() {
$r = q("SELECT `TABLE_NAME` FROM `information_schema`.`tables` WHERE `engine` = 'MyISAM' AND `table_schema` = '%s'",
dbesc(dba::database_name()));
dbesc(DBA::database_name()));
if (!DBM::is_result($r)) {
echo L10n::t('There are no tables on MyISAM.')."\n";
@ -37,7 +37,7 @@ class DBStructure
$sql = sprintf("ALTER TABLE `%s` engine=InnoDB;", dbesc($table['TABLE_NAME']));
echo $sql."\n";
$result = dba::e($sql);
$result = DBA::e($sql);
if (!DBM::is_result($result)) {
self::printUpdateError($sql);
}
@ -189,7 +189,7 @@ class DBStructure
*/
private static function printUpdateError($message) {
echo L10n::t("\nError %d occurred during database update:\n%s\n",
dba::errorNo(), dba::errorMessage());
DBA::errorNo(), DBA::errorMessage());
return L10n::t('Errors encountered performing database changes: ').$message.EOL;
}
@ -236,8 +236,8 @@ class DBStructure
}
// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements
if ((version_compare(dba::server_info(), '5.7.4') >= 0) &&
!(strpos(dba::server_info(), 'MariaDB') !== false)) {
if ((version_compare(DBA::server_info(), '5.7.4') >= 0) &&
!(strpos(DBA::server_info(), 'MariaDB') !== false)) {
$ignore = '';
} else {
$ignore = ' IGNORE';
@ -322,8 +322,8 @@ class DBStructure
$parameters['comment'] = "";
}
$current_field_definition = dba::clean_query(implode(",", $field_definition));
$new_field_definition = dba::clean_query(implode(",", $parameters));
$current_field_definition = DBA::clean_query(implode(",", $field_definition));
$new_field_definition = DBA::clean_query(implode(",", $parameters));
if ($current_field_definition != $new_field_definition) {
$sql2 = self::modifyTableField($fieldname, $parameters);
if ($sql3 == "") {
@ -460,7 +460,7 @@ class DBStructure
if ($ignore != "") {
echo "SET session old_alter_table=0;\n";
} else {
echo "INSERT INTO `".$temp_name."` SELECT ".dba::any_value_fallback($field_list)." FROM `".$name."`".$group_by.";\n";
echo "INSERT INTO `".$temp_name."` SELECT ".DBA::any_value_fallback($field_list)." FROM `".$name."`".$group_by.";\n";
echo "DROP TABLE `".$name."`;\n";
echo "RENAME TABLE `".$temp_name."` TO `".$name."`;\n";
}
@ -475,15 +475,15 @@ class DBStructure
// Ensure index conversion to unique removes duplicates
if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
dba::e("SET session old_alter_table=1;");
DBA::e("SET session old_alter_table=1;");
} else {
$r = dba::e("DROP TABLE IF EXISTS `".$temp_name."`;");
$r = DBA::e("DROP TABLE IF EXISTS `".$temp_name."`;");
if (!DBM::is_result($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
}
$r = dba::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
$r = DBA::e("CREATE TABLE `".$temp_name."` LIKE `".$name."`;");
if (!DBM::is_result($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
@ -491,25 +491,25 @@ class DBStructure
}
}
$r = dba::e($sql3);
$r = DBA::e($sql3);
if (!DBM::is_result($r)) {
$errors .= self::printUpdateError($sql3);
}
if ($is_unique && ($temp_name != $name)) {
if ($ignore != "") {
dba::e("SET session old_alter_table=0;");
DBA::e("SET session old_alter_table=0;");
} else {
$r = dba::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
$r = DBA::e("INSERT INTO `".$temp_name."` SELECT ".$field_list." FROM `".$name."`".$group_by.";");
if (!DBM::is_result($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
}
$r = dba::e("DROP TABLE `".$name."`;");
$r = DBA::e("DROP TABLE `".$name."`;");
if (!DBM::is_result($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
}
$r = dba::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
$r = DBA::e("RENAME TABLE `".$temp_name."` TO `".$name."`;");
if (!DBM::is_result($r)) {
$errors .= self::printUpdateError($sql3);
return $errors;
@ -606,7 +606,7 @@ class DBStructure
}
if ($action) {
$r = dba::e($sql);
$r = DBA::e($sql);
}
return $r;

8
src/Database/PostUpdate.php
View file

@ -124,7 +124,7 @@ class PostUpdate
// Check if the first step is done (Setting "author-id" and "owner-id" in the item table)
$fields = ['author-link', 'author-name', 'author-avatar', 'owner-link', 'owner-name', 'owner-avatar', 'network', 'uid'];
$r = dba::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
$r = DBA::select('item', $fields, ['author-id' => 0, 'owner-id' => 0], ['limit' => 1000]);
if (!$r) {
// Are there unfinished entries in the thread table?
$r = q("SELECT COUNT(*) AS `total` FROM `thread`
@ -180,7 +180,7 @@ class PostUpdate
if ($owner_id == 0) {
$owner_id = -1;
}
dba::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
DBA::update('item', ['author-id' => $author_id, 'owner-id' => $owner_id], ['uid' => $item['uid'], 'author-link' => $item['author-link'], 'owner-link' => $item['owner-link'], 'author-id' => 0, 'owner-id' => 0]);
}
logger("Updated items", LOGGER_DEBUG);
@ -212,7 +212,7 @@ class PostUpdate
}
foreach ($r as $user) {
if (!empty($user["lastitem_date"]) && ($user["lastitem_date"] > $user["last-item"])) {
dba::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
DBA::update('contact', ['last-item' => $user['lastitem_date']], ['id' => $user['id']]);
}
}
@ -282,7 +282,7 @@ class PostUpdate
++$rows;
}
dba::close($items);
DBA::close($items);
Config::set("system", "post_update_version_1279_id", $id);