Preparing for ST2 port

Author: mtxr

.gitignore

@@ -0,0 +1,3 @@
+.DS_Store
+*.pyc
+*.sublime-workspace

SQLTools.py

@@ -1,6 +1,7 @@
-import sublime, sublime_plugin
+import sublime, sublime_plugin, sys, os
 
-from .SQLToolsModels import Log, Settings, Connection, Selection, Window, View, Const, History
+sys.path.append(os.path.dirname(__file__))
+from SQLToolsModels import Log, Settings, Connection, Selection, Window, View, Const, History
 
 class ST(sublime_plugin.EventListener):
     conn             = None
@@ -10,17 +11,20 @@ class ST(sublime_plugin.EventListener):
     connectionList   = {}
     autoCompleteList = []
 
+    @staticmethod
     def bootstrap():
         ST.connectionList = Settings.getConnections()
         ST.checkDefaultConnection()
 
+    @staticmethod
     def loadConnectionData():
         if not ST.conn:
             return
 
         ST.conn.getTables(lambda tables: setattr(ST, 'tables', tables))
         ST.conn.getColumns(lambda columns: setattr(ST, 'columns', columns))
 
+    @staticmethod
     def setConnection(index):
         if index < 0 or index > (len(ST.connectionList) - 1) :
             return
@@ -33,6 +37,7 @@ def setConnection(index):
 
         Log.debug('Connection {0} selected'.format(ST.conn))
 
+    @staticmethod
     def showConnectionMenu():
         ST.connectionList = Settings.getConnections()
         if len(ST.connectionList) == 0:
@@ -74,6 +79,7 @@ def getAutoCompleteList(self, word):
         ST.autoCompleteList.sort()
         return (ST.autoCompleteList, sublime.INHIBIT_EXPLICIT_COMPLETIONS)
 
+    @staticmethod
     def checkDefaultConnection():
         default = Connection.loadDefaultConnectionName()
         if not default:
@@ -84,6 +90,7 @@ def checkDefaultConnection():
         except Exception as e:
             Log.debug("Invalid connection setted")
 
+    @staticmethod
     def display(content, name="SQLTools Result"):
         if not sublime.load_settings(Const.SETTINGS_FILENAME).get('show_result_on_window'):
             resultContainer = Window().create_output_panel(name)

SQLTools.sublime-settings

@@ -10,7 +10,7 @@
         "mysql"   : "mysql",
         "pgsql"   : "psql",
         "oracle"  : "sqlplus",
-        "vertica" : "vsql",
+        "vertica" : "vsql"
     },
     "show_records" : {
         "limit" : 50

SQLToolsModels.py

@@ -35,6 +35,7 @@ def getConnections():
 
         return connections
 
+    @staticmethod
     def userFolder():
         return '{0}/User'.format(sublime.packages_path())
 
@@ -44,20 +45,24 @@ class Storage:
     savedQueries  = None
     selectedQuery = ''
 
+    @staticmethod
     def getSavedQueries():
         Storage.savedQueries = sublime.load_settings(Const.USER_QUERIES_FILENAME)
         return Storage.savedQueries
 
+    @staticmethod
     def flushSavedQueries():
         if not Storage.savedQueries:
             Storage.getSavedQueries()
 
         return sublime.save_settings(Const.USER_QUERIES_FILENAME)
 
+    @staticmethod
     def promptQueryAlias():
         Storage.selectedQuery = Selection.get()
         Window().show_input_panel('Query alias', '', Storage.saveQuery, None, None)
 
+    @staticmethod
     def saveQuery(alias):
         if len(alias) <= 0:
             return
@@ -67,6 +72,7 @@ def saveQuery(alias):
         Storage.flushSavedQueries()
 
 
+    @staticmethod
     def getSavedQuery(alias):
         if len(alias) <= 0:
             return
@@ -102,6 +108,7 @@ def _info(self):
     def _quickPanel(self):
         return [self.name, self._info()]
 
+    @staticmethod
     def killCommandAfterTimeout(command):
         timeout = sublime.load_settings(Const.SETTINGS_FILENAME).get('thread_timeout', 5000)
         sublime.set_timeout(command.stop, timeout)
@@ -181,6 +188,7 @@ def getOptionsForSgdbCli(self):
 
 
 class Selection:
+    @staticmethod
     def get():
         text = []
         if View().sel():
@@ -191,6 +199,7 @@ def get():
                     text.append(View().substr(region))
         return text
 
+    @staticmethod
     def formatSql(edit):
         for region in View().sel():
             if region.empty():
@@ -219,9 +228,10 @@ def run(self):
         self.tmp.write(self.query)
         self.tmp.close()
 
+        self.args = map(str, self.args)
         self.process = subprocess.Popen(self.args, stdout=subprocess.PIPE,stderr=subprocess.PIPE, stdin=open(self.tmp.name))
 
-        results, errors = self.process.communicate(input=self.query.encode('utf-8'))
+        results, errors = self.process.communicate()
 
         if errors:
             self.callback(errors.decode('utf-8', 'replace').replace('\r', ''))
@@ -244,6 +254,7 @@ def stop(self):
             os.unlink(self.tmp.name)
 
 class Utils:
+    @staticmethod
     def getResultAsList(results, callback=None):
         resultList = []
         for result in results.splitlines():
@@ -257,6 +268,7 @@ def getResultAsList(results, callback=None):
 
         return resultList
 
+    @staticmethod
     def formatSql(raw):
         settings = sublime.load_settings(Const.SETTINGS_FILENAME).get("format")
         try:
@@ -279,11 +291,13 @@ def formatSql(raw):
 class History:
     queries = []
 
+    @staticmethod
     def add(query):
         if len(History.queries) >= sublime.load_settings(Const.SETTINGS_FILENAME).get('history_size', 100):
             History.queries.pop(0)
         History.queries.append(query)
 
+    @staticmethod
     def get(index):
         if index < 0 or index > (len(History.queries) - 1):
             raise "No query selected"