codeninjasllc/discourse
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

6
app/jobs/regular/importer.rb
View file

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