nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Move config/dbstructure.php to config/dbstructure.config.php

Browse source
This commit is contained in:
Hypolite Petovan 2018-11-25 01:07:31 -05:00
parent 3f4636d490
commit 6eb6cc94c7
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
config/dbstructure.php → config/dbstructure.config.php
View file

12
src/Database/DBStructure.php
View file

@ -28,7 +28,7 @@ class DBStructure
const UPDATE_FAILED = 2; // Database check failed const UPDATE_FAILED = 2; // Database check failed
/** /**
* Database structure definition loaded from config/dbstructure.php * Database structure definition loaded from config/dbstructure.config.php
* *
* @var array * @var array
*/ */
@ -783,10 +783,10 @@ class DBStructure
} }
/** /**
* Loads the database structure definition from the config/dbstructure.php file. * Loads the database structure definition from the config/dbstructure.config.php file.
* On first pass, defines DB_UPDATE_VERSION constant. * On first pass, defines DB_UPDATE_VERSION constant.
* *
* @see config/dbstructure.php * @see config/dbstructure.config.php
* @param boolean $with_addons_structure Whether to tack on addons additional tables * @param boolean $with_addons_structure Whether to tack on addons additional tables
* @return array * @return array
* @throws Exception * @throws Exception
@ -796,16 +796,16 @@ class DBStructure
if (!self::$definition) { if (!self::$definition) {
$a = \Friendica\BaseObject::getApp(); $a = \Friendica\BaseObject::getApp();
$filename = $a->getBasePath() . '/config/dbstructure.php'; $filename = $a->getBasePath() . '/config/dbstructure.config.php';
if (!is_readable($filename)) { if (!is_readable($filename)) {
throw new Exception('Missing database structure config file config/dbstructure.php'); throw new Exception('Missing database structure config file config/dbstructure.config.php');
} }
$definition = require $filename; $definition = require $filename;
if (!$definition) { if (!$definition) {
throw new Exception('Corrupted database structure config file config/dbstructure.php'); throw new Exception('Corrupted database structure config file config/dbstructure.config.php');
} }
self::$definition = $definition; self::$definition = $definition;

2
tests/Util/VFSTrait.php
View file

@ -30,7 +30,7 @@ trait VFSTrait
$this->setConfigFile('config.ini.php'); $this->setConfigFile('config.ini.php');
$this->setConfigFile('settings.ini.php'); $this->setConfigFile('settings.ini.php');
$this->setConfigFile('local.ini.php'); $this->setConfigFile('local.ini.php');
$this->setConfigFile('dbstructure.php'); $this->setConfigFile('dbstructure.config.php');
} }
/** /**

4
update.php
View file

@ -21,7 +21,7 @@ require_once 'include/dba.php';
* This function is responsible for doing post update changes to the data * This function is responsible for doing post update changes to the data
* (not the structure) in the database. * (not the structure) in the database.
* *
* Database structure changes are done in config/dbstructure.php * Database structure changes are done in config/dbstructure.config.php
* *
* If there is a need for a post process to a structure change, update this file * If there is a need for a post process to a structure change, update this file
* by adding a new function at the end with the number of the new DB_UPDATE_VERSION. * by adding a new function at the end with the number of the new DB_UPDATE_VERSION.
@ -33,7 +33,7 @@ require_once 'include/dba.php';
* *
* 1. Create a function "update_4712()" here in the update.php * 1. Create a function "update_4712()" here in the update.php
* 2. Apply the needed structural changes in config/dbStructure.php * 2. Apply the needed structural changes in config/dbStructure.php
* 3. Set DB_UPDATE_VERSION in config/dbstructure.php to 4712. * 3. Set DB_UPDATE_VERSION in config/dbstructure.config.php to 4712.
* *
* If you need to run a script before the database update, name the function "pre_update_4712()" * If you need to run a script before the database update, name the function "pre_update_4712()"
*/ */