Merge branch 'main' into fix/pg16

.github/workflows/golangci.yml

@@ -10,16 +10,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.0.1
+        uses: actions/checkout@v4
 
       - name: Setup Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: 1.20.x
+          go-version: 1.23.x
 
       - run: go mod vendor
 
       - name: Run golangci-lint
-        uses: golangci/golangci-lint-action@v3
+        uses: golangci/golangci-lint-action@v6
         with:
-          version: v1.53
+          version: v1.61

.github/workflows/test.yml

@@ -19,12 +19,12 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
-          go-version: '1.20'
+          go-version: '1.23'
 
       - name: test
         run: make test

go.mod

@@ -1,6 +1,8 @@
 module github.com/terraform-providers/terraform-provider-postgresql
 
-go 1.20
+go 1.23
+
+toolchain go1.23.2
 
 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1

postgresql/resource_postgresql_user_mapping.go

@@ -114,6 +114,13 @@ func resourcePostgreSQLUserMappingReadImpl(db *DBConnection, d *schema.ResourceD
 	var userMappingOptions []string
 	query := "SELECT umoptions FROM information_schema._pg_user_mappings WHERE authorization_identifier = $1 and foreign_server_name = $2"
 	err = txn.QueryRow(query, username, serverName).Scan(pq.Array(&userMappingOptions))
+
+	if err != sql.ErrNoRows && err != nil {
+		// Fallback to pg_user_mappings table if information_schema._pg_user_mappings is not available
+		query := "SELECT umoptions FROM pg_user_mappings WHERE usename = $1 and srvname = $2"
+		err = txn.QueryRow(query, username, serverName).Scan(pq.Array(&userMappingOptions))
+	}
+
 	switch {
 	case err == sql.ErrNoRows:
 		log.Printf("[WARN] PostgreSQL user mapping (%s) for server (%s) not found", username, serverName)