database_cleaner 1.1.1 → 1.2.0

data/lib/database_cleaner/configuration.rb

@@ -37,7 +37,7 @@ module DatabaseCleaner
     end
 
     def app_root
-      @app_root || Dir.pwd
+      @app_root ||= Dir.pwd
     end
 
     def connections

data/lib/database_cleaner/data_mapper/base.rb

@@ -13,7 +13,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
 
     end

data/lib/database_cleaner/data_mapper/truncation.rb

@@ -53,7 +53,7 @@ module DataMapper
 
       def truncate_table(table_name)
         execute("DELETE FROM #{quote_name(table_name)};")
-        if uses_sequence
+        if uses_sequence?
           execute("DELETE FROM sqlite_sequence where name = '#{table_name}';")
         end
       end
@@ -65,6 +65,16 @@ module DataMapper
         yield
       end
 
+      private
+
+      def uses_sequence?
+        sql = <<-SQL
+          SELECT name FROM sqlite_master
+          WHERE type='table' AND name='sqlite_sequence'
+        SQL
+        select(sql).first
+      end
+
     end
 
     class SqliteAdapter < DataObjectsAdapter
@@ -82,7 +92,7 @@ module DataMapper
 
       def truncate_table(table_name)
         execute("DELETE FROM #{quote_name(table_name)};")
-        if uses_sequence
+        if uses_sequence?
           execute("DELETE FROM sqlite_sequence where name = '#{table_name}';")
         end
       end
@@ -94,6 +104,16 @@ module DataMapper
         yield
       end
 
+      private
+
+      def uses_sequence?
+        sql = <<-SQL
+          SELECT name FROM sqlite_master
+          WHERE type='table' AND name='sqlite_sequence'
+        SQL
+        select(sql).first
+      end
+
     end
 
     # FIXME

data/lib/database_cleaner/generic/truncation.rb

@@ -2,18 +2,19 @@ module DatabaseCleaner
   module Generic
     module Truncation
       def initialize(opts={})
-        if !opts.empty? && !(opts.keys - [:only, :except, :pre_count, :reset_ids]).empty?
-          raise ArgumentError, "The only valid options are :only, :except, :pre_count or :reset_ids. You specified #{opts.keys.join(',')}."
+        if !opts.empty? && !(opts.keys - [:only, :except, :pre_count, :reset_ids, :cache_tables]).empty?
+          raise ArgumentError, "The only valid options are :only, :except, :pre_count, :reset_ids or :cache_tables. You specified #{opts.keys.join(',')}."
         end
         if opts.has_key?(:only) && opts.has_key?(:except)
           raise ArgumentError, "You may only specify either :only or :except.  Doing both doesn't really make sense does it?"
         end
 
         @only = opts[:only]
-        @tables_to_exclude = (opts[:except] || []).dup
+        @tables_to_exclude = Array( (opts[:except] || []).dup ).flatten
         @tables_to_exclude += migration_storage_names
         @pre_count = opts[:pre_count]
         @reset_ids = opts[:reset_ids]
+        @cache_tables = opts.has_key?(:cache_tables) ? !!opts[:cache_tables] : true
       end
 
       def start

data/lib/database_cleaner/mongo_mapper/base.rb

@@ -13,7 +13,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
     end
   end

data/lib/database_cleaner/moped/base.rb

@@ -14,7 +14,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
 
       def host_port=(desired_host)
@@ -22,7 +22,7 @@ module DatabaseCleaner
       end
 
       def host
-        @host || '127.0.0.1:27017'
+        @host ||= '127.0.0.1:27017'
       end
 
       private

data/lib/database_cleaner/redis/base.rb

@@ -14,7 +14,7 @@ module DatabaseCleaner
       end
 
       def db
-        @db || :default
+        @db ||= :default
       end
 
       alias url db

data/spec/database_cleaner/active_record/base_spec.rb

@@ -19,7 +19,7 @@ module DatabaseCleaner
       it "should default to DatabaseCleaner.root / config / database.yml" do
         ActiveRecord.config_file_location=nil
         DatabaseCleaner.should_receive(:app_root).and_return("/path/to")
-        subject.should == '/path/to/config/database.yml'
+        subject.should eq '/path/to/config/database.yml'
       end
     end
 
@@ -45,11 +45,11 @@ module DatabaseCleaner
           subject.stub(:load_config)
 
           subject.db = :my_db
-          subject.db.should == :my_db
+          subject.db.should eq :my_db
         end
 
         it "should default to :default" do
