--- a/pgtoolkit/tools/runquery.py	Tue May 06 18:37:43 2014 +0200
+++ b/pgtoolkit/tools/runquery.py	Wed May 07 18:33:50 2014 +0200
@@ -1,4 +1,4 @@
-from pgtoolkit.toolbase import ToolBase
+from pgtoolkit.toolbase import SimpleTool
 
 import logging.handlers
 import time
@@ -13,13 +13,11 @@
     """
 
     def __init__(self):
-        ToolBase.__init__(self, name='runquery')
+        SimpleTool.__init__(self, name='runquery')
         self.target_isolation_level = 'autocommit'
 
     def specify_args(self):
-        ToolBase.specify_args(self)
-        self.parser.add_argument('target', nargs='?', metavar='target', type=str, help='Target database')
-        self.parser.add_argument('-c', dest='config', type=str, help='Additional config file (besides pgtoolkit.conf).')
+        SimpleTool.specify_args(self)
         self.parser.add_argument('-q', dest='queries', metavar='QUERY', nargs='*', help='Queries to run.')
         self.parser.add_argument('-f', dest='file', metavar='FILE', help='Read query from file.')
         self.parser.add_argument('--one-query-per-line', action='store_true', help='When reading queries from file, consider each line as separate query.')
@@ -28,18 +26,11 @@
         self.parser.add_argument('--output-file', dest='output_file', metavar='OUTPUT_FILE', help='Write query result in specified file.')
         self.parser.add_argument('--format', dest='format', metavar='FORMAT', help='Format string for each line in output file (using Python\'s format()).')
 
-        self.config.add_option('target', type=str, default=None)
         self.config.add_option('queries', type=list, default=[])
         self.config.add_option('log_path', type=str)
 
-    def setup(self, args=None):
-        ToolBase.setup(self, args)
-        self.prepare_conns(target=self.args.target or self.config.target)
-
     def load_args(self, args=None, config_file=None):
-        ToolBase.load_args(self, args, config_file)
-        if self.args.config:
-            self.config.load(self.args.config)
+        SimpleTool.load_args(self, args, config_file)
         self.queries = self.args.queries or self.config.queries
         # read query from file
         if self.args.file:
@@ -73,7 +64,6 @@
 
     def main(self):
         """Execute the queries."""
-        print(self.queries)
         for q in self.queries:
             if self.parameters:
                 q = q.format(**self.parameters)