database_cleaner 0.6.1 → 0.6.2

data/History.txt

@@ -1,5 +1,12 @@
 == 0.6.2 (in git)
 
+ === New Features
+  * Support IBM_DB Adapter for table truncation. This is for DB2 >= 9.7 (GH-39 Samer Abukhait)
+
+ === Bugfixes
+  * Reversed GH-41 after larger community discussion. Mongo indexes are no longer dropped. (Ben Mabey)
+  * Truncation strategy works on SqlServer tables with FKs. (GH-33, Hugo Freire)
+
 == 0.6.1 2011-01-27
 
  === New Features

data/Rakefile

@@ -48,3 +48,18 @@ rescue LoadError
 end
 
 task :default => [:spec, :features]
+
+
+desc "Cleans the project of any tmp file that should not be included in the gemspec."
+task :clean do
+  ["examples/config/database.yml", "examples/db/activerecord_one.db", "examples/db/activerecord_two.db", "examples/db/datamapper_default.db",
+    "examples/db/datamapper_one.db", "examples/db/datamapper_two.db"].each do |f|
+    FileUtils.rm_f(f)
+  end
+  %w[*.sqlite3 *.log].each do |pattern|
+    `find . -name "#{pattern}" -delete`
+  end
+end
+
+desc "Cleans the dir and builds the gem"
+task :prep => [:clean, :gemspec, :build]

data/VERSION.yml

@@ -1,6 +1,5 @@
----
+--- 
 :minor: 6
-:patch: 1
-:build:
+:build: 
+:patch: 2
 :major: 0
-

data/examples/Gemfile

@@ -32,6 +32,7 @@ group :development do
     gem "tzinfo",             "0.3.22"
   gem "mongo_mapper",         "0.8.2"
   gem "couch_potato",         "0.3.0"
+  #gem "ibm_db"  # I don't want to add this dependency, even as a dev one since it requires DB2 to be installed
 end
 
 group :test do

data/lib/database_cleaner/active_record/truncation.rb

@@ -34,6 +34,12 @@ module ActiveRecord
       end
     end
 
+    class IBM_DBAdapter < AbstractAdapter
+      def truncate_table(table_name)
+        execute("TRUNCATE #{quote_table_name(table_name)} IMMEDIATE")
+      end
+    end
+
     class SQLite3Adapter < SQLITE_ADAPTER_PARENT
       def delete_table(table_name)
         execute("DELETE FROM #{quote_table_name(table_name)};")
@@ -72,7 +78,11 @@ module ActiveRecord
 
     class SQLServerAdapter < AbstractAdapter
       def truncate_table(table_name)
-        execute("TRUNCATE TABLE #{quote_table_name(table_name)};")
+        begin
+          execute("TRUNCATE TABLE #{quote_table_name(table_name)};")
+        rescue ActiveRecord::StatementInvalid
+          execute("DELETE FROM #{quote_table_name(table_name)};")
+        end
       end
     end
 

data/lib/database_cleaner/mongo/truncation.rb

@@ -1,22 +1,17 @@
 module DatabaseCleaner
   module Mongo
     module Truncation
-      
+
       def clean
         if @only
-          collections.each { |c| remove(c) if @only.include?(c.name) }
+          collections.each { |c| c.remove if @only.include?(c.name) }
         else
-          collections.each { |c| remove(c) unless @tables_to_exclude.include?(c.name) }
+          collections.each { |c| c.remove unless @tables_to_exclude.include?(c.name) }
         end
         true
       end
 
       private
-      
-      def remove(collection)
-        collection.drop_indexes
-        collection.remove
-      end
 
       def collections
         database.collections.select { |c| c.name !~ /^system/ }

data/spec/database_cleaner/active_record/truncation_spec.rb

@@ -5,8 +5,11 @@ require 'database_cleaner/active_record/truncation'
 
 module ActiveRecord
   module ConnectionAdapters
-    [MysqlAdapter, Mysql2Adapter, SQLite3Adapter, JdbcAdapter, PostgreSQLAdapter].each do |adapter|
+    [MysqlAdapter, Mysql2Adapter, SQLite3Adapter, JdbcAdapter, PostgreSQLAdapter, IBM_DBAdapter].each do |adapter|
       describe adapter, "#truncate_table" do
+        it "responds" do
+          adapter.new("foo").should respond_to(:truncate_table)
+        end
         it "should truncate the table"
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 5
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 6
-  - 1
-  version: 0.6.1
+  - 2
+  version: 0.6.2
 platform: ruby
 authors: 
 - Ben Mabey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-27 00:00:00 -07:00
+date: 2011-02-04 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -38,13 +38,7 @@ files:
 - cucumber.yml
 - examples/Gemfile
 - examples/Gemfile.lock
-- examples/config/database.yml
 - examples/config/database.yml.example
-- examples/db/activerecord_one.db
-- examples/db/activerecord_two.db
-- examples/db/datamapper_default.db
-- examples/db/datamapper_one.db
-- examples/db/datamapper_two.db
 - examples/db/sqlite_databases_go_here
 - examples/features/example.feature
 - examples/features/example_multiple_db.feature

data/examples/config/database.yml

@@ -1,7 +0,0 @@
---- 
-two: 
-  adapter: sqlite3
-  database: /Users/bmabey/Programming/ruby/database_cleaner/examples/features/support/../../db/activerecord_two.db
-one: 
-  adapter: sqlite3
-  database: /Users/bmabey/Programming/ruby/database_cleaner/examples/features/support/../../db/activerecord_one.db