activerecord-jdbc-adapter 1.0.0-java → 1.0.1-java

data/History.txt

@@ -1,3 +1,8 @@
+== 1.0.1
+
+- Fix db:test:purge issue affecting all adapters in 1.0.0 due to
+  incorrect fix to JRUBY-5081 in 8b4b9c5
+
 == 1.0.0
 
 - Thanks to David Kellum, Dmitry Denisov, Dwayne Litzenberger, Gregor

data/lib/arjdbc/jdbc/jdbc.rake

@@ -28,7 +28,8 @@ namespace :db do
   redefine_task :drop => :environment do
     config = ActiveRecord::Base.configurations[rails_env]
     begin
-      ActiveRecord::Base.connection.drop_database(find_database_name(config))
+      db = find_database_name(config)
+      ActiveRecord::Base.connection.drop_database(db)
     rescue
       drop_database(config.merge('adapter' => config['adapter'].sub(/^jdbc/, '')))
     end
@@ -49,6 +50,7 @@ namespace :db do
   end
 
   def find_database_name(config)
+    db = config['database']
     if config['adapter'] =~ /postgresql/i
       config = config.dup
       if config['url']
@@ -118,7 +120,8 @@ namespace :db do
 
     redefine_task :purge => :environment do
       abcs = ActiveRecord::Base.configurations
-      ActiveRecord::Base.connection.recreate_database(find_database_name(abcs['test']))
+      db = find_database_name(abcs['test'])
+      ActiveRecord::Base.connection.recreate_database(db)
     end
   end
 end

data/lib/arjdbc/version.rb

@@ -1,6 +1,6 @@
 module ArJdbc
   module Version
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
   end
 end
 # Compatibility with older versions of ar-jdbc for other extensions out there

data/test/abstract_db_create.rb

@@ -57,6 +57,8 @@ module AbstractDbCreate
     the_db_name = @db_name
     the_db_config = db_config
     @configs = { "unittest" => the_db_config.merge({:database => the_db_name}).stringify_keys! }
+    @configs["test"] = @configs["unittest"].dup
+    @configs
   end
 
   def setup_rails2

data/test/mysql_db_create_test.rb

@@ -18,6 +18,11 @@ class MysqlDbCreateTest < Test::Unit::TestCase
         assert mysql.read =~ /#{@db_name}/m
       end
     end
+
+    def test_rake_db_test_purge
+      Rake::Task["db:create"].invoke
+      Rake::Task["db:test:purge"].invoke
+    end
   else
     def test_skipped
     end

data/test/postgres_db_create_test.rb

@@ -14,6 +14,11 @@ class PostgresDbCreateTest < Test::Unit::TestCase
       output = `psql -c '\\l'`
       assert output =~ /#{@db_name}/m
     end
+
+    def test_rake_db_test_purge
+      Rake::Task["db:create"].invoke
+      Rake::Task["db:test:purge"].invoke
+    end
   else
     def test_skipped
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
     - 1
     - 0
-    - 0
-  version: 1.0.0
+    - 1
+  version: 1.0.1
 platform: java
 authors: 
   - Nick Sieger, Ola Bini and JRuby contributors