File tree 8 files changed +11
-11
lines changed
8 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 28
28
29
29
# If possible use the version of the remote database, otherwise
30
30
# fallback to our local DB version
31
- if $connect_settings != undef and has_key( $connect_settings , ' DBVERSION' ) {
31
+ if $connect_settings != undef and ' DBVERSION' in $connect_settings {
32
32
$version = $connect_settings [' DBVERSION' ]
33
33
} else {
34
34
$version = $postgresql::server::_version
35
35
}
36
36
37
37
# If the connection settings do not contain a port, then use the local server port
38
- if $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
38
+ if $connect_settings != undef and ' PGPORT' in $connect_settings {
39
39
$port = undef
40
40
} else {
41
41
$port = $postgresql::server::port
Original file line number Diff line number Diff line change 37
37
) {
38
38
# If possible use the version of the remote database, otherwise
39
39
# fallback to our local DB version
40
- if $connect_settings != undef and has_key( $connect_settings , ' DBVERSION' ) {
40
+ if $connect_settings != undef and ' DBVERSION' in $connect_settings {
41
41
$version = $connect_settings [' DBVERSION' ]
42
42
} else {
43
43
$version = $postgresql::server::_version
64
64
#
65
65
if $port != undef {
66
66
$port_override = $port
67
- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
67
+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
68
68
$port_override = undef
69
69
} else {
70
70
$port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 74
74
#
75
75
if $port != undef {
76
76
$port_override = $port
77
- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
77
+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
78
78
$port_override = undef
79
79
} else {
80
80
$port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 75
75
#
76
76
if $port != undef {
77
77
$port_override = $port
78
- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
78
+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
79
79
$port_override = undef
80
80
} else {
81
81
$port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 26
26
#
27
27
if $port != undef {
28
28
$port_override = $port
29
- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
29
+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
30
30
$port_override = undef
31
31
} else {
32
32
$port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 52
52
#
53
53
if $port != undef {
54
54
$port_override = $port
55
- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
55
+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
56
56
$port_override = undef
57
57
} else {
58
58
$port_override = $postgresql::server::port
59
59
}
60
60
61
61
# If possible use the version of the remote database, otherwise
62
62
# fallback to our local DB version
63
- if $connect_settings != undef and has_key( $connect_settings , ' DBVERSION' ) {
63
+ if $connect_settings != undef and ' DBVERSION' in $connect_settings {
64
64
$version = $connect_settings [' DBVERSION' ]
65
65
} else {
66
66
$version = $postgresql::server::_version
Original file line number Diff line number Diff line change 27
27
Postgresql::Server::Db <| dbname == $db |> -> Postgresql::Server::Schema[$name ]
28
28
29
29
# If the connection settings do not contain a port, then use the local server port
30
- if $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
30
+ if $connect_settings != undef and ' PGPORT' in $connect_settings {
31
31
$port = undef
32
32
} else {
33
33
$port = $postgresql::server::port
Original file line number Diff line number Diff line change 18
18
$module_workdir = $postgresql::server::module_workdir
19
19
20
20
# If the connection settings do not contain a port, then use the local server port
21
- if $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
21
+ if $connect_settings != undef and ' PGPORT' in $connect_settings {
22
22
$port = undef
23
23
} else {
24
24
$port = $postgresql::server::port
You can’t perform that action at this time.
0 commit comments