mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Ok, story real database server info, as well as caching it

Browse Source 
Store it on installation too - allows us to check the db version used on installation and used currently to warn the user about incompatibilities

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8814 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2008-09-04 12:01:47 +00:00
parent 4a225280a0
commit 2fcd96ca72
18 changed files with 199 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/install/convertors/functions_phpbb20.php
View File

@@ -1710,7 +1710,7 @@ function phpbb_check_username_collisions()
break;
case 'mysql4':
if (version_compare($db->mysql_version, '4.1.3', '>='))
if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
{
$map_dbms = 'mysql_41';
}

5
phpBB/install/database_update.php
View File

@@ -552,7 +552,7 @@ switch ($db->sql_layer)
break;
case 'mysql4':
if (version_compare($db->mysql_version, '4.1.3', '>='))
if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
{
$map_dbms = 'mysql_41';
}
@@ -1837,6 +1837,9 @@ function change_database_data(&$no_updates, $version)
set_config('enable_queue_trigger', '0');
set_config('queue_trigger_posts', '3');
// Not prefilling yet
set_config('dbms_version', '');
// Resync post counts
$sql = 'SELECT COUNT(p.post_id) AS num_posts, u.user_id
FROM ' . USERS_TABLE . ' u

2
phpBB/install/install_convert.php
View File

@@ -685,7 +685,7 @@ class install_convert extends module
// Thanks MySQL, for silently converting...
case 'mysql':
case 'mysql4':
if (version_compare($src_db->mysql_version, '4.1.3', '>='))
if (version_compare($src_db->sql_server_info(true), '4.1.3', '>='))
{
$convert->mysql_convert = true;
}

6
phpBB/install/install_install.php
View File

@@ -1157,7 +1157,7 @@ class install_install extends module
// If mysql is chosen, we need to adjust the schema filename slightly to reflect the correct version. ;)
if ($data['dbms'] == 'mysql')
{
if (version_compare($db->mysql_version, '4.1.3', '>='))
if (version_compare($db->sql_server_info(true), '4.1.3', '>='))
{
$available_dbms[$data['dbms']]['SCHEMA'] .= '_41';
}
@@ -1363,6 +1363,10 @@ class install_install extends module
'UPDATE ' . $data['table_prefix'] . "forums
SET forum_last_post_time = $current_time",
'UPDATE ' . $data['table_prefix'] . "config
SET config_value = '" . $db->sql_escape($db->sql_server_info(true)) . "'
WHERE config_name = 'dbms_version'",
);
if (@extension_loaded('gd') || can_load_dll('gd'))

1
phpBB/install/schemas/schema_data.sql
View File

@@ -75,6 +75,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_enable', '0'
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_fax', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('coppa_mail', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('database_gc', '604800');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('dbms_version', '');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_dateformat', 'D M d, Y g:i a');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('default_style', '1');
INSERT INTO phpbb_config (config_name, config_value) VALUES ('display_last_edited', '1');