diff --git a/contrib/babelfishpg_tsql/sql/ownership.sql b/contrib/babelfishpg_tsql/sql/ownership.sql
index ee3a5446a43..1b0af43e697 100644
--- a/contrib/babelfishpg_tsql/sql/ownership.sql
+++ b/contrib/babelfishpg_tsql/sql/ownership.sql
@@ -17,12 +17,12 @@ GRANT SELECT on sys.babelfish_sysdatabases TO PUBLIC;
 -- BABELFISH_SCHEMA_PERMISSIONS
 CREATE TABLE sys.babelfish_schema_permissions (
   dbid smallint NOT NULL,
-  schema_name NAME NOT NULL,
-  object_name NAME NOT NULL,
-  permission NAME NOT NULL,
-  grantee NAME NOT NULL,
-  object_type NAME,
-  PRIMARY KEY(dbid, schema_name, object_name, permission, grantee)
+  schema_name NAME NOT NULL COLLATE sys.database_default,
+  object_name NAME NOT NULL COLLATE sys.database_default,
+  permission SMALLINT,
+  grantee NAME NOT NULL COLLATE sys.database_default,
+  object_type NAME COLLATE sys.database_default,
+  PRIMARY KEY(dbid, schema_name, object_name, grantee)
 );
 
 -- BABELFISH_FUNCTION_EXT
diff --git a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
index 547560cbac7..080c44cfe62 100644
--- a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
+++ b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
@@ -890,14 +890,14 @@ $body$
 LANGUAGE plpgsql STABLE;
 
 -- BABELFISH_SCHEMA_PERMISSIONS
