database_cleaner 1.7.0 → 1.8.0.beta

data/Rakefile

@@ -1,12 +1,12 @@
 require "rubygems"
 require "bundler"
+require "bundler/gem_tasks"
 Bundler.setup
 
 require 'rake'
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  
   spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
@@ -15,15 +15,19 @@ RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.rcov = true
 end
 
-begin
-  require 'cucumber/rake/task'
-  Cucumber::Rake::Task.new(:features)
-rescue LoadError
-  puts "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"
-end
+require 'cucumber/rake/task'
+Cucumber::Rake::Task.new(:features)
 
-task :default => [:spec, :features]
+desc "Run adapter test suites"
+task :adapters do
+  Dir["adapters/*"].each do |adapter_dir|
+    Dir.chdir adapter_dir do
+      sh "bundle exec rake"
+    end
+  end
+end
 
+task :default => [:spec, :features, :adapters]
 
 desc "Cleans the project of any tmp file that should not be included in the gemspec."
 task :clean do

data/adapters/database_cleaner-active_record/lib/database_cleaner-active_record.rb

@@ -0,0 +1 @@
+require "database_cleaner/active_record"

data/adapters/database_cleaner-active_record/lib/database_cleaner/active_record.rb

@@ -0,0 +1,6 @@
+require 'database_cleaner/active_record/version'
+require 'database_cleaner'
+require 'database_cleaner/active_record/deletion'
+require 'database_cleaner/active_record/transaction'
+require 'database_cleaner/active_record/truncation'
+

data/{lib → adapters/database_cleaner-active_record/lib}/database_cleaner/active_record/base.rb

@@ -1,20 +1,29 @@
-require 'database_cleaner/generic/base'
 require 'active_record'
+require 'database_cleaner/generic/base'
 require 'erb'
+require 'yaml'
 
 module DatabaseCleaner
   module ActiveRecord
-
     def self.available_strategies
       %w[truncation transaction deletion]
     end
 
+    def self.default_strategy
+      :transaction
+    end
+
     def self.config_file_location=(path)
       @config_file_location = path
     end
 
     def self.config_file_location
-      @config_file_location ||= "#{DatabaseCleaner.app_root}/config/database.yml"
+      @config_file_location ||= begin
+        # Has DC.app_root been set? Check in this intrusive way to avoid triggering deprecation warnings if it hasn't.
+        app_root = DatabaseCleaner.send(:configuration).instance_variable_get(:@app_root)
+        root = app_root || Dir.pwd
+        "#{root}/config/database.yml"
+      end
     end
 
     module Base
@@ -79,7 +88,7 @@ module DatabaseCleaner
         if ::ActiveRecord::Base.respond_to?(:descendants)
           database_name = connection_hash["database"] || connection_hash[:database]
           models        = ::ActiveRecord::Base.descendants
-          models.detect { |m| m.connection_pool.spec.config[:database] == database_name }
+          models.select(&:connection_pool).detect { |m| m.connection_pool.spec.config[:database] == database_name }
         end
       end
 

data/{lib → adapters/database_cleaner-active_record/lib}/database_cleaner/active_record/deletion.rb

@@ -1,7 +1,6 @@
-require 'active_record/base'
+require 'active_record'
 require 'active_record/connection_adapters/abstract_adapter'
 require "database_cleaner/generic/truncation"
-require 'database_cleaner/active_record/base'
 require 'database_cleaner/active_record/truncation'
 
 module DatabaseCleaner
@@ -53,30 +52,31 @@ module DatabaseCleaner::ActiveRecord
     end
 
     def tables_with_new_rows(connection)
-      @db_name ||= connection.instance_variable_get('@config')[:database]
-      stats = table_stats_query(connection, @db_name)
+      stats = table_stats_query(connection)
       if stats != ''
-        connection.exec_query(stats).inject([]) {|all, stat| all << stat['table_name'] if stat['exact_row_count'] > 0; all }
+        connection.select_values(stats)
       else
         []
       end
     end
 
