sql-testing-tools 0.2.9__py3-none-any.whl → 0.2.10__py3-none-any.whl

sql_testing_tools/Helper.py

@@ -152,34 +152,35 @@ def buildAndSendCosetteRequest(baseDict, sql, sol):
 def checkKeywords(startWord:str, endWords:list):
     global sql,sol
 
-    if(startWord not in sol and startWord not in sql):
+    startWord = startWord.lower()
+
+    if(startWord not in sol.lower() and startWord not in sql.lower()):
         return ""
 
-    if(startWord in sql):
-        start = str.find(sql, startWord)
+    if(startWord in sql.lower()):
+        start = sql.lower().find(startWord) + len(startWord)
         end = -1
         for kw in endWords:
-            if(str.find(sql, kw) != -1):
-                end = str.find(sql, kw)
-                break
+            index = sql.lower().find(kw.lower(), start)
+            if -1 < index < end or end == -1:
+                end = index
         if(end == -1):
             end = len(sql)
 
         submission = str.strip(sql[start:end])
         #print("'"+submission+"'")
 
-        start = str.find(sol, startWord)
+        start = sol.lower().find(startWord) + len(startWord)
         end = -1
         
         for kw in endWords:
-            if(str.find(sol, kw) != -1):
-                end = str.find(sol, kw)
-                break
+            index = sol.lower().find(kw.lower(), start)
+            if -1 < index < end or end == -1:
+                end = index
         if(end == -1):
             end = len(sol)
 
         solution = str.strip(sol[start:end])
-        #print("'"+solution+"'")
 
         if submission == solution:
             return ""
@@ -189,31 +190,31 @@ def checkKeywords(startWord:str, endWords:list):
 def checkColumns(sqlPath="", solPath=""):
     global sql,sol
     setup(sqlPath, solPath)
-    return checkKeywords("SELECT", ["FROM", "WHERE", "GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
+    return checkKeywords("SELECT ", ["FROM", "WHERE", "GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
 
 
 def checkTables(sqlPath="", solPath=""):
     global sql,sol
     setup(sqlPath, solPath)
-    return checkKeywords("FROM", ["FROM", "WHERE", "GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
+    return checkKeywords("FROM ", ["SELECT", "WHERE", "GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
 
 
 def checkCondition(sqlPath="", solPath=""):
     global sql,sol
     setup(sqlPath, solPath)
-    return checkKeywords("WHERE", ["GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
+    return checkKeywords("WHERE ", ["SELECT", "FROM", "GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
 
 
 def checkOrder(sqlPath="", solPath=""):
     global sql,sol
     setup(sqlPath, solPath)
-    return checkKeywords("ORDER BY", ["WHERE", "GROUP BY", "ORDER BY", "LIMIT", ";", "HAVING"])
+    return checkKeywords("ORDER BY ", ["SELECT", "WHERE", "GROUP BY", "FROM", "LIMIT", ";", "HAVING"])
 
 
 def checkGroup(sqlPath="", solPath=""):
-    global sql,sol
+    global sql, sol
     setup(sqlPath, solPath)
-    return checkKeywords("GROUP BY", ["WHERE", "ORDER BY", "LIMIT", ";", "HAVING"])
+    return checkKeywords("GROUP BY ", ["SELECT", "WHERE", "FROM BY", "ORDER BY", "LIMIT", ";", "HAVING"])
 
 
 def checkEquality(sqlPath="", solPath=""):

{sql_testing_tools-0.2.9.dist-info → sql_testing_tools-0.2.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: sql_testing_tools
-Version: 0.2.9
+Version: 0.2.10
 Description-Content-Type: text/markdown
 Requires-Dist: sqlparse>=0.5.1
 Requires-Dist: requests>=2.32.3
@@ -136,6 +136,9 @@ res = checkEquality()
 
 ### Changelog
 
+##### V 0.2.10
+- fixed part checks if keywords are in wrong order
+
 ##### V 0.2.9
 - added NOT support
 - improved Parentheses handling

sql_testing_tools-0.2.10.dist-info/RECORD

@@ -0,0 +1,8 @@
+sql_testing_tools/BaseAccess.py,sha256=VcudaUKwhIF00UxZSYTQAN-6bK6K4Q1zrsSM6VoPF6o,6297
+sql_testing_tools/Helper.py,sha256=rLqiPw3Ub7WYa6mM0mh7a1QF0fv9PhwLrl6OxBv8DLc,8453
+sql_testing_tools/TokenProcessing.py,sha256=mfhDeB-8osAv8qnVoYFw01O112x3OKBaOIGrptuKR9E,14878
+sql_testing_tools/__init__.py,sha256=eihMp9aizQd5Lnegu0y57WcyCinmy4Jvp66e0fiMPU4,49
+sql_testing_tools-0.2.10.dist-info/METADATA,sha256=8k-yYVo-n496H-BcnFCzNAG61jrTkJucmAeKEGh2Mik,7353
+sql_testing_tools-0.2.10.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+sql_testing_tools-0.2.10.dist-info/top_level.txt,sha256=qwEkmfJ_lYhIwcLXgfU75m0_JavVbOg96fN2zSatN3E,18
+sql_testing_tools-0.2.10.dist-info/RECORD,,

sql_testing_tools-0.2.9.dist-info/RECORD

@@ -1,8 +0,0 @@
-sql_testing_tools/BaseAccess.py,sha256=VcudaUKwhIF00UxZSYTQAN-6bK6K4Q1zrsSM6VoPF6o,6297
-sql_testing_tools/Helper.py,sha256=C8yfKFNsAWvfGXc4jkeocVvLgtr9XCcOox8sb-yoMZw,8280
-sql_testing_tools/TokenProcessing.py,sha256=mfhDeB-8osAv8qnVoYFw01O112x3OKBaOIGrptuKR9E,14878
-sql_testing_tools/__init__.py,sha256=eihMp9aizQd5Lnegu0y57WcyCinmy4Jvp66e0fiMPU4,49
-sql_testing_tools-0.2.9.dist-info/METADATA,sha256=9YGnTqOlaTJRRWoW3EUG0x3GFt4XwuC3x7yn62hRubU,7285
-sql_testing_tools-0.2.9.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-sql_testing_tools-0.2.9.dist-info/top_level.txt,sha256=qwEkmfJ_lYhIwcLXgfU75m0_JavVbOg96fN2zSatN3E,18
-sql_testing_tools-0.2.9.dist-info/RECORD,,