Subversion Repositories oidplus

Compare Revisions

Regard whitespace Rev 829 → Rev 830

/trunk/includes/db_updates/run.inc.php
0,0 → 1,82
<?php
 
/*
* OIDplus 2.0
* Copyright 2019 - 2022 Daniel Marschall, ViaThinkSoft
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
 
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @throws OIDplusException
*/
function oidplus_dbupdate(OIDplusDatabaseConnection $db) {
// Detect database version
$res = $db->query("SELECT value FROM ###config WHERE name = 'database_version'");
$row = $res->fetch_array();
if ($row == null) {
// Note: The config setting "database_version" is inserted in setup/sql/...sql, not in the OIDplus core init
throw new OIDplusConfigInitializationException(_L('Cannot determine database version (the entry "database_version" inside the table "###config" is probably missing)'));
}
$version = $row['value'];
if (!is_numeric($version)) {
throw new OIDplusConfigInitializationException(_L('Entry "database_version" inside the table "###config" seems to be wrong (expect number between 200 and 999)'));
}
 
// Upgrade from old versions
try {
if ($version == 200) {
// Update 200 => 201
require_once __DIR__.'/update200.inc.php';
$version = oidplus_dbupdate_200($db);
}
if ($version == 201) {
// Update 201 => 202
require_once __DIR__.'/update201.inc.php';
$version = oidplus_dbupdate_201($db);
}
if ($version == 202) {
// Update 202 => 203
require_once __DIR__.'/update202.inc.php';
$version = oidplus_dbupdate_202($db);
}
if ($version == 203) {
// Update 203 => 204
require_once __DIR__.'/update203.inc.php';
$version = oidplus_dbupdate_203($db);
}
if ($version == 204) {
// Update 204 => 205
require_once __DIR__.'/update204.inc.php';
$version = oidplus_dbupdate_204($db);
}
if ($version == 205) {
// Update 205 => 1000
require_once __DIR__.'/update205.inc.php';
$version = oidplus_dbupdate_205($db);
}
if ($version == 1000) {
// ... in the future, add updates here! ...
}
} catch (Exception $e) {
throw new OIDplusException(_L('Database update from version %1 failed: %2',$version,$e->getMessage()));
}
 
// Don't allow if the database version if newer than we expect
if ($version != 1000) {
require_once __DIR__.'/update205.inc.php';
$version = oidplus_dbupdate_205($db);
}
}
/trunk/includes/db_updates/update200.inc.php
20,10 → 20,10
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @param string $version is the current version (this script MUST increase the number by 1 when it is done)
* @return int new version set
* @throws OIDplusException
*/
function oidplus_dbupdate_200_201(OIDplusDatabaseConnection $db, string &$version) {
function oidplus_dbupdate_200(OIDplusDatabaseConnection $db) {
if ($db->transaction_supported()) $db->transaction_begin();
 
$db->query("ALTER TABLE ###objects ADD comment varchar(255) NULL");
32,4 → 32,6
$db->query("UPDATE ###config SET value = ? WHERE name = 'database_version'", array($version));
 
if ($db->transaction_supported()) $db->transaction_commit();
}
 
return $version;
}
/trunk/includes/db_updates/update201.inc.php
20,10 → 20,10
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @param string $version is the current version (this script MUST increase the number by 1 when it is done)
* @return int new version set
* @throws OIDplusException
*/
function oidplus_dbupdate_201_202(OIDplusDatabaseConnection $db, string &$version) {
function oidplus_dbupdate_201(OIDplusDatabaseConnection $db) {
if ($db->transaction_supported()) $db->transaction_begin();
 
// Change bit(1) types to boolean/tinyint(1)
79,4 → 79,6
$db->query("UPDATE ###config SET value = ? WHERE name = 'database_version'", array($version));
 
if ($db->transaction_supported()) $db->transaction_commit();
}
 
return $version;
}
/trunk/includes/db_updates/update202.inc.php
20,10 → 20,10
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @param string $version is the current version (this script MUST increase the number by 1 when it is done)
* @return int new version set
* @throws OIDplusException
*/
function oidplus_dbupdate_202_203(OIDplusDatabaseConnection $db, string &$version) {
function oidplus_dbupdate_202(OIDplusDatabaseConnection $db) {
if ($db->transaction_supported()) $db->transaction_begin();
 
if ($db->getSlang()->id() == 'mssql') {
70,4 → 70,6
$db->query("UPDATE ###config SET value = ? WHERE name = 'database_version'", array($version));
 
if ($db->transaction_supported()) $db->transaction_commit();
}
 
return $version;
}
/trunk/includes/db_updates/update203.inc.php
20,10 → 20,10
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @param string $version is the current version (this script MUST increase the number by 1 when it is done)
* @return int new version set
* @throws OIDplusException
*/
function oidplus_dbupdate_203_204(OIDplusDatabaseConnection $db, string &$version) {
function oidplus_dbupdate_203(OIDplusDatabaseConnection $db) {
if ($db->transaction_supported()) $db->transaction_begin();
 
if ($db->getSlang()->id() == 'mssql') {
47,4 → 47,6
$db->query("UPDATE ###config SET value = ? WHERE name = 'database_version'", array($version));
 
if ($db->transaction_supported()) $db->transaction_commit();
}
 
return $version;
}
/trunk/includes/db_updates/update204.inc.php
20,10 → 20,10
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @param string $version is the current version (this script MUST increase the number by 1 when it is done)
* @return int new version set
* @throws OIDplusException
*/
function oidplus_dbupdate_204_205(OIDplusDatabaseConnection $db, string &$version) {
function oidplus_dbupdate_204(OIDplusDatabaseConnection $db) {
if ($db->transaction_supported()) $db->transaction_begin();
 
if ($db->getSlang()->id() == 'mssql') {
123,4 → 123,6
$db->query("UPDATE ###config SET value = ? WHERE name = 'database_version'", array($version));
 
if ($db->transaction_supported()) $db->transaction_commit();
 
return $version;
}
/trunk/includes/db_updates/update205.inc.php
0,0 → 1,37
<?php
 
/*
* OIDplus 2.0
* Copyright 2019 - 2022 Daniel Marschall, ViaThinkSoft
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
 
/**
* This function will be called by OIDplusDatabaseConnection.class.php at method afterConnect().
* @param OIDplusDatabaseConnection $db is the OIDplusDatabaseConnection class
* @return int new version set
* @throws OIDplusException
*/
function oidplus_dbupdate_205(OIDplusDatabaseConnection $db) {
// Note: We update to version 1000, because we want to intentionally break older versions of OIDplus
// if they try to connect to a database that is newer than their own program files. Older versions
// of OIDplus checked for DB version 200..999 and failed if the version is outside this range.
// The main reason is that the new version of OIDplus added encrypted private keys,
// and if an older version of OIDplus would try to connect to such a database,
// then it would re-generate the keys (and therefore destroy the existing SystemID).
$version = 1000;
$db->query("UPDATE ###config SET value = ? WHERE name = 'database_version'", array($version));
 
return $version;
}