-    def table_stats_query(connection, db_name)
-      if @cache_tables && !@table_stats_query.nil?
-        return @table_stats_query
-      else
-        tables = connection.select_values(<<-SQL)
-          SELECT table_name
-          FROM information_schema.tables
-          WHERE table_schema = '#{db_name}'
-          AND #{::DatabaseCleaner::ActiveRecord::Base.exclusion_condition('table_name')};
-        SQL
-        queries = tables.map do |table|
-          "SELECT #{connection.quote(table)} AS table_name, COUNT(*) AS exact_row_count FROM #{connection.quote_table_name(table)}"
-        end
-        @table_stats_query = queries.join(' UNION ')
+    def table_stats_query(connection)
+      @table_stats_query ||= build_table_stats_query(connection)
+    ensure
+      @table_stats_query = nil unless @cache_tables
+    end
+
+    def build_table_stats_query(connection)
+      tables = connection.select_values(<<-SQL)
+        SELECT table_name
+        FROM information_schema.tables
+        WHERE table_schema = database()
+        AND #{::DatabaseCleaner::ActiveRecord::Base.exclusion_condition('table_name')};
+      SQL
+      queries = tables.map do |table|
+        "(SELECT #{connection.quote(table)} FROM #{connection.quote_table_name(table)} LIMIT 1)"
       end
+      queries.join(' UNION ALL ')
     end
 
     def information_schema_exists? connection

data/{lib → adapters/database_cleaner-active_record/lib}/database_cleaner/active_record/truncation.rb

@@ -1,10 +1,10 @@
 require 'active_record/base'
-
+require 'database_cleaner/active_record/base'
 require 'active_record/connection_adapters/abstract_adapter'
 
 #Load available connection adapters
 %w(
-  abstract_mysql_adapter postgresql_adapter sqlite3_adapter mysql_adapter mysql2_adapter
+  abstract_mysql_adapter postgresql_adapter sqlite3_adapter mysql_adapter mysql2_adapter oracle_enhanced_adapter
 ).each do |known_adapter|
   begin
     require "active_record/connection_adapters/#{known_adapter}"
@@ -27,7 +27,11 @@ module DatabaseCleaner
 
       def database_cleaner_table_cache
         # the adapters don't do caching (#130) but we make the assumption that the list stays the same in tests
-        @database_cleaner_tables ||= ::ActiveRecord::VERSION::MAJOR >= 5 ? data_sources : tables
+        @database_cleaner_tables ||= database_tables
+      end
+
+      def database_tables
+        ::ActiveRecord::VERSION::MAJOR >= 5 ? data_sources : tables
       end
 
       def truncate_table(table_name)
@@ -63,22 +67,21 @@ module DatabaseCleaner
         select_value("SELECT EXISTS (SELECT 1 FROM #{quote_table_name(table)} LIMIT 1)").to_i
       end
 
-      # Returns a boolean indicating if the given table has an auto-inc number higher than 0.
-      # Note, this is different than an empty table since an table may populated, the index increased,
-      # but then the table is cleaned.  In other words, this function tells us if the given table
-      # was ever inserted into.
-      def has_been_used?(table)
-        if has_rows?(table)
-          true
-        else
-          # Patch for MysqlAdapter with ActiveRecord 3.2.7 later
-          # select_value("SELECT 1") #=> "1"
-          select_value(<<-SQL).to_i > 1 # returns nil if not present
-          SELECT Auto_increment
+      def auto_increment_value(table)
+        select_value(<<-SQL).to_i
+          SELECT auto_increment
           FROM information_schema.tables
