makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/9725] Remove explicit filegroup designations

Browse source 
PHPBB3-9725
This commit is contained in:
Patrick Webster 2014-03-01 22:29:08 -06:00
parent 80a844d38c
commit 68ae8dfa97
1 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
phpBB/includes/db/db_tools.php
View file

@ -452,9 +452,6 @@ class phpbb_db_tools
// Determine if we have created a PRIMARY KEY in the earliest // Determine if we have created a PRIMARY KEY in the earliest
$primary_key_gen = false; $primary_key_gen = false;
// Determine if the table must be created with TEXTIMAGE
$create_textimage = false;
// Determine if the table requires a sequence // Determine if the table requires a sequence
$create_sequence = false; $create_sequence = false;
@ -501,12 +498,6 @@ class phpbb_db_tools
$primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set']; $primary_key_gen = isset($prepared_column['primary_key_set']) && $prepared_column['primary_key_set'];
} }
// create textimage DDL based off of the existance of certain column types
if (!$create_textimage)
{
$create_textimage = isset($prepared_column['textimage']) && $prepared_column['textimage'];
}
// create sequence DDL based off of the existance of auto incrementing columns // create sequence DDL based off of the existance of auto incrementing columns
if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment']) if (!$create_sequence && isset($prepared_column['auto_increment']) && $prepared_column['auto_increment'])
{ {
@ -521,13 +512,9 @@ class phpbb_db_tools
switch ($this->sql_layer) switch ($this->sql_layer)
{ {
case 'firebird': case 'firebird':
$table_sql .= "\n);";
$statements[] = $table_sql;
break;
case 'mssql': case 'mssql':
case 'mssqlnative': case 'mssqlnative':
$table_sql .= "\n) ON [PRIMARY]" . (($create_textimage) ? ' TEXTIMAGE_ON [PRIMARY]' : ''); $table_sql .= "\n);";
$statements[] = $table_sql; $statements[] = $table_sql;
break; break;
} }
@ -2038,7 +2025,7 @@ class phpbb_db_tools
$sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD "; $sql = "ALTER TABLE [{$table_name}] WITH NOCHECK ADD ";
$sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY CLUSTERED ("; $sql .= "CONSTRAINT [PK_{$table_name}] PRIMARY KEY CLUSTERED (";
$sql .= '[' . implode("],\n\t\t[", $column) . ']'; $sql .= '[' . implode("],\n\t\t[", $column) . ']';
$sql .= ') ON [PRIMARY]'; $sql .= ')';
$statements[] = $sql; $statements[] = $sql;
break; break;
@ -2136,7 +2123,7 @@ class phpbb_db_tools
case 'mssql': case 'mssql':
case 'mssqlnative': case 'mssqlnative':
$statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; $statements[] = 'CREATE UNIQUE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
break; break;
} }
@ -2189,7 +2176,7 @@ class phpbb_db_tools
case 'mssql': case 'mssql':
case 'mssqlnative': case 'mssqlnative':
$statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ') ON [PRIMARY]'; $statements[] = 'CREATE INDEX ' . $index_name . ' ON ' . $table_name . '(' . implode(', ', $column) . ')';
break; break;
} }