@@ -594,7 +594,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
594594 if conf .db is not None and len (kb .data .cachedColumns ) > 0 \
595595 and conf .db in kb .data .cachedColumns and tbl in \
596596 kb .data .cachedColumns [conf .db ]:
597- infoMsg = "fetched tables' columns on "
597+ infoMsg = "fetched table columns from "
598598 infoMsg += "database '%s'" % unsafeSQLIdentificatorNaming (conf .db )
599599 logger .info (infoMsg )
600600
@@ -619,7 +619,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
619619 query += condQuery
620620
621621 if Backend .isFork (FORK .DRIZZLE ):
622- query = query . replace ("column_type" , "data_type" )
622+ query = re . sub ("column_type" , "data_type" , query , flags = re . I )
623623
624624 elif Backend .getIdentifiedDbms () in (DBMS .ORACLE , DBMS .DB2 , DBMS .DERBY , DBMS .ALTIBASE , DBMS .MIMERSQL ):
625625 query = rootQuery .inband .query % (unsafeSQLIdentificatorNaming (tbl .upper ()), unsafeSQLIdentificatorNaming (conf .db .upper ()))
@@ -730,7 +730,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
730730 if conf .db is not None and len (kb .data .cachedColumns ) > 0 \
731731 and conf .db in kb .data .cachedColumns and tbl in \
732732 kb .data .cachedColumns [conf .db ]:
733- infoMsg = "fetched tables' columns on "
733+ infoMsg = "fetched table columns from "
734734 infoMsg += "database '%s'" % unsafeSQLIdentificatorNaming (conf .db )
735735 logger .info (infoMsg )
736736
@@ -1050,7 +1050,7 @@ def getStatements(self):
10501050 query = rootQuery .blind .count
10511051
10521052 if Backend .isFork (FORK .DRIZZLE ):
1053- query = query . replace ("INFORMATION_SCHEMA" , "DATA_DICTIONARY" )
1053+ query = re . sub ("INFORMATION_SCHEMA" , "DATA_DICTIONARY" , query , flags = re . I )
10541054
10551055 count = inject .getValue (query , union = False , error = False , expected = EXPECTED .INT , charsetType = CHARSET_TYPE .DIGITS )
10561056
@@ -1078,7 +1078,7 @@ def getStatements(self):
10781078 query = rootQuery .blind .query % index
10791079
10801080 if Backend .isFork (FORK .DRIZZLE ):
1081- query = query . replace ("INFORMATION_SCHEMA" , "DATA_DICTIONARY" )
1081+ query = re . sub ("INFORMATION_SCHEMA" , "DATA_DICTIONARY" , query , flags = re . I )
10821082
10831083 value = unArrayizeValue (inject .getValue (query , union = False , error = False ))
10841084
0 commit comments