database_cleaner 0.6.7 → 0.7.0

data/Gemfile.lock

@@ -127,6 +127,7 @@ GEM
       linecache (>= 0.3)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    sequel (3.21.0)
     sqlite3-ruby (1.3.1)
     stringex (1.1.0)
     sys-uname (0.8.4)
@@ -157,5 +158,6 @@ DEPENDENCIES
   rspactor
   rspec
   ruby-debug
+  sequel (~> 3.21.0)
   sqlite3-ruby
   tzinfo (= 0.3.22)

data/History.txt

@@ -1,4 +1,19 @@
-== 0.6.x (in git)
+== 0.7.x (in git)
+
+== 0.7.0 2011-11-12
+
+ === New Features
+
+ * Sequel Support (Corin Langosch)
+ * Updates DataMapper strategies to work with DataMapper 1.1 (Xavier Shay and Anthony Williams)
+ * for AR and PSQL, truncate all tables with one command, improving performance due to avoiding cascades (Leonid Shevtsov)
+
+=== Bugfixes
+
+  * Avoids trying to load the ':default' ActiveRecord config. #72 (Ben Mabey)
+
+
+== 0.6.7 2011-04-21
 
 === Bugfixes
  * Explicity require ERB. (Vít Ondruch)

data/README.textile

@@ -73,7 +73,7 @@ strategy the remaining time.  To accomplish this you can say:
 Example usage with RSpec:
 
 <pre>
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
 
   config.before(:suite) do
     DatabaseCleaner.strategy = :transaction
@@ -99,6 +99,12 @@ In rare cases DatabaseCleaner will encounter errors that it will log.  By defaul
   DatabaseCleaner.logger = Rails.logger
 </pre>
 
+If you are using Postgres and have foreign key constraints, the truncation strategy will cause a lot of extra noise to appear on STDERR (in
+the form of "NOTICE truncate cascades" messages). To silence these warnings set the following log level in your postgresql.conf file:
+
+<pre>
+  client_min_messages = warning
+</pre>
 
 h2. How to use with multiple ORM's
 

data/Rakefile

@@ -56,7 +56,7 @@ task :clean do
     "examples/db/datamapper_one.db", "examples/db/datamapper_two.db"].each do |f|
     FileUtils.rm_f(f)
   end
