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

- Handle ISO-8859-8-i

Browse source 
- Renamed two indicies for Oracle support #11457


git-svn-id: file:///svn/phpbb/trunk@7669 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M 2007-05-23 23:37:04 +00:00
parent d180ac3d02
commit e4de958704
10 changed files with 42 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/develop/create_schema_files.php
View file

@ -858,7 +858,7 @@ function get_schema_struct()
), ),
'PRIMARY_KEY' => array('role_id', 'auth_option_id'), 'PRIMARY_KEY' => array('role_id', 'auth_option_id'),
'KEYS' => array( 'KEYS' => array(
'ath_opt_id' => array('INDEX', 'auth_option_id'), 'ath_op_id' => array('INDEX', 'auth_option_id'),
), ),
); );
@ -1643,7 +1643,7 @@ function get_schema_struct()
), ),
'PRIMARY_KEY' => 'image_id', 'PRIMARY_KEY' => 'image_id',
'KEYS' => array( 'KEYS' => array(
'i_id' => array('INDEX', 'imageset_id'), 'i_d' => array('INDEX', 'imageset_id'),
), ),
); );

6
phpBB/includes/utf/utf_tools.php
View file

@ -713,6 +713,12 @@ function utf8_recode($string, $encoding)
{ {
$encoding = 'cp1252'; $encoding = 'cp1252';
} }
// convert iso-8859-8-i to iso-8859-8
else if ($encoding == 'iso-8859-8-i')
{
$encoding = 'iso-8859-8';
$string = strrev($string);
}
// First, try iconv() // First, try iconv()
if (function_exists('iconv')) if (function_exists('iconv'))

21
phpBB/install/database_update.php
View file

@ -312,7 +312,26 @@ $unsigned_types = array('UINT', 'UINT:', 'USINT', 'BOOL', 'TIMESTAMP');
// Only an example, but also commented out // Only an example, but also commented out
$database_update_info = array( $database_update_info = array(
// Changes from 3.0.RC1 to the next version // Changes from 3.0.RC1 to the next version
// '3.0.RC1' => array(), '3.0.RC1' => array(
// Remove the following keys
'drop_keys' => array(
STYLES_IMAGESET_DATA_TABLE => array(
'i_id',
),
ACL_ROLES_DATA_TABLE => array(
'ath_opt_id',
),
),
// Add the following keys
'add_index' => array(
STYLES_IMAGESET_DATA_TABLE => array(
'i_d' => array('imageset_id'),
),
ACL_ROLES_DATA_TABLE => array(
'ath_opt_id' => array('auth_option_id'),
),
),
),
); );
// Determine mapping database type // Determine mapping database type

4
phpBB/install/schemas/firebird_schema.sql
View file

@ -112,7 +112,7 @@ CREATE TABLE phpbb_acl_roles_data (
ALTER TABLE phpbb_acl_roles_data ADD PRIMARY KEY (role_id, auth_option_id);; ALTER TABLE phpbb_acl_roles_data ADD PRIMARY KEY (role_id, auth_option_id);;
CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data(auth_option_id);; CREATE INDEX phpbb_acl_roles_data_ath_op_id ON phpbb_acl_roles_data(auth_option_id);;
# Table: 'phpbb_acl_users' # Table: 'phpbb_acl_users'
CREATE TABLE phpbb_acl_users ( CREATE TABLE phpbb_acl_users (
@ -1176,7 +1176,7 @@ CREATE TABLE phpbb_styles_imageset_data (
ALTER TABLE phpbb_styles_imageset_data ADD PRIMARY KEY (image_id);; ALTER TABLE phpbb_styles_imageset_data ADD PRIMARY KEY (image_id);;
CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data(imageset_id);; CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data(imageset_id);;
CREATE GENERATOR phpbb_styles_imageset_data_gen;; CREATE GENERATOR phpbb_styles_imageset_data_gen;;
SET GENERATOR phpbb_styles_imageset_data_gen TO 0;; SET GENERATOR phpbb_styles_imageset_data_gen TO 0;;

4
phpBB/install/schemas/mssql_schema.sql
View file

@ -141,7 +141,7 @@ ALTER TABLE [phpbb_acl_roles_data] WITH NOCHECK ADD
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
CREATE INDEX [ath_opt_id] ON [phpbb_acl_roles_data]([auth_option_id]) ON [PRIMARY] CREATE INDEX [ath_op_id] ON [phpbb_acl_roles_data]([auth_option_id]) ON [PRIMARY]
GO GO
@ -1392,7 +1392,7 @@ ALTER TABLE [phpbb_styles_imageset_data] WITH NOCHECK ADD
) ON [PRIMARY] ) ON [PRIMARY]
GO GO
CREATE INDEX [i_id] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY] CREATE INDEX [i_d] ON [phpbb_styles_imageset_data]([imageset_id]) ON [PRIMARY]
GO GO

4
phpBB/install/schemas/mysql_40_schema.sql
View file

@ -72,7 +72,7 @@ CREATE TABLE phpbb_acl_roles_data (
auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_setting tinyint(2) DEFAULT '0' NOT NULL, auth_setting tinyint(2) DEFAULT '0' NOT NULL,
PRIMARY KEY (role_id, auth_option_id), PRIMARY KEY (role_id, auth_option_id),
KEY ath_opt_id (auth_option_id) KEY ath_op_id (auth_option_id)
); );
@ -788,7 +788,7 @@ CREATE TABLE phpbb_styles_imageset_data (
image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL, image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
imageset_id tinyint(4) DEFAULT '0' NOT NULL, imageset_id tinyint(4) DEFAULT '0' NOT NULL,
PRIMARY KEY (image_id), PRIMARY KEY (image_id),
KEY i_id (imageset_id) KEY i_d (imageset_id)
); );

