database_cleaner 0.6.0.rc.3 → 0.6.0

data/History.txt

@@ -1,6 +1,6 @@
 == 0.6.x (In Git)
 
-== 0.6.0 2010-08-2x - The Multi-ORM/Connection Release
+== 0.6.0 2010-10-25 - The Multi-ORM/Connection Release
 
 This release has the often asked for functionality of being able to clean
 multiple databases within the same project.  This involves being able to 
@@ -19,11 +19,14 @@ of the hours and effort he put into making this feature request a reality.
   * Ability to clean multiple DBs managed by different ORMs in same project. (Jon Rowe)
   * Allows for the ActiveRecord config file (database.yml) to contain ERB and process it. (Fletcher Nichol)
   * Mysql2Adapter support. (Kamal Fariz Mahyuddin and John Ferlito)
+  * Deletion strategy for ActiveRecord (Mikl Kurkov)
 
  === Bugfixes
   * Updates the DataMapper truncation strategy to version 0.10.3. (Robert Rouse)
   * Addresses Ruby 1.9 and 1.8 differences causing a bug in the AR PostgreSQLAdapter truncation strategy. (GH-14, James B. Byrne)
   * Fixes syntax error that MySQL was throwing during DataMapper truncation. (Blake Gentry)
+  * Fixes truncation for PostgreSQL (Bodaniel Jeanes and Gabriel Sobrinho)
+  * Workaround for superclass mismatches for the ActiveRecord-jdbc-adapter (Toms Mikoss)
 
 == 0.5.2
 

data/README.textile

@@ -7,6 +7,19 @@ that is testing with a database.
 
 ActiveRecord, DataMapper, MongoMapper, Mongoid, and CouchPotato are supported.
 
+Here is an overview of the strategies supported for each library:
+
+|_. ORM        |_.  Truncation  |_.  Transaction  |_.  Deletion    |
+| ActiveRecord | Yes            | Yes             | Yes            |
+| DataMapper   | Yes            | Yes             | No             |
+| CouchPotato  | Yes            | No              | No             |
+| MongoMapper  | Yes            | No              | No             |
+| Mongiod      | Yes            | No              | No             |
+
+The ActiveRecord @:deletion@ strategy is only useful for when the @:truncation@ strategy causes
+locks (as reported by some Oracle DB users).  The @:truncation@ strategy is the preferred option
+since it is much faster.
+
 h2. How to use
 
 <pre>
@@ -28,7 +41,6 @@ With the :truncation strategy you can also pass in options, for example:
 
 (I should point out the truncation strategy will never truncate your schema_migrations table.)
 
-
 Some strategies require that you call DatabaseCleaner.start before calling clean
 (for example the :transaction one needs to know to open up a transaction). So
 you would have:
@@ -93,38 +105,13 @@ Usage beyond that remains the same with DatabaseCleaner.start calling any setup
 
 Configuration options
 
-<table>
-<tr>
-<th>ORM</th>
-<th>How to access</th>
-<th>Notes</th>
-</tr>
-<tr>
-<td>Active Record</td>
-<td>DatabaseCleaner[:active_record]</td>
-<td>Connection specified as :symbol keys, loaded from config/database.yml</td>
-</th>
-<tr>
-<td>Data Mapper</td>
-<td>DatabaseCleaner[:data_mapper]</td>
-<td>Connection specified as :symbol keys, loaded via Datamapper repositories</td>
-</th>
-<tr>
-<td>Mongo Mapper</td>
-<td>DatabaseCleaner[:mongo_mapper]</td>
-<td>Multiple connections not yet supported</td>
-</th>
-<tr>
-<td>Mongoid</td>
-<td>DatabaseCleaner[:mongoid]</td>
-<td>Multiple connections not yet supported</td>
-</th>
-<tr>
-<td>Couch Potato</td>
-<td>DatabaseCleaner[:couch_potato]</td>
-<td>Multiple connections not yet supported</td>
-</tr>
-</table>
+
+|_. ORM         |_.   How to access               |_.   Notes                                                                |
+| Active Record | DatabaseCleaner[:active_record] | Connection specified as :symbol keys, loaded from config/database.yml    |
+| Data Mapper   | DatabaseCleaner[:data_mapper]   | Connection specified as :symbol keys, loaded via Datamapper repositories |
+| Mongo Mapper  | DatabaseCleaner[:mongo_mapper]  | Multiple connections not yet supported                                   |
+| Mongoid       | DatabaseCleaner[:mongoid]       | Multiple connections not yet supported                                   |
+| Couch Potato  | DatabaseCleaner[:couch_potato]  | Multiple connections not yet supported                                   |
 
 h2. Why?
 

data/features/cleaning.feature

@@ -14,6 +14,7 @@ Feature: database cleaning
     | ORM          | Strategy      |
     | ActiveRecord | transaction   |
     | ActiveRecord | truncation    |
+    | ActiveRecord | deletion      |
     | DataMapper   | transaction   |
     | DataMapper   | truncation    |
     | MongoMapper  | truncation    |

data/features/cleaning_multiple_dbs.feature

@@ -13,6 +13,7 @@ Feature: multiple database cleaning
   Examples:
   | ORM          | Strategy      |
   | ActiveRecord | truncation    |
+  | ActiveRecord | deletion      |
   | DataMapper   | truncation    |
   | MongoMapper  | truncation    |
   | DataMapper   | transaction   |

data/lib/database_cleaner/active_record/base.rb

