codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-23 23:58:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #3868 from gschlager/patch-3

Browse source 
Fix base and vBulletin importer
This commit is contained in:
Robin Ward 2015-10-23 01:21:36 +11:00
commit 3c99d536f6
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
script/import_scripts/base.rb
View file

@ -199,7 +199,7 @@ class ImportScripts::Base
Post.exec_sql('create temp table import_ids(val varchar(200) primary key)') Post.exec_sql('create temp table import_ids(val varchar(200) primary key)')
import_id_clause = import_ids.map{|id| "('#{PG::Connection.escape_string(id)}')"}.join(",") import_id_clause = import_ids.map{|id| "('#{PG::Connection.escape_string(id.to_s)}')"}.join(",")
Post.exec_sql("insert into import_ids values #{import_id_clause}") Post.exec_sql("insert into import_ids values #{import_id_clause}")
existing = "#{type.to_s.classify}CustomField".constantize.where(name: 'import_id') existing = "#{type.to_s.classify}CustomField".constantize.where(name: 'import_id')

4
script/import_scripts/vbulletin.rb
View file

@ -210,7 +210,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
SQL SQL
break if topics.size < 1 break if topics.size < 1
next if all_records_exist? :posts, topics.map {|t| "thread-#{topic["threadid"]}" } next if all_records_exist? :posts, topics.map {|t| "thread-#{t["threadid"]}" }
create_posts(topics, total: topic_count, offset: offset) do |topic| create_posts(topics, total: topic_count, offset: offset) do |topic|
raw = preprocess_post_raw(topic["raw"]) rescue nil raw = preprocess_post_raw(topic["raw"]) rescue nil
@ -555,7 +555,7 @@ class ImportScripts::VBulletin < ImportScripts::Base
end end
def mysql_query(sql) def mysql_query(sql)
@client.query(sql, cache_rows: false) @client.query(sql, cache_rows: true)
end end
end end