mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 06:08:52 +00:00
Merge branch 'ticket/cs278/9582' into develop-olympus
* ticket/cs278/9582: [ticket/9582] MSSQL native backups can now be restored. [ticket/9582] Advanced search cannot be accessed using MSSQL native. [ticket/9582] Removing a report reason leaves reports with an unknown reason under MSSQL native. [ticket/9582] Unable to edit CPFs from UCP under MSSQL native driver. [ticket/9582] Custom profile fields cannot be created under MSSQL native.
This commit is contained in:
commit
ad93eaaaf3
5 changed files with 5 additions and 0 deletions
|
@ -394,6 +394,7 @@ class acp_database
|
||||||
|
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
|
while (($sql = $fgetd($fp, "GO\n", $read, $seek, $eof)) !== false)
|
||||||
{
|
{
|
||||||
$db->sql_query($sql);
|
$db->sql_query($sql);
|
||||||
|
|
|
@ -1480,6 +1480,7 @@ class acp_profile
|
||||||
|
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
|
|
||||||
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
|
// We are defining the biggest common value, because of the possibility to edit the min/max values of each field.
|
||||||
$sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] ";
|
$sql = 'ALTER TABLE [' . PROFILE_FIELDS_DATA_TABLE . "] ADD [$field_ident] ";
|
||||||
|
|
|
@ -233,6 +233,7 @@ class acp_reasons
|
||||||
// Standard? What's that?
|
// Standard? What's that?
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
// Change the reports using this reason to 'other'
|
// Change the reports using this reason to 'other'
|
||||||
$sql = "DECLARE @ptrval binary(16)
|
$sql = "DECLARE @ptrval binary(16)
|
||||||
|
|
||||||
|
|
|
@ -366,6 +366,7 @@ class custom_profile
|
||||||
case 'sqlite':
|
case 'sqlite':
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
$right_delim = ']';
|
$right_delim = ']';
|
||||||
$left_delim = '[';
|
$left_delim = '[';
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1155,6 +1155,7 @@ if ($auth->acl_get('a_search'))
|
||||||
|
|
||||||
case 'mssql':
|
case 'mssql':
|
||||||
case 'mssql_odbc':
|
case 'mssql_odbc':
|
||||||
|
case 'mssqlnative':
|
||||||
$sql = 'SELECT search_time, search_keywords
|
$sql = 'SELECT search_time, search_keywords
|
||||||
FROM ' . SEARCH_RESULTS_TABLE . '
|
FROM ' . SEARCH_RESULTS_TABLE . '
|
||||||
WHERE DATALENGTH(search_keywords) > 0
|
WHERE DATALENGTH(search_keywords) > 0
|
||||||
|
|
Loading…
Add table
Reference in a new issue