-          subject.db.should == :default
+          subject.db.should eq :default
         end
 
         it "should load_config when I set db" do
@@ -86,7 +86,7 @@ my_db:
 
         it "should store the relevant config in connection_hash" do
           subject.load_config
-          subject.connection_hash.should == { "database" => "one" }
+          subject.connection_hash.should eq( "database" => "one" )
         end
 
         it "should skip config if config file is not available" do
@@ -115,14 +115,14 @@ my_db:
       describe "connection_hash" do
         it "should store connection_hash" do
           subject.connection_hash = { :key => "value" }
-          subject.connection_hash.should == { :key => "value" }
+          subject.connection_hash.should eq( :key => "value" )
         end
       end
 
       describe "connection_class" do
         it { expect { subject.connection_class }.to_not raise_error }
         it "should default to ActiveRecord::Base" do
-          subject.connection_class.should == ::ActiveRecord::Base
+          subject.connection_class.should eq ::ActiveRecord::Base
         end
 
         context "with database models" do
@@ -131,21 +131,21 @@ my_db:
               subject.db = FakeModel
               subject.connection_hash = { }
               subject.load_config
-              subject.connection_class.should == FakeModel
+              subject.connection_class.should eq FakeModel
             end
           end
 
           context "connection_hash is not set" do
             it "allows for database models to be passed in" do
               subject.db = FakeModel
-              subject.connection_class.should == FakeModel
+              subject.connection_class.should eq FakeModel
             end
           end
         end
 
         context "when connection_hash is set" do
-          let(:hash) { mock("hash") }
-          before { ::ActiveRecord::Base.stub!(:respond_to?).and_return(false) }
+          let(:hash) { double("hash") }
+          before { ::ActiveRecord::Base.stub(:respond_to?).and_return(false) }
           before { subject.stub(:connection_hash).and_return(hash) }
 
           it "establish a connection using ActiveRecord::Base" do

data/spec/database_cleaner/active_record/transaction_spec.rb

@@ -6,7 +6,7 @@ module DatabaseCleaner
   module ActiveRecord
 
     describe Transaction do
-      let (:connection) { mock("connection") }
+      let (:connection) { double("connection") }
       before(:each) do
         ::ActiveRecord::Base.stub(:connection).and_return(connection)
       end

data/spec/database_cleaner/active_record/truncation/mysql2_spec.rb

@@ -17,7 +17,7 @@ module ActiveRecord
           2.times { User.create }
 
           connection.truncate_table('users')
-          User.count.should == 0
+          User.count.should eq 0
         end
 
         it "should reset AUTO_INCREMENT index of table" do
@@ -26,7 +26,7 @@ module ActiveRecord
 
           connection.truncate_table('users')
 
-          User.create.id.should == 1
+          User.create.id.should eq 1
         end
       end
 

data/spec/database_cleaner/active_record/truncation/mysql_spec.rb

@@ -17,7 +17,7 @@ module ActiveRecord
           2.times { User.create }
 
           connection.truncate_table('users')
-          User.count.should == 0
+          User.count.should eq 0
         end
 
         it "should reset AUTO_INCREMENT index of table" do
@@ -26,7 +26,7 @@ module ActiveRecord
 
           connection.truncate_table('users')
 
-          User.create.id.should == 1
+          User.create.id.should eq 1
         end
       end
  

data/spec/database_cleaner/active_record/truncation/postgresql_spec.rb

@@ -24,7 +24,7 @@ module ActiveRecord
           2.times { User.create }
 
           connection.truncate_table('users')
-          User.count.should == 0
+          User.count.should eq 0
         end
 
         it "resets AUTO_INCREMENT index of table" do
@@ -33,7 +33,7 @@ module ActiveRecord
 
           connection.truncate_table('users')
 
-          User.create.id.should == 1
+          User.create.id.should eq 1
         end
       end
 

data/spec/database_cleaner/active_record/truncation/shared_fast_truncation.rb

@@ -14,7 +14,7 @@ shared_examples_for "an adapter with pre-count truncation" do
         User.delete_all
 
         connection.pre_count_truncate_tables(%w[users]) # true is also the default
-        User.create.id.should == 1
+        User.create.id.should eq 1
       end
     end
 
@@ -33,7 +33,7 @@ shared_examples_for "an adapter with pre-count truncation" do
 
         connection.pre_count_truncate_tables(%w[users], :reset_ids => false)
 
-        User.create.id.should == 3
+        User.create.id.should eq 3
       end
     end
   end

