IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

BUGFIX: don't leak out a transaction if fails

Browse Source
This commit is contained in:
Sam
2014-01-31 11:38:18 +11:00
parent f71c8bb533
commit 9fc3a335cc
1 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/jobs/regular/importer.rb
View File

@@ -188,16 +188,22 @@ module Jobs
parameter_markers = fields.map {|x| "?"}.join(',')
sql_stmt = "INSERT INTO #{table_name} (#{fields.join(',')}) VALUES (#{parameter_markers})"
User.exec_sql("BEGIN TRANSACTION") unless Rails.env.test?
i = 0
rows.each do |row|
if i % batch_size == 0 && i > 0
log "#{i} rows done"
in_tran = false
begin
User.exec_sql("BEGIN TRANSACTION") unless Rails.env.test?
in_tran = true
i = 0
rows.each do |row|
if i % batch_size == 0 && i > 0
log "#{i} rows done"
end
User.exec_sql(sql_stmt, *row)
i += 1
end
User.exec_sql(sql_stmt, *row)
i += 1
User.exec_sql("COMMIT") unless Rails.env.test?
rescue
User.exec_sql("ROLLBACK") if in_tran
end
User.exec_sql("COMMIT") unless Rails.env.test?
true
else