Minor consistency update

Author: stamparm

lib/core/dicts.py

@@ -40,34 +40,34 @@
                 }
 
 SYBASE_TYPES = {
-                    "14": "floatn",
-                    "8": "float",
-                    "15": "datetimn",
-                    "12": "datetime",
-                    "23": "real",
-                    "28": "numericn",
-                    "10": "numeric",
-                    "27": "decimaln",
-                    "26": "decimal",
-                    "17": "moneyn",
-                    "11": "money",
-                    "21": "smallmoney",
-                    "22": "smalldatetime",
-                    "13": "intn",
-                    "7": "int",
-                    "6": "smallint",
-                    "5": "tinyint",
-                    "16": "bit",
-                    "2": "varchar",
-                    "18": "sysname",
-                    "25": "nvarchar",
-                    "1": "char",
-                    "24": "nchar",
-                    "4": "varbinary",
-                    "80": "timestamp",
-                    "3": "binary",
-                    "19": "text",
-                    "20": "image",
+                    14: "floatn",
+                    8: "float",
+                    15: "datetimn",
+                    12: "datetime",
+                    23: "real",
+                    28: "numericn",
+                    10: "numeric",
+                    27: "decimaln",
+                    26: "decimal",
+                    17: "moneyn",
+                    11: "money",
+                    21: "smallmoney",
+                    22: "smalldatetime",
+                    13: "intn",
+                    7: "int",
+                    6: "smallint",
+                    5: "tinyint",
+                    16: "bit",
+                    2: "varchar",
+                    18: "sysname",
+                    25: "nvarchar",
+                    1: "char",
+                    24: "nchar",
+                    4: "varbinary",
+                    80: "timestamp",
+                    3: "binary",
+                    19: "text",
+                    20: "image",
                 }
 
 MYSQL_PRIVS = {

plugins/dbms/sybase/enumeration.py

@@ -287,7 +287,7 @@ def getColumns(self, onlyColNames=False, colTuple=None, bruteForce=None, dumpMod
                     columns = {}
 
                     for name, type_ in filterPairValues(zip(retVal[0]["%s.name" % randStr], retVal[0]["%s.usertype" % randStr])):
-                        columns[name] = SYBASE_TYPES.get(type_, type_)
+                        columns[name] = SYBASE_TYPES.get(int(type_) if isinstance(type_, basestring) and type_.isdigit() else type_, type_)
 
                     table[safeSQLIdentificatorNaming(tbl)] = columns
                     kb.data.cachedColumns[safeSQLIdentificatorNaming(conf.db)] = table