data/spec/database_cleaner/active_record/truncation/sqlite3_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+require 'active_record'
+require 'support/active_record/sqlite3_setup'
+require 'database_cleaner/active_record/truncation'
+
+module ActiveRecord
+  module ConnectionAdapters
+    describe do
+      before(:all) { active_record_sqlite3_setup }
+
+      let(:adapter) { SQLite3Adapter }
+
+      let(:connection) do
+        active_record_sqlite3_connection
+      end
+
+      before(:each) do
+        connection.truncate_tables connection.tables
+      end
+
+      describe "#truncate_table" do
+        it "truncates the table" do
+          2.times { User.create }
+
+          connection.truncate_table('users')
+          User.count.should eq 0
+        end
+
+        it "resets AUTO_INCREMENT index of table" do
+          2.times { User.create }
+          User.delete_all
+
+          connection.truncate_table('users')
+
+          User.create.id.should eq 1
+        end
+      end
+
+    end
+  end
+end
+

data/spec/database_cleaner/active_record/truncation_spec.rb

@@ -9,7 +9,8 @@ require 'database_cleaner/active_record/truncation'
 
 module ActiveRecord
   module ConnectionAdapters
-    [MysqlAdapter, Mysql2Adapter, SQLite3Adapter, JdbcAdapter, PostgreSQLAdapter, IBM_DBAdapter].each do |adapter|
+    #JdbcAdapter IBM_DBAdapter
+    [ MysqlAdapter, Mysql2Adapter, SQLite3Adapter, PostgreSQLAdapter ].each do |adapter|
       describe adapter, "#truncate_table" do
         it "responds" do
           adapter.instance_methods.should include(:truncate_table)
@@ -23,26 +24,26 @@ module DatabaseCleaner
   module ActiveRecord
 
     describe Truncation do
-      let(:connection) { mock('connection') }
+      let(:connection) { double('connection') }
 
       before(:each) do
-        connection.stub!(:disable_referential_integrity).and_yield
-        connection.stub!(:database_cleaner_view_cache).and_return([])
-        ::ActiveRecord::Base.stub!(:connection).and_return(connection)
+        connection.stub(:disable_referential_integrity).and_yield
+        connection.stub(:database_cleaner_view_cache).and_return([])
+        ::ActiveRecord::Base.stub(:connection).and_return(connection)
       end
 
       describe '#clean' do
         it "should truncate all tables except for schema_migrations" do
-          connection.stub!(:database_cleaner_table_cache).and_return(%w[schema_migrations widgets dogs])
+          connection.stub(:database_cleaner_table_cache).and_return(%w[schema_migrations widgets dogs])
 
           connection.should_receive(:truncate_tables).with(['widgets', 'dogs'])
           Truncation.new.clean
         end
 
         it "should use ActiveRecord's schema_migrations_table_name" do
-          connection.stub!(:database_cleaner_table_cache).and_return(%w[pre_schema_migrations_suf widgets dogs])
-          ::ActiveRecord::Base.stub!(:table_name_prefix).and_return('pre_')
-          ::ActiveRecord::Base.stub!(:table_name_suffix).and_return('_suf')
+          connection.stub(:database_cleaner_table_cache).and_return(%w[pre_schema_migrations_suf widgets dogs])
+          ::ActiveRecord::Base.stub(:table_name_prefix).and_return('pre_')
+          ::ActiveRecord::Base.stub(:table_name_suffix).and_return('_suf')
 
           connection.should_receive(:truncate_tables).with(['widgets', 'dogs'])
 
@@ -50,7 +51,7 @@ module DatabaseCleaner
         end
 
         it "should only truncate the tables specified in the :only option when provided" do
-          connection.stub!(:database_cleaner_table_cache).and_return(%w[schema_migrations widgets dogs])
+          connection.stub(:database_cleaner_table_cache).and_return(%w[schema_migrations widgets dogs])
 
           connection.should_receive(:truncate_tables).with(['widgets'])
 
@@ -58,7 +59,7 @@ module DatabaseCleaner
         end
 
         it "should not truncate the tables specified in the :except option" do
-          connection.stub!(:database_cleaner_table_cache).and_return(%w[schema_migrations widgets dogs])
+          connection.stub(:database_cleaner_table_cache).and_return(%w[schema_migrations widgets dogs])
 
           connection.should_receive(:truncate_tables).with(['dogs'])
 
@@ -76,8 +77,8 @@ module DatabaseCleaner
         end
 
         it "should not truncate views" do
