fix for a bug reported by blueBoy

doc/THANKS

@@ -565,6 +565,9 @@ Brandon E. <[email protected]>
 black zero <[email protected]>
     for reporting a minor bug
 
+blueBoy <[email protected]>
+    for reporting a bug
+
 buawig <[email protected]>
     for reporting considerable amount of bugs
 

lib/core/agent.py

@@ -560,8 +560,8 @@ class Agent:
 
         if limited:
             inbandQuery += ",".join(map(lambda x: char if x != position else '(SELECT %s)' % query, range(0, count)))
-            inbandQuery = self.suffixQuery(inbandQuery, comment, suffix)
             inbandQuery += FROM_TABLE.get(Backend.getIdentifiedDbms(), "")
+            inbandQuery = self.suffixQuery(inbandQuery, comment, suffix)
 
             return inbandQuery
 

plugins/generic/enumeration.py

@@ -2352,6 +2352,8 @@ class Enumeration:
         sqlType = None
         getOutput = None
 
+        query = query.rstrip(';')
+
         for sqlTitle, sqlStatements in SQL_STATEMENTS.items():
             for sqlStatement in sqlStatements:
                 if query.lower().startswith(sqlStatement):