@@ -5,7 +5,7 @@ module DatabaseCleaner
   module ActiveRecord
 
     def self.available_strategies
-      %w[truncation transaction]
+      %w[truncation transaction deletion]
     end
 
     def self.config_file_location

data/lib/database_cleaner/active_record/deletion.rb

@@ -0,0 +1,66 @@
+require 'active_record/base'
+require 'active_record/connection_adapters/abstract_adapter'
+require "database_cleaner/generic/truncation"
+require 'database_cleaner/active_record/base'
+require 'database_cleaner/active_record/truncation'
+# This file may seem to have duplication with that of truncation, but by keeping them separate
+# we avoiding loading this code when it is not being used (which is the common case).
+
+module ActiveRecord
+  module ConnectionAdapters
+
+    class MysqlAdapter < MYSQL_ADAPTER_PARENT
+      def delete_table(table_name)
+        execute("DELETE FROM #{quote_table_name(table_name)};")
+      end
+    end
+
+    class Mysql2Adapter < AbstractAdapter
+      def delete_table(table_name)
+        execute("DELETE FROM #{quote_table_name(table_name)};")
+      end
+    end
+
+    class JdbcAdapter < AbstractAdapter
+      def delete_table(table_name)
+          execute("DELETE FROM #{quote_table_name(table_name)};")
+      end
+    end
+
+    class PostgreSQLAdapter < AbstractAdapter
+      def delete_table(table_name)
+        execute("DELETE FROM #{quote_table_name(table_name)};")
+      end
+    end
+
+    class SQLServerAdapter < AbstractAdapter
+      def delete_table(table_name)
+        execute("DELETE FROM #{quote_table_name(table_name)};")
+      end
+    end
+
+    class OracleEnhancedAdapter < AbstractAdapter
+      def delete_table(table_name)
+        execute("DELETE FROM #{quote_table_name(table_name)}")
+      end
+    end
+
+  end
+end
+
+
+module DatabaseCleaner::ActiveRecord
+  class Deletion < Truncation
+
+    def clean
+      connection.disable_referential_integrity do
+        tables_to_truncate.each do |table_name|
+          connection.delete_table table_name
+        end
+      end
+    end
+
+  end
+end
+
+

data/lib/database_cleaner/active_record/truncation.rb

@@ -5,14 +5,21 @@ require 'database_cleaner/active_record/base'
 
 module ActiveRecord
   module ConnectionAdapters
+    # Activerecord-jdbc-adapter defines class dependencies a bit differently - if it is present, confirm to ArJdbc hierarchy to avoid 'superclass mismatch' errors.
+    USE_ARJDBC_WORKAROUND = defined?(ArJdbc)
 
     class AbstractAdapter
     end
 
-    class SQLiteAdapter < AbstractAdapter
+    unless USE_ARJDBC_WORKAROUND
+      class SQLiteAdapter < AbstractAdapter
+      end
     end
 
-    class MysqlAdapter < AbstractAdapter
+    MYSQL_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : AbstractAdapter
+    SQLITE_ADAPTER_PARENT = USE_ARJDBC_WORKAROUND ? JdbcAdapter : SQLiteAdapter
+
+    class MysqlAdapter < MYSQL_ADAPTER_PARENT
       def truncate_table(table_name)
         execute("TRUNCATE TABLE #{quote_table_name(table_name)};")
       end
@@ -24,10 +31,11 @@ module ActiveRecord
       end
     end
 
-    class SQLite3Adapter < SQLiteAdapter
-      def truncate_table(table_name)
+    class SQLite3Adapter < SQLITE_ADAPTER_PARENT
+      def delete_table(table_name)
         execute("DELETE FROM #{quote_table_name(table_name)};")
       end
+      alias truncate_table delete_table
     end
 
     class JdbcAdapter < AbstractAdapter
@@ -42,19 +50,19 @@ module ActiveRecord
 
     class PostgreSQLAdapter < AbstractAdapter
 
-      def self.db_version
-        @db_version ||= connection.select_values(
+      def db_version
+        @db_version ||= select_values(
           "SELECT CHARACTER_VALUE
             FROM INFORMATION_SCHEMA.SQL_IMPLEMENTATION_INFO
             WHERE IMPLEMENTATION_INFO_NAME = 'DBMS VERSION' ").join.to_s
       end
 
-      def self.cascade
+      def cascade
         @cascade ||= db_version >=  "08.02" ? "CASCADE" : ""
       end
 
       def truncate_table(table_name)
-        execute("TRUNCATE TABLE #{quote_table_name(table_name)} #{self.class.cascade};")
+        execute("TRUNCATE TABLE #{quote_table_name(table_name)} #{cascade};")
       end
 
     end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 15424115
-  prerelease: true
+  hash: 7
+  prerelease: false
   segments: 
   - 0
   - 6
   - 0
-  - rc
-  - 3
-  version: 0.6.0.rc.3
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ben Mabey
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-22 00:00:00 -06:00
+date: 2010-10-25 00:00:00 -06:00
 default_executable: 
 dependencies: []
 
@@ -65,6 +63,7 @@ files:
 - features/support/feature_runner.rb
 - lib/database_cleaner.rb
 - lib/database_cleaner/active_record/base.rb
+- lib/database_cleaner/active_record/deletion.rb
 - lib/database_cleaner/active_record/transaction.rb
 - lib/database_cleaner/active_record/truncation.rb
 - lib/database_cleaner/base.rb