github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-14 19:29:21 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: phpBB3 importer imported some users as anonymous users

Browse Source
This commit is contained in:
Gerhard Schlager
2018-01-18 10:39:06 +01:00
parent 88c05d7050
commit c26db2116c
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
script/import_scripts/phpbb3/database/database_3_0.rb
View File

@ -30,9 +30,10 @@ module ImportScripts::PhpBB3
def count_anonymous_users def count_anonymous_users
count(<<-SQL) count(<<-SQL)
SELECT COUNT(DISTINCT post_username) AS count SELECT COUNT(DISTINCT p.post_username) AS count
FROM #{@table_prefix}posts FROM #{@table_prefix}posts p
WHERE post_username <> '' JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
WHERE p.post_username <> '' AND u.user_type = #{Constants::USER_TYPE_IGNORE}
SQL SQL
end end
@ -40,11 +41,12 @@ module ImportScripts::PhpBB3
last_username = escape(last_username) last_username = escape(last_username)
query(<<-SQL, :post_username) query(<<-SQL, :post_username)
SELECT post_username, MIN(post_time) AS first_post_time SELECT p.post_username, MIN(p.post_time) AS first_post_time
FROM #{@table_prefix}posts FROM #{@table_prefix}posts p
WHERE post_username > '#{last_username}' JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
GROUP BY post_username WHERE p.post_username > '#{last_username}' AND u.user_type = #{Constants::USER_TYPE_IGNORE}
ORDER BY post_username GROUP BY p.post_username
ORDER BY p.post_username
LIMIT #{@batch_size} LIMIT #{@batch_size}
SQL SQL
end end
@ -73,11 +75,13 @@ module ImportScripts::PhpBB3
def fetch_posts(last_post_id) def fetch_posts(last_post_id)
query(<<-SQL, :post_id) query(<<-SQL, :post_id)
SELECT p.post_id, p.topic_id, t.forum_id, t.topic_title, t.topic_first_post_id, p.poster_id, SELECT p.post_id, p.topic_id, t.forum_id, t.topic_title, t.topic_first_post_id, p.poster_id,
p.post_text, p.post_time, p.post_username, t.topic_status, t.topic_type, t.poll_title, p.post_text, p.post_time, t.topic_status, t.topic_type, t.poll_title,
CASE WHEN t.poll_length > 0 THEN t.poll_start + t.poll_length ELSE NULL END AS poll_end, CASE WHEN t.poll_length > 0 THEN t.poll_start + t.poll_length ELSE NULL END AS poll_end,
t.poll_max_options, p.post_attachment t.poll_max_options, p.post_attachment,
CASE WHEN u.user_type = #{Constants::USER_TYPE_IGNORE} THEN p.post_username ELSE NULL END post_username
FROM #{@table_prefix}posts p FROM #{@table_prefix}posts p
JOIN #{@table_prefix}topics t ON (p.topic_id = t.topic_id) JOIN #{@table_prefix}topics t ON (p.topic_id = t.topic_id)
JOIN #{@table_prefix}users u ON (p.poster_id = u.user_id)
WHERE p.post_id > #{last_post_id} WHERE p.post_id > #{last_post_id}
ORDER BY p.post_id ORDER BY p.post_id
LIMIT #{@batch_size} LIMIT #{@batch_size}