activerecord_unload_all_fixtures 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/activerecord_unload_all_fixtures.rb

@@ -10,34 +10,43 @@ module ActiveRecord
       # iterate over all ActiveRecord models associated with db tables, deleting all rows
       # if we're inside a transaction, use delete, otherwise use truncate
       def unload_all_fixtures() 
-        if ActiveRecord::UnloadAllFixtures::ordered_active_record_table_names.nil? || 
-            ActiveRecord::UnloadAllFixtures::ordered_active_record_table_names.empty?
-          klasses = ActiveRecord::Base.send(:subclasses).reject{ |klass| klass.skip_unload_fixtures if klass.respond_to?(:skip_unload_fixtures) }
-          ActiveRecord::UnloadAllFixtures::ordered_active_record_table_names = klasses.map do |klass|
-            if defined?(ActiveRecord::WormTable) && klass.ancestors.include?(ActiveRecord::WormTable)
-              [klass.switch_table_name] + klass.table_version_names
-            else
-              klass.table_name
-            end
-          end.flatten.to_set.to_a
+        if UnloadAllFixtures::ordered_active_record_table_names.nil? || 
+            UnloadAllFixtures::ordered_active_record_table_names.empty?
+          UnloadAllFixtures::ordered_active_record_table_names = activerecord_model_tables
+        else
+          # add newly defined models onto the end of the ordered list
+          UnloadAllFixtures::ordered_active_record_table_names += activerecord_model_tables - UnloadAllFixtures::ordered_active_record_table_names
         end
         
-        ActiveRecord::UnloadAllFixtures::table_name_set = ActiveRecord::Base::connection.tables.to_set
+        # get latest list of all tables
+        UnloadAllFixtures::table_name_set = ActiveRecord::Base::connection.tables.to_set
 
         # start with the last successful delete ordering, only re-ordering if new foreign key dependencies are found
         ActiveRecord::Base::without_foreign_key_checks do
-          ActiveRecord::UnloadAllFixtures::ordered_active_record_table_names = delete_rows( ActiveRecord::UnloadAllFixtures::ordered_active_record_table_names, 
+          UnloadAllFixtures::ordered_active_record_table_names = delete_rows( UnloadAllFixtures::ordered_active_record_table_names, 
                                                                             ActiveRecord::Base.connection.open_transactions == 0 )
         end
         
         true
       end
 
+      # all tables associated with ActiveRecord models, not marked for skip_unload_fixtures
+      def activerecord_model_tables
+        klasses = ActiveRecord::Base.send(:subclasses).reject{ |klass| klass.skip_unload_fixtures if klass.respond_to?(:skip_unload_fixtures) }
+        klasses.map do |klass|
+          if defined?(ActiveRecord::WormTable) && klass.ancestors.include?(ActiveRecord::WormTable)
+            [klass.switch_table_name] + klass.table_version_names
+          else
+            klass.table_name
+          end
+        end.flatten.to_set.to_a
+      end
+
       def delete_rows(table_names, truncate=false, shift_counter=table_names.size)
         processed = []
         table_names.each_with_index{ |table_name,i|
           begin
-            if ActiveRecord::UnloadAllFixtures::table_name_set.include?(table_name)
+            if UnloadAllFixtures::table_name_set.include?(table_name)
               if truncate
                 ActiveRecord::Base.connection.execute("truncate table #{table_name}")
               else

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - mccraig mccraig of the clan mccraig
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-06 00:00:00 +01:00
+date: 2010-05-10 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency