pgreset 0.2 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34faaca27defbd9899bcc44b48b501a1c10e2da614bac7a44549fcebd1434aea
-  data.tar.gz: 71f1207de1fd4e907dfab41811f3eb1cb82ffdec573ade06f1877f7450d3c3d0
+  metadata.gz: de67aa02241019195553648e33408586563205a64baf3fb219b26de23fb9e180
+  data.tar.gz: db83454a328df654b9000b5b08bb8c378ed36ddb020e8dd786329dacfdff920e
 SHA512:
-  metadata.gz: 9dedf9dbffd685fd05073f9ad7a2321b98b7b40b2a043301e1160a3656ad71a0ea72edf0f842edf40f8e9a2fdfa86d9392b669a8b4c576a51681cb60f026c048
-  data.tar.gz: 8148337cad52a15fe7a70a3cfb2a21e1003a59727db228220ef65940e6828516016bf3d137517a44917ddc1fcceb64289068df6ebd47dfddc60fb84c12e877bc
+  metadata.gz: ceb11b130b41efa4eebb8af64e7a6787b694b795a10d206e5157de20caedb0a9b1db102e6b8d9dcaf8573767c5af8949e6fca03069130f73378e3310209fcef5
+  data.tar.gz: bdc44ff256602541c9434be34f0860881c6baf1211163656167f58cace2ff41531f9e43f88cf6ff512b4031bd7528e4c7bb9b15b2adb42e35a01b5f965fd3480

data/README.md

@@ -4,7 +4,7 @@ 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.
+Special thanks to [Emil Kampp](https://github.com/ekampp), [Michael Yin](https://github.com/layerssss), and [Kate Donaldson](https://github.com/katelovescode) for adding Rails 6.1 support.
 
 ## Installation and Usage
 
@@ -31,7 +31,20 @@ Now you can run rails db:reset as normal, and rails will kill active connections
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
-To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+To install this gem onto your local machine, run `bundle exec rake install`.
+
+## Testing
+
+There's a script called pgreset-test.sh that can test a local copy of pgreset against various versions of ruby and rails.  The script assumes postgres is listening on a socket at /tmp/.s.PGSQL.5432 and accepts connections for a user with no password, and that rvm is installed.  You should at least test against these versions, since there were breaking changes to pgreset in them (replace PG_USER with your postgres username):
+
+    cd /path/to/your/pgreset/clone
+    ./pgreset-test.sh 3.0.4 6.0.4 PG_USER
+    ./pgreset-test.sh 3.1.2 7.0.8 PG_USER
+    ./pgreset-test.sh 3.1.2 7.1.1 PG_USER
+
+## Releasing
+
+To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
 ## Contributing
 

data/lib/pgreset/version.rb

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

data/lib/pgreset.rb

@@ -4,14 +4,16 @@ module ActiveRecord
   module Tasks
     class PostgreSQLDatabaseTasks
       def drop
-        establish_master_connection
-
-        database_name =
-          begin
-            self.configuration_hash[:database] || self.configuration_hash.fetch('database')
-          rescue NoMethodError
-            configuration['database']
-          end
+        # Extract the name of the application database from the configuration and
+        # establish a connection to the "postgres" database in the public schema.
+        # `configuration_hash` was introduced in rails 6.1.0, prior versions use `configuration`.
+        if respond_to?(:configuration_hash, true)
+          database_name = configuration_hash.with_indifferent_access.fetch(:database)
+          establish_connection(configuration_hash.merge(database: "postgres", schema_search_path: "public"))
+        else
+          database_name = configuration['database']
+          establish_connection(configuration.merge(database: "postgres", schema_search_path: "public"))
+        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

data/pgreset-test.sh

@@ -0,0 +1,76 @@
+#!/usr/bin/env bash
+
+# This is a simple script to test pgreset against different versions of ruby and rails.
+# Right now it expects to connect to postgres through a socket in /tmp as a given user
+# with no password.
+
+function die
+{
+  echo "$*" >&2
+  exit 1
+}
+
+if [[ ! -f "pgreset.gemspec" ]]; then
+  die "This script must be run from the pgreset source directory"
+fi
+
+if [[ -z "$3" ]]; then
+  die "Usage: $0 RUBY_VERSION RAILS_VERSION POSTGRES_USERNAME"
+fi
+
+
+source "$HOME/.rvm/scripts/rvm"
+
+set -e
+
+PGRESET_DIR="$(pwd)"
+RUBY_VERSION="ruby-$1"
+RAILS_VERSION="$2"
+PG_USER="$3"
+
+# can't have periods in the database name
+TEST_NAME="$(echo pgreset-test-rails-$RAILS_VERSION | sed 's/\./-/g')"
+
+rvm install "$RUBY_VERSION"
+rvm use "$RUBY_VERSION"
+rvm --force gemset delete "$TEST_NAME"
+rvm gemset create "$TEST_NAME"
+rvm gemset use "$TEST_NAME"
+cd /tmp
+rm -rf "$TEST_NAME"
+gem install rails -N -v "$RAILS_VERSION"
+rails new "$TEST_NAME"
+cd "$TEST_NAME"
+echo "gem 'pg'" >> Gemfile
+echo "gem 'pgreset', path: \"${PGRESET_DIR}\"" >> Gemfile
+bundle install
+rails g model user name:string
+
+echo "development: 
+  adapter: postgresql
+  encoding: UTF8
+  username: $PG_USER
+  host: /tmp
+  database: $TEST_NAME
+" > config/database.yml
+
+dropdb --if-exists -f "$TEST_NAME"
+rails db:create
+rails db:migrate
+
+
+# Start a connection to the database.
+# If pgreset works properly, this will automatically be disconnected
+# with an error saying the server closed the connection unexpectedly.
+psql -U "$PG_USER" "$TEST_NAME" -c 'select pg_sleep(120);' >log/psql.log 2>&1 &  
+sleep 1 # make sure psql is fully connected
+
+rails db:reset
+
+if grep 'terminating connection due to administrator command' log/psql.log >/dev/null ; then
+  echo "pgreset successfully terminated the postgres connection!"
+else
+  echo "Hmm something doesn't look right.  Here's the psql output:"
+  echo
+  cat log/psql.log
+fi

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pgreset
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.4'
 platform: ruby
 authors:
 - Dan Falcone
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-07 00:00:00.000000000 Z
+date: 2023-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -55,6 +55,7 @@ files:
 - bin/setup
 - lib/pgreset.rb
 - lib/pgreset/version.rb
+- pgreset-test.sh
 - pgreset.gemspec
 homepage: https://github.com/dafalcon/pgreset
 licenses:
@@ -75,7 +76,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Automatically kill postgres connections during db:reset