diff options
| author | David M <davidmj@users.sourceforge.net> | 2006-05-13 02:14:59 +0000 |
|---|---|---|
| committer | David M <davidmj@users.sourceforge.net> | 2006-05-13 02:14:59 +0000 |
| commit | fd609f28babd75640b90a7e6fffed254ab83ad34 (patch) | |
| tree | 53002e7294df5cb7b19707f8a8127b2cb1a67544 /phpBB | |
| parent | d5fc1c29f2ce7d7a310f63eaf877e0bfa42ef57c (diff) | |
| download | forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar.gz forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar.bz2 forums-fd609f28babd75640b90a7e6fffed254ab83ad34.tar.xz forums-fd609f28babd75640b90a7e6fffed254ab83ad34.zip | |
- Firebird is people too
git-svn-id: file:///svn/phpbb/trunk@5907 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acm/acm_main.php | 7 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/message_parser.php | 10 | ||||
| -rw-r--r-- | phpBB/install/schemas/firebird_schema.sql | 43 |
4 files changed, 42 insertions, 20 deletions
diff --git a/phpBB/includes/acm/acm_main.php b/phpBB/includes/acm/acm_main.php index f1aea8c115..9e1d8349c1 100644 --- a/phpBB/includes/acm/acm_main.php +++ b/phpBB/includes/acm/acm_main.php @@ -270,6 +270,13 @@ class cache extends acm WHERE bot_active = 1 ORDER BY LEN(bot_agent) DESC'; break; + + case 'firebird': + $sql = 'SELECT user_id, bot_agent, bot_ip + FROM ' . BOTS_TABLE . ' + WHERE bot_active = 1 + ORDER BY STRLEN(bot_agent) DESC'; + break; // LENGTH supported by MySQL, IBM DB2 and Oracle for sure... default: diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index dad152ea87..9a0aa1409d 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -658,7 +658,7 @@ class acp_groups $sql = 'SELECT g.group_id, g.group_name, g.group_type, COUNT(ug.user_id) AS total_members FROM ' . GROUPS_TABLE . ' g - LEFT JOIN ' . USER_GROUP_TABLE . ' ug USING (group_id) + LEFT JOIN ' . USER_GROUP_TABLE . ' ug ON (g.group_id = ug.group_id) GROUP BY g.group_id, g.group_name, g.group_type ORDER BY g.group_type ASC, g.group_name'; $result = $db->sql_query($sql); diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php index 4d940b749e..3060d76ed5 100644 --- a/phpBB/includes/message_parser.php +++ b/phpBB/includes/message_parser.php @@ -919,14 +919,20 @@ class parse_message extends bbcode_firstpass $sql = 'SELECT * FROM ' . SMILIES_TABLE . ' ORDER BY LEN(code) DESC'; - break; + break; + case 'firebird': + $sql = 'SELECT * + FROM ' . SMILIES_TABLE . ' + ORDER BY STRLEN(code) DESC'; + break; + // LENGTH supported by MySQL, IBM DB2, Oracle and Access for sure... default: $sql = 'SELECT * FROM ' . SMILIES_TABLE . ' ORDER BY LENGTH(code) DESC'; - break; + break; } $result = $db->sql_query($sql, 600); diff --git a/phpBB/install/schemas/firebird_schema.sql b/phpBB/install/schemas/firebird_schema.sql index c7121d8a6d..cc0eefdd21 100644 --- a/phpBB/install/schemas/firebird_schema.sql +++ b/phpBB/install/schemas/firebird_schema.sql @@ -1328,12 +1328,12 @@ CREATE TABLE phpbb_users ( user_passchg INTEGER DEFAULT 0 NULL, user_email VARCHAR(100) NOT NULL, user_email_hash DOUBLE PRECISION DEFAULT 0 NOT NULL, - user_birthday VARCHAR(10) NULL, + user_birthday VARCHAR(10) DEFAULT '' NULL, user_lastvisit INTEGER DEFAULT 0 NOT NULL, user_lastmark INTEGER DEFAULT 0 NOT NULL, user_lastpost_time INTEGER DEFAULT 0 NOT NULL, - user_lastpage VARCHAR(200) NOT NULL, - user_last_confirm_key VARCHAR(10) NULL, + user_lastpage VARCHAR(200) DEFAULT '' NOT NULL, + user_last_confirm_key VARCHAR(10) DEFAULT '' NULL, user_warnings INTEGER DEFAULT 0 NULL, user_last_warning INTEGER DEFAULT 0 NULL, user_login_attempts INTEGER DEFAULT 0 NULL, @@ -1344,7 +1344,7 @@ CREATE TABLE phpbb_users ( user_dateformat VARCHAR(30) DEFAULT 'd M Y H:i' NOT NULL, user_style INTEGER DEFAULT 0 NOT NULL, user_rank INTEGER DEFAULT 0 , - user_colour VARCHAR(6) NOT NULL, + user_colour VARCHAR(6) DEFAULT '' NOT NULL, user_new_privmsg INTEGER DEFAULT 0 NOT NULL, user_unread_privmsg INTEGER DEFAULT 0 NOT NULL, user_last_privmsg INTEGER DEFAULT 0 NOT NULL, @@ -1366,24 +1366,24 @@ CREATE TABLE phpbb_users ( user_allow_viewemail INTEGER DEFAULT 1 NOT NULL, user_allow_massemail INTEGER DEFAULT 1 NOT NULL, user_options INTEGER DEFAULT 893 NOT NULL, - user_avatar VARCHAR(255) NOT NULL, + user_avatar VARCHAR(255) DEFAULT '' NOT NULL, user_avatar_type INTEGER DEFAULT 0 NOT NULL, user_avatar_width INTEGER DEFAULT 0 NOT NULL, user_avatar_height INTEGER DEFAULT 0 NOT NULL, user_sig BLOB SUB_TYPE TEXT NULL, - user_sig_bbcode_uid VARCHAR(5) NULL, + user_sig_bbcode_uid VARCHAR(5) DEFAULT '' NULL, user_sig_bbcode_bitfield INTEGER DEFAULT 0 NULL, - user_from VARCHAR(100) NULL, - user_icq VARCHAR(15) NULL, - user_aim VARCHAR(255) NULL, - user_yim VARCHAR(255) NULL, - user_msnm VARCHAR(255) NULL, - user_jabber VARCHAR(255) NULL, - user_website VARCHAR(200) NULL, - user_occ VARCHAR(255) NULL, - user_interests VARCHAR(255) NULL, - user_actkey VARCHAR(32) NOT NULL, - user_newpasswd VARCHAR(32) NULL + user_from VARCHAR(100) DEFAULT '' NULL, + user_icq VARCHAR(15) DEFAULT '' NULL, + user_aim VARCHAR(255) DEFAULT '' NULL, + user_yim VARCHAR(255) DEFAULT '' NULL, + user_msnm VARCHAR(255) DEFAULT '' NULL, + user_jabber VARCHAR(255) DEFAULT '' NULL, + user_website VARCHAR(200) DEFAULT '' NULL, + user_occ VARCHAR(255) DEFAULT '' NULL, + user_interests VARCHAR(255) DEFAULT '' NULL, + user_actkey VARCHAR(32) DEFAULT '' NOT NULL, + user_newpasswd VARCHAR(32) DEFAULT '' NULL );; ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);; @@ -1455,3 +1455,12 @@ CREATE TABLE phpbb_zebra ( CREATE INDEX phpbb_zebra_user_id ON phpbb_zebra(user_id);; CREATE INDEX phpbb_zebra_zebra_id ON phpbb_zebra(zebra_id);; + +DECLARE EXTERNAL FUNCTION STRLEN + CSTRING(32767) +RETURNS INTEGER BY VALUE +ENTRY_POINT 'IB_UDF_strlen' MODULE_NAME 'ib_udf';; + +DECLARE EXTERNAL FUNCTION LOWER CSTRING(80) +RETURNS CSTRING(80) FREE_IT +ENTRY_POINT 'IB_UDF_lower' MODULE_NAME 'ib_udf';;
\ No newline at end of file |