bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

4) Adding Factories to other entrypoints

Browse source
This commit is contained in:
Philipp Holzer 2019-02-03 22:46:50 +01:00
commit 1e0e1674f2
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
20 changed files with 100 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Database/DBA.php
View file

@ -2,7 +2,7 @@
namespace Friendica\Database;
use Friendica\Core\Config\ConfigCache;
use Friendica\Core\Config\IConfigCache;
use Friendica\Core\Logger;
use Friendica\Core\System;
use Friendica\Util\DateTimeFormat;
@ -32,7 +32,7 @@ class DBA
public static $connected = false;
/**
* @var ConfigCache
* @var IConfigCache
*/
private static $config;
private static $server_info = '';
@ -1031,7 +1031,7 @@ class DBA
* This process must only be started once, since the value is cached.
*/
private static function buildRelationData() {
$definition = DBStructure::definition();
$definition = DBStructure::definition(self::$config->get('system', 'basepath'));
foreach ($definition AS $table => $structure) {
foreach ($structure['fields'] AS $field => $field_struct) {

24
src/Database/DBStructure.php
View file

@ -74,9 +74,9 @@ class DBStructure
return L10n::t('Errors encountered performing database changes: ') . $message . EOL;
}
public static function printStructure()
public static function printStructure($basePath)
{
$database = self::definition(false);
$database = self::definition($basePath, false);
echo "-- ------------------------------------------\n";
echo "-- " . FRIENDICA_PLATFORM . " " . FRIENDICA_VERSION . " (" . FRIENDICA_CODENAME, ")\n";
@ -98,14 +98,15 @@ class DBStructure
*
* @see config/dbstructure.config.php
* @param boolean $with_addons_structure Whether to tack on addons additional tables
* @param string $basePath The base path of this application
* @return array
* @throws Exception
*/
public static function definition($basepath, $with_addons_structure = true)
public static function definition($basePath, $with_addons_structure = true)
{
if (!self::$definition) {
$filename = $basepath . '/config/dbstructure.config.php';
$filename = $basePath . '/config/dbstructure.config.php';
if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.config.php');
@ -246,15 +247,16 @@ class DBStructure
/**
* Updates DB structure and returns eventual errors messages
*
* @param bool $verbose
* @param bool $action Whether to actually apply the update
* @param bool $install Is this the initial update during the installation?
* @param array $tables An array of the database tables
* @param array $definition An array of the definition tables
* @param string $basePath The base path of this application
* @param bool $verbose
* @param bool $action Whether to actually apply the update
* @param bool $install Is this the initial update during the installation?
* @param array $tables An array of the database tables
* @param array $definition An array of the definition tables
* @return string Empty string if the update is successful, error messages otherwise
* @throws Exception
*/
public static function update($verbose, $action, $install = false, array $tables = null, array $definition = null)
public static function update($basePath, $verbose, $action, $install = false, array $tables = null, array $definition = null)
{
if ($action && !$install) {
Config::set('system', 'maintenance', 1);
@ -283,7 +285,7 @@ class DBStructure
// Get the definition
if (is_null($definition)) {
$definition = self::definition();
$definition = self::definition($basePath);
}
// MySQL >= 5.7.4 doesn't support the IGNORE keyword in ALTER TABLE statements