-CREATE TABLE IF NOT EXISTS sys.babelfish_schema_permissions (
+CREATE TABLE sys.babelfish_schema_permissions (
   dbid smallint NOT NULL,
-  schema_name NAME NOT NULL,
-  object_name NAME NOT NULL,
-  permission NAME NOT NULL,
-  grantee NAME NOT NULL,
-  object_type NAME,
-  PRIMARY KEY(dbid, schema_name, object_name, permission, grantee)
+  schema_name NAME NOT NULL COLLATE sys.database_default,
+  object_name NAME NOT NULL COLLATE sys.database_default,
+  permission SMALLINT,
+  grantee NAME NOT NULL COLLATE sys.database_default,
+  object_type NAME COLLATE sys.database_default,
+  PRIMARY KEY(dbid, schema_name, object_name, grantee)
 );
 
 create or replace function sys.babelfish_timezone_mapping(IN tmz text) returns text
diff --git a/contrib/babelfishpg_tsql/src/catalog.c b/contrib/babelfishpg_tsql/src/catalog.c
index 8f1f9bdc2a2..ed59635d810 100644
--- a/contrib/babelfishpg_tsql/src/catalog.c
+++ b/contrib/babelfishpg_tsql/src/catalog.c
@@ -2832,7 +2832,7 @@ rename_procfunc_update_bbf_catalog(RenameStmt *stmt)
 void
 add_entry_to_bbf_schema(const char *schema_name,
 				const char *object_name,
-				const char *permission,
+				int16 permission,
 				const char *grantee,
 				const char *object_type)
 {
@@ -2855,7 +2855,7 @@ add_entry_to_bbf_schema(const char *schema_name,
 	new_record_bbf_schema[BBF_SCHEMA_PERMS_DBID] = Int16GetDatum(dbid);
 	new_record_bbf_schema[BBF_SCHEMA_PERMS_SCHEMA_NAME] = CStringGetDatum(pstrdup(schema_name));
 	new_record_bbf_schema[BBF_SCHEMA_PERMS_OBJECT_NAME] = CStringGetDatum(pstrdup(object_name));
-	new_record_bbf_schema[BBF_SCHEMA_PERMS_PERMISSION] = CStringGetDatum(pstrdup(permission));
+	new_record_bbf_schema[BBF_SCHEMA_PERMS_PERMISSION] = Int16GetDatum(permission);
 	new_record_bbf_schema[BBF_SCHEMA_PERMS_GRANTEE] = CStringGetDatum(pstrdup(grantee));
 	if (object_type != NULL)
 		new_record_bbf_schema[BBF_SCHEMA_PERMS_OBJECT_TYPE] = CStringGetDatum(pstrdup(object_type));
@@ -2876,16 +2876,160 @@ add_entry_to_bbf_schema(const char *schema_name,
 	CommandCounterIncrement();
 }
 
+/*
+ * Get the value of permission column from BABELFISH_SCHEMA_PERMISSIONS table.
+ */
+int16
+get_bbf_schema_privilege(const char *schema_name,
+ 						const char *object_name,
+						const char *grantee)
+{
+	Relation	bbf_schema_rel;
+	HeapTuple	tuple_bbf_schema;
+	ScanKeyData	key[4];
+	TableScanDesc	scan;
+	int16	dbid = get_cur_db_id();
+	int16 permission = 0;
+
+	bbf_schema_rel = table_open(get_bbf_schema_perms_oid(),
+									AccessShareLock);
+	ScanKeyInit(&key[0],
+				Anum_bbf_schema_perms_dbid,
+				BTEqualStrategyNumber, F_INT2EQ,
+				Int16GetDatum(dbid));
+	ScanKeyInit(&key[1],
+				Anum_bbf_schema_perms_schema_name,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(schema_name));
+	ScanKeyInit(&key[2],
+				Anum_bbf_schema_perms_object_name,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(object_name));
+	ScanKeyInit(&key[3],
+				Anum_bbf_schema_perms_grantee,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(grantee));
+
+	scan = table_beginscan_catalog(bbf_schema_rel, 4, key);
+	tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
+	if (HeapTupleIsValid(tuple_bbf_schema))
+	{
+		Form_bbf_schema_perms bbf_schema = (Form_bbf_schema_perms) GETSTRUCT(tuple_bbf_schema);
+		permission = bbf_schema->permission;
+	}
+
+	table_endscan(scan);
+	table_close(bbf_schema_rel, AccessShareLock);
+	return permission;
+}
+
+/*
+ * Update permission column in the catalog when privilege on an object is changed.
+ */
+void
+update_bbf_schema_privilege(const char *schema_name,
+							const char *object_name,
+							int16 new_priv,
+							int16 old_priv,
+							const char *grantee,
+							const char *object_type,
+							bool is_grant)
+{
+	Relation	bbf_schema_rel;
+	HeapTuple	tuple_bbf_schema;
+	TupleDesc	bbf_schema_dsc;
+	HeapTuple	new_tuple;
+	ScanKeyData key[5];
+	TableScanDesc scan;
+	int16	dbid = get_cur_db_id();
+	int16 permission = 0;
+	Datum		new_record_bbf_schema[BBF_SCHEMA_PERMS_NUM_OF_COLS];
+	bool		new_record_nulls_bbf_schema[BBF_SCHEMA_PERMS_NUM_OF_COLS];
+	bool		new_record_repl_bbf_schema[BBF_SCHEMA_PERMS_NUM_OF_COLS];
+
+	if(is_grant)
+	{
+		/*
+		 * In case of GRANT, we add the new privilege along with the previous privilege in the column.
+		 */
+		permission = new_priv | old_priv;
+	}
+	else
+	{
+		/*
+		 * In case of REVOKE, we remove the new privilege and keep the previous privilege as it is.
+		 */
+		permission = ~new_priv & old_priv;
+	}
+	
+	if(permission == 0)
+	{
+		del_from_bbf_schema(schema_name, object_name, grantee);
+		return;
+	}
+
+	bbf_schema_rel = table_open(get_bbf_schema_perms_oid(),
+							RowExclusiveLock);
+
+	ScanKeyInit(&key[0],
+				Anum_bbf_schema_perms_dbid,
+				BTEqualStrategyNumber, F_INT2EQ,
+				Int16GetDatum(dbid));
+	ScanKeyInit(&key[1],
+				Anum_bbf_schema_perms_schema_name,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(schema_name));
+	ScanKeyInit(&key[2],
+				Anum_bbf_schema_perms_object_name,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(object_name));
+	ScanKeyInit(&key[3],
+				Anum_bbf_schema_perms_permission,
+				BTEqualStrategyNumber, F_INT2EQ,
+				Int16GetDatum(old_priv));
+	ScanKeyInit(&key[4],
+				Anum_bbf_schema_perms_grantee,
+				BTEqualStrategyNumber, F_NAMEEQ,
+				CStringGetDatum(grantee));
+
+	scan = table_beginscan_catalog(bbf_schema_rel, 5, key);
+	tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
+	if (HeapTupleIsValid(tuple_bbf_schema))
+	{
+		bbf_schema_dsc = RelationGetDescr(bbf_schema_rel);
+		/* Build a tuple to insert */
+		MemSet(new_record_bbf_schema, 0, sizeof(new_record_bbf_schema));
+		MemSet(new_record_nulls_bbf_schema, false, sizeof(new_record_nulls_bbf_schema));
+		MemSet(new_record_repl_bbf_schema, false, sizeof(new_record_repl_bbf_schema));
+
+		new_record_bbf_schema[BBF_SCHEMA_PERMS_PERMISSION] = Int16GetDatum(permission);
+		new_record_repl_bbf_schema[BBF_SCHEMA_PERMS_PERMISSION] = true;
+
+		new_tuple = heap_modify_tuple(tuple_bbf_schema,
+									bbf_schema_dsc,
+									new_record_bbf_schema,
+									new_record_nulls_bbf_schema,
+									new_record_repl_bbf_schema);
+
+		CatalogTupleUpdate(bbf_schema_rel, &new_tuple->t_self, new_tuple);
+		heap_freetuple(new_tuple);
+	}
+
+	table_endscan(scan);
+	table_close(bbf_schema_rel, RowExclusiveLock);
+
+	CommandCounterIncrement();
+}
+
 /* Check if the catalog entry exists. */
 bool
 check_bbf_schema_for_entry(const char *schema_name,
 							const char *object_name,
-						   	const char *permission,
 							const char *grantee)
 {
 	Relation	bbf_schema_rel;
 	HeapTuple	tuple_bbf_schema;
-	ScanKeyData	key[5];
+	ScanKeyData	key[4];
 	TableScanDesc	scan;
 	bool	catalog_entry_exists = false;
 	int16	dbid = get_cur_db_id();
@@ -2905,15 +3049,11 @@ check_bbf_schema_for_entry(const char *schema_name,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(object_name));
 	ScanKeyInit(&key[3],
-				Anum_bbf_schema_perms_permission,
-				BTEqualStrategyNumber, F_NAMEEQ,
-				CStringGetDatum(permission));
-	ScanKeyInit(&key[4],
 				Anum_bbf_schema_perms_grantee,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(grantee));
 
-	scan = table_beginscan_catalog(bbf_schema_rel, 5, key);
+	scan = table_beginscan_catalog(bbf_schema_rel, 4, key);
 
 	tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
 	if (HeapTupleIsValid(tuple_bbf_schema))
@@ -2924,17 +3064,21 @@ check_bbf_schema_for_entry(const char *schema_name,
 	return catalog_entry_exists;
 }
 
+/*
+ * Checks if the specified permission exists on a particular schema
+ * at the schemma level in the catalog.
+ */
 bool
 check_bbf_schema_for_schema(const char *schema_name,
 							const char *object_name,
-							const char *permission)
+							int16 permission)
 {
 	Relation	bbf_schema_rel;
 	HeapTuple	tuple_bbf_schema;
-	ScanKeyData key[4];
+	ScanKeyData key[3];
 	TableScanDesc scan;
-	bool		catalog_entry_exists = false;
 	int16	dbid = get_cur_db_id();
+	int16 priv = 0;
 
 	bbf_schema_rel = table_open(get_bbf_schema_perms_oid(),
 									AccessShareLock);
@@ -2950,31 +3094,32 @@ check_bbf_schema_for_schema(const char *schema_name,
 				Anum_bbf_schema_perms_object_name,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(object_name));
-	ScanKeyInit(&key[3],
-				Anum_bbf_schema_perms_permission,
-				BTEqualStrategyNumber, F_NAMEEQ,
-				CStringGetDatum(permission));
 
-	scan = table_beginscan_catalog(bbf_schema_rel, 4, key);
+	scan = table_beginscan_catalog(bbf_schema_rel, 3, key);
 
 	tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
-	if (HeapTupleIsValid(tuple_bbf_schema))
-		catalog_entry_exists = true;
+	while (HeapTupleIsValid(tuple_bbf_schema))
+	{
+		Form_bbf_schema_perms schemaform;
+		schemaform = (Form_bbf_schema_perms) GETSTRUCT(tuple_bbf_schema);
+		priv = schemaform->permission;
 
+		if((permission & priv) == permission)
+			return true;
+	}
 	table_endscan(scan);
 	table_close(bbf_schema_rel, AccessShareLock);
-	return catalog_entry_exists;
+	return false;
 }
 
 void
 del_from_bbf_schema(const char *schema_name,
 				  const char *object_name,
-				  const char *permission,
 				  const char *grantee)
 {
 	Relation	bbf_schema_rel;
 	HeapTuple	tuple_bbf_schema;
-	ScanKeyData key[5];
+	ScanKeyData key[4];
 	TableScanDesc scan;
 	int16	dbid = get_cur_db_id();
 
@@ -2993,15 +3138,11 @@ del_from_bbf_schema(const char *schema_name,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(object_name));
 	ScanKeyInit(&key[3],
-				Anum_bbf_schema_perms_permission,
-				BTEqualStrategyNumber, F_NAMEEQ,
-				CStringGetDatum(permission));
-	ScanKeyInit(&key[4],
 				Anum_bbf_schema_perms_grantee,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(grantee));
 
-	scan = table_beginscan_catalog(bbf_schema_rel, 5, key);
+	scan = table_beginscan_catalog(bbf_schema_rel, 4, key);
 
 	tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
 
@@ -3074,19 +3215,71 @@ clean_up_bbf_schema(const char *schema_name,
 	table_close(bbf_schema_rel, RowExclusiveLock);
 }
 
+void
+grant_perms_to_each_obj(const char *db_name,
+					const char	*object_type,
+					const char *schema_name,
+					const char	*object_name,
+					const char *grantee,
+					const char *permission)
+{
+	StringInfoData	query;
+	char			*schema;
+	List			*res;
+	Node			*res_stmt;
+	PlannedStmt		*wrapper;
+
+	schema = get_physical_schema_name((char *)db_name, schema_name);
+	initStringInfo(&query);
+	if (strcmp(permission, "execute") != 0)
+		appendStringInfo(&query, "GRANT \"%s\" ON \"%s\".\"%s\" TO \"%s\"; ", permission, schema, object_name, grantee);
+	else
+	{
+		if (object_type != NULL && strcmp(object_type, "f") == 0)
+			appendStringInfo(&query, "GRANT \"%s\" ON FUNCTION \"%s\".\"%s\" TO \"%s\"; ", permission, schema, object_name, grantee);
+		else
+			appendStringInfo(&query, "GRANT \"%s\" ON PROCEDURE \"%s\".\"%s\" TO \"%s\"; ", permission, schema, object_name, grantee);
+	}
+	res = raw_parser(query.data, RAW_PARSE_DEFAULT);
+	res_stmt = ((RawStmt *) linitial(res))->stmt;
+
+	/* need to make a wrapper PlannedStmt */
+	wrapper = makeNode(PlannedStmt);
+	wrapper->commandType = CMD_UTILITY;
+	wrapper->canSetTag = false;
+	wrapper->utilityStmt = res_stmt;
+	wrapper->stmt_location = 0;
+	wrapper->stmt_len = 1;
+
+	/* do this step */
+	ProcessUtility(wrapper,
+				"(GRANT STATEMENT )",
+				false,
+				PROCESS_UTILITY_SUBCOMMAND,
+				NULL,
+				NULL,
+				None_Receiver,
+				NULL);
+
+	/* make sure later steps can see the object created here */
+	CommandCounterIncrement();
+	pfree(query.data);
+}
+
 void
 grant_perms_to_objects_in_schema(const char *schema_name,
-				  const char *permission,
-				  const char *grantee)
+				int16 priv,
+				const char *grantee)
 {
 	TableScanDesc scan;
 	Relation	bbf_schema_rel;
 	HeapTuple	tuple_bbf_schema;
 	const char	*object_name;
 	const char	*object_type;
-	ScanKeyData scanKey[4];
+	ScanKeyData scanKey[3];
 	int16		dbid = get_cur_db_id();
 	const char *db_name = get_cur_db_name();
+	int16 permission = 0;
 
 	/* Fetch the relation */
 	bbf_schema_rel = table_open(get_bbf_schema_perms_oid(),
@@ -3100,15 +3293,11 @@ grant_perms_to_objects_in_schema(const char *schema_name,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(schema_name));
 	ScanKeyInit(&scanKey[2],
-				Anum_bbf_schema_perms_permission,
-				BTEqualStrategyNumber, F_NAMEEQ,
-				CStringGetDatum(permission));
-	ScanKeyInit(&scanKey[3],
 				Anum_bbf_schema_perms_grantee,
 				BTEqualStrategyNumber, F_NAMEEQ,
 				CStringGetDatum(grantee));
 
-	scan = table_beginscan_catalog(bbf_schema_rel, 4, scanKey);
+	scan = table_beginscan_catalog(bbf_schema_rel, 3, scanKey);
 	tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
 
 	while (HeapTupleIsValid(tuple_bbf_schema))
@@ -3117,50 +3306,22 @@ grant_perms_to_objects_in_schema(const char *schema_name,
 		schemaform = (Form_bbf_schema_perms) GETSTRUCT(tuple_bbf_schema);
 		object_name = pstrdup(NameStr(schemaform->object_name));
 		object_type = pstrdup(NameStr(schemaform->object_type));
-
+		permission = (priv & (schemaform->permission));
 		/* For each object, grant the permission explicitly. */
 		if (strcmp(object_name, "ALL") != 0)
 		{
-			StringInfoData	query;
-			char			*schema;
-			List			*res;
-			Node			*res_stmt;
-			PlannedStmt		*wrapper;
-
-			schema = get_physical_schema_name((char *)db_name, schema_name);
-			initStringInfo(&query);
-			if (strcmp(permission, "execute") != 0)
-				appendStringInfo(&query, "GRANT \"%s\" ON \"%s\".\"%s\" TO \"%s\"; ", permission, schema, object_name, grantee);
-			else
-			{
-				if (object_type != NULL && strcmp(object_type, "f") == 0)
-					appendStringInfo(&query, "GRANT \"%s\" ON FUNCTION \"%s\".\"%s\" TO \"%s\"; ", permission, schema, object_name, grantee);
-				else
-					appendStringInfo(&query, "GRANT \"%s\" ON PROCEDURE \"%s\".\"%s\" TO \"%s\"; ", permission, schema, object_name, grantee);
-			}
-			res = raw_parser(query.data, RAW_PARSE_DEFAULT);
-			res_stmt = ((RawStmt *) linitial(res))->stmt;
-
-			/* need to make a wrapper PlannedStmt */
-			wrapper = makeNode(PlannedStmt);
-			wrapper->commandType = CMD_UTILITY;
-			wrapper->canSetTag = false;
-			wrapper->utilityStmt = res_stmt;
-			wrapper->stmt_location = 0;
-			wrapper->stmt_len = 1;
-
-			/* do this step */
-			ProcessUtility(wrapper,
-						"(GRANT STATEMENT )",
-						false,
-						PROCESS_UTILITY_SUBCOMMAND,
-						NULL,
-						NULL,
-						None_Receiver,
-						NULL);
-
-			/* make sure later steps can see the object created here */
-			CommandCounterIncrement();
+			if((permission & PRIVILEGE_EXECUTE) == PRIVILEGE_EXECUTE)
+				grant_perms_to_each_obj(db_name, object_type, schema_name, object_name, grantee, "execute");
+			if((permission & PRIVILEGE_SELECT) == PRIVILEGE_SELECT)
+				grant_perms_to_each_obj(db_name, object_type, schema_name, object_name, grantee, "select");
+			if((permission & PRIVILEGE_INSERT) == PRIVILEGE_INSERT)
+				grant_perms_to_each_obj(db_name, object_type, schema_name, object_name, grantee, "insert");
+			if((permission & PRIVILEGE_UPDATE) == PRIVILEGE_UPDATE)
+				grant_perms_to_each_obj(db_name, object_type, schema_name, object_name, grantee, "update");
+			if((permission & PRIVILEGE_DELETE) == PRIVILEGE_DELETE)
+				grant_perms_to_each_obj(db_name, object_type, schema_name, object_name, grantee, "delete");
+			if((permission & PRIVILEGE_REFERENCES) == PRIVILEGE_REFERENCES)
+				grant_perms_to_each_obj(db_name, object_type, schema_name, object_name, grantee, "references");
 		}
 		tuple_bbf_schema = heap_getnext(scan, ForwardScanDirection);
 	}
diff --git a/contrib/babelfishpg_tsql/src/catalog.h b/contrib/babelfishpg_tsql/src/catalog.h
index 7b8ad195c27..b3b1b024c7d 100644
--- a/contrib/babelfishpg_tsql/src/catalog.h
+++ b/contrib/babelfishpg_tsql/src/catalog.h
@@ -310,7 +310,7 @@ typedef struct FormData_bbf_schema_perms
 	int16		dbid;
 	NameData	schema_name;
 	NameData	object_name;
-	NameData	permission;
+	int16		permission;
 	NameData	grantee;
 	NameData	object_type;
 } FormData_bbf_schema_perms;
@@ -319,30 +319,47 @@ typedef FormData_bbf_schema_perms *Form_bbf_schema_perms;
 
 extern void add_entry_to_bbf_schema(const char *schema_name,
 				  const char *object_name,
-				  const char *permission,
+				  int16 permission,
 				  const char *grantee,
 				  const char *object_type);
 
+extern int16 get_bbf_schema_privilege(const char *schema_name,
+ 							const char *object_name,
+							const char *grantee);
+
+extern void update_bbf_schema_privilege(const char *schema_name,
+							const char *object_name,
+							int16 new_priv,
+							int16 old_priv,
+							const char *grantee,
+							const char *object_type,
+							bool is_grant);
+
 extern bool check_bbf_schema_for_entry(const char *schema_name,
 									   const char *object_name,
-									   const char *permission,
 									   const char *grantee);
 
 extern void del_from_bbf_schema(const char *schema_name,
 					  const char *object_name,
-					  const char *permission,
 					  const char *grantee);
 
 extern bool check_bbf_schema_for_schema(const char *schema_name,
 									   const char *object_name,
-									   const char *permission);
+									   int16 permission);
 
 extern void clean_up_bbf_schema(const char *schema_name,
 								const char *object_name,
 								bool is_schema);
 
+extern void grant_perms_to_each_obj(const char *db_name,
+					const char	*object_type,
+					const char *schema_name,
+					const char	*object_name,
+					const char *grantee,
+					const char *permission);
+
 extern void grant_perms_to_objects_in_schema(const char *schema_name,
-				  const char *permission,
+				  int16 permission,
 				  const char *grantee);
 
 /*****************************************
diff --git a/contrib/babelfishpg_tsql/src/pl_exec-2.c b/contrib/babelfishpg_tsql/src/pl_exec-2.c
index 3636c3ab7e4..12b1e50097e 100644
--- a/contrib/babelfishpg_tsql/src/pl_exec-2.c
+++ b/contrib/babelfishpg_tsql/src/pl_exec-2.c
@@ -53,6 +53,7 @@ static int	exec_stmt_usedb_explain(PLtsql_execstate *estate, PLtsql_stmt_usedb *
 static int	exec_stmt_grantdb(PLtsql_execstate *estate, PLtsql_stmt_grantdb *stmt);
 static int	exec_stmt_grantschema(PLtsql_execstate *estate, PLtsql_stmt_grantschema *stmt);
 static int	exec_stmt_fulltextindex(PLtsql_execstate *estate, PLtsql_stmt_fulltextindex *stmt);
+static void	exec_gen_grantschema(char *schema_name, char *rolname,  PLtsql_stmt_grantschema *stmt, char *priv_name);
 static int	exec_stmt_insert_execute_select(PLtsql_execstate *estate, PLtsql_expr *expr);
 static int	exec_stmt_insert_bulk(PLtsql_execstate *estate, PLtsql_stmt_insert_bulk *expr);
 static int	exec_stmt_dbcc(PLtsql_execstate *estate, PLtsql_stmt_dbcc *stmt);
@@ -3661,101 +3662,132 @@ get_insert_bulk_kilobytes_per_batch()
 	return insert_bulk_kilobytes_per_batch;
 }
 
-static int
-exec_stmt_grantschema(PLtsql_execstate *estate, PLtsql_stmt_grantschema *stmt)
+static void
+exec_gen_grantschema(char *schema_name, char *rolname,  PLtsql_stmt_grantschema *stmt, char *priv_name)
 {
 	List	   *parsetree_list;
 	ListCell   *parsetree_item;
-	char	   *dbname = get_cur_db_name();
-	char	   *login = GetUserNameFromId(GetSessionUserId(), false);
+	parsetree_list = gen_grantschema_subcmds(schema_name, rolname, stmt->is_grant, stmt->with_grant_option, priv_name);
+	/* Run all subcommands */
+	foreach(parsetree_item, parsetree_list)
+	{
+		Node	   *stmt = ((RawStmt *) lfirst(parsetree_item))->stmt;
+		PlannedStmt *wrapper;
+
+		/* need to make a wrapper PlannedStmt */
+		wrapper = makeNode(PlannedStmt);
+		wrapper->commandType = CMD_UTILITY;
+		wrapper->canSetTag = false;
+		wrapper->utilityStmt = stmt;
+		wrapper->stmt_location = 0;
+		wrapper->stmt_len = 0;
+
+		/* do this step */
+		ProcessUtility(wrapper,
+					"(GRANT SCHEMA )",
+					false,
+					PROCESS_UTILITY_SUBCOMMAND,
+					NULL,
+					NULL,
+					None_Receiver,
+					NULL);
+
+		/* make sure later steps can see the object created here */
+		CommandCounterIncrement();
+	}
+}
+
+static int
+exec_stmt_grantschema(PLtsql_execstate *estate, PLtsql_stmt_grantschema *stmt)
+{
+	char		*dbname = get_cur_db_name();
+	char		*login = GetUserNameFromId(GetSessionUserId(), false);
 	bool		login_is_db_owner;
-	Oid			datdba;
 	char		*rolname;
 	char		*schema_name;
-	ListCell   *lc;
-	ListCell	*lc1;
-	Oid 		schemaOid;
+	ListCell	*lc;
+	Oid			schemaOid;
+	int16		privilege_maskInt = create_privilege_bitmask(stmt->privileges, true);
 
 	/*
 	 * If the login is not the db owner or the login is not the member of
 	 * sysadmin or login is not the schema owner, then it doesn't have the permission to GRANT/REVOKE.
 	 */
 	login_is_db_owner = 0 == strncmp(login, get_owner_of_db(dbname), NAMEDATALEN);
-	datdba = get_role_oid("sysadmin", false);
 	schema_name = get_physical_schema_name(dbname, stmt->schema_name);
-	schemaOid = LookupExplicitNamespace(schema_name, true);
+	if(schema_name)
+	{
+		schemaOid = LookupExplicitNamespace(schema_name, true);
+	}
+	else
+	{
+		ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_SCHEMA),
+					 errmsg("An object or column name is missing or empty. For SELECT INTO statements, verify each column has a name. For other statements, look for empty alias names. Aliases defined as \"\" or [] are not allowed. Change the alias to a valid name.")));
+	}
 
 	if (!OidIsValid(schemaOid))
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_SCHEMA),
 					 errmsg("schema \"%s\" does not exist",
 							schema_name)));
