database_cleaner 0.6.5 → 0.6.6

data/History.txt

@@ -1,5 +1,9 @@
 == 0.6.x (in git)
 
+=== Bugfixes
+ * Don't modify the array passed in with the :except key. (Eric Wollesen)
+ * Fixes version checking for postgresql. (Greg Barnett)
+
 == 0.6.5 2011-03-08
 
 === Bugfixes

data/VERSION.yml

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

data/lib/database_cleaner/active_record/truncation.rb

@@ -60,18 +60,15 @@ module ActiveRecord
     class PostgreSQLAdapter < AbstractAdapter
 
       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
+        @db_version ||= postgresql_version
       end
 
       def cascade
-        @cascade ||= db_version >=  "08.02" ? "CASCADE" : ""
+        @cascade ||= db_version >=  80200 ? 'CASCADE' : ''
       end
 
       def restart_identity
-        @restart_identity ||= db_version >=  "08.04" ? "RESTART IDENTITY" : ""
+        @restart_identity ||= db_version >=  80400 ? 'RESTART IDENTITY' : ''
       end
 
       def truncate_table(table_name)

data/lib/database_cleaner/generic/truncation.rb

@@ -15,7 +15,7 @@ module DatabaseCleaner
           end
 
           @only = opts[:only]
-          @tables_to_exclude = (opts[:except] || [])
+          @tables_to_exclude = (opts[:except] || []).dup
           @tables_to_exclude << migration_storage_name unless migration_storage_name.nil?
         end
 

data/spec/database_cleaner/generic/truncation_spec.rb

@@ -62,6 +62,16 @@ module ::DatabaseCleaner
           its(:only)   { should == nil }
           its(:except) { should == ["migration_storage_name"] }
         end
+
+        context "" do
+          EXCEPT_TABLES = ["something"]
+          subject { MigrationExample.new( { :except => EXCEPT_TABLES } ) }
+
+          it "should not modify the array of excepted tables" do
+            subject.except.should include("migration_storage_name")
+            EXCEPT_TABLES.should_not include("migration_storage_name")
+          end
+        end
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: database_cleaner
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 6
-  - 5
-  version: 0.6.5
+  - 6
+  version: 0.6.6
 platform: ruby
 authors: 
 - Ben Mabey
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-08 00:00:00 -07:00
+date: 2011-03-16 00:00:00 -06:00
 default_executable: 
 dependencies: []