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

Merge pull request #5431 from MrPetovan/task/5410-rename-database-methods

Browse source 
Move DBA to src/ part 3.1: Rename DBA methods
This commit is contained in:
Michael Vogel 2018-07-23 15:18:58 +02:00 • committed by GitHub
commit 2d0a749734
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 142 additions and 142 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Core/ACL.php
View file

@ -106,7 +106,7 @@ class ACL extends BaseObject
ORDER BY `name` ASC ", intval(local_user())
);
$contacts = DBA::inArray($stmt);
$contacts = DBA::toArray($stmt);
$arr = ['contact' => $contacts, 'entry' => $o];
@ -171,7 +171,7 @@ class ACL extends BaseObject
ORDER BY `name` ASC ", intval(local_user())
);
$contacts = DBA::inArray($stmt);
$contacts = DBA::toArray($stmt);
$arr = ['contact' => $contacts, 'entry' => $o];

2
src/Core/Addon.php
View file

@ -81,7 +81,7 @@ class Addon
if (strlen($addons)) {
$r = DBA::select('addon', [], ['installed' => 1]);
if (DBM::is_result($r)) {
$installed = DBA::inArray($r);
$installed = DBA::toArray($r);
} else {
$installed = [];
}

12
src/Core/Worker.php
View file

@ -477,7 +477,7 @@ class Worker
if ($max == 0) {
// the maximum number of possible user connections can be a system variable
$r = DBA::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
$r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_user_connections'");
if (DBM::is_result($r)) {
$max = $r["Value"];
}
@ -498,7 +498,7 @@ class Worker
// The processlist only shows entries of the current user
if ($max != 0) {
$r = DBA::p('SHOW PROCESSLIST');
$used = DBA::num_rows($r);
$used = DBA::numRows($r);
DBA::close($r);
logger("Connection usage (user values): ".$used."/".$max, LOGGER_DEBUG);
@ -513,7 +513,7 @@ class Worker
// We will now check for the system values.
// This limit could be reached although the user limits are fine.
$r = DBA::fetch_first("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
$r = DBA::fetchFirst("SHOW VARIABLES WHERE `variable_name` = 'max_connections'");
if (!DBM::is_result($r)) {
return false;
}
@ -521,7 +521,7 @@ class Worker
if ($max == 0) {
return false;
}
$r = DBA::fetch_first("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
$r = DBA::fetchFirst("SHOW STATUS WHERE `variable_name` = 'Threads_connected'");
if (!DBM::is_result($r)) {
return false;
}
@ -874,7 +874,7 @@ class Worker
$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
if (DBM::is_result($r)) {
self::$db_duration += (microtime(true) - $stamp);
return DBA::inArray($r);
return DBA::toArray($r);
}
DBA::close($r);
@ -892,7 +892,7 @@ class Worker
if ($found) {
$r = DBA::select('workerqueue', [], ['pid' => getmypid(), 'done' => false]);
return DBA::inArray($r);
return DBA::toArray($r);
}
return false;
}