-          WHERE table_name='#{table}';
-          SQL
-        end
+          WHERE table_name = '#{table}'
+          AND table_schema = database()
+        SQL
+      end
+
+      # This method tells us if the given table has been inserted into since its
+      # last truncation. Note that the table might have been populated, which
+      # increased the auto-increment counter, but then cleaned again such that
+      # it appears empty now.
+      def has_been_used?(table)
+        has_rows?(table) || auto_increment_value(table) > 1
       end
 
       def has_rows?(table)
@@ -244,7 +247,7 @@ module DatabaseCleaner::ActiveRecord
     private
 
     def tables_to_truncate(connection)
-      tables_in_db = cache_tables? ? connection.database_cleaner_table_cache : connection.tables
+      tables_in_db = cache_tables? ? connection.database_cleaner_table_cache : connection.database_tables
       to_reject = (@tables_to_exclude + connection.database_cleaner_view_cache)
       (@only || tables_in_db).reject do |table|
         if ( m = table.match(/([^.]+)$/) )

data/adapters/database_cleaner-active_record/lib/database_cleaner/active_record/version.rb

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module ActiveRecord
+    VERSION = "1.8.0.beta"
+  end
+end

data/adapters/database_cleaner-couch_potato/lib/database_cleaner-couch_potato.rb

@@ -0,0 +1 @@
+require "database_cleaner/couch_potato"

data/adapters/database_cleaner-couch_potato/lib/database_cleaner/couch_potato.rb

@@ -0,0 +1,11 @@
+require "database_cleaner/couch_potato/version"
+require "database_cleaner"
+require "database_cleaner/couch_potato/base"
+require "database_cleaner/couch_potato/truncation"
+
+module DatabaseCleaner::CouchPotato
+  def self.default_strategy
+    :truncation
+  end
+end
+

data/adapters/database_cleaner-couch_potato/lib/database_cleaner/couch_potato/version.rb

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module CouchPotato
+    VERSION = "1.8.0.beta"
+  end
+end

data/adapters/database_cleaner-data_mapper/lib/database_cleaner-data_mapper.rb

@@ -0,0 +1 @@
+require "database_cleaner/data_mapper"

data/adapters/database_cleaner-data_mapper/lib/database_cleaner/data_mapper.rb

@@ -0,0 +1,4 @@
+require "database_cleaner/data_mapper/version"
+require "database_cleaner"
+require "database_cleaner/data_mapper/transaction"
+require "database_cleaner/data_mapper/truncation"

data/{lib → adapters/database_cleaner-data_mapper/lib}/database_cleaner/data_mapper/base.rb

@@ -5,6 +5,10 @@ module DatabaseCleaner
       %w[truncation transaction]
     end
 
+    def self.default_strategy
+      :transaction
+    end
+
     module Base
       include ::DatabaseCleaner::Generic::Base
 

data/{lib → adapters/database_cleaner-data_mapper/lib}/database_cleaner/data_mapper/truncation.rb

@@ -1,5 +1,6 @@
 require "database_cleaner/generic/truncation"
 require 'database_cleaner/data_mapper/base'
+require 'data_mapper'
 
 module DataMapper
   module Adapters
@@ -20,7 +21,7 @@ module DataMapper
 
     class MysqlAdapter < DataObjectsAdapter
 
-      # taken from http://github.com/godfat/dm-mapping/tree/master
+      # taken from https://github.com/godfat/dm-mapping/tree/master
       def storage_names(repository = :default)
         select 'SHOW TABLES'
       end
@@ -44,7 +45,7 @@ module DataMapper
 
     module SqliteAdapterMethods
 
-      # taken from http://github.com/godfat/dm-mapping/tree/master
+      # taken from https://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
@@ -92,7 +93,7 @@ module DataMapper
     # maybe codes below gets some postgres/datamapper user going, though.
     class PostgresAdapter < DataObjectsAdapter
 
-      # taken from http://github.com/godfat/dm-mapping/tree/master
+      # taken from https://github.com/godfat/dm-mapping/tree/master
       def storage_names(repository = :default)
         sql = <<-SQL
           SELECT table_name FROM "information_schema"."tables"

