fix: filter tables/functions by db

Author: Intuinewin

redshift/resource_redshift_grant.go

@@ -387,10 +387,13 @@ func readSchemaGrants(db *DBConnection, d *schema.ResourceData) error {
 
 func readTableGrants(db *DBConnection, d *schema.ResourceData) error {
 	log.Printf("[DEBUG] Reading table grants")
+
 	var entityName, query string
 	_, isUser := d.GetOk(grantUserAttr)
 	_, isGroup := d.GetOk(grantGroupAttr)
 
+	databaseName := getDatabaseName(db, d)
+
 	if isUser {
 		entityName = d.Get(grantUserAttr).(string)
 		query = `
@@ -451,14 +454,15 @@ func readTableGrants(db *DBConnection, d *schema.ResourceData) error {
     AND p.identity_name = $2
     AND p.identity_type = 'role'
   WHERE t.schema_name = $3
+    and t.database_name = $4
   GROUP BY t.table_name
 `
 	}
 
 	schemaName := d.Get(grantSchemaAttr).(string)
 	objects := d.Get(grantObjectsAttr).(*schema.Set)
 	queryArgs := []interface{}{
-		pq.Array(grantObjectTypesCodes["table"]), entityName, schemaName,
+		pq.Array(grantObjectTypesCodes["table"]), entityName, schemaName, databaseName,
 	}
 
 	if isGrantToPublic(d) {
@@ -549,6 +553,8 @@ func readCallableGrants(db *DBConnection, d *schema.ResourceData) error {
 	schemaName := d.Get(grantSchemaAttr).(string)
 	objectType := d.Get(grantObjectTypeAttr).(string)
 
+	databaseName := getDatabaseName(db, d)
+
 	if isUser {
 		entityName = d.Get(grantUserAttr).(string)
 		query = `
@@ -587,14 +593,15 @@ func readCallableGrants(db *DBConnection, d *schema.ResourceData) error {
 	JOIN svv_redshift_functions pr ON pr.function_name = p.function_name AND pr.schema_name = p.namespace_name
 	WHERE p.namespace_name = $1
 		AND p.identity_name = $2
-	AND p.identity_type = 'role'
+		AND p.identity_type = 'role'
+        AND pr.database_name = $4
 	GROUP BY p.function_name
 `
 	}
 
 	callables := stripArgumentsFromCallablesDefinitions(d.Get(grantObjectsAttr).(*schema.Set))
 	queryArgs := []interface{}{
-		schemaName, entityName, pq.Array(grantObjectTypesCodes[objectType]),
+		schemaName, entityName, pq.Array(grantObjectTypesCodes[objectType]), databaseName,
 	}
 
 	if isGrantToPublic(d) {