diff options
| author | David M <davidmj@users.sourceforge.net> | 2008-01-08 06:44:05 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2008-01-08 06:44:05 +0000 |
| commit | 370e189f156730f3ea602052737fb6995c85c23c (patch) | |
| tree | dac369961ff10f5a31f6ad40318afb8702b31e4d /phpBB/develop | |
| parent | b4e64655afc6279d7c64a952ee5f43fe65751c19 (diff) | |
| download | forums-370e189f156730f3ea602052737fb6995c85c23c.tar forums-370e189f156730f3ea602052737fb6995c85c23c.tar.gz forums-370e189f156730f3ea602052737fb6995c85c23c.tar.bz2 forums-370e189f156730f3ea602052737fb6995c85c23c.tar.xz forums-370e189f156730f3ea602052737fb6995c85c23c.zip | |
- make viewforum work again
- remove the lower case functions, they were stupid anyway
- added some indexes
- added a group_name_clean column
git-svn-id: file:///svn/phpbb/trunk@8315 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/develop')
| -rw-r--r-- | phpBB/develop/create_schema_files.php | 97 |
1 files changed, 11 insertions, 86 deletions
diff --git a/phpBB/develop/create_schema_files.php b/phpBB/develop/create_schema_files.php index d4309d153e..c856988719 100644 --- a/phpBB/develop/create_schema_files.php +++ b/phpBB/develop/create_schema_files.php @@ -208,7 +208,7 @@ $dbms_type_map = array( 'UINT' => 'INT4', // unsigned 'UINT:' => 'INT4', // unsigned 'USINT' => 'INT2', // unsigned - 'BOOL' => 'INT2', // unsigned + 'BOOL' => 'boolean', // unsigned 'TINT:' => 'INT2', 'VCHAR' => 'varchar(255)', 'VCHAR:' => 'varchar(%d)', @@ -228,7 +228,7 @@ $dbms_type_map = array( 'PDECIMAL:' => 'decimal(%d,3)', 'VCHAR_UNI' => 'varchar(255)', 'VCHAR_UNI:'=> 'varchar(%d)', - 'VCHAR_CI' => 'varchar_ci', + 'VCHAR_CI' => 'varchar(255)', 'VARBINARY' => 'bytea', ), ); @@ -239,7 +239,7 @@ $supported_dbms = array('firebird', 'mssql', 'mysql', 'db2', 'oracle', 'postgres foreach ($supported_dbms as $dbms) { - $fp = fopen($schema_path . '_' . $dbms . '_schema.sql', 'wt'); + $fp = fopen($schema_path . '' . $dbms . '_schema.sql', 'wt'); $line = ''; @@ -999,6 +999,7 @@ function get_schema_struct() 'PRIMARY_KEY' => 'config_name', 'KEYS' => array( 'is_dynamic' => array('INDEX', 'is_dynamic'), + 'config_name' => array('INDEX', 'config_name'), ), ); @@ -1150,7 +1151,8 @@ function get_schema_struct() 'group_id' => array('UINT', NULL, 'auto_increment'), 'group_type' => array('TINT:4', 1), 'group_founder_manage' => array('BOOL', 0), - 'group_name' => array('VCHAR_CI', ''), + 'group_name' => array('VCHAR_UNI', ''), + 'group_name_clean' => array('VCHAR_UNI', ''), 'group_desc' => array('TEXT_UNI', ''), 'group_desc_bitfield' => array('VCHAR:255', ''), 'group_desc_options' => array('UINT:11', 7), @@ -1803,8 +1805,8 @@ function get_schema_struct() 'user_perm_from' => array('UINT', 0), 'user_ip' => array('VCHAR:40', ''), 'user_regdate' => array('TIMESTAMP', 0), - 'username' => array('VCHAR_CI', ''), - 'username_clean' => array('VCHAR_CI', ''), + 'username' => array('VCHAR_UNI', ''), + 'username_clean' => array('VCHAR_UNI', ''), 'user_password' => array('VCHAR_UNI:40', ''), 'user_passchg' => array('TIMESTAMP', 0), 'user_pass_convert' => array('BOOL', 0), @@ -1908,6 +1910,9 @@ function get_schema_struct() 'foe' => array('BOOL', 0), ), 'PRIMARY_KEY' => array('user_id', 'zebra_id'), + 'KEYS' => array( + 'zebra_user' => array('INDEX', array('zebra_id', 'user_id')), + ), ); return $schema_data; @@ -1963,86 +1968,6 @@ CONNECT phpbb/phpbb_password; EOF; break; - - case 'postgres': - return <<<EOF -/* - Domain definition -*/ -CREATE DOMAIN varchar_ci AS varchar(255) NOT NULL DEFAULT ''::character varying; - -/* - Operation Functions -*/ -CREATE FUNCTION _varchar_ci_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) = LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_not_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) != LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_less_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) < LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_less_equal(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) <= LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_greater_than(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) > LOWER($2)' LANGUAGE SQL STRICT; -CREATE FUNCTION _varchar_ci_greater_equals(varchar_ci, varchar_ci) RETURNS boolean AS 'SELECT LOWER($1) >= LOWER($2)' LANGUAGE SQL STRICT; - -/* - Operators -*/ -CREATE OPERATOR <( - PROCEDURE = _varchar_ci_less_than, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = >, - NEGATOR = >=, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); - -CREATE OPERATOR <=( - PROCEDURE = _varchar_ci_less_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = >=, - NEGATOR = >, - RESTRICT = scalarltsel, - JOIN = scalarltjoinsel); - -CREATE OPERATOR >( - PROCEDURE = _varchar_ci_greater_than, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <, - NEGATOR = <=, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); - -CREATE OPERATOR >=( - PROCEDURE = _varchar_ci_greater_equals, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <=, - NEGATOR = <, - RESTRICT = scalargtsel, - JOIN = scalargtjoinsel); - -CREATE OPERATOR <>( - PROCEDURE = _varchar_ci_not_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = <>, - NEGATOR = =, - RESTRICT = neqsel, - JOIN = neqjoinsel); - -CREATE OPERATOR =( - PROCEDURE = _varchar_ci_equal, - LEFTARG = varchar_ci, - RIGHTARG = varchar_ci, - COMMUTATOR = =, - NEGATOR = <>, - RESTRICT = eqsel, - JOIN = eqjoinsel, - HASHES, - MERGES, - SORT1= <); - -EOF; - break; } return ''; |