talentbox-sequel-rails 0.3.7 → 0.3.8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    talentbox-sequel-rails (0.3.7)
+    talentbox-sequel-rails (0.3.8)
       railties (~> 3.2.0)
       sequel (~> 3.28)
 

data/History.md

@@ -1,6 +1,15 @@
-0.3.8 - dev
+0.3.9 - dev
 ===========
 
+0.3.8
+=====
+
+* Fix bug in `db:force_close_open_connections` and make it work with
+  PostgreSQL 9.2.
+* Ensure `db:test:prepare` use `execute` instead of `invoke` so that tasks
+  already invoked are executed again. This make the following work as expected:
+    `rake db:create db:migrate db:test:prepare`
+
 0.3.7
 =====
 

data/lib/sequel-rails/railties/database.rake

@@ -142,13 +142,14 @@ namespace :db do
 
   desc 'Forcibly close any open connections to the test database'
   task :force_close_open_connections => :environment do
-    if Rails.env.test?
+    if db_for_current_env.database_type==:postgres
       begin
-        #Will only work on Postgres > 8.4
+        # Will only work on Postgres > 8.4
+        pid_column = db_for_current_env.server_version < 90200 ? "procpid" : "pid"
         db_for_current_env.execute <<-SQL.gsub(/^\s{9}/,'')
-          SELECT COUNT(pg_terminate_backend(procpid))
+          SELECT COUNT(pg_terminate_backend(#{pid_column}))
           FROM  pg_stat_activity
-          WHERE datname = '#{db_config[:database]}';
+          WHERE datname = '#{db_for_current_env.opts[:database]}';
         SQL
       rescue => e
         #Will raise an error as it kills existing process running this command
@@ -160,10 +161,10 @@ namespace :db do
   namespace :test do
     task :prepare => "db:abort_if_pending_migrations" do
       Rails.env = 'test'
-      Rake::Task['db:force_close_open_connections'].invoke
-      Rake::Task['db:drop'].invoke
-      Rake::Task['db:create'].invoke
-      Rake::Task['db:schema:load'].invoke
+      Rake::Task['db:force_close_open_connections'].execute
+      Rake::Task['db:drop'].execute
+      Rake::Task['db:create'].execute
+      Rake::Task['db:schema:load'].execute
       Sequel::DATABASES.each do |db|
         db.disconnect
       end

data/lib/sequel-rails/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Sequel
-    VERSION = "0.3.7"
+    VERSION = "0.3.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: talentbox-sequel-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.7
+  version: 0.3.8
   prerelease: 
 platform: ruby
 authors:
@@ -191,7 +191,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1170649878632369574
+      hash: -412832233955601598
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -200,7 +200,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1170649878632369574
+      hash: -412832233955601598
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24