underglow 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38ac5a603868fe7f2ef6ef365d5f82cd009df5cd
-  data.tar.gz: 28db6dae6fff9a3be83bd6502c6aa33a4aba9c44
+  metadata.gz: 97d1d3096bbc803fc39402f43d44e857385f5508
+  data.tar.gz: 00c466a05323056648943876e80e73b4332ac57e
 SHA512:
-  metadata.gz: cfd60065aaed01a3fbeffbff44510bd7439a3b34d960120be17031aeb69013fe17b3cb76f4f01b32e2fd367c1502736868fe5bae240d445d92cda0b74c462ab4
-  data.tar.gz: 099bbd8b5af80728c9be8e970e81667c74d6c9f79ee57c83ca287b283c9af5a6670e01882dd6ef399c0dd23f61d35b473f816b7b5747940f413ee128aa9d9fd5
+  metadata.gz: d884d9de3887d6377572e2fdef53ff40667dcd0852818b26b84f317aded3fd543b680b05be046aefaf6d857dc8bdf1b6686f734794e0e707fc7d1ba453d0acac
+  data.tar.gz: 44626cc4fcb586832a9bed34c096fdc6ac2e18ea07fe2f8f765cb56882de947686e0cd88caf74d3486e476c6c82650b5815fac4fba865943135b2902c16eb547

data/lib/underglow/tasks/db.rake

@@ -22,9 +22,16 @@ namespace :db do
 
         FileUtils.rm(file)
       when 'postgresql'
-        ActiveRecord::Base.connection.select_all("select * from pg_stat_activity order by procpid;").each do |x|
+        # Detect PostgreSQL version
+        version = `psql --version`.match(/([0-9\.]+)/)[1]
+        release, major, minor = version.split(".").map(&:to_i)
+
+        # In PostgreSQL >= 9.2 the column has changed to pid
+        pid_column = major >= 2 ? "pid" : "procpid"
+
+        ActiveRecord::Base.connection.select_all("select * from pg_stat_activity order by #{pid_column};").each do |x|
           if config['database'] == x['datname'] && x['current_query'] == '<IDLE>'
-      ActiveRecord::Base.connection.execute("select pg_terminate_backend(#{x['procpid']})")
+            ActiveRecord::Base.connection.execute("select pg_terminate_backend(#{x[pid_column]})")
           end
         end
         ActiveRecord::Base.establish_connection(config.merge('database' => 'postgres', 'schema_search_path' => 'public'))
@@ -32,7 +39,7 @@ namespace :db do
       end
     end
   end
-  
+
   desc "Recreates and migrates db useful for development"
   task :fresh do
     # We need to keep track of initial RAILS_ENV because db:test:load changes RAILS_ENV to test

data/lib/underglow/version.rb

@@ -1,3 +1,3 @@
 module Underglow
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/underglow.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "underglow"
-  s.version = "0.1.6"
+  s.version = "0.1.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Hu"]
-  s.date = "2013-12-07"
+  s.date = "2014-10-06"
   s.description = "A library that makes life easier."
   s.email = "axsuul@gmail.com"
   s.extra_rdoc_files = [
@@ -49,7 +49,7 @@ Gem::Specification.new do |s|
   s.homepage = "http://github.com/axsuul/underglow"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.0.14"
   s.summary = "Vroom yourself."
 
   if s.respond_to? :specification_version then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: underglow
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - James Hu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-07 00:00:00.000000000 Z
+date: 2014-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -122,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Vroom yourself.