-	
-	if (!is_member_of_role(GetSessionUserId(), datdba) && !login_is_db_owner && !pg_namespace_ownercheck(schemaOid, GetUserId()))
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("Cannot find the schema \"%s\", because it does not exist or you do not have permission.", stmt->schema_name)));
 
-	foreach(lc1, stmt->privileges)
+	foreach(lc, stmt->grantees)
 	{
-		char	*priv_name = (char *) lfirst(lc1);
-		foreach(lc, stmt->grantees)
-		{
-			char	   *grantee_name = (char *) lfirst(lc);
-			Oid	role_oid;
-			bool		grantee_is_db_owner;
+		char	*grantee_name = (char *) lfirst(lc);
+		char	*user = GetUserNameFromId(GetUserId(), false);
+		Oid		role_oid;
+		int16	old_priv = 0;
+		if(strcmp(grantee_name, "public") != 0)
 			rolname	= get_physical_user_name(dbname, grantee_name);
-			role_oid = get_role_oid(rolname, true);
-			grantee_is_db_owner = 0 == strncmp(grantee_name, get_owner_of_db(dbname), NAMEDATALEN);
-
+		else
+			rolname = pstrdup("public");
+		role_oid = get_role_oid(rolname, true);
 
-			if (role_oid == InvalidOid)
-				ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					errmsg("Cannot find the principal '%s', because it does not exist or you do not have permission.", grantee_name)));
+		if (strcmp(grantee_name, "public") != 0 && role_oid == InvalidOid)
+			ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				errmsg("Cannot find the principal '%s', because it does not exist or you do not have permission.", grantee_name)));
 
