Skip to content

Commit cdcab17

Browse files
authored
fix(user_mapping): Adds fallback query to fix #327 (#469)
#274 broke support for GCP Cloud Postgres and perhaps other versions. fix: #327
1 parent dea1401 commit cdcab17

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

postgresql/resource_postgresql_user_mapping.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,13 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
114114
var userMappingOptions []string
115115
query := "SELECT umoptions FROM information_schema._pg_user_mappings WHERE authorization_identifier = $1 and foreign_server_name = $2"
116116
err = txn.QueryRow(query, username, serverName).Scan(pq.Array(&userMappingOptions))
117+
118+
if err != sql.ErrNoRows && err != nil {
119+
// Fallback to pg_user_mappings table if information_schema._pg_user_mappings is not available
120+
query := "SELECT umoptions FROM pg_user_mappings WHERE usename = $1 and srvname = $2"
121+
err = txn.QueryRow(query, username, serverName).Scan(pq.Array(&userMappingOptions))
122+
}
123+
117124
switch {
118125
case err == sql.ErrNoRows:
119126
log.Printf("[WARN] PostgreSQL user mapping (%s) for server (%s) not found", username, serverName)

0 commit comments

Comments
 (0)