From 5a1aaecf166764bfb6f70fb6fffe78277ade2f2c Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Tue, 22 Mar 2011 13:07:37 +0000 Subject: [PATCH] minor fix so concatenated queries could be run in Oracle --sql-shell (e.g. select NAME||chr(58)||OWNER FROM ALL_SOURCE WHERE TYPE='FUNCTION') --- lib/core/agent.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/core/agent.py b/lib/core/agent.py index 4ad9daac1..05cf1f343 100644 --- a/lib/core/agent.py +++ b/lib/core/agent.py @@ -637,7 +637,8 @@ class Agent: limitedQuery = limitedQuery[:limitedQuery.index(" ORDER BY ")] if query.startswith("SELECT "): - limitedQuery = "%s FROM (%s, %s" % (untilFrom, untilFrom, limitStr) + delimiter = queries[Backend.getIdentifiedDbms()].delimiter.query + limitedQuery = "%s FROM (%s, %s" % (untilFrom, untilFrom.replace(delimiter, ','), limitStr) else: limitedQuery = "%s FROM (SELECT %s, %s" % (untilFrom, ", ".join(f for f in field), limitStr) limitedQuery = limitedQuery % fromFrom