-			if (pg_namespace_ownercheck(schemaOid, role_oid) || is_member_of_role(role_oid, datdba) || grantee_is_db_owner)
-				ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("Cannot grant, deny, or revoke permissions to sa, dbo, entity owner, information_schema, sys, or yourself.")));
+		if ((strcmp(rolname, user) == 0) || pg_namespace_ownercheck(schemaOid, role_oid) || is_member_of_role(role_oid, get_sysadmin_oid()))
+			ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					errmsg("Cannot grant, deny, or revoke permissions to sa, dbo, entity owner, information_schema, sys, or yourself.")));
 
-			parsetree_list = gen_grantschema_subcmds(schema_name, rolname, stmt->is_grant, stmt->with_grant_option, priv_name);
-			/* Run all subcommands */
-			foreach(parsetree_item, parsetree_list)
-			{
-				Node	   *stmt = ((RawStmt *) lfirst(parsetree_item))->stmt;
-				PlannedStmt *wrapper;
-
-				/* need to make a wrapper PlannedStmt */
-				wrapper = makeNode(PlannedStmt);
-				wrapper->commandType = CMD_UTILITY;
-				wrapper->canSetTag = false;
-				wrapper->utilityStmt = stmt;
-				wrapper->stmt_location = 0;
-				wrapper->stmt_len = 0;
-
-				/* do this step */
-				ProcessUtility(wrapper,
-							"(GRANT SCHEMA )",
-							false,
-							PROCESS_UTILITY_SUBCOMMAND,
-							NULL,
-							NULL,
-							None_Receiver,
-							NULL);
-
-				/* make sure later steps can see the object created here */
-				CommandCounterIncrement();
-			}
-			/* Add entry for each grant statement. */
-			if (stmt->is_grant && !check_bbf_schema_for_entry(stmt->schema_name, "ALL", priv_name, rolname))
-				add_entry_to_bbf_schema(stmt->schema_name, "ALL", priv_name, rolname, NULL);
-			/* Remove entry for each revoke statement. */
-			if (!stmt->is_grant && check_bbf_schema_for_entry(stmt->schema_name, "ALL", priv_name, rolname))
-			{
-				/* If any object in the schema has the OBJECT level permission. Then, internally grant that permission back. */
-				grant_perms_to_objects_in_schema(stmt->schema_name, priv_name, rolname);
-				del_from_bbf_schema(stmt->schema_name, "ALL", priv_name, rolname);
-			}
+		if (!is_member_of_role(GetSessionUserId(), get_sysadmin_oid()) && !login_is_db_owner && !pg_namespace_ownercheck(schemaOid, GetUserId()))
+			ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("Cannot find the schema \"%s\", because it does not exist or you do not have permission.", stmt->schema_name)));
+
+		if((privilege_maskInt & PRIVILEGE_EXECUTE) == PRIVILEGE_EXECUTE)
+			exec_gen_grantschema(schema_name, rolname, stmt, "execute");
+		if((privilege_maskInt & PRIVILEGE_SELECT) == PRIVILEGE_SELECT)
+			exec_gen_grantschema(schema_name, rolname, stmt, "select");
+		if((privilege_maskInt & PRIVILEGE_INSERT) == PRIVILEGE_INSERT)
+			exec_gen_grantschema(schema_name, rolname, stmt, "insert");
+		if((privilege_maskInt & PRIVILEGE_UPDATE) == PRIVILEGE_UPDATE)
+			exec_gen_grantschema(schema_name, rolname, stmt, "update");
+		if((privilege_maskInt & PRIVILEGE_DELETE) == PRIVILEGE_DELETE)
+			exec_gen_grantschema(schema_name, rolname, stmt, "delete");
+		if((privilege_maskInt & PRIVILEGE_REFERENCES) == PRIVILEGE_REFERENCES)
+			exec_gen_grantschema(schema_name, rolname, stmt, "references");
+
+		/* Add entry for each grant statement. */
+		if (stmt->is_grant && !check_bbf_schema_for_entry(stmt->schema_name, "ALL", rolname))
+			add_entry_to_bbf_schema(stmt->schema_name, "ALL",  privilege_maskInt, rolname, NULL);
+		else if(stmt->is_grant)
+		{
+			int16 old_priv = get_bbf_schema_privilege(stmt->schema_name, "ALL", rolname);
+			if(old_priv!= privilege_maskInt || ((old_priv|privilege_maskInt) != old_priv))
+				update_bbf_schema_privilege(stmt->schema_name, "ALL", privilege_maskInt, old_priv, rolname, NULL, stmt->is_grant);
+		}
+		/* Remove entry for each revoke statement. */
+		else if (!stmt->is_grant && check_bbf_schema_for_entry(stmt->schema_name, "ALL", rolname))
+		{
+			/* If any object in the schema has the OBJECT level permission. Then, internally grant that permission back. */
+			grant_perms_to_objects_in_schema(stmt->schema_name, privilege_maskInt, rolname);
+			old_priv = get_bbf_schema_privilege(stmt->schema_name, "ALL", rolname);
+			if(old_priv!= privilege_maskInt || ((old_priv)&(~privilege_maskInt)) != old_priv)
+				update_bbf_schema_privilege(stmt->schema_name, "ALL", privilege_maskInt, old_priv, rolname, NULL, stmt->is_grant);
 		}
 	}
 	return PLTSQL_RC_OK;
