mirror of
https://github.com/phpbb/phpbb.git
synced 2025-08-09 02:06:32 +02:00
Lifted minimum requirement for Firebird DBMS from 2.0+ to 2.1+.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9970 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
@@ -20,7 +20,7 @@ include_once($phpbb_root_path . 'includes/db/dbal.' . $phpEx);
|
||||
|
||||
/**
|
||||
* Firebird/Interbase Database Abstraction Layer
|
||||
* Minimum Requirement is Firebird 2.0
|
||||
* Minimum Requirement is Firebird 2.1
|
||||
* @package dbal
|
||||
*/
|
||||
class dbal_firebird extends dbal
|
||||
@@ -72,7 +72,7 @@ class dbal_firebird extends dbal
|
||||
return @ibase_server_info($this->service_handle, IBASE_SVC_SERVER_VERSION);
|
||||
}
|
||||
|
||||
return ($raw) ? '2.0' : 'Firebird/Interbase';
|
||||
return ($raw) ? '2.1' : 'Firebird/Interbase';
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -181,7 +181,7 @@ function get_available_dbms($dbms = false, $return_unavailable = false, $only_20
|
||||
function dbms_select($default = '', $only_20x_options = false)
|
||||
{
|
||||
global $lang;
|
||||
|
||||
|
||||
$available_dbms = get_available_dbms(false, false, $only_20x_options);
|
||||
$dbms_options = '';
|
||||
foreach ($available_dbms as $dbms_name => $details)
|
||||
@@ -402,10 +402,10 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
|
||||
}
|
||||
else
|
||||
{
|
||||
$sql = "SELECT FIRST 0 char_length('')
|
||||
FROM RDB\$DATABASE";
|
||||
$sql = 'SELECT 1 FROM RDB$DATABASE
|
||||
WHERE BIN_AND(10, 1) = 0';
|
||||
$result = $db->sql_query($sql);
|
||||
if (!$result) // This can only fail if char_length is not defined
|
||||
if (!$result) // This can only fail if BIN_AND is not defined
|
||||
{
|
||||
$error[] = $lang['INST_ERR_DB_NO_FIREBIRD'];
|
||||
}
|
||||
@@ -446,7 +446,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
|
||||
unset($final);
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 'oracle':
|
||||
if ($unicode_check)
|
||||
{
|
||||
@@ -468,7 +468,7 @@ function connect_check_db($error_connect, &$error, $dbms_details, $table_prefix,
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case 'postgres':
|
||||
if ($unicode_check)
|
||||
{
|
||||
|
Reference in New Issue
Block a user