mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-27 21:58:52 +00:00
Firebird!
git-svn-id: file:///svn/phpbb/trunk@5918 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
David M
parent
d52e31a489
commit
68e374067b
4 changed files with 47 additions and 37 deletions
|
|
@ -818,7 +818,7 @@ class ucp_main
|
|||
AND f.forum_id = p.forum_id
|
||||
$post_count_sql
|
||||
GROUP BY f.forum_id
|
||||
ORDER BY num_posts DESC";
|
||||
ORDER BY COUNT(p.post_id) DESC";
|
||||
$result = $db->sql_query_limit($sql, 1);
|
||||
$active_f_row = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
|
@ -838,7 +838,7 @@ class ucp_main
|
|||
AND f.forum_id = t.forum_id
|
||||
$post_count_sql
|
||||
GROUP BY t.topic_id
|
||||
ORDER BY num_posts DESC";
|
||||
ORDER BY COUNT(p.post_id) DESC";
|
||||
$result = $db->sql_query_limit($sql, 1);
|
||||
$active_t_row = $db->sql_fetchrow($result);
|
||||
$db->sql_freeresult($result);
|
||||
|
|
|
|||
|
|
@ -1110,6 +1110,16 @@ class install_install extends module
|
|||
$_module = &new acp_modules();
|
||||
$module_classes = array('acp', 'mcp', 'ucp');
|
||||
|
||||
switch ($dbms)
|
||||
{
|
||||
case 'firebird':
|
||||
$column_name = '"module_name"';
|
||||
break;
|
||||
|
||||
default:
|
||||
$column_name = 'module_name';
|
||||
}
|
||||
|
||||
foreach ($module_classes as $module_class)
|
||||
{
|
||||
$categories = array();
|
||||
|
|
@ -1117,7 +1127,7 @@ class install_install extends module
|
|||
foreach ($this->module_categories[$module_class] as $cat_name => $subs)
|
||||
{
|
||||
$module_data = array(
|
||||
'module_name' => '',
|
||||
$column_name => '',
|
||||
'module_enabled' => 1,
|
||||
'module_display' => 1,
|
||||
'parent_id' => 0,
|
||||
|
|
@ -1144,7 +1154,7 @@ class install_install extends module
|
|||
foreach ($subs as $level2_name)
|
||||
{
|
||||
$module_data = array(
|
||||
'module_name' => '',
|
||||
$column_name => '',
|
||||
'module_enabled' => 1,
|
||||
'module_display' => 1,
|
||||
'parent_id' => $categories[$cat_name]['id'],
|
||||
|
|
@ -1181,7 +1191,7 @@ class install_install extends module
|
|||
foreach ($row['cat'] as $cat_name)
|
||||
{
|
||||
$module_data = array(
|
||||
'module_name' => $module_name,
|
||||
$column_name => $module_name,
|
||||
'module_enabled' => 1,
|
||||
'module_display' => (isset($row['display'])) ? $row['display'] : 1,
|
||||
'parent_id' => $categories[$cat_name]['id'],
|
||||
|
|
|
|||
|
|
@ -616,7 +616,7 @@ CREATE TABLE phpbb_posts (
|
|||
enable_smilies INTEGER DEFAULT 1 NOT NULL,
|
||||
enable_magic_url INTEGER DEFAULT 1 NOT NULL,
|
||||
enable_sig INTEGER DEFAULT 1 NOT NULL,
|
||||
post_username VARCHAR(255) NULL,
|
||||
post_username VARCHAR(255),
|
||||
post_subject BLOB SUB_TYPE TEXT NOT NULL,
|
||||
post_text BLOB SUB_TYPE TEXT NOT NULL,
|
||||
post_checksum VARCHAR(32) NOT NULL,
|
||||
|
|
@ -624,11 +624,11 @@ CREATE TABLE phpbb_posts (
|
|||
post_attachment INTEGER DEFAULT 0 NOT NULL,
|
||||
bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
|
||||
bbcode_uid VARCHAR(5) NOT NULL,
|
||||
post_edit_time INTEGER DEFAULT 0 NULL,
|
||||
post_edit_reason BLOB SUB_TYPE TEXT NULL,
|
||||
post_edit_user INTEGER DEFAULT 0 NULL,
|
||||
post_edit_count INTEGER DEFAULT 0 NULL,
|
||||
post_edit_locked INTEGER DEFAULT 0 NULL
|
||||
post_edit_time INTEGER DEFAULT 0,
|
||||
post_edit_reason BLOB SUB_TYPE TEXT,
|
||||
post_edit_user INTEGER DEFAULT 0,
|
||||
post_edit_count INTEGER DEFAULT 0,
|
||||
post_edit_locked INTEGER DEFAULT 0
|
||||
);;
|
||||
|
||||
ALTER TABLE phpbb_posts ADD PRIMARY KEY (post_id);;
|
||||
|
|
@ -665,14 +665,14 @@ CREATE TABLE phpbb_privmsgs (
|
|||
enable_sig INTEGER DEFAULT 1 NOT NULL,
|
||||
message_subject BLOB SUB_TYPE TEXT NOT NULL,
|
||||
message_text BLOB SUB_TYPE TEXT NOT NULL,
|
||||
message_edit_reason BLOB SUB_TYPE TEXT NULL,
|
||||
message_edit_user INTEGER DEFAULT 0 NULL,
|
||||
message_edit_reason BLOB SUB_TYPE TEXT,
|
||||
message_edit_user INTEGER DEFAULT 0,
|
||||
message_encoding VARCHAR(20) DEFAULT 'iso-8859-1' NOT NULL,
|
||||
message_attachment INTEGER DEFAULT 0 NOT NULL,
|
||||
bbcode_bitfield INTEGER DEFAULT 0 NOT NULL,
|
||||
bbcode_uid VARCHAR(5) NOT NULL,
|
||||
message_edit_time INTEGER DEFAULT 0 NULL,
|
||||
message_edit_count INTEGER DEFAULT 0 NULL,
|
||||
message_edit_time INTEGER DEFAULT 0,
|
||||
message_edit_count INTEGER DEFAULT 0,
|
||||
to_address BLOB SUB_TYPE TEXT NOT NULL,
|
||||
bcc_address BLOB SUB_TYPE TEXT NOT NULL
|
||||
);;
|
||||
|
|
@ -1319,24 +1319,24 @@ CREATE TABLE phpbb_users (
|
|||
user_id INTEGER NOT NULL,
|
||||
user_type INTEGER DEFAULT 0 NOT NULL,
|
||||
group_id INTEGER DEFAULT 3 NOT NULL,
|
||||
user_permissions BLOB SUB_TYPE TEXT NULL,
|
||||
user_perm_from INTEGER DEFAULT 0 NULL,
|
||||
user_permissions BLOB SUB_TYPE TEXT,
|
||||
user_perm_from INTEGER DEFAULT 0,
|
||||
user_ip VARCHAR(40) NOT NULL,
|
||||
user_regdate INTEGER DEFAULT 0 NOT NULL,
|
||||
username VARCHAR(252) NOT NULL,
|
||||
user_password VARCHAR(40) NOT NULL,
|
||||
user_passchg INTEGER DEFAULT 0 NULL,
|
||||
user_passchg INTEGER DEFAULT 0,
|
||||
user_email VARCHAR(100) NOT NULL,
|
||||
user_email_hash DOUBLE PRECISION DEFAULT 0 NOT NULL,
|
||||
user_birthday VARCHAR(10) DEFAULT '' NULL,
|
||||
user_birthday VARCHAR(10) DEFAULT '',
|
||||
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) 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,
|
||||
user_last_confirm_key VARCHAR(10) DEFAULT '',
|
||||
user_warnings INTEGER DEFAULT 0,
|
||||
user_last_warning INTEGER DEFAULT 0,
|
||||
user_login_attempts INTEGER DEFAULT 0,
|
||||
user_posts INTEGER DEFAULT 0 NOT NULL,
|
||||
user_lang VARCHAR(30) NOT NULL,
|
||||
user_timezone DOUBLE PRECISION DEFAULT 0 NOT NULL,
|
||||
|
|
@ -1370,20 +1370,20 @@ CREATE TABLE phpbb_users (
|
|||
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) DEFAULT '' NULL,
|
||||
user_sig_bbcode_bitfield INTEGER DEFAULT 0 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_sig BLOB SUB_TYPE TEXT,
|
||||
user_sig_bbcode_uid VARCHAR(5) DEFAULT '',
|
||||
user_sig_bbcode_bitfield INTEGER DEFAULT 0,
|
||||
user_from VARCHAR(100) DEFAULT '',
|
||||
user_icq VARCHAR(15) DEFAULT '',
|
||||
user_aim VARCHAR(255) DEFAULT '',
|
||||
user_yim VARCHAR(255) DEFAULT '',
|
||||
user_msnm VARCHAR(255) DEFAULT '',
|
||||
user_jabber VARCHAR(255) DEFAULT '',
|
||||
user_website VARCHAR(200) DEFAULT '',
|
||||
user_occ VARCHAR(255) DEFAULT '',
|
||||
user_interests VARCHAR(255) DEFAULT '',
|
||||
user_actkey VARCHAR(32) DEFAULT '' NOT NULL,
|
||||
user_newpasswd VARCHAR(32) DEFAULT '' NULL
|
||||
user_newpasswd VARCHAR(32) DEFAULT ''
|
||||
);;
|
||||
|
||||
ALTER TABLE phpbb_users ADD PRIMARY KEY (user_id);;
|
||||
|
|
|
|||
|
|
@ -239,7 +239,7 @@ if (!($topic_data = $db->sql_fetchrow($result)))
|
|||
// This is for determining where we are (page)
|
||||
if ($post_id)
|
||||
{
|
||||
$sql = "SELECT count(*) AS prev_posts
|
||||
$sql = "SELECT COUNT(*) AS prev_posts
|
||||
FROM " . POSTS_TABLE . " p
|
||||
WHERE p.post_approved = 1
|
||||
AND p.topic_id = {$topic_data['topic_id']}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue