github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 20:43:40 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #5725 from miromichalicka/master

Browse Source 
Fix broken queries in Drupal 6 migration.
This commit is contained in:
Guo Xiang Tan 2018-04-02 10:14:56 +08:00 committed by GitHub
commit 40dde7d259
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
script/import_scripts/drupal-6.rb
View File

@ -115,8 +115,8 @@ class ImportScripts::Drupal < ImportScripts::Base
FROM node n FROM node n
LEFT JOIN forum f ON f.vid=n.vid LEFT JOIN forum f ON f.vid=n.vid
LEFT JOIN node_revisions nr ON nr.vid=n.vid LEFT JOIN node_revisions nr ON nr.vid=n.vid
WHERE node.type = 'forum' WHERE n.type = 'forum'
AND node.status = 1 AND n.status = 1
LIMIT #{batch_size} LIMIT #{batch_size}
OFFSET #{offset}; OFFSET #{offset};
", cache_rows: false) ", cache_rows: false)
@ -152,9 +152,9 @@ class ImportScripts::Drupal < ImportScripts::Base
SELECT COUNT(*) count SELECT COUNT(*) count
FROM comments c FROM comments c
LEFT JOIN node n ON n.nid=c.nid LEFT JOIN node n ON n.nid=c.nid
WHERE node.type IN #{node_types} WHERE n.type IN #{node_types}
AND node.status = 1 AND n.status = 1
AND comments.status=0; AND c.status=0;
").first['count'] ").first['count']
batch_size = 1000 batch_size = 1000