-  %w[*.sqlite3 *.log].each do |pattern|
+  %w[*.sqlite3 *.log #* *.swp *.swo].each do |pattern|
     `find . -name "#{pattern}" -delete`
   end
 end

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
-:patch: 7
 :major: 0
 :build: 
-:minor: 6
+:minor: 7
+:patch: 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 "sequel",               "~>3.21.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
 

data/examples/Gemfile.lock

@@ -127,6 +127,7 @@ GEM
       linecache (>= 0.3)
     rubyforge (2.0.4)
       json_pure (>= 1.1.7)
+    sequel (3.21.0)
     sqlite3-ruby (1.3.1)
     stringex (1.1.0)
     sys-uname (0.8.4)
@@ -157,5 +158,6 @@ DEPENDENCIES
   rspactor
   rspec
   ruby-debug
+  sequel (~> 3.21.0)
   sqlite3-ruby
   tzinfo (= 0.3.22)

data/lib/database_cleaner/active_record/base.rb

@@ -8,7 +8,7 @@ module DatabaseCleaner
     def self.available_strategies
       %w[truncation transaction deletion]
     end
-    
+
     def self.config_file_location=(path)
       @config_file_location = path
     end
@@ -32,9 +32,9 @@ module DatabaseCleaner
       end
 
       def load_config
-        if File.file?(ActiveRecord.config_file_location)
+        if self.db != :default && File.file?(ActiveRecord.config_file_location)
           connection_details   = YAML::load(ERB.new(IO.read(ActiveRecord.config_file_location)).result)
-          self.connection_hash = connection_details[self.db.to_s]
+          @connection_hash = connection_details[self.db.to_s]
         end
       end
 

data/lib/database_cleaner/active_record/deletion.rb

@@ -53,7 +53,8 @@ module DatabaseCleaner::ActiveRecord
   class Deletion < Truncation
 
     def clean
-      each_table do |connection, table_name|
+      connection = connection_klass.connection
+      tables_to_truncate(connection).each do |table_name|
         connection.delete_table table_name
       end
     end

data/lib/database_cleaner/active_record/truncation.rb

@@ -12,6 +12,16 @@ module ActiveRecord
       def views
         @views ||= select_values("select table_name from information_schema.views where table_schema = '#{current_database}'") rescue []
       end
+
+      def truncate_table(table_name)
+        raise NotImplementedError
+      end
+
+      def truncate_tables(tables)
+        tables.each do |table_name|
+          self.truncate_table(table_name)
+        end
+      end
     end
 
     unless USE_ARJDBC_WORKAROUND
@@ -72,7 +82,11 @@ module ActiveRecord
       end
 
       def truncate_table(table_name)
-        execute("TRUNCATE TABLE #{quote_table_name(table_name)} #{restart_identity} #{cascade};")
+        truncate_tables([table_name])
+      end
+      
+      def truncate_tables(table_names)
+        execute("TRUNCATE TABLE #{table_names.map{|name| quote_table_name(name)}.join(', ')} #{restart_identity} #{cascade};")
       end
 
     end
@@ -103,17 +117,9 @@ 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(connection).each do |table_name|
-          yield connection, table_name
-        end
+        connection.truncate_tables(tables_to_truncate(connection))
       end
     end
 

data/lib/database_cleaner/base.rb

@@ -118,15 +118,17 @@ module DatabaseCleaner
           :mongoid
         elsif defined? ::CouchPotato
           :couch_potato
+        elsif defined? ::Sequel
+          :sequel
         else
-          raise NoORMDetected, "No known ORM was detected!  Is ActiveRecord, DataMapper, MongoMapper, Mongoid, or CouchPotato loaded?"
+          raise NoORMDetected, "No known ORM was detected!  Is ActiveRecord, DataMapper, Sequel, MongoMapper, Mongoid, or CouchPotato loaded?"
         end
       end
     end
 
     def set_default_orm_strategy
       case orm
-      when :active_record, :data_mapper
+      when :active_record, :data_mapper, :sequel
         self.strategy = :transaction
       when :mongo_mapper, :mongoid, :couch_potato
         self.strategy = :truncation

data/lib/database_cleaner/configuration.rb

@@ -25,48 +25,48 @@ module DatabaseCleaner
     def connections
       @connections ||= [::DatabaseCleaner::Base.new]
     end
-    
+
     def logger=(log_source)
       @logger = log_source
     end
 
     def logger
       return @logger if @logger
-      
+
       @logger = Logger.new(STDOUT)
       @logger.level = Logger::ERROR
       @logger
     end
 
     def strategy=(stratagem)
-      self.connections.each { |connect| connect.strategy = stratagem }
+      connections.each { |connect| connect.strategy = stratagem }
       remove_duplicates
     end
 
     def orm=(orm)
-      self.connections.each { |connect| connect.orm = orm }
+      connections.each { |connect| connect.orm = orm }
       remove_duplicates
     end
 
     def start
-      self.connections.each { |connection| connection.start }
+      connections.each { |connection| connection.start }
     end
 
     def clean
-      self.connections.each { |connection| connection.clean }
+      connections.each { |connection| connection.clean }
     end
 
     alias clean! clean
 
     def clean_with(*args)
-      self.connections.each { |connection| connection.clean_with(*args) }
+      connections.each { |connection| connection.clean_with(*args) }
     end
 
     alias clean_with! clean_with
 
     def remove_duplicates
       temp = []
-      self.connections.each do |connect|
+      connections.each do |connect|
         temp.push connect unless temp.include? connect
       end
       @connections = temp
@@ -86,6 +86,8 @@ module DatabaseCleaner
           DatabaseCleaner::MongoMapper
         when :couch_potato
           DatabaseCleaner::CouchPotato
+        when :sequel
+          DatabaseCleaner::Sequel
       end
     end
   end

data/lib/database_cleaner/data_mapper/truncation.rb

@@ -42,7 +42,7 @@ module DataMapper
       # taken from http://github.com/godfat/dm-mapping/tree/master
       def storage_names(repository = :default)
         # activerecord-2.1.0/lib/active_record/connection_adapters/sqlite_adapter.rb: 177
-        sql = <<-SQL.compress_lines
+        sql = <<-SQL
           SELECT name
           FROM sqlite_master
           WHERE type = 'table' AND NOT name = 'sqlite_sequence'
@@ -68,7 +68,7 @@ module DataMapper
       # taken from http://github.com/godfat/dm-mapping/tree/master
       def storage_names(repository = :default)
         # activerecord-2.1.0/lib/active_record/connection_adapters/sqlite_adapter.rb: 177
-        sql = <<-SQL.compress_lines
+        sql = <<-SQL
           SELECT name
           FROM sqlite_master
           WHERE type = 'table' AND NOT name = 'sqlite_sequence'
@@ -99,7 +99,7 @@ module DataMapper
 
       # taken from http://github.com/godfat/dm-mapping/tree/master
       def storage_names(repository = :default)
-        sql = <<-SQL.compress_lines
+        sql = <<-SQL
           SELECT table_name FROM "information_schema"."tables"
           WHERE table_schema = current_schema() and table_type = 'BASE TABLE'
         SQL

data/lib/database_cleaner/generic/base.rb

@@ -4,13 +4,10 @@ module ::DatabaseCleaner
 
        def self.included(base)
          base.extend(ClassMethods)
-         base.send(:include, InstanceMethods)
        end
 
-       module InstanceMethods
-         def db
-           :default
-         end
+       def db
+         :default
        end
 
        module ClassMethods

data/lib/database_cleaner/sequel/base.rb

@@ -0,0 +1,22 @@
+require 'database_cleaner/generic/base'
+module DatabaseCleaner
+  module Sequel
+    def self.available_strategies
+      %w[truncation transaction]
+    end
+
+    module Base
+      include ::DatabaseCleaner::Generic::Base
+
+      def db=(desired_db)
+        @db = desired_db
+      end
+
+      def db
+        return @db if @db && @db != :default
+        raise "As you have more than one active sequel database you have to specify the one to use manually!" if ::Sequel::DATABASES.count > 1 
+        ::Sequel::DATABASES.first || :default
+      end
+    end
+  end
+end

data/lib/database_cleaner/sequel/transaction.rb

@@ -0,0 +1,20 @@
+require 'database_cleaner/sequel/base'
+module DatabaseCleaner
+  module Sequel
+    class Transaction
+      include ::DatabaseCleaner::Sequel::Base
+
+      def start
+        @transactions ||= []
+        db.send(:add_transaction)
+        @transactions << db.send(:begin_transaction, db)
+      end
+  
+      def clean
+        transaction = @transactions.pop
+        db.send(:rollback_transaction, transaction)
+        db.send(:remove_transaction, transaction)
+      end
+    end
+  end
+end

data/lib/database_cleaner/sequel/truncation.rb

@@ -0,0 +1,31 @@
+require "database_cleaner/generic/truncation"
+require 'database_cleaner/sequel/base'
+
+module DatabaseCleaner
+  module Sequel
+    class Truncation
+      include ::DatabaseCleaner::Sequel::Base
+      include ::DatabaseCleaner::Generic::Truncation
+  
+      def clean
+        each_table do |db, table|
+          db[table].truncate
+        end
+      end
+  
+      def each_table
+        tables_to_truncate(db).each do |table|
+          yield db, table
+        end
+      end
+
+      private
+  
+      def tables_to_truncate(db)
+        (@only || db.tables) - @tables_to_exclude
+      end
+    end
+  end
+end
+
+

data/spec/database_cleaner/active_record/truncation_spec.rb

@@ -31,19 +31,15 @@ module DatabaseCleaner
 
       it "should truncate all tables except for schema_migrations" do
         connection.stub!(:tables).and_return(%w[schema_migrations widgets dogs])
-
-        connection.should_receive(:truncate_table).with('widgets')
-        connection.should_receive(:truncate_table).with('dogs')
-        connection.should_not_receive(:truncate_table).with('schema_migrations')
-
+        
+        connection.should_receive(:truncate_tables).with(['widgets', 'dogs'])
         Truncation.new.clean
       end
 
       it "should only truncate the tables specified in the :only option when provided" do
         connection.stub!(:tables).and_return(%w[schema_migrations widgets dogs])
 
-        connection.should_receive(:truncate_table).with('widgets')
-        connection.should_not_receive(:truncate_table).with('dogs')
+        connection.should_receive(:truncate_tables).with(['widgets'])
 
         Truncation.new(:only => ['widgets']).clean
       end
@@ -51,8 +47,7 @@ module DatabaseCleaner
       it "should not truncate the tables specified in the :except option" do
         connection.stub!(:tables).and_return(%w[schema_migrations widgets dogs])
 
-        connection.should_receive(:truncate_table).with('dogs')
-        connection.should_not_receive(:truncate_table).with('widgets')
+        connection.should_receive(:truncate_tables).with(['dogs'])
 
         Truncation.new(:except => ['widgets']).clean
       end
@@ -71,8 +66,7 @@ module DatabaseCleaner
         connection.stub!(:tables).and_return(%w[widgets dogs])
         connection.stub!(:views).and_return(["widgets"])
 
-        connection.should_receive(:truncate_table).with('dogs')
-        connection.should_not_receive(:truncate_table).with('widgets')
+        connection.should_receive(:truncate_tables).with(['dogs'])
 
         Truncation.new.clean
       end

data/spec/database_cleaner/base_spec.rb

@@ -17,6 +17,7 @@ module DatabaseCleaner
          Temp_MM = ::MongoMapper  if defined?(::MongoMapper)  and not defined?(Temp_MM)
          Temp_MO = ::Mongoid      if defined?(::Mongoid)      and not defined?(Temp_MO)
          Temp_CP = ::CouchPotato  if defined?(::CouchPotato)  and not defined?(Temp_CP)
+         Temp_SQ = ::Sequel       if defined?(::Sequel)       and not defined?(Temp_SQ)
        end
 
        #Remove all ORM mocks and restore from cache
@@ -26,6 +27,7 @@ module DatabaseCleaner
          Object.send(:remove_const, 'MongoMapper')  if defined?(::MongoMapper)
          Object.send(:remove_const, 'Mongoid')      if defined?(::Mongoid)
          Object.send(:remove_const, 'CouchPotato')  if defined?(::CouchPotato)
+         Object.send(:remove_const, 'Sequel')       if defined?(::Sequel)
 
 
          # Restore ORMs
@@ -43,8 +45,9 @@ module DatabaseCleaner
          Object.send(:remove_const, 'MongoMapper')  if defined?(::MongoMapper)
          Object.send(:remove_const, 'Mongoid')      if defined?(::Mongoid)
          Object.send(:remove_const, 'CouchPotato')  if defined?(::CouchPotato)
+         Object.send(:remove_const, 'Sequel')       if defined?(::Sequel)
        end
-
+       
        let(:cleaner) { DatabaseCleaner::Base.new :autodetect }
 
        it "should raise an error when no ORM is detected" do
@@ -57,6 +60,7 @@ module DatabaseCleaner
          Object.const_set('MongoMapper', 'Mapping mock mongos')
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
+         Object.const_set('Sequel',      'Sequel mock')
 
          cleaner.orm.should == :active_record
          cleaner.should be_auto_detected
@@ -67,6 +71,7 @@ module DatabaseCleaner
          Object.const_set('MongoMapper', 'Mapping mock mongos')
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
+         Object.const_set('Sequel',      'Sequel mock')
 
          cleaner.orm.should == :data_mapper
          cleaner.should be_auto_detected
@@ -76,6 +81,7 @@ module DatabaseCleaner
          Object.const_set('MongoMapper', 'Mapping mock mongos')
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
+         Object.const_set('Sequel',      'Sequel mock')
 
          cleaner.orm.should == :mongo_mapper
          cleaner.should be_auto_detected
@@ -84,17 +90,26 @@ module DatabaseCleaner
        it "should detect Mongoid fourth" do
          Object.const_set('Mongoid',     'Mongoid mock')
          Object.const_set('CouchPotato', 'Couching mock potatos')
+         Object.const_set('Sequel',      'Sequel mock')
 
          cleaner.orm.should == :mongoid
          cleaner.should be_auto_detected
        end
 
-       it "should detect CouchPotato last" do
+       it "should detect CouchPotato fifth" do
          Object.const_set('CouchPotato', 'Couching mock potatos')
+         Object.const_set('Sequel',      'Sequel mock')
 
          cleaner.orm.should == :couch_potato
          cleaner.should be_auto_detected
        end
+       
+       it "should detect Sequel last" do
+         Object.const_set('Sequel', 'Sequel mock')
+
+         cleaner.orm.should == :sequel
+         cleaner.should be_auto_detected
+       end
     end
 
     describe "orm_module" do

data/spec/database_cleaner/sequel/base_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+require 'database_cleaner/sequel/base'
+require 'database_cleaner/shared_strategy_spec'
+require 'sequel'
+
+module DatabaseCleaner
+  describe Sequel do
+    it { should respond_to(:available_strategies) }
+  end
+
+  module Sequel
+    class ExampleStrategy
+      include ::DatabaseCleaner::Sequel::Base
+    end
+
+    describe ExampleStrategy do
+      it_should_behave_like "a generic strategy"
+      it { should respond_to(:db)  }
+      it { should respond_to(:db=) }
+
+      it "should store my desired db" do
+        subject.db = :my_db
+        subject.db.should == :my_db
+      end
+
+      it "should default to :default" do
+        subject.db.should == :default
+      end
+    end
+  end
+end

data/spec/database_cleaner/sequel/transaction_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+require 'database_cleaner/sequel/transaction'
+require 'database_cleaner/shared_strategy_spec'
+require 'sequel'
+
+module DatabaseCleaner
+  module Sequel
+    describe Transaction do
+      it_should_behave_like "a generic strategy"
+      it_should_behave_like "a generic transaction strategy"
+
+      describe "start" do
+        it "should start a transaction"
+      end
+
+      describe "clean" do
+        it "should finish a transaction"
+      end
+    end
+  end
+end

data/spec/database_cleaner/sequel/truncation_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+require 'database_cleaner/sequel/truncation'
+require 'database_cleaner/shared_strategy_spec'
+require 'sequel'
+
+module DatabaseCleaner
+  module Sequel
+    describe Truncation do
+      it_should_behave_like "a generic strategy"
+      it_should_behave_like "a generic truncation strategy"
+    end
+  end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 9
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
   - 7
-  version: 0.6.7
+  - 0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 -06:00
-default_executable: 
+date: 2011-11-12 00:00:00 Z
 dependencies: []
 
 description: Strategies for cleaning databases.  Can be used to ensure a clean state for testing.
@@ -63,7 +62,6 @@ files:
 - features/support/env.rb
 - features/support/feature_runner.rb
 - lib/database_cleaner.rb
-- lib/database_cleaner/active_record/#transaction.rb#
 - lib/database_cleaner/active_record/base.rb
 - lib/database_cleaner/active_record/deletion.rb
 - lib/database_cleaner/active_record/transaction.rb
@@ -84,6 +82,9 @@ files:
 - lib/database_cleaner/mongoid/base.rb
 - lib/database_cleaner/mongoid/truncation.rb
 - lib/database_cleaner/null_strategy.rb
+- lib/database_cleaner/sequel/base.rb
+- lib/database_cleaner/sequel/transaction.rb
+- lib/database_cleaner/sequel/truncation.rb
 - spec/database_cleaner/active_record/base_spec.rb
 - spec/database_cleaner/active_record/transaction_spec.rb
 - spec/database_cleaner/active_record/truncation_spec.rb
@@ -98,13 +99,15 @@ files:
 - spec/database_cleaner/mongo_mapper/base_spec.rb
 - spec/database_cleaner/mongo_mapper/mongo_examples.rb
 - spec/database_cleaner/mongo_mapper/truncation_spec.rb
+- spec/database_cleaner/sequel/base_spec.rb
+- spec/database_cleaner/sequel/transaction_spec.rb
+- spec/database_cleaner/sequel/truncation_spec.rb
 - spec/database_cleaner/shared_strategy_spec.rb
 - spec/rcov.opts
 - spec/spec.opts
 - spec/spec_helper.rb
 - LICENSE
 - TODO
-has_rdoc: true
 homepage: http://github.com/bmabey/database_cleaner
 licenses: []
 
@@ -134,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Strategies for cleaning databases.  Can be used to ensure a clean state for testing.
@@ -153,6 +156,9 @@ test_files:
 - spec/database_cleaner/mongo_mapper/base_spec.rb
 - spec/database_cleaner/mongo_mapper/mongo_examples.rb
 - spec/database_cleaner/mongo_mapper/truncation_spec.rb
+- spec/database_cleaner/sequel/base_spec.rb
+- spec/database_cleaner/sequel/transaction_spec.rb
+- spec/database_cleaner/sequel/truncation_spec.rb
 - spec/database_cleaner/shared_strategy_spec.rb
 - spec/spec_helper.rb
 - examples/features/step_definitions/activerecord_steps.rb

data/lib/database_cleaner/active_record/#transaction.rb#

@@ -1,34 +0,0 @@
-require 'database_cleaner/active_record/base'
-class Foo
-  def bar
-    "fdfd"
-  end
-  def zaz(x,y)
-  end
-end
-module DatabaseCleaner::ActiveRecord
-  class Transaction
-    include ::DatabaseCleaner::ActiveRecord::Base
-
-    def start
-      connection_klass.Foo
-      if connection_klass.connection.respond_to?(:increment_open_transactions)
-        connection_klass.connection.increment_open_transactions
-      else
-        connection_klass.__send__(:increment_open_transactions)
-      end
-      connection_klass.connection.begin_db_transaction
-    end
-
-
-    def clean
-      connection_klass.connection.rollback_db_transaction
-
-      if connection_klass.connection.respond_to?(:decrement_open_transactions)
-        connection_klass.connection.decrement_open_transactions
-      else
-        connection_klass.__send__(:decrement_open_transactions)
-      end
-    end
-  end
-end