@@ -3922,4 +3954,4 @@ exec_stmt_fulltextindex(PLtsql_execstate *estate, PLtsql_stmt_fulltextindex *stm
 	 */
 	exec_utility_cmd_helper(query_str);
 	return PLTSQL_RC_OK;
-}
\ No newline at end of file
+}
diff --git a/contrib/babelfishpg_tsql/src/pl_handler.c b/contrib/babelfishpg_tsql/src/pl_handler.c
index 66c79d94f61..b87ba0f9dfb 100644
--- a/contrib/babelfishpg_tsql/src/pl_handler.c
+++ b/contrib/babelfishpg_tsql/src/pl_handler.c
@@ -3608,6 +3608,9 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 				GrantStmt *grant = (GrantStmt *) parsetree;
 				char	   *dbname = get_cur_db_name();
 				const char *current_user = GetUserNameFromId(GetUserId(), false);
+				int16 privilege_maskInt = create_privilege_bitmask(grant->privileges, false);
+				ListCell   *lc1;
+
 				/* Ignore when GRANT statement has no specific named object. */
 				if (sql_dialect != SQL_DIALECT_TSQL || grant->targtype != ACL_TARGET_OBJECT)
 					break;
@@ -3623,7 +3626,6 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 						const char *logical_schema = NULL;
 						char	   *obj = rv->relname;
 						ListCell   *lc;
-						ListCell	*lc1;
 						const char *obj_type = "r";
 						if (rv->schemaname != NULL)
 							logical_schema = get_logical_schema_name(rv->schemaname, true);
@@ -3637,12 +3639,18 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 								foreach(lc, grant->grantees)
 								{
 									RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-									int i = 0;
-									char *permissions[] = {"select", "insert", "update", "references", "delete"};
-									for(i = 0; i < 5; i++)
+									if((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
 									{
-										if ((rol_spec->rolename != NULL) && !check_bbf_schema_for_entry(logical_schema, obj, permissions[i], rol_spec->rolename))
-											add_entry_to_bbf_schema(logical_schema, obj, permissions[i], rol_spec->rolename, obj_type);
+										if (!check_bbf_schema_for_entry(logical_schema, obj,rol_spec->rolename))
+										{
+											add_entry_to_bbf_schema(logical_schema, obj, 31, rol_spec->rolename, obj_type);
+										}
+										else
+										{
+											int16 old_priv = get_bbf_schema_privilege(logical_schema, obj,rol_spec->rolename);
+											if(old_priv!= 31 || (old_priv|(31)) != old_priv)
+												update_bbf_schema_privilege(logical_schema, obj, 31, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+										}
 									}
 								}
 								break;
@@ -3652,15 +3660,17 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 								foreach(lc, grant->grantees)
 								{
 									RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-									int i = 0;
 									bool has_schema_perms = false;
-									char *permissions[] = {"select", "insert", "update", "references", "delete"};
-									for(i = 0; i < 5; i++)
+									if((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
 									{
-										if ((rol_spec->rolename != NULL) && check_bbf_schema_for_entry(logical_schema, "ALL", permissions[i], rol_spec->rolename) && !has_schema_perms)
+										if (check_bbf_schema_for_entry(logical_schema, "ALL", rol_spec->rolename) && !has_schema_perms)
 											has_schema_perms = true;
-										if ((rol_spec->rolename != NULL) && check_bbf_schema_for_entry(logical_schema, obj, permissions[i], rol_spec->rolename))
-											del_from_bbf_schema(logical_schema, obj, permissions[i], rol_spec->rolename);
+										if (check_bbf_schema_for_entry(logical_schema, obj, rol_spec->rolename))
+										{
+											int16 old_priv = get_bbf_schema_privilege(logical_schema, obj,rol_spec->rolename);
+											if(old_priv!= 31 || ((old_priv)&(~(31))) != old_priv)
+												update_bbf_schema_privilege(logical_schema, obj, 31, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+										}
 									}
 									if (has_schema_perms)
 										return;
@@ -3668,52 +3678,88 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 								break;
 							}
 						}
-						foreach(lc1, grant->privileges)
+						if (grant->is_grant)
 						{
-							AccessPriv *ap = (AccessPriv *) lfirst(lc1);
-							if (grant->is_grant)
+							/*
+							* 1. Execute the GRANT statement.
+							* 2. Add its corresponding entry in the catalog, if doesn't exist already.
+							* 3. Don't add an entry, if the permission is granted on column list.
+							*/
+							if (prev_ProcessUtility)
+								prev_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
+									queryEnv, dest, qc);
+							else
+								standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
+									queryEnv, dest, qc);
+							foreach(lc, grant->grantees)
 							{
-								/*
-								* 1. Execute the GRANT statement.
-								* 2. Add its corresponding entry in the catalog, if doesn't exist already.
-								* 3. Don't add an entry, if the permission is granted on column list.
-								*/
-								if (prev_ProcessUtility)
-									prev_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
-										queryEnv, dest, qc);
-								else
-									standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
-										queryEnv, dest, qc);
-								foreach(lc, grant->grantees)
+								RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
+								bool flag = false;
+								foreach(lc1, grant->privileges)
 								{
-									RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-									if ((ap->cols == NULL) && (rol_spec->rolename != NULL) && !check_bbf_schema_for_entry(logical_schema, obj, ap->priv_name, rol_spec->rolename))
-										add_entry_to_bbf_schema(logical_schema, obj, ap->priv_name, rol_spec->rolename, obj_type);
+									AccessPriv *ap = (AccessPriv *) lfirst(lc1);
+									if(ap->cols != NULL)
+									{
+										flag = true;
+										break;
+									}
+								}
+								if(flag)
+									break;
+								if((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
+								{
+									if (!check_bbf_schema_for_entry(logical_schema, obj, rol_spec->rolename))
+										add_entry_to_bbf_schema(logical_schema, obj, privilege_maskInt, rol_spec->rolename, obj_type);
+									else
+									{
+										int16 old_priv = get_bbf_schema_privilege(logical_schema, obj, rol_spec->rolename);
+										if(old_priv!= privilege_maskInt || ((old_priv)|(privilege_maskInt)) != old_priv)
+											update_bbf_schema_privilege(logical_schema, obj, privilege_maskInt, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+									}
 								}
 							}
-							else
+						}
+						else
+						{
+							foreach(lc, grant->grantees)
 							{
-								foreach(lc, grant->grantees)
+								RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
+								bool flag = false;
+								bool role_is_public = false;
+								if ((rol_spec->rolename == NULL) || (strcmp(rol_spec->rolename, "public") == 0))
+										role_is_public = true;
+								/*
+								 * 1. If GRANT on schema does not exist, execute REVOKE statement and remove the catalog entry if exists.
+								 * 2. If GRANT on schema exist, only remove the entry from the catalog if exists.
+								 */
+								if ((logical_schema != NULL) && !role_is_public && !check_bbf_schema_for_entry(logical_schema, "ALL", rol_spec->rolename))
 								{
-									RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-									/*
-									* 1. If GRANT on schema does not exist, execute REVOKE statement and remove the catalog entry if exists.
-									* 2. If GRANT on schema exist, only remove the entry from the catalog if exists.
-									*/
-									if ((logical_schema != NULL) && (rol_spec->rolename != NULL) && !check_bbf_schema_for_entry(logical_schema, "ALL", ap->priv_name, rol_spec->rolename))
-									{
-										if (prev_ProcessUtility)
-											prev_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
+									if (prev_ProcessUtility)
+										prev_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
+															queryEnv, dest, qc);
+									else
+										standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
 																queryEnv, dest, qc);
-										else
-											standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
-																	queryEnv, dest, qc);
+								}
+								foreach(lc1, grant->privileges)
+								{
+									AccessPriv *ap = (AccessPriv *) lfirst(lc1);
+									if(ap->cols != NULL)
+									{
+										flag = true;
+										break;
 									}
-									if ((ap->cols == NULL) && (rol_spec->rolename != NULL) && check_bbf_schema_for_entry(logical_schema, obj, ap->priv_name, rol_spec->rolename))
-										del_from_bbf_schema(logical_schema, obj, ap->priv_name, rol_spec->rolename);
+								}
+								if(flag)
+									continue;
+								if (!role_is_public && check_bbf_schema_for_entry(logical_schema, obj, rol_spec->rolename))
+								{
+									int16 old_priv = get_bbf_schema_privilege(logical_schema, obj,rol_spec->rolename);
+									if(old_priv!= privilege_maskInt || ((old_priv)&(~(privilege_maskInt))) != old_priv)
+										update_bbf_schema_privilege(logical_schema, obj, privilege_maskInt, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
 								}
 							}
-						}
+						}					
 						return;
 					}
 				}
