From 03df419fd6361c282e37de2036cf5528b91340d8 Mon Sep 17 00:00:00 2001 From: aNiceGuy Date: Mon, 16 Jul 2012 18:30:37 +0100 Subject: [PATCH] added support for dotted database-, table- and column-names like 'my.db' for mysql --- plugins/generic/enumeration.py | 5 ++++- xml/queries.xml | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/plugins/generic/enumeration.py b/plugins/generic/enumeration.py index 9f15f2137..1d5c6b4b5 100644 --- a/plugins/generic/enumeration.py +++ b/plugins/generic/enumeration.py @@ -1625,7 +1625,10 @@ class Enumeration: entries = zip(*[entries[colName] for colName in colList]) else: query = rootQuery.inband.query % (colString, conf.db, tbl) - elif Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.PGSQL): + elif Backend.getIdentifiedDbms() in (DBMS.PGSQL): + query = rootQuery.inband.query % (colString, conf.db, tbl, prioritySortColumns(colList)[0]) + elif Backend.getIdentifiedDbms() in (DBMS.MYSQL): + colString = '`%s`' % colString query = rootQuery.inband.query % (colString, conf.db, tbl, prioritySortColumns(colList)[0]) else: query = rootQuery.inband.query % (colString, conf.db, tbl) diff --git a/xml/queries.xml b/xml/queries.xml index e78c7a77c..5441be322 100644 --- a/xml/queries.xml +++ b/xml/queries.xml @@ -12,7 +12,7 @@ - +