mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
- utf8_general_ci picked over utf8_unicode_ci for performance reasons git-svn-id: file:///svn/phpbb/trunk@7202 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
parent
a387828494
commit
0f840a80c2
3 changed files with 17 additions and 4 deletions
|
@ -379,9 +379,16 @@ foreach ($supported_dbms as $dbms)
|
||||||
}
|
}
|
||||||
$line .= 'NOT NULL';
|
$line .= 'NOT NULL';
|
||||||
|
|
||||||
if (isset($column_data[2]) && $column_data[2] == 'auto_increment')
|
if (isset($column_data[2]))
|
||||||
{
|
{
|
||||||
$line .= ' auto_increment';
|
if ($column_data[2] == 'auto_increment')
|
||||||
|
{
|
||||||
|
$line .= ' auto_increment';
|
||||||
|
}
|
||||||
|
else if ($dbms === 'mysql_41' && $column_data[2] == 'true_sort')
|
||||||
|
{
|
||||||
|
$line .= ' COLLATE utf8_general_ci';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$line .= ",\n";
|
$line .= ",\n";
|
||||||
|
@ -1744,7 +1751,7 @@ function get_schema_struct()
|
||||||
'topic_attachment' => array('BOOL', 0),
|
'topic_attachment' => array('BOOL', 0),
|
||||||
'topic_approved' => array('BOOL', 1),
|
'topic_approved' => array('BOOL', 1),
|
||||||
'topic_reported' => array('BOOL', 0),
|
'topic_reported' => array('BOOL', 0),
|
||||||
'topic_title' => array('XSTEXT_UNI', ''),
|
'topic_title' => array('XSTEXT_UNI', '', 'true_sort'),
|
||||||
'topic_poster' => array('UINT', 0),
|
'topic_poster' => array('UINT', 0),
|
||||||
'topic_time' => array('TIMESTAMP', 0),
|
'topic_time' => array('TIMESTAMP', 0),
|
||||||
'topic_time_limit' => array('TIMESTAMP', 0),
|
'topic_time_limit' => array('TIMESTAMP', 0),
|
||||||
|
|
|
@ -740,6 +740,12 @@ if (version_compare($current_version, '3.0.b4', '<='))
|
||||||
|
|
||||||
if (version_compare($current_version, '3.0.b6', '<='))
|
if (version_compare($current_version, '3.0.b6', '<='))
|
||||||
{
|
{
|
||||||
|
// sorting thang
|
||||||
|
if ($map_dbms === 'mysql_41')
|
||||||
|
{
|
||||||
|
sql_column_change($dbms, TOPICS_TABLE, 'topic_title', 'varchar(100) DEFAULT \'\' NOT NULL COLLATE utf8_general_ci');
|
||||||
|
}
|
||||||
|
|
||||||
if ($config['fulltext_native_common_thres'] == 20)
|
if ($config['fulltext_native_common_thres'] == 20)
|
||||||
{
|
{
|
||||||
set_config('fulltext_native_common_thres', '5');
|
set_config('fulltext_native_common_thres', '5');
|
||||||
|
|
|
@ -884,7 +884,7 @@ CREATE TABLE phpbb_topics (
|
||||||
topic_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
topic_attachment tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
topic_approved tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
|
topic_approved tinyint(1) UNSIGNED DEFAULT '1' NOT NULL,
|
||||||
topic_reported tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
topic_reported tinyint(1) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
topic_title varchar(100) DEFAULT '' NOT NULL,
|
topic_title varchar(100) DEFAULT '' NOT NULL COLLATE utf8_general_ci,
|
||||||
topic_poster mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
topic_poster mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
topic_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
topic_time int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
topic_time_limit int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
topic_time_limit int(11) UNSIGNED DEFAULT '0' NOT NULL,
|
||||||
|
|
Loading…
Add table
Reference in a new issue