Added opening saved queries support

Author: mtxr

.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 *.pyc
+*.py~
 *.sublime-workspace

Default (Linux).sublime-keymap

@@ -7,5 +7,6 @@
     { "keys": ["ctrl+e", "ctrl+b"], "command": "st_format" },
     { "keys": ["ctrl+e", "ctrl+q"], "command": "st_save_query" },
     { "keys": ["ctrl+e", "ctrl+r"], "command": "st_remove_saved_query" },
-    { "keys": ["ctrl+e", "ctrl+a"], "command": "st_list_queries" }
+    { "keys": ["ctrl+e", "ctrl+a"], "command": "st_list_queries"},
+    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}}
 ]

Default (OSX).sublime-keymap

@@ -7,5 +7,6 @@
     { "keys": ["ctrl+e", "ctrl+b"], "command": "st_format" },
     { "keys": ["ctrl+e", "ctrl+q"], "command": "st_save_query" },
     { "keys": ["ctrl+e", "ctrl+r"], "command": "st_remove_saved_query" },
-    { "keys": ["ctrl+e", "ctrl+a"], "command": "st_list_queries" }
+    { "keys": ["ctrl+e", "ctrl+a"], "command": "st_list_queries"},
+    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}}
 ]

Default (Windows).sublime-keymap

@@ -7,5 +7,6 @@
     { "keys": ["ctrl+e", "ctrl+b"], "command": "st_format" },
     { "keys": ["ctrl+e", "ctrl+q"], "command": "st_save_query" },
     { "keys": ["ctrl+e", "ctrl+r"], "command": "st_remove_saved_query" },
-    { "keys": ["ctrl+e", "ctrl+a"], "command": "st_list_queries" }
+    { "keys": ["ctrl+e", "ctrl+a"], "command": "st_list_queries"},
+    { "keys": ["ctrl+e", "ctrl+o"], "command": "st_list_queries", "args": {"mode" : "open"}}
 ]

Default.sublime-commands

@@ -33,12 +33,22 @@
   },
   {
     "caption": "ST: List and Run Saved Queries",
-    "command": "st_list_queries"
+    "command": "st_list_queries",
+    "args"   : {"mode": "run"}
+  },
+  {
+    "caption": "ST: List and Open Saved Queries",
+    "command": "st_list_queries",
+    "args"   :  {"mode": "open"}
   },
   {
     "caption": "ST: Format Current SQL File",
     "command": "st_format"
   },
+  {
+    "caption": "ST: About",
+    "command": "st_version"
+  },
   {
     "caption": "ST: Setup Connections",
     "command": "open_file",

SQLTools.py

@@ -128,6 +128,13 @@ def display(content, name="SQLTools Result"):
         resultContainer.run_command('append', {'characters': content})
         resultContainer.set_read_only(True)
 
+    @staticmethod
+    def toBuffer(content, name="", suffix="SQLTools Saved Query"):
+        resultContainer = STM.Window().new_file()
+        resultContainer.set_name(((name + " - ") if name != "" else "") + suffix)
+        resultContainer.set_syntax_file('Packages/SQL/SQL.tmLanguage')
+        resultContainer.run_command('append', {'characters': content})
+
 #
 # Commands
 #
@@ -180,7 +187,8 @@ def run(self):
         STM.Storage.promptQueryAlias()
 
 class StListQueries(sublime_plugin.WindowCommand):
-    def run(self):
+    def run(self, mode="run"):
+        print(mode)
         if not ST.conn:
             ST.showConnectionMenu()
             return
@@ -197,7 +205,10 @@ def run(self):
             queriesArray.append([alias, query])
         queriesArray.sort()
         try:
-            STM.Window().show_quick_panel(queriesArray, lambda index: ST.conn.execute(queriesArray[index][1], ST.display) if index != -1 else None)
+            if mode == "run":
+                STM.Window().show_quick_panel(queriesArray, lambda index: ST.conn.execute(queriesArray[index][1], ST.display) if index != -1 else None)
+            else:
+                STM.Window().show_quick_panel(queriesArray, lambda index: ST.toBuffer(queriesArray[index][1], queriesArray[index][0]) if index != -1 else None)
         except Exception:
             pass
 
@@ -223,8 +234,12 @@ class StFormat(sublime_plugin.TextCommand):
     def run(self, edit):
         STM.Selection.formatSql(edit)
 
+class StVersion(sublime_plugin.WindowCommand):
+    def run(self):
+        sublime.message_dialog('Using SQLTools ' + STM.Const.VERSION)
+
 def plugin_loaded():
-    STM.Log.debug(__name__ + ' loaded successfully')
+    STM.Log.debug('%s loaded successfully' % (__name__))
     try:
         ST.bootstrap()
     except Exception as e:

SQLTools.sublime-settings

@@ -1,5 +1,5 @@
 {
-    "debug"                 : false,
+    "debug"                 : true,
     "thread_timeout"        : 5000,
     "history_size"          : 100,
     "show_result_on_window" : false,

SQLToolsModels.py

@@ -12,6 +12,7 @@ class Const:
     SGDB_FILENAME         = "SQLToolsSGBD.{0}".format(SETTINGS_EXTENSION)
     CONNECTIONS_FILENAME  = "SQLToolsConnections.{0}".format(SETTINGS_EXTENSION)
     USER_QUERIES_FILENAME = "SQLToolsSavedQueries.{0}".format(SETTINGS_EXTENSION)
+    VERSION               = "v1.0.8"
     pass
 
 class Log:
@@ -20,7 +21,7 @@ class Log:
     def debug(message):
         if not sublime.load_settings(Const.SETTINGS_FILENAME).get('debug', False):
             return
-        print ("SQLTools: " + message)
+        print ("SQLTools %s: %s" % (Const.VERSION, message))
 
 
 class Settings:
@@ -196,6 +197,12 @@ def builArgs(self, queryName=None):
         if queryName and len(cliOptions['queries'][queryName]['options']) > 0:
             args = args + cliOptions['queries'][queryName]['options']
 
+        argsType = 'string'
+        if type(cliOptions['args']) is list:
+            argsType = 'list'
+            cliOptions['args'] = ' '.join(cliOptions['args'])
+
+        Log.debug('Usgin cli args (%s) "%s"' %(argsType, cliOptions['args']))
         return args + shlex.split(cliOptions['args'].format(**self.options))
 
     def getOptionsForSgdbCli(self):

messages/v0.2.0.md

@@ -0,0 +1,20 @@
+## v0.2.0 Changelog
+
+Now you can open your saved queries using `CTRL+E CTRL+O`!
+
+### Improvements
+* Added opening support for saved queries (Issue #12)
+```javascript
+// new hotkeys setting
+{
+    "keys": ["ctrl+e", "ctrl+o"], 
+    "command": "st_list_queries", 
+    "args": {
+        "mode" : "open"
+    }
+}
+```
+
+### Fixes
+
+No fixes for this version