database_cleaner 0.6.6 → 0.6.7.RC

data/History.txt

@@ -1,5 +1,11 @@
 == 0.6.x (in git)
 
+=== Bugfixes
+ * Explicity require ERB. (Vít Ondruch)
+ * Cache DB connections, fixes referential integrity bug when using multiple DBs. (John Ferlito)
+
+== 0.6.6 2011-03-16
+
 === Bugfixes
  * Don't modify the array passed in with the :except key. (Eric Wollesen)
  * Fixes version checking for postgresql. (Greg Barnett)
@@ -45,7 +51,7 @@
 == 0.6.0 2010-10-25 - The Multi-ORM/Connection Release
 
 This release has the often asked for functionality of being able to clean
-multiple databases within the same project.  This involves being able to 
+multiple databases within the same project.  This involves being able to
 clean databases managed by the same ORM (i.e. different connections) and
 also being able to clean databases managed by distinct ORMs.  So, for
 example you can now use DatabaseCleaner on a project that has ActiveRecord

data/lib/database_cleaner/active_record/base.rb

@@ -1,5 +1,6 @@
 require 'database_cleaner/generic/base'
 require 'active_record'
+require 'erb'
 
 module DatabaseCleaner
   module ActiveRecord

data/lib/database_cleaner/active_record/deletion.rb

@@ -53,10 +53,8 @@ module DatabaseCleaner::ActiveRecord
   class Deletion < Truncation
 
     def clean
-      connection.disable_referential_integrity do
-        tables_to_truncate.each do |table_name|
-          connection.delete_table table_name
-        end
+      each_table do |connection, table_name|
+        connection.delete_table table_name
       end
     end
 

data/lib/database_cleaner/active_record/truncation.rb

@@ -103,24 +103,26 @@ module DatabaseCleaner::ActiveRecord
     include ::DatabaseCleaner::Generic::Truncation
 
     def clean
+      each_table do |connection, table_name|
+        connection.truncate_table table_name
+      end
+    end
+
+    def each_table
+      connection = connection_klass.connection
       connection.disable_referential_integrity do
-        tables_to_truncate.each do |table_name|
-          connection.truncate_table table_name
+        tables_to_truncate(connection).each do |table_name|
+          yield connection, table_name
         end
       end
     end
 
     private
 
-    def tables_to_truncate
+    def tables_to_truncate(connection)
        (@only || connection.tables) - @tables_to_exclude - connection.views
     end
 
-    def connection
-       #::ActiveRecord::Base.connection
-       connection_klass.connection
-    end
-
     # overwritten
     def migration_storage_name
       'schema_migrations'

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 11
-  prerelease: false
+  hash: 5547382
+  prerelease: true
   segments: 
   - 0
   - 6
-  - 6
-  version: 0.6.6
+  - 7
+  - RC
+  version: 0.6.7.RC
 platform: ruby
 authors: 
 - Ben Mabey
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-16 00:00:00 -06:00
+date: 2011-03-24 00:00:00 -06:00
 default_executable: 
 dependencies: []