@@ -3721,7 +3767,6 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 				{
 					ObjectWithArgs  *ob = (ObjectWithArgs *) linitial(grant->objects);
 					ListCell   *lc;
-					ListCell	*lc1;
 					const char *logicalschema = NULL;
 					char *funcname = NULL;
 					const char *obj_type = NULL;
@@ -3749,8 +3794,10 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 					 */
 					if (pstmt->stmt_len == 0 && list_length(grant->privileges) == 0)
 					{
-						if(check_bbf_schema_for_schema(logicalschema, "ALL", "execute"))
+						if(check_bbf_schema_for_schema(logicalschema, "ALL", 32))
+						{
 							return;
+						}
 						break;
 					}
 					/* If ALL PRIVILEGES is granted/revoked. */
@@ -3761,8 +3808,17 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 							foreach(lc, grant->grantees)
 							{
 								RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-								if ((rol_spec->rolename != NULL) && !check_bbf_schema_for_entry(logicalschema, funcname, "execute", rol_spec->rolename))
-									add_entry_to_bbf_schema(logicalschema, funcname, "execute", rol_spec->rolename, obj_type);
+								if((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
+								{
+									if (!check_bbf_schema_for_entry(logicalschema, funcname, rol_spec->rolename))
+										add_entry_to_bbf_schema(logicalschema, funcname, 32, rol_spec->rolename, obj_type);
+									else
+									{
+										int16 old_priv = get_bbf_schema_privilege(logicalschema, funcname, rol_spec->rolename);
+										if(old_priv!= 32 || ((old_priv)|(32)) != old_priv)
+											update_bbf_schema_privilege(logicalschema, funcname, 32, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+									}
+								}
 							}
 							break;
 						}
@@ -3772,47 +3828,64 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 							{
 								RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
 								bool has_schema_perms = false;
-								if ((rol_spec->rolename != NULL) && check_bbf_schema_for_entry(logicalschema, "ALL", "execute", rol_spec->rolename) && !has_schema_perms)
-									has_schema_perms = true;
-								if ((rol_spec->rolename != NULL) && check_bbf_schema_for_entry(logicalschema, funcname, "execute", rol_spec->rolename))
-									del_from_bbf_schema(logicalschema, funcname, "execute", rol_spec->rolename);
+								if((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
+								{
+									if (check_bbf_schema_for_entry(logicalschema, "ALL", rol_spec->rolename) && !has_schema_perms)
+										has_schema_perms = true;
+
+									if (check_bbf_schema_for_entry(logicalschema, funcname, rol_spec->rolename))
+									{
+										int16 old_priv = get_bbf_schema_privilege(logicalschema, funcname,rol_spec->rolename);
+										if(old_priv!= 32 || ((old_priv)&(~(32))) != old_priv)
+											update_bbf_schema_privilege(logicalschema, funcname, 32, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+									}
+								}
 								if (has_schema_perms)
 									return;
 							}
 							break;
 						}
 					}
-					foreach(lc1, grant->privileges)
+					
+					if (grant->is_grant)
 					{
-						AccessPriv *ap = (AccessPriv *) lfirst(lc1);
-						if (grant->is_grant)
+						/* Execute the GRANT statement. */
+						if (prev_ProcessUtility)
+							prev_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
+								queryEnv, dest, qc);
+						else
+							standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
+								queryEnv, dest, qc);
+						/* Add entry to the catalog if it doesn't exist already. */
+						foreach(lc, grant->grantees)
 						{
-							/* Execute the GRANT statement. */
-							if (prev_ProcessUtility)
-								prev_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
-									queryEnv, dest, qc);
-							else
-								standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
-									queryEnv, dest, qc);
-							/* Add entry to the catalog if it doesn't exist already. */
-							foreach(lc, grant->grantees)
+							RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
+							/* Don't store a row in catalog, if permission is granted for column */
+							if ((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
 							{
-								RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-								/* Don't store a row in catalog, if permission is granted for column */
-								if ((rol_spec->rolename != NULL) && !check_bbf_schema_for_entry(logicalschema, funcname, ap->priv_name, rol_spec->rolename))
-									add_entry_to_bbf_schema(logicalschema, funcname, ap->priv_name, rol_spec->rolename, obj_type);
+								if (!check_bbf_schema_for_entry(logicalschema, funcname, rol_spec->rolename))
+									add_entry_to_bbf_schema(logicalschema, funcname, privilege_maskInt, rol_spec->rolename, obj_type);
+								else
+								{
+									int16 old_priv = get_bbf_schema_privilege(logicalschema, funcname, rol_spec->rolename);
+									if(old_priv!= privilege_maskInt || ((old_priv)|(privilege_maskInt)) != old_priv)
+										update_bbf_schema_privilege(logicalschema, funcname, privilege_maskInt, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+								}
 							}
 						}
-						else
+					}
+					else
+					{
+						foreach(lc, grant->grantees)
 						{
-							foreach(lc, grant->grantees)
+							RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
+							/*
+							 * 1. If GRANT on schema does not exist, execute REVOKE statement and remove the catalog entry if exists.
+							 * 2. If GRANT on schema exist, only remove the entry from the catalog if exists.
+							 */
+							if ((rol_spec->rolename != NULL) && (strcmp(rol_spec->rolename, "public") != 0))
 							{
-								RoleSpec	   *rol_spec = (RoleSpec *) lfirst(lc);
-								/* 
-								* 1. If GRANT on schema does not exist, execute REVOKE statement and remove the catalog entry if exists. 
-								* 2. If GRANT on schema exist, only remove the entry from the catalog if exists.
-								*/
-								if ((rol_spec->rolename != NULL) && !check_bbf_schema_for_entry(logicalschema, "ALL", ap->priv_name, rol_spec->rolename))
+								if (!check_bbf_schema_for_entry(logicalschema, "ALL", rol_spec->rolename))
 								{
 									/* Execute REVOKE statement. */
 									if (prev_ProcessUtility)
@@ -3822,8 +3895,12 @@ bbf_ProcessUtility(PlannedStmt *pstmt,
 										standard_ProcessUtility(pstmt, queryString, readOnlyTree, context, params,
 																queryEnv, dest, qc);
 								}
-								if ((rol_spec->rolename != NULL) && check_bbf_schema_for_entry(logicalschema, funcname, ap->priv_name, rol_spec->rolename))
-									del_from_bbf_schema(logicalschema, funcname, ap->priv_name, rol_spec->rolename);
+								if (check_bbf_schema_for_entry(logicalschema, funcname, rol_spec->rolename))
+								{
+									int16 old_priv = get_bbf_schema_privilege(logicalschema, funcname, rol_spec->rolename);
+									if(old_priv!= privilege_maskInt || ((old_priv)&(~(privilege_maskInt))) != old_priv)
+										update_bbf_schema_privilege(logicalschema, funcname, privilege_maskInt, old_priv, rol_spec->rolename, obj_type, grant->is_grant);
+								}
 							}
 						}
 					}
diff --git a/contrib/babelfishpg_tsql/src/pltsql.h b/contrib/babelfishpg_tsql/src/pltsql.h
index ae94b0ddf16..169316e8ae3 100644
--- a/contrib/babelfishpg_tsql/src/pltsql.h
+++ b/contrib/babelfishpg_tsql/src/pltsql.h
@@ -1914,6 +1914,14 @@ extern int	insert_bulk_rows_per_batch;
 extern int	insert_bulk_kilobytes_per_batch;
 extern bool insert_bulk_keep_nulls;
 
+/* Privilege Bits for GRANT SCHEMA */
+#define PRIVILEGE_EXECUTE 32
+#define PRIVILEGE_SELECT 16
+#define PRIVILEGE_INSERT 8
+#define PRIVILEGE_UPDATE 4
+#define PRIVILEGE_DELETE 2
+#define PRIVILEGE_REFERENCES 1
+
 /**********************************************************************
  * Function declarations
  **********************************************************************/
@@ -2119,6 +2127,7 @@ extern bool pltsql_createFunction(ParseState *pstate, PlannedStmt *pstmt, const
                           ParamListInfo params);
 extern Oid get_sys_varcharoid(void);
 extern Oid get_sysadmin_oid(void);
+extern int16 create_privilege_bitmask(const List *l, bool grant_schema_stmt);
 
 typedef struct
 {
diff --git a/contrib/babelfishpg_tsql/src/pltsql_utils.c b/contrib/babelfishpg_tsql/src/pltsql_utils.c
index df3c57df719..08af2cdfeca 100644
--- a/contrib/babelfishpg_tsql/src/pltsql_utils.c
+++ b/contrib/babelfishpg_tsql/src/pltsql_utils.c
@@ -25,6 +25,7 @@
 #include "parser/gramparse.h"
 #include "hooks.h"
 #include "tcop/utility.h"
+#include "session.h"
 
 #include "multidb.h"
 
@@ -1036,7 +1037,10 @@ update_GrantStmt(Node *n, const char *object, const char *obj_schema, const char
 	if (grantee && stmt->grantees)
 	{
 		RoleSpec   *tmp = (RoleSpec *) llast(stmt->grantees);
-
+		if (strcmp(grantee, "public") == 0)
+		{
+			tmp->roletype = ROLESPEC_PUBLIC;
+		}
 		tmp->rolename = pstrdup(grantee);
 	}
 
@@ -1996,3 +2000,35 @@ char
 		appendStringInfo(&query, "\"%s\".\"%s\"", schema_name, index_name);
 	return query.data;
 }
+
+/* Creates integer bitmask for permissions to be referenced in the catalog. */
+int16
+create_privilege_bitmask(const List *l, bool grant_schema_stmt)
+{
+	int16 privilege_maskInt = 0;
+	ListCell   *lc;
+	foreach(lc, l)
+	{
+		char	*priv_name;
+		if (grant_schema_stmt)
+			priv_name = (char *) lfirst(lc);
+		else
+		{
+			AccessPriv *ap = (AccessPriv *) lfirst(lc);
+			priv_name = ap->priv_name;
+		}
+		if (!strcmp(priv_name,"execute"))
+			privilege_maskInt |= PRIVILEGE_EXECUTE;
+		else if (!strcmp(priv_name,"select"))
+			privilege_maskInt |= PRIVILEGE_SELECT;
+		else if (!strcmp(priv_name,"insert"))
+			privilege_maskInt |= PRIVILEGE_INSERT;
+		else if (!strcmp(priv_name,"update"))
+			privilege_maskInt |= PRIVILEGE_UPDATE;
+		else if (!strcmp(priv_name,"delete"))
+			privilege_maskInt |= PRIVILEGE_DELETE;
+		else if (!strcmp(priv_name,"references"))
+			privilege_maskInt |= PRIVILEGE_REFERENCES;
+	}
+	return privilege_maskInt;
+}
diff --git a/contrib/babelfishpg_tsql/src/tsqlIface.cpp b/contrib/babelfishpg_tsql/src/tsqlIface.cpp
index 695b28dc468..ae4704c293c 100644
--- a/contrib/babelfishpg_tsql/src/tsqlIface.cpp
+++ b/contrib/babelfishpg_tsql/src/tsqlIface.cpp
@@ -5527,6 +5527,11 @@ makeGrantdbStatement(TSqlParser::Security_statementContext *ctx)
 						char *grantee_name = pstrdup(downcase_truncate_identifier(id_str.c_str(), id_str.length(), true));
 						grantee_list = lappend(grantee_list, grantee_name);
 					}
+					if (prin->PUBLIC())
+					{
+						char *grantee_name = (char *)"public";
+						grantee_list = lappend(grantee_list, grantee_name);
+					}
 				}
 				result->grantees = grantee_list;
 				return (PLtsql_stmt *) result;
@@ -5555,6 +5560,11 @@ makeGrantdbStatement(TSqlParser::Security_statementContext *ctx)
 						char *grantee_name = pstrdup(downcase_truncate_identifier(id_str.c_str(), id_str.length(), true));
 						grantee_list = lappend(grantee_list, grantee_name);
 					}
+					if (prin->PUBLIC())
+					{
+						char *grantee_name = (char *)"public";
+						grantee_list = lappend(grantee_list, grantee_name);
+					}
 				}
 				result->grantees = grantee_list;
 				return (PLtsql_stmt *) result;
@@ -5585,6 +5595,11 @@ makeGrantdbStatement(TSqlParser::Security_statementContext *ctx)
 					char *grantee_name = pstrdup(downcase_truncate_identifier(id_str.c_str(), id_str.length(), true));
 					grantee_list = lappend(grantee_list, grantee_name);
 				}
