3434from lib .core .data import logger
3535from lib .core .settings import MSSQL_ALIASES
3636from lib .core .settings import MYSQL_ALIASES
37+ from lib .core .settings import PGSQL_ALIASES
38+ from lib .core .settings import ORACLE_ALIASES
3739
3840
3941def setString ():
@@ -133,8 +135,10 @@ def setDbms(dbms):
133135 if condition :
134136 dataToSessionFile ("[%s][%s][%s][DBMS][%s]\n " % (conf .url , kb .injPlace , conf .parameters [kb .injPlace ], dbms ))
135137
136- firstRegExp = "(%s|%s)" % ("|" .join ([alias for alias in MSSQL_ALIASES ]),
137- "|" .join ([alias for alias in MYSQL_ALIASES ]))
138+ firstRegExp = "(%s|%s|%s|%s)" % ("|" .join ([alias for alias in MSSQL_ALIASES ]),
139+ "|" .join ([alias for alias in MYSQL_ALIASES ]),
140+ "|" .join ([alias for alias in PGSQL_ALIASES ]),
141+ "|" .join ([alias for alias in ORACLE_ALIASES ]))
138142 dbmsRegExp = re .search ("^%s" % firstRegExp , dbms , re .I )
139143
140144 if dbmsRegExp :
@@ -368,20 +372,23 @@ def resumeConfKb(expression, url, value):
368372 logger .info (logMsg )
369373
370374 elif expression == "DBMS" and url == conf .url :
371- dbms = value [:- 1 ]
375+ dbms = value [:- 1 ]
376+ dbms = dbms .lower ()
377+ dbmsVersion = None
372378
373379 logMsg = "resuming back-end DBMS '%s' " % dbms
374380 logMsg += "from session file"
375381 logger .info (logMsg )
376382
377- dbms = dbms .lower ()
378- firstRegExp = "(%s|%s)" % ("|" .join ([alias for alias in MSSQL_ALIASES ]),
379- "|" .join ([alias for alias in MYSQL_ALIASES ]))
383+ firstRegExp = "(%s|%s|%s|%s)" % ("|" .join ([alias for alias in MSSQL_ALIASES ]),
384+ "|" .join ([alias for alias in MYSQL_ALIASES ]),
385+ "|" .join ([alias for alias in PGSQL_ALIASES ]),
386+ "|" .join ([alias for alias in ORACLE_ALIASES ]))
380387 dbmsRegExp = re .search ("%s ([\d\.]+)" % firstRegExp , dbms )
381388
382389 if dbmsRegExp :
383- dbms = dbmsRegExp .group (1 )
384- kb . dbmsVersion = [ dbmsRegExp .group (2 ) ]
390+ dbms = dbmsRegExp .group (1 )
391+ dbmsVersion = [ dbmsRegExp .group (2 ) ]
385392
386393 if conf .dbms and conf .dbms .lower () != dbms :
387394 message = "you provided '%s' as back-end DBMS, " % conf .dbms
@@ -392,9 +399,11 @@ def resumeConfKb(expression, url, value):
392399 test = readInput (message , default = "N" )
393400
394401 if not test or test [0 ] in ("n" , "N" ):
395- conf .dbms = dbms
402+ conf .dbms = dbms
403+ kb .dbmsVersion = dbmsVersion
396404 else :
397- conf .dbms = dbms
405+ conf .dbms = dbms
406+ kb .dbmsVersion = dbmsVersion
398407
399408 elif expression == "OS" and url == conf .url :
400409 os = value [:- 1 ]
0 commit comments