lib/populator/adapters/sqlite.rb in ryanb-populator-0.1.0 vs lib/populator/adapters/sqlite.rb in ryanb-populator-0.2.1

@@ -1,11 +1,15 @@
 module Populator
   module Adapters
     module Sqlite
       # Executes multiple SQL statements in one query when joined with ";"
       def execute_batch(sql, name = nil)
-        catch_schema_changes { log(sql, name) { @connection.execute_batch(sql) } }
+        catch_schema_changes do
+          log(sql, name) do
+            @connection.transaction { |db| db.execute_batch(sql) }
+          end
+        end
       end
       
       def populate(table, columns, rows, name = nil)
         queries = []
         rows.each do |row|
@@ -15,8 +19,13 @@
       end
     end
   end
 end
 
-class ActiveRecord::ConnectionAdapters::SQLiteAdapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
-  include Populator::Adapters::Sqlite
+# TODO find a better way to load the SQLite adapter
+module ActiveRecord # :nodoc: all
+  module ConnectionAdapters
+    class SQLiteAdapter < ActiveRecord::ConnectionAdapters::AbstractAdapter
+      include Populator::Adapters::Sqlite
+    end
+  end
 end