friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Move DB_UPDATE_VERSION from boot.php to config/dbstructure.php

This commit is contained in:
Hypolite Petovan 2018-10-21 01:58:10 -04:00
parent fad99b8619
commit 19ffc0510b
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
boot.php
View File

@ -41,7 +41,6 @@ define('FRIENDICA_PLATFORM', 'Friendica');
define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily'); define('FRIENDICA_CODENAME', 'The Tazmans Flax-lily');
define('FRIENDICA_VERSION', '2018.12-dev'); define('FRIENDICA_VERSION', '2018.12-dev');
define('DFRN_PROTOCOL_VERSION', '2.23'); define('DFRN_PROTOCOL_VERSION', '2.23');
define('DB_UPDATE_VERSION', 1289);
define('NEW_UPDATE_ROUTINE_VERSION', 1170); define('NEW_UPDATE_ROUTINE_VERSION', 1170);
/** /**

5
config/dbstructure.php
View File

@ -27,11 +27,16 @@
* ], * ],
* ], * ],
* *
* If you need to make any change, make sure to increment the DB_UPDATE_VERSION constant value below.
* *
*/ */
use Friendica\Database\DBA; use Friendica\Database\DBA;
if (!defined('DB_UPDATE_VERSION')) {
define('DB_UPDATE_VERSION', 1289);
}
return [ return [
"addon" => [ "addon" => [
"comment" => "registered addons", "comment" => "registered addons",

6
src/App.php
View File

@ -573,7 +573,11 @@ class App
$stamp1 = microtime(true); $stamp1 = microtime(true);
DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset); if (DBA::connect($db_host, $db_user, $db_pass, $db_data, $charset)) {
// Loads DB_UPDATE_VERSION constant
Database\DBStructure::definition();
}
unset($db_host, $db_user, $db_pass, $db_data, $charset); unset($db_host, $db_user, $db_pass, $db_data, $charset);
$this->saveTimestamp($stamp1, 'network'); $this->saveTimestamp($stamp1, 'network');

3
src/Database/DBStructure.php
View File

@ -5,8 +5,8 @@
namespace Friendica\Database; namespace Friendica\Database;
use Exception; use Exception;
use Friendica\Core\Hook;
use Friendica\Core\Config; use Friendica\Core\Config;
use Friendica\Core\Hook;
use Friendica\Core\L10n; use Friendica\Core\L10n;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
@ -830,6 +830,7 @@ class DBStructure
/** /**
* Loads the database structure definition from the config/dbstructure.php file. * Loads the database structure definition from the config/dbstructure.php file.
* On first pass, defines DB_UPDATE_VERSION constant.
* *
* @see config/dbstructure.php * @see config/dbstructure.php
* @return array * @return array

2
update.php
View File

@ -32,7 +32,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 boot.php to 4712. * 3. Set DB_UPDATE_VERSION in config/dbstructure.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()"
*/ */