-          connection.stub!(:database_cleaner_table_cache).and_return(%w[widgets dogs])
-          connection.stub!(:database_cleaner_view_cache).and_return(["widgets"])
+          connection.stub(:database_cleaner_table_cache).and_return(%w[widgets dogs])
+          connection.stub(:database_cleaner_view_cache).and_return(["widgets"])
 
           connection.should_receive(:truncate_tables).with(['dogs'])
 
@@ -88,8 +89,8 @@ module DatabaseCleaner
           subject { Truncation.new }
 
           it "should rely on #pre_count_truncate_tables if #pre_count? returns true" do
-            connection.stub!(:database_cleaner_table_cache).and_return(%w[widgets dogs])
-            connection.stub!(:database_cleaner_view_cache).and_return(["widgets"])
+            connection.stub(:database_cleaner_table_cache).and_return(%w[widgets dogs])
+            connection.stub(:database_cleaner_view_cache).and_return(["widgets"])
 
             subject.instance_variable_set(:"@pre_count", true)
 
@@ -100,8 +101,8 @@ module DatabaseCleaner
           end
 
           it "should not rely on #pre_count_truncate_tables if #pre_count? return false" do
-            connection.stub!(:database_cleaner_table_cache).and_return(%w[widgets dogs])
-            connection.stub!(:database_cleaner_view_cache).and_return(["widgets"])
+            connection.stub(:database_cleaner_table_cache).and_return(%w[widgets dogs])
+            connection.stub(:database_cleaner_view_cache).and_return(["widgets"])
 
             subject.instance_variable_set(:"@pre_count", false)
 
@@ -111,47 +112,67 @@ module DatabaseCleaner
             subject.clean
           end
         end
+
+        context 'when :cache_tables is set to true' do
+          it 'caches the list of tables to be truncated' do
+            connection.should_receive(:database_cleaner_table_cache).and_return([])
+            connection.should_not_receive(:tables)
+
+            connection.stub!(:truncate_tables)
+            Truncation.new({ :cache_tables => true }).clean
+          end
+        end
+
+        context 'when :cache_tables is set to false' do
+          it 'does not cache the list of tables to be truncated' do
+            connection.should_not_receive(:database_cleaner_table_cache)
+            connection.should_receive(:tables).and_return([])
+
+            connection.stub!(:truncate_tables)
+            Truncation.new({ :cache_tables => false }).clean
+          end
+        end
       end
 
       describe '#pre_count?' do
         before(:each) do
-          connection.stub!(:disable_referential_integrity).and_yield
-          connection.stub!(:database_cleaner_view_cache).and_return([])
-          ::ActiveRecord::Base.stub!(:connection).and_return(connection)
+          connection.stub(:disable_referential_integrity).and_yield
+          connection.stub(:database_cleaner_view_cache).and_return([])
+          ::ActiveRecord::Base.stub(:connection).and_return(connection)
         end
 
         subject { Truncation.new }
-        its(:pre_count?) { should == false }
+        its(:pre_count?) { should eq false }
 
         it 'should return true if @reset_id is set and non false or nil' do
           subject.instance_variable_set(:"@pre_count", true)
-          subject.send(:pre_count?).should == true
+          subject.send(:pre_count?).should eq true
         end
 
         it 'should return false if @reset_id is set to false' do
           subject.instance_variable_set(:"@pre_count", false)
-          subject.send(:pre_count?).should == false
+          subject.send(:pre_count?).should eq false
         end
       end
 
       describe '#reset_ids?' do
         before(:each) do
-          connection.stub!(:disable_referential_integrity).and_yield
-          connection.stub!(:database_cleaner_view_cache).and_return([])
-          ::ActiveRecord::Base.stub!(:connection).and_return(connection)
+          connection.stub(:disable_referential_integrity).and_yield
+          connection.stub(:database_cleaner_view_cache).and_return([])
+          ::ActiveRecord::Base.stub(:connection).and_return(connection)
         end
 
         subject { Truncation.new }
-        its(:reset_ids?) { should == true }
+        its(:reset_ids?) { should eq true }
 
         it 'should return true if @reset_id is set and non false or nil' do
           subject.instance_variable_set(:"@reset_ids", 'Something')
-          subject.send(:reset_ids?).should == true
+          subject.send(:reset_ids?).should eq true
         end
 
         it 'should return false if @reset_id is set to false' do
           subject.instance_variable_set(:"@reset_ids", false)
-          subject.send(:reset_ids?).should == false
+          subject.send(:reset_ids?).should eq false
         end
       end
     end