Fetch Data - Unsupported commands test updates

Author: abhinavminhas

QueryDB.Core.Tests/MySQLTests.cs

@@ -1325,7 +1325,11 @@ public void Test_MySQL_ExecuteCommand_DCL_Queries()
             var password = "Test@1234";
             var table = "Agents";
             var commands = "SELECT, UPDATE";
-            var checkCommand = "SELECT";
+            var checkCommands = new List<string>()
+            {
+                "SELECT",
+                "UPDATE"
+            };
 
             var createUser = string.Format(Queries.MySQLQueries.TestDB.DCL.CreateUserSql_User_Password, user, password);
             var grantSql = string.Format(Queries.MySQLQueries.TestDB.DCL.GrantSql_Command_Table_User, commands, table, user);
@@ -1341,22 +1345,25 @@ public void Test_MySQL_ExecuteCommand_DCL_Queries()
 
             // Existing Permissions
             var data = dbContext.FetchData(verifyPermissions);
-            Assert.AreEqual(1, data.Count);
-            Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
+            Assert.AreEqual(0, data.Count);
+            foreach (var checkCommand in checkCommands)
+                Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
 
             // Grant
             result = dbContext.ExecuteCommand(grantSql);
             Assert.AreEqual(0, result);
             data = dbContext.FetchData(verifyPermissions);
             Assert.AreEqual(2, data.Count);
-            Assert.IsTrue(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
+            foreach (var checkCommand in checkCommands)
+                Assert.IsTrue(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
 
             // Revoke
             result = dbContext.ExecuteCommand(revokeSql);
             Assert.AreEqual(0, result);
             data = dbContext.FetchData(verifyPermissions);
-            Assert.AreEqual(1, data.Count);
-            Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
+            Assert.AreEqual(0, data.Count);
+            foreach (var checkCommand in checkCommands)
+                Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
 
             //Remove User
             result = dbContext.ExecuteCommand(removeUser);
@@ -1488,7 +1495,11 @@ public async Task Test_MySQL_ExecuteCommandAsync_DCL_Queries()
             var password = "Test@1234";
             var table = "Agents";
             var commands = "SELECT, UPDATE";
-            var checkCommand = "SELECT";
+            var checkCommands = new List<string>()
+            {
+                "SELECT",
+                "UPDATE"
+            };
 
             var createUser = string.Format(Queries.MySQLQueries.TestDB.DCL.CreateUserSql_User_Password, user, password);
             var grantSql = string.Format(Queries.MySQLQueries.TestDB.DCL.GrantSql_Command_Table_User, commands, table, user);
@@ -1504,22 +1515,25 @@ public async Task Test_MySQL_ExecuteCommandAsync_DCL_Queries()
 
             // Existing Permissions
             var data = await dbContext.FetchDataAsync(verifyPermissions);
-            Assert.AreEqual(1, data.Count);
-            Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
+            Assert.AreEqual(0, data.Count);
+            foreach (var checkCommand in checkCommands)
+                Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
 
             // Grant
             result = await dbContext.ExecuteCommandAsync(grantSql);
             Assert.AreEqual(0, result);
             data = await dbContext.FetchDataAsync(verifyPermissions);
             Assert.AreEqual(2, data.Count);
-            Assert.IsTrue(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
+            foreach (var checkCommand in checkCommands)
+                Assert.IsTrue(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
 
             // Revoke
             result = await dbContext.ExecuteCommandAsync(revokeSql);
             Assert.AreEqual(0, result);
             data = await dbContext.FetchDataAsync(verifyPermissions);
-            Assert.AreEqual(1, data.Count);
-            Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
+            Assert.AreEqual(0, data.Count);
+            foreach (var checkCommand in checkCommands)
+                Assert.IsFalse(data.Any(data => data.ReferenceData.Values.Any(value => value.Contains(checkCommand))));
 
             //Remove User
             result = await dbContext.ExecuteCommandAsync(removeUser);

QueryDB.Core.Tests/Queries.cs

@@ -125,7 +125,7 @@ internal static class DCL
                     internal static string CreateUserSql_User_Password = @"CREATE USER '{0}' IDENTIFIED BY '{1}'";
                     internal static string GrantSql_Command_Table_User = @"GRANT {0} ON {1} TO '{2}'";
                     internal static string RevokeSql_Command_Table_User = @"REVOKE {0} ON {1} FROM '{2}'";
-                    internal static string VerifyPermission_User = @"SHOW GRANTS FOR '{0}'";
+                    internal static string VerifyPermission_User = "SELECT PRIVILEGE_TYPE FROM INFORMATION_SCHEMA.TABLE_PRIVILEGES WHERE GRANTEE = \"'test_user'@'%'\"";
                     internal static string RemoveUserSql_User = "DROP USER '{0}'";
                 }
             }