clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing DBA::(re-)connect()

This commit is contained in:
Philipp Holzer 2019-02-23 12:50:52 +01:00
parent a73235b6ee
commit 5f17ce574f
No known key found for this signature in database
GPG Key ID: 517BE60E2CE5C8A5
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Database/DBA.php
View File

@ -43,7 +43,7 @@ class DBA
/** /**
* @var string * @var string
*/ */
private static $basedir; private static $basePath;
private static $server_info = ''; private static $server_info = '';
private static $connection; private static $connection;
private static $driver; private static $driver;
@ -59,14 +59,14 @@ class DBA
private static $db_name = ''; private static $db_name = '';
private static $db_charset = ''; private static $db_charset = '';
public static function connect($basedir, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null) public static function connect($basePath, IConfigCache $configCache, Profiler $profiler, $serveraddr, $user, $pass, $db, $charset = null)
{ {
if (!is_null(self::$connection) && self::connected()) { if (!is_null(self::$connection) && self::connected()) {
return true; return true;
} }
// We are storing these values for being able to perform a reconnect // We are storing these values for being able to perform a reconnect
self::$basedir = $basedir; self::$basePath = $basePath;
self::$configCache = $configCache; self::$configCache = $configCache;
self::$profiler = $profiler; self::$profiler = $profiler;
self::$db_serveraddr = $serveraddr; self::$db_serveraddr = $serveraddr;
@ -169,7 +169,7 @@ class DBA
public static function reconnect() { public static function reconnect() {
self::disconnect(); self::disconnect();
$ret = self::connect(self::$basedir, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset); $ret = self::connect(self::$basePath, self::$configCache, self::$profiler, self::$db_serveraddr, self::$db_user, self::$db_pass, self::$db_name, self::$db_charset);
return $ret; return $ret;
} }
@ -1039,7 +1039,7 @@ class DBA
* This process must only be started once, since the value is cached. * This process must only be started once, since the value is cached.
*/ */
private static function buildRelationData() { private static function buildRelationData() {
$definition = DBStructure::definition(self::$basedir); $definition = DBStructure::definition(self::$basePath);
foreach ($definition AS $table => $structure) { foreach ($definition AS $table => $structure) {
foreach ($structure['fields'] AS $field => $field_struct) { foreach ($structure['fields'] AS $field => $field_struct) {

6
tests/DatabaseTest.php
View File

@ -40,14 +40,14 @@ abstract class DatabaseTest extends MockedTest
$this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.'); $this->markTestSkipped('Please set the MYSQL_* environment variables to your test database credentials.');
} }
$basedir = BasePath::create(dirname(__DIR__)); $basePath = BasePath::create(dirname(__DIR__));
$configLoader = new Cache\ConfigCacheLoader($basedir); $configLoader = new Cache\ConfigCacheLoader($basePath);
$config = Factory\ConfigFactory::createCache($configLoader); $config = Factory\ConfigFactory::createCache($configLoader);
$profiler = \Mockery::mock(Profiler::class); $profiler = \Mockery::mock(Profiler::class);
DBA::connect( DBA::connect(
$basedir, $basePath,
$config, $config,
$profiler, $profiler,
getenv('MYSQL_HOST'), getenv('MYSQL_HOST'),