From 76c8ce0e702043ed079a8bbea4ba5b32dc62cc7e Mon Sep 17 00:00:00 2001 From: Miroslav Stampar Date: Sun, 23 Aug 2015 22:54:08 +0200 Subject: [PATCH] More flexible --sql-file --- plugins/generic/custom.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/generic/custom.py b/plugins/generic/custom.py index 2871d90c4..8362a4948 100644 --- a/plugins/generic/custom.py +++ b/plugins/generic/custom.py @@ -120,9 +120,12 @@ class Custom: if not sfile: continue - query = getSQLSnippet(Backend.getDbms(), sfile) + snippet = getSQLSnippet(Backend.getDbms(), sfile) - infoMsg = "executing SQL statement%s from file '%s'" % ("s" if ";" in query else "", sfile) - logger.info(infoMsg) - - conf.dumper.query(query, self.sqlQuery(query)) + if snippet and all(query.strip().upper().startswith("SELECT") for query in filter(None, snippet.split(';' if ';' in snippet else '\n'))): + for query in filter(None, snippet.split(';' if ';' in snippet else '\n')): + query = query.strip() + if query: + conf.dumper.query(query, self.sqlQuery(query)) + else: + conf.dumper.query(snippet, self.sqlQuery(snippet))