fixes for Sybase

stamparm · stamparm · commit 4188df050162 · 2011-06-15T18:49:35.000Z
diff --git a/plugins/dbms/sybase/enumeration.py b/plugins/dbms/sybase/enumeration.py
@@ -167,6 +167,14 @@ def getColumns(self, onlyColNames=False):
 
         conf.db = safeSQLIdentificatorNaming(conf.db)
 
+        if conf.col:
+            colList = conf.col.split(",")
+        else:
+            colList = []
+
+        for col in colList:
+            colList[colList.index(col)] = safeSQLIdentificatorNaming(col)
+
         if conf.tbl:
             tblList = conf.tbl.split(",")
         else:
@@ -202,6 +210,12 @@ def getColumns(self, onlyColNames=False):
 
                 return { conf.db: kb.data.cachedColumns[conf.db]}
 
+            if colList:
+                table = {}
+                table[unsafeSQLIdentificatorNaming(tbl)] = dict(map(lambda x: (x, None), colList))
+                kb.data.cachedColumns[unsafeSQLIdentificatorNaming(conf.db)] = table
+                continue
+
             infoMsg = "fetching columns "
             infoMsg += "for table '%s' " % tbl
             infoMsg += "on database '%s'" % conf.db
@@ -219,8 +233,8 @@ def getColumns(self, onlyColNames=False):
                     for name, type_ in zip(retVal[0]["%s.name" % randStr], retVal[0]["%s.usertype" % randStr]):
                         columns[name] = sybaseTypes.get(type_, type_)
 
-                    table[tbl] = columns
-                    kb.data.cachedColumns[conf.db] = table
+                    table[unsafeSQLIdentificatorNaming(tbl)] = columns
+                    kb.data.cachedColumns[unsafeSQLIdentificatorNaming(conf.db)] = table
 
                     break
 
diff --git a/xml/queries.xml b/xml/queries.xml
@@ -524,7 +524,7 @@
             <blind/>
         </columns>
         <dump_table>
-            <inband query="SELECT %s FROM %s..%s"/>
+            <inband query="SELECT %s FROM %s.%s"/>
             <blind query="SELECT MIN(%s) FROM %s WHERE CONVERT(NVARCHAR(4000),%s)>'%s'" query2="SELECT MAX(%s) FROM %s WHERE CONVERT(NVARCHAR(4000),%s) LIKE '%s'" count="SELECT COUNT(*) FROM %s" count2="SELECT COUNT(*) FROM (SELECT DISTINCT %s FROM %s) AS value_table"/>
         </dump_table>
         <search_db>
