Skip to content

Commit c52a2b6

Browse files
committed
Quick fix for fetch(:pg_database) on extension adding
1 parent ae71112 commit c52a2b6

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
### master
44

5+
## v5.0.1, 2018-06-05
6+
- Quick fix for fetch(:pg_database) on extension adding
7+
58
## v5.0.0, 2018-06-05
69
- Code cleanup
710
- Removal of legacy add hstore method

lib/capistrano/postgresql/helper_methods.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ module Postgresql
55
module HelperMethods
66

77
def extension_exists?(extension)
8-
psql 'test', fetch(:pg_system_db), '-tAc', %Q{"SELECT 1 FROM pg_extension WHERE extname='#{extension}';" | grep -q 1}
8+
psql 'test', fetch(:pg_database), '-tAc', %Q{"SELECT 1 FROM pg_extension WHERE extname='#{extension}';" | grep -q 1}
99
end
1010

1111
def remove_extensions
@@ -14,7 +14,7 @@ def remove_extensions
1414
# remove in reverse order if extension is present
1515
Array( fetch(:pg_extensions) ).reverse.each do |ext|
1616
next if [nil, false, ""].include?(ext)
17-
psql 'execute', fetch(:pg_system_db), '-c', %Q{"DROP EXTENSION IF EXISTS #{ext};"} if extension_exists?(ext)
17+
psql 'execute', fetch(:pg_database), '-c', %Q{"DROP EXTENSION IF EXISTS #{ext};"} if extension_exists?(ext)
1818
end
1919
end
2020
end

lib/capistrano/postgresql/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Capistrano
22
module Postgresql
3-
VERSION = '5.0.0'
3+
VERSION = '5.0.1'
44
end
55
end

lib/capistrano/tasks/postgresql.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ namespace :postgresql do
7676
if Array( fetch(:pg_extensions) ).any?
7777
Array( fetch(:pg_extensions) ).each do |ext|
7878
next if [nil, false, ''].include?(ext)
79-
psql 'execute', fetch(:pg_system_db), '-c', %Q{"CREATE EXTENSION IF NOT EXISTS #{ext};"}unless extension_exists?(ext)
79+
psql 'execute', fetch(:pg_database), '-c', %Q{"CREATE EXTENSION IF NOT EXISTS #{ext};"}unless extension_exists?(ext)
8080
end
8181
end
8282
end

0 commit comments

Comments
 (0)