4
phpBB/install/schemas/mysql_41_schema.sql
View file

@ -72,7 +72,7 @@ CREATE TABLE phpbb_acl_roles_data (
auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL, auth_option_id mediumint(8) UNSIGNED DEFAULT '0' NOT NULL,
auth_setting tinyint(2) DEFAULT '0' NOT NULL, auth_setting tinyint(2) DEFAULT '0' NOT NULL,
PRIMARY KEY (role_id, auth_option_id), PRIMARY KEY (role_id, auth_option_id),
KEY ath_opt_id (auth_option_id) KEY ath_op_id (auth_option_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`; ) CHARACTER SET `utf8` COLLATE `utf8_bin`;
@ -788,7 +788,7 @@ CREATE TABLE phpbb_styles_imageset_data (
image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL, image_width smallint(4) UNSIGNED DEFAULT '0' NOT NULL,
imageset_id tinyint(4) DEFAULT '0' NOT NULL, imageset_id tinyint(4) DEFAULT '0' NOT NULL,
PRIMARY KEY (image_id), PRIMARY KEY (image_id),
KEY i_id (imageset_id) KEY i_d (imageset_id)
) CHARACTER SET `utf8` COLLATE `utf8_bin`; ) CHARACTER SET `utf8` COLLATE `utf8_bin`;

4
phpBB/install/schemas/oracle_schema.sql
View file

@ -187,7 +187,7 @@ CREATE TABLE phpbb_acl_roles_data (
) )
/ /
CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data (auth_option_id) CREATE INDEX phpbb_acl_roles_data_ath_op_id ON phpbb_acl_roles_data (auth_option_id)
/ /
/* /*
@ -1560,7 +1560,7 @@ CREATE TABLE phpbb_styles_imageset_data (
) )
/ /
CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data (imageset_id) CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data (imageset_id)
/ /
CREATE SEQUENCE phpbb_styles_imageset_data_seq CREATE SEQUENCE phpbb_styles_imageset_data_seq

4
phpBB/install/schemas/postgres_schema.sql
View file

@ -169,7 +169,7 @@ CREATE TABLE phpbb_acl_roles_data (
PRIMARY KEY (role_id, auth_option_id) PRIMARY KEY (role_id, auth_option_id)
); );
CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data (auth_option_id); CREATE INDEX phpbb_acl_roles_data_ath_op_id ON phpbb_acl_roles_data (auth_option_id);
/* /*
Table: 'phpbb_acl_users' Table: 'phpbb_acl_users'
@ -1039,7 +1039,7 @@ CREATE TABLE phpbb_styles_imageset_data (
PRIMARY KEY (image_id) PRIMARY KEY (image_id)
); );
CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data (imageset_id); CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data (imageset_id);
/* /*
Table: 'phpbb_topics' Table: 'phpbb_topics'

4
phpBB/install/schemas/sqlite_schema.sql
View file

@ -73,7 +73,7 @@ CREATE TABLE phpbb_acl_roles_data (
PRIMARY KEY (role_id, auth_option_id) PRIMARY KEY (role_id, auth_option_id)
); );
CREATE INDEX phpbb_acl_roles_data_ath_opt_id ON phpbb_acl_roles_data (auth_option_id); CREATE INDEX phpbb_acl_roles_data_ath_op_id ON phpbb_acl_roles_data (auth_option_id);
# Table: 'phpbb_acl_users' # Table: 'phpbb_acl_users'
CREATE TABLE phpbb_acl_users ( CREATE TABLE phpbb_acl_users (
@ -761,7 +761,7 @@ CREATE TABLE phpbb_styles_imageset_data (
imageset_id tinyint(4) NOT NULL DEFAULT '0' imageset_id tinyint(4) NOT NULL DEFAULT '0'
); );
CREATE INDEX phpbb_styles_imageset_data_i_id ON phpbb_styles_imageset_data (imageset_id); CREATE INDEX phpbb_styles_imageset_data_i_d ON phpbb_styles_imageset_data (imageset_id);
# Table: 'phpbb_topics' # Table: 'phpbb_topics'
CREATE TABLE phpbb_topics ( CREATE TABLE phpbb_topics (