data/adapters/database_cleaner-data_mapper/lib/database_cleaner/data_mapper/version.rb

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module DataMapper
+    VERSION = "1.8.0.beta"
+  end
+end

data/adapters/database_cleaner-mongo/lib/database_cleaner-mongo.rb

@@ -0,0 +1 @@
+require "database_cleaner/mongo"

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo.rb

@@ -0,0 +1,10 @@
+require 'database_cleaner/mongo/version'
+require 'database_cleaner'
+require 'database_cleaner/mongo/truncation'
+
+module DatabaseCleaner::Mongo
+  def self.default_strategy
+    :truncation
+  end
+end
+

data/adapters/database_cleaner-mongo/lib/database_cleaner/mongo/version.rb

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Mongo
+    VERSION = "1.8.0.beta"
+  end
+end

data/adapters/database_cleaner-mongo_mapper/lib/database_cleaner-mongo_mapper.rb

@@ -0,0 +1 @@
+require "database_cleaner/mongo_mapper"

data/adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper.rb

@@ -0,0 +1,4 @@
+require "database_cleaner/mongo_mapper/version"
+require "database_cleaner"
+require "database_cleaner/mongo_mapper/truncation"
+

data/{lib → adapters/database_cleaner-mongo_mapper/lib}/database_cleaner/mongo_mapper/base.rb

@@ -5,6 +5,10 @@ module DatabaseCleaner
       %w[truncation]
     end
 
+    def self.default_strategy
+      :truncation
+    end
+
     module Base
       include ::DatabaseCleaner::Generic::Base
 

data/adapters/database_cleaner-mongo_mapper/lib/database_cleaner/mongo_mapper/version.rb

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module MongoMapper
+    VERSION = "1.8.0.beta"
+  end
+end

data/adapters/database_cleaner-mongoid/lib/database_cleaner-mongoid.rb

@@ -0,0 +1 @@
+require "database_cleaner/mongoid"

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid.rb

@@ -0,0 +1,10 @@
+require "database_cleaner/mongoid/version"
+require "database_cleaner"
+require "database_cleaner/mongoid/truncation"
+
+module DatabaseCleaner::Mongoid
+  def self.default_strategy
+    :truncation
+  end
+end
+

data/adapters/database_cleaner-mongoid/lib/database_cleaner/mongoid/version.rb

@@ -0,0 +1,5 @@
+module DatabaseCleaner
+  module Mongoid
+    VERSION = "1.8.0.beta"
+  end
+end

data/adapters/database_cleaner-moped/lib/database_cleaner-moped.rb

@@ -0,0 +1 @@
+require "database_cleaner/moped"

data/adapters/database_cleaner-moped/lib/database_cleaner/moped.rb

@@ -0,0 +1,10 @@
+require "database_cleaner/moped/version"
+require "database_cleaner"
+require "database_cleaner/moped/truncation"
+
+module DatabaseCleaner::Moped
+  def self.default_strategy
+    :truncation
+  end
+end
+

data/{lib → adapters/database_cleaner-moped/lib}/database_cleaner/moped/base.rb

@@ -32,7 +32,7 @@ module DatabaseCleaner
       private
 
       def session
-        ::Moped::Session.new([host], database: db)
+        @session ||= ::Moped::Session.new([host], database: db)
       end
     end
   end

data/{lib → adapters/database_cleaner-moped/lib}/database_cleaner/moped/truncation_base.rb

@@ -13,6 +13,7 @@ module DatabaseCleaner
         else
           collections.each { |c| session[c].find.remove_all unless @tables_to_exclude.include?(c) }
         end
+        wait_for_removals_to_finish
         true
       end
 
@@ -35,6 +36,9 @@ module DatabaseCleaner
         end
       end
 
+      def wait_for_removals_to_finish
+        session.command(getlasterror: 1)
+      end
     end
   end
 end