+				if (prin->PUBLIC())
+				{
+					char *grantee_name = (char *)"public";
+					grantee_list = lappend(grantee_list, grantee_name);
+				}
 			}
 			List *privilege_list = NIL;
 			for (auto perm: ctx->grant_statement()->permissions()->permission())
@@ -5637,6 +5652,11 @@ makeGrantdbStatement(TSqlParser::Security_statementContext *ctx)
 					char *grantee_name = pstrdup(downcase_truncate_identifier(id_str.c_str(), id_str.length(), true));
 					grantee_list = lappend(grantee_list, grantee_name);
 				}
+				if (prin->PUBLIC())
+				{
+					char *grantee_name = (char *)"public";
+					grantee_list = lappend(grantee_list, grantee_name);
+				}
 			}
 			List *privilege_list = NIL;
 			for (auto perm: ctx->revoke_statement()->permissions()->permission())
diff --git a/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp b/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp
index 29cdc5ac320..64a4d12f89e 100644
--- a/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp
+++ b/contrib/babelfishpg_tsql/src/tsqlUnsupportedFeatureHandler.cpp
@@ -1704,7 +1704,8 @@ void TsqlUnsupportedFeatureHandlerImpl::checkSupportedGrantStmt(TSqlParser::Gran
 				continue;
 			else
 			{
-				unsupported_feature = "GRANT PERMISSION " + perm->getText();
+				unsupported_feature = "GRANT PERMISSION " + ::getFullText(single_perm);
+				std::transform(unsupported_feature.begin(), unsupported_feature.end(), unsupported_feature.begin(), ::toupper);
 				handle(INSTR_UNSUPPORTED_TSQL_REVOKE_STMT, unsupported_feature.c_str(), getLineAndPos(perm));
 			}
 		}
@@ -1719,6 +1720,7 @@ void TsqlUnsupportedFeatureHandlerImpl::checkSupportedGrantStmt(TSqlParser::Gran
 		if (obj_type && !(obj_type->OBJECT() || obj_type->SCHEMA()))
 		{
 			unsupported_feature = "GRANT ON " + obj_type->getText();
+			std::transform(unsupported_feature.begin(), unsupported_feature.end(), unsupported_feature.begin(), ::toupper);
 			handle(INSTR_UNSUPPORTED_TSQL_REVOKE_STMT, unsupported_feature.c_str(), getLineAndPos(obj_type));
 		}
 	}
@@ -1798,7 +1800,8 @@ void TsqlUnsupportedFeatureHandlerImpl::checkSupportedRevokeStmt(TSqlParser::Rev
 				continue;
 			else
 			{
-				unsupported_feature = "REVOKE PERMISSION " + perm->getText();
+				unsupported_feature = "REVOKE PERMISSION " + ::getFullText(single_perm);
+				std::transform(unsupported_feature.begin(), unsupported_feature.end(), unsupported_feature.begin(), ::toupper);
 				handle(INSTR_UNSUPPORTED_TSQL_REVOKE_STMT, unsupported_feature.c_str(), getLineAndPos(perm));
 			}
 		}
@@ -1813,6 +1816,7 @@ void TsqlUnsupportedFeatureHandlerImpl::checkSupportedRevokeStmt(TSqlParser::Rev
 		if (obj_type && !(obj_type->OBJECT() || obj_type->SCHEMA()))
 		{
 			unsupported_feature = "REVOKE ON " + obj_type->getText();
+			std::transform(unsupported_feature.begin(), unsupported_feature.end(), unsupported_feature.begin(), ::toupper);
 			handle(INSTR_UNSUPPORTED_TSQL_REVOKE_STMT, unsupported_feature.c_str(), getLineAndPos(obj_type));
 		}
 	}
diff --git a/test/JDBC/expected/BABEL-GRANT.out b/test/JDBC/expected/BABEL-GRANT.out
index d3f48b241fe..1dd162edd9f 100644
--- a/test/JDBC/expected/BABEL-GRANT.out
+++ b/test/JDBC/expected/BABEL-GRANT.out
@@ -174,28 +174,56 @@ GO
 REVOKE SELECT ON SCHEMA::scm FROM guest;
 GO
 
-GRANT SHOWPLAN ON OBJECT::t1 TO guest;  -- unsupported permission
+GRANT showplan ON OBJECT::t1 TO guest;  -- unsupported permission
 GO
 ~~ERROR (Code: 33557097)~~
 
 ~~ERROR (Message: 'GRANT PERMISSION SHOWPLAN' is not currently supported in Babelfish)~~
 
 
