From 2a268199d422a8603bc6abd6524f65562587eeca Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 26 Aug 2014 23:11:44 +0200 Subject: [PATCH] Patch for an Issue #798 --- lib/core/common.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/lib/core/common.py b/lib/core/common.py index 69b392e86..cbf92ccce 100755 --- a/lib/core/common.py +++ b/lib/core/common.py @@ -1268,7 +1268,14 @@ def expandAsteriskForColumns(expression): logger.info(infoMsg) _ = asterisk.group(2).replace("..", ".").replace(".dbo.", ".") - conf.db, conf.tbl = _.split(".", 1) if '.' in _ else (None, _) + db, conf.tbl = _.split(".", 1) if '.' in _ else (None, _) + if db is None: + if expression != conf.query: + conf.db = db + else: + expression = re.sub(r"([^\w])%s" % conf.tbl, "\g<1>%s.%s" % (conf.db, conf.tbl), expression) + else: + conf.db = db conf.db = safeSQLIdentificatorNaming(conf.db) conf.tbl = safeSQLIdentificatorNaming(conf.tbl, True)