File tree Expand file tree Collapse file tree 8 files changed +11
-11
lines changed Expand file tree Collapse file tree 8 files changed +11
-11
lines changed Original file line number Diff line number Diff line change 2828
2929 # If possible use the version of the remote database, otherwise
3030 # fallback to our local DB version
31- if $connect_settings != undef and has_key( $connect_settings , ' DBVERSION' ) {
31+ if $connect_settings != undef and ' PGPORT ' in $connect_settings , ' DBVERSION' ) {
3232 $version = $connect_settings [' DBVERSION' ]
3333 } else {
3434 $version = $postgresql::server::_version
3535 }
3636
3737 # 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 {
3939 $port = undef
4040 } else {
4141 $port = $postgresql::server::port
Original file line number Diff line number Diff line change 3737) {
3838 # If possible use the version of the remote database, otherwise
3939 # fallback to our local DB version
40- if $connect_settings != undef and has_key( $connect_settings , ' DBVERSION' ) {
40+ if $connect_settings != undef and ' PGPORT ' in $connect_settings , ' DBVERSION' ) {
4141 $version = $connect_settings [' DBVERSION' ]
4242 } else {
4343 $version = $postgresql::server::_version
6464 #
6565 if $port != undef {
6666 $port_override = $port
67- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
67+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
6868 $port_override = undef
6969 } else {
7070 $port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 7474 #
7575 if $port != undef {
7676 $port_override = $port
77- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
77+ } elsif $connect_settings != undef and ' PGPORT ' in $connect_settings , ' PGPORT' ) {
7878 $port_override = undef
7979 } else {
8080 $port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 7575 #
7676 if $port != undef {
7777 $port_override = $port
78- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
78+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
7979 $port_override = undef
8080 } else {
8181 $port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 2626 #
2727 if $port != undef {
2828 $port_override = $port
29- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
29+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
3030 $port_override = undef
3131 } else {
3232 $port_override = $postgresql::server::port
Original file line number Diff line number Diff line change 5252 #
5353 if $port != undef {
5454 $port_override = $port
55- } elsif $connect_settings != undef and has_key( $connect_settings , ' PGPORT' ) {
55+ } elsif $connect_settings != undef and ' PGPORT' in $connect_settings {
5656 $port_override = undef
5757 } else {
5858 $port_override = $postgresql::server::port
5959 }
6060
6161 # If possible use the version of the remote database, otherwise
6262 # fallback to our local DB version
63- if $connect_settings != undef and has_key( $connect_settings , ' DBVERSION' ) {
63+ if $connect_settings != undef and ' PGPORT ' in $connect_settings , ' DBVERSION' ) {
6464 $version = $connect_settings [' DBVERSION' ]
6565 } else {
6666 $version = $postgresql::server::_version
Original file line number Diff line number Diff line change 2727 Postgresql::Server::Db <| dbname == $db |> -> Postgresql::Server::Schema[$name ]
2828
2929 # 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 , ' PGPORT' {
3131 $port = undef
3232 } else {
3333 $port = $postgresql::server::port
Original file line number Diff line number Diff line change 1818 $module_workdir = $postgresql::server::module_workdir
1919
2020 # 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 {
2222 $port = undef
2323 } else {
2424 $port = $postgresql::server::port
You can’t perform that action at this time.
0 commit comments