-REVOKE SHOWPLAN ON OBJECT::t2 TO alogin;  -- unsupported permission
+REVOKE showplan ON OBJECT::t2 TO alogin;  -- unsupported permission
 GO
 ~~ERROR (Code: 33557097)~~
 
 ~~ERROR (Message: 'REVOKE PERMISSION SHOWPLAN' is not currently supported in Babelfish)~~
 
 
-GRANT ALL ON SCHEMA::scm TO guest;  -- unsupported class
+GRANT create table ON OBJECT::t1 TO guest;  -- unsupported permission
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'GRANT PERMISSION CREATE TABLE' is not currently supported in Babelfish)~~
+
+
+REVOKE create table ON OBJECT::t2 FROM alogin;  -- unsupported permission
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'REVOKE PERMISSION CREATE TABLE' is not currently supported in Babelfish)~~
+
+
+GRANT SELECT ON table::t1 TO guest; -- unsupported object
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'GRANT ON TABLE' is not currently supported in Babelfish)~~
+
+
+REVOKE SELECT ON table::t1 FROM guest; -- unsupported object
+GO
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: 'REVOKE ON TABLE' is not currently supported in Babelfish)~~
+
+
+GRANT ALL ON SCHEMA::scm TO guest;
 GO
 ~~ERROR (Code: 33557097)~~
 
 ~~ERROR (Message: The all permission has been deprecated and is not available for this class of entity.)~~
 
 
-REVOKE ALL ON SCHEMA::scm TO guest; -- unsupported class
+REVOKE ALL ON SCHEMA::scm FROM guest;
 GO
 ~~ERROR (Code: 33557097)~~
 
diff --git a/test/JDBC/expected/GRANT_SCHEMA.out b/test/JDBC/expected/GRANT_SCHEMA.out
index 1891d685978..2a9a69e75b3 100644
--- a/test/JDBC/expected/GRANT_SCHEMA.out
+++ b/test/JDBC/expected/GRANT_SCHEMA.out
@@ -51,10 +51,39 @@ go
 CREATE FUNCTION babel_4344_s1.babel_4344_f1() RETURNS INT AS BEGIN RETURN (SELECT COUNT(*) FROM sys.objects) END
 go
 
+grant select on schema::babel_4344_s1 to public;
+go
+
 -- tsql user=babel_4344_l1 password=12345678 
 use babel_4344_d1;
 go
 
+-- User has select privileges, tables and views be accessible
+select * from babel_4344_s1.babel_4344_t1
+go
+~~START~~
+int
+~~END~~
+
+select * from babel_4344_s1.babel_4344_v1;
+go
+~~START~~
+int
+2
+~~END~~
+
+use master;
+go
+
+-- tsql
+use babel_4344_d1;
+go
+revoke select on schema::babel_4344_s1 from public;
+go
+
+-- tsql user=babel_4344_l1 password=12345678 
+use babel_4344_d1;
+go
 -- User doesn't have any privileges, objects should not be accessible
 select * from babel_4344_t1;
 go
@@ -135,7 +164,8 @@ grant execute on babel_4344_p1 to babel_4344_u1;
 go
 grant execute on babel_4344_s1.babel_4344_p1 to babel_4344_u1;
 go
-grant execute on babel_4344_f1 to babel_4344_u1;
+-- Mixed case
+grant Execute on Babel_4344_F1 to babel_4344_u1;
 go
 grant execute on babel_4344_s1.babel_4344_f1 to babel_4344_u1;
 go
@@ -154,6 +184,18 @@ go
 
 grant select on schema::babel_4344_s2 to guest; -- should pass 
 go
+grant select on schema::"" to guest; -- should fail 
+go
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: An object or column name is missing or empty. For SELECT INTO statements, verify each column has a name. For other statements, look for empty alias names. Aliases defined as "" or [] are not allowed. Change the alias to a valid name.)~~
+
+grant select on schema::[] to guest; -- should fail 
+go
+~~ERROR (Code: 33557097)~~
+
+~~ERROR (Message: An object or column name is missing or empty. For SELECT INTO statements, verify each column has a name. For other statements, look for empty alias names. Aliases defined as "" or [] are not allowed. Change the alias to a valid name.)~~
+
 
 -- tsql user=babel_4344_l1 password=12345678
 -- User has OBJECT privileges, should be accessible.
@@ -242,7 +284,7 @@ grant select on schema::babel_4344_s1 to babel_4344_u1; -- should fail
 go
 ~~ERROR (Code: 33557097)~~
 
-~~ERROR (Message: Cannot find the schema "babel_4344_s1", because it does not exist or you do not have permission.)~~
+~~ERROR (Message: Cannot grant, deny, or revoke permissions to sa, dbo, entity owner, information_schema, sys, or yourself.)~~
 
 use master;
 go
diff --git a/test/JDBC/input/BABEL-GRANT.sql b/test/JDBC/input/BABEL-GRANT.sql
index 3e0155ea283..07dd38876b9 100644
--- a/test/JDBC/input/BABEL-GRANT.sql
+++ b/test/JDBC/input/BABEL-GRANT.sql
@@ -164,16 +164,28 @@ GO
 REVOKE SELECT ON SCHEMA::scm FROM guest;
 GO
 
-GRANT SHOWPLAN ON OBJECT::t1 TO guest;  -- unsupported permission
+GRANT showplan ON OBJECT::t1 TO guest;  -- unsupported permission
 GO
 
-REVOKE SHOWPLAN ON OBJECT::t2 TO alogin;  -- unsupported permission
+REVOKE showplan ON OBJECT::t2 TO alogin;  -- unsupported permission
 GO
 
-GRANT ALL ON SCHEMA::scm TO guest;  -- unsupported class
+GRANT create table ON OBJECT::t1 TO guest;  -- unsupported permission
 GO
 
-REVOKE ALL ON SCHEMA::scm TO guest; -- unsupported class
+REVOKE create table ON OBJECT::t2 FROM alogin;  -- unsupported permission
+GO
+
+GRANT SELECT ON table::t1 TO guest; -- unsupported object
+GO
+
+REVOKE SELECT ON table::t1 FROM guest; -- unsupported object
+GO
+
+GRANT ALL ON SCHEMA::scm TO guest;
+GO
+
+REVOKE ALL ON SCHEMA::scm FROM guest;
 GO
 
 GRANT ALL ON OBJECT::t1 TO guest WITH GRANT OPTION AS superuser;
diff --git a/test/JDBC/input/GRANT_SCHEMA.mix b/test/JDBC/input/GRANT_SCHEMA.mix
index 1572bea803b..21bf69d72ac 100644
--- a/test/JDBC/input/GRANT_SCHEMA.mix
+++ b/test/JDBC/input/GRANT_SCHEMA.mix
@@ -51,10 +51,30 @@ go
 CREATE FUNCTION babel_4344_s1.babel_4344_f1() RETURNS INT AS BEGIN RETURN (SELECT COUNT(*) FROM sys.objects) END
 go
 
+grant select on schema::babel_4344_s1 to public;
+go
+
 -- tsql user=babel_4344_l1 password=12345678 
 use babel_4344_d1;
 go
 
+-- User has select privileges, tables and views be accessible
+select * from babel_4344_s1.babel_4344_t1
+go
+select * from babel_4344_s1.babel_4344_v1;
+go
+use master;
+go
+
+-- tsql
+use babel_4344_d1;
+go
+revoke select on schema::babel_4344_s1 from public;
+go
+
+-- tsql user=babel_4344_l1 password=12345678 
+use babel_4344_d1;
+go
 -- User doesn't have any privileges, objects should not be accessible
 select * from babel_4344_t1;
 go
@@ -99,7 +119,8 @@ grant execute on babel_4344_p1 to babel_4344_u1;
 go
 grant execute on babel_4344_s1.babel_4344_p1 to babel_4344_u1;
 go
-grant execute on babel_4344_f1 to babel_4344_u1;
+-- Mixed case
+grant Execute on Babel_4344_F1 to babel_4344_u1;
 go
 grant execute on babel_4344_s1.babel_4344_f1 to babel_4344_u1;
 go
@@ -110,6 +131,10 @@ grant select on schema::babel_4344_s2 to jdbc_user; -- should fail
 go
 grant select on schema::babel_4344_s2 to guest; -- should pass 
 go
+grant select on schema::"" to guest; -- should fail 
+go
+grant select on schema::[] to guest; -- should fail 
+go
 
 -- tsql user=babel_4344_l1 password=12345678
 -- User has OBJECT privileges, should be accessible.