Merge branch '3.2.x'

This commit is contained in:
Marc Alexander 2016-05-24 21:47:56 +02:00
commit 682aa32af1

View file

@ -58,7 +58,7 @@ class database
'LABEL' => 'MS SQL Server 2000+', 'LABEL' => 'MS SQL Server 2000+',
'SCHEMA' => 'mssql', 'SCHEMA' => 'mssql',
'MODULE' => 'mssql', 'MODULE' => 'mssql',
'DELIM' => 'GO', 'DELIM' => ';',
'DRIVER' => 'phpbb\db\driver\mssql', 'DRIVER' => 'phpbb\db\driver\mssql',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
@ -67,7 +67,7 @@ class database
'LABEL' => 'MS SQL Server [ ODBC ]', 'LABEL' => 'MS SQL Server [ ODBC ]',
'SCHEMA' => 'mssql', 'SCHEMA' => 'mssql',
'MODULE' => 'odbc', 'MODULE' => 'odbc',
'DELIM' => 'GO', 'DELIM' => ';',
'DRIVER' => 'phpbb\db\driver\mssql_odbc', 'DRIVER' => 'phpbb\db\driver\mssql_odbc',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => true, '2.0.x' => true,
@ -76,7 +76,7 @@ class database
'LABEL' => 'MS SQL Server 2005+ [ Native ]', 'LABEL' => 'MS SQL Server 2005+ [ Native ]',
'SCHEMA' => 'mssql', 'SCHEMA' => 'mssql',
'MODULE' => 'sqlsrv', 'MODULE' => 'sqlsrv',
'DELIM' => 'GO', 'DELIM' => ';',
'DRIVER' => 'phpbb\db\driver\mssqlnative', 'DRIVER' => 'phpbb\db\driver\mssqlnative',
'AVAILABLE' => true, 'AVAILABLE' => true,
'2.0.x' => false, '2.0.x' => false,