pgreset 0.1.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 59d339c9ccaf6e9ff9c8901629f53380bb30b4d1
-  data.tar.gz: cac6274c05f6ef656bf31dfc7bb340c6705c4660
+SHA256:
+  metadata.gz: 34faaca27defbd9899bcc44b48b501a1c10e2da614bac7a44549fcebd1434aea
+  data.tar.gz: 71f1207de1fd4e907dfab41811f3eb1cb82ffdec573ade06f1877f7450d3c3d0
 SHA512:
-  metadata.gz: 8382b5e2ec778346a58bb87b71b316496dd762973bf6f146eec3d2a2700bb555311fdda033a5aacb64d51f4b51484d499f2138dbc48a5ac7f2ae4fe5fe9461f2
-  data.tar.gz: d3c2247cdfbdc28d1dc0a1b544f079bf08c0bfc18e938b371bc6a4295219b6e8c8cce3a6d742799bfd70b0abb2867996f7463c9074974d6dec79057d453c2a62
+  metadata.gz: 9dedf9dbffd685fd05073f9ad7a2321b98b7b40b2a043301e1160a3656ad71a0ea72edf0f842edf40f8e9a2fdfa86d9392b669a8b4c576a51681cb60f026c048
+  data.tar.gz: 8148337cad52a15fe7a70a3cfb2a21e1003a59727db228220ef65940e6828516016bf3d137517a44917ddc1fcceb64289068df6ebd47dfddc60fb84c12e877bc

data/.gitignore

@@ -7,4 +7,5 @@
 /pkg/
 /spec/reports/
 /tmp/
-*gem
+*gem
+.idea/

data/{LICENSE → LICENSE.txt}

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 falconed
+Copyright (c) 2020 Dan Falcone
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -4,6 +4,8 @@ The pgreset gem makes it possible to run rails db:reset against a postgres datab
 
 Credit for the [original solution](https://github.com/basecamp/pow/issues/212) goes to [Manuel Meurer](https://github.com/manuelmeurer).
 
+Special thanks to [Emil Kampp](https://github.com/ekampp) and [Michael Yin](https://github.com/layerssss) for adding Rails 6.1 support.
+
 ## Installation and Usage
 
 Add this line to your application's Gemfile:
@@ -33,5 +35,9 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/falconed/pgreset.
+Bug reports and pull requests are welcome on GitHub at https://github.com/dafalcon/pgreset.
+
+## License
 
+The gem is available as open source under the terms of the [MIT
+License](https://opensource.org/licenses/MIT).

data/lib/pgreset.rb

@@ -5,14 +5,21 @@ module ActiveRecord
     class PostgreSQLDatabaseTasks
       def drop
         establish_master_connection
-        
+
+        database_name =
+          begin
+            self.configuration_hash[:database] || self.configuration_hash.fetch('database')
+          rescue NoMethodError
+            configuration['database']
+          end
+
         pid_column = 'pid'       # Postgresql 9.2 and newer
         if 0 == connection.select_all("SELECT column_name FROM information_schema.columns WHERE table_name = 'pg_stat_activity' AND column_name = 'pid';").count
           pid_column = 'procpid' # Postgresql 9.1 and older
         end
 
-        connection.select_all "SELECT pg_terminate_backend(pg_stat_activity.#{pid_column}) FROM pg_stat_activity WHERE datname='#{configuration['database']}' AND #{pid_column} <> pg_backend_pid();"
-        connection.drop_database configuration['database']
+        connection.select_all "SELECT pg_terminate_backend(pg_stat_activity.#{pid_column}) FROM pg_stat_activity WHERE datname='#{database_name}' AND #{pid_column} <> pg_backend_pid();"
+        connection.drop_database database_name
       end
     end
   end

data/lib/pgreset/version.rb

@@ -1,3 +1,3 @@
 module Pgreset
-  VERSION = "0.1.1"
+  VERSION = "0.2"
 end

data/pgreset.gemspec

@@ -11,13 +11,14 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Automatically kill postgres connections during db:reset}
   spec.description   = %q{Kills postgres connections during db:reset so you don't have to restart your server.  Fixes "database in use" errors.}
-  spec.homepage      = "https://github.com/falconed/pgreset"
+  spec.homepage      = "https://github.com/dafalcon/pgreset"
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
+  spec.licenses = ['MIT']
 
-  spec.add_development_dependency "bundler", "~> 1.12"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", "~> 2.2.4"
+  spec.add_development_dependency "rake", "~> 13.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgreset
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: '0.2'
 platform: ruby
 authors:
 - Dan Falcone
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-09-28 00:00:00.000000000 Z
+date: 2021-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: 2.2.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: 13.0.3
 description: Kills postgres connections during db:reset so you don't have to restart
   your server.  Fixes "database in use" errors.
 email:
@@ -48,7 +48,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.md
 - Rakefile
 - bin/console
@@ -56,10 +56,11 @@ files:
 - lib/pgreset.rb
 - lib/pgreset/version.rb
 - pgreset.gemspec
-homepage: https://github.com/falconed/pgreset
-licenses: []
+homepage: https://github.com/dafalcon/pgreset
+licenses:
+- MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -74,9 +75,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.8
-signing_key: 
+rubygems_version: 3.0.6
+signing_key:
 specification_version: 4
 summary: Automatically kill postgres connections during db:reset
 test_files: []