More flexible --sql-file

stamparm · stamparm · commit 76c8ce0e7020 · 2015-08-23T22:54:08.000+02:00
diff --git a/plugins/generic/custom.py b/plugins/generic/custom.py
@@ -120,9 +120,12 @@ def sqlFile(self):
             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))
