1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

Merge branch '3.2.x'

* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
This commit is contained in:
Tristan Darricau
2016-09-25 17:19:18 +02:00
21 changed files with 7 additions and 636 deletions

View File

@@ -54,15 +54,6 @@ class database
'AVAILABLE' => true,
'2.0.x' => true,
),
'mssql' => array(
'LABEL' => 'MS SQL Server 2000+',
'SCHEMA' => 'mssql',
'MODULE' => 'mssql',
'DELIM' => ';',
'DRIVER' => 'phpbb\db\driver\mssql',
'AVAILABLE' => true,
'2.0.x' => true,
),
'mssql_odbc'=> array(
'LABEL' => 'MS SQL Server [ ODBC ]',
'SCHEMA' => 'mssql',

View File

@@ -134,7 +134,7 @@ class add_default_data extends \phpbb\install\task_base
*/
protected function replace_dbms_specific_sql($query)
{
if ($this->db instanceof \phpbb\db\driver\mssql_base || $this->db instanceof \phpbb\db\driver\mssql)
if ($this->db instanceof \phpbb\db\driver\mssql_base)
{
$query = preg_replace('#\# MSSQL IDENTITY (phpbb_[a-z_]+) (ON|OFF) \##s', 'SET IDENTITY_INSERT \1 \2;', $query);
}