v1.5.1 terminaltables loading fix

Author: tosher

base/te_open_local_obj.py

@@ -20,19 +20,19 @@ def run(self, view):
         if self.is_path(path):
             self.get_proc(path)
         else:
-            sublime.status_message('File [%s] does not exists in dir [%s]' % (self.filename, path))
+            self.view.window().status_message('File [%s] does not exists in dir [%s]' % (self.filename, path))
             self.on_select()
 
     def on_select(self):
         self.proc_dirs = list(utils.te_get_setting('te_procedure_path'))
-        sublime.set_timeout(lambda: sublime.active_window().show_quick_panel(self.proc_dirs, self.on_done), 1)
+        sublime.set_timeout(lambda: self.view.window().show_quick_panel(self.proc_dirs, self.on_done), 1)
 
     def on_done(self, dir_index):
         path = self.proc_dirs[dir_index]
         if self.is_path(path):
             self.get_proc(path)
         else:
-            sublime.status_message('File [%s] does not exists in dir [%s]' % (self.filename, path))
+            self.view.window().status_message('File [%s] does not exists in dir [%s]' % (self.filename, path))
             print('File [%s] does not exists in dir [%s]' % (self.filename, path))
 
     def is_path(self, path):
@@ -43,6 +43,6 @@ def is_path(self, path):
             return False
 
     def get_proc(self, path):
-        sublime.active_window().open_file(self.filename_abs_path)
+        self.view.window().active_window().open_file(self.filename_abs_path)
         self.view.set_syntax_file(utils.te_get_setting('te_syntax', utils.DEFAULT_SYNTAX))
         self.view.settings().set('tsqleasy_is_here', True)

base/te_open_server_obj.py

@@ -45,10 +45,10 @@ def run(self, edit):
                     tf.write(text.replace('\r', ''))
                     tf.seek(0)
                     if os.path.exists(tf.name):
-                        new_view = sublime.active_window().open_file(tf.name)
+                        new_view = self.view.window().open_file(tf.name)
 
                         new_view.set_syntax_file(utils.te_get_setting('te_syntax', utils.DEFAULT_SYNTAX))
                         new_view.settings().set('tsqleasy_is_here', True)
                         new_view.set_line_endings('unix')
         else:
-            sublime.status_message('No connection to SQL server')
+            self.view.window().status_message('No connection to SQL server')

base/te_show_query.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python\n
 # -*- coding: utf-8 -*-
 
-import sublime
+# import sublime
 import sublime_plugin
 from . import te_utils as utils
 
@@ -55,7 +55,7 @@ def get_query(self, row_id):
         elif long_queries:
             sql_query = self.sql_query_longq
         else:
-            sublime.status_message('Error: Unknown mode')
+            self.view.window().status_message('Error: Unknown mode')
 
         if row_id:
             sqlcon = utils.te_get_connection()
@@ -96,7 +96,7 @@ def get_query(self, row_id):
 
                 sqlcon.dbdisconnect()
         else:
-            sublime.status_message('Error: ROW ID is not found')
+            self.view.window().status_message('Error: ROW ID is not found')
 
     def is_visible(self, *args):
         is_actmon = self.view.settings().get('te_activity_monitor', False)

base/te_sql_exec.py

@@ -1,11 +1,14 @@
 #!/usr/bin/env python\n
 # -*- coding: utf-8 -*-
 
+import sys
+import os
 import time
 from datetime import datetime
 import sublime
 import sublime_plugin
 from . import te_utils as utils
+sys.path.append(os.path.join(os.path.dirname(__file__), "../libs"))
 from ..libs.terminaltables.other_tables import WindowsTable as SingleTable
 
 
@@ -45,24 +48,24 @@ def run(self, view, query=None):
             result_in_new_tab = utils.te_get_setting('te_result_in_new_tab', False)
 
             if result_in_tab:
-                if not self.res_view or result_in_new_tab or self.res_view.id() not in [v.id() for v in sublime.active_window().views()]:
-                    self.res_view = sublime.active_window().new_file()
+                if not self.res_view or result_in_new_tab or self.res_view.id() not in [v.id() for v in self.view.window().views()]:
+                    self.res_view = self.view.window().new_file()
                 self.res_view.set_name('TSQLEasy result (%s)' % current_time)
                 self.res_view.settings().set("word_wrap", False)
                 self.res_view.run_command('tsql_easy_insert_text', {'position': self.res_view.size(), 'text': text})
-                sublime.active_window().focus_view(self.res_view)
+                self.view.window().focus_view(self.res_view)
 
             else:
                 panel_name = 'result_panel'
                 if not self.res_view:
-                    self.res_view = sublime.active_window().create_output_panel(panel_name)
+                    self.res_view = self.view.window().create_output_panel(panel_name)
                 self.res_view.run_command('tsql_easy_insert_text', {'position': self.res_view.size(), 'text': text + '\n'})
                 self.res_view.show(self.res_view.size())
-                sublime.active_window().run_command("show_panel", {"panel": "output." + panel_name})
+                self.view.window().run_command("show_panel", {"panel": "output." + panel_name})
 
-            sublime.status_message('Executed.')
+            self.view.window().status_message('Executed.')
         else:
-            sublime.status_message('Nothing to execute.')
+            self.view.window().status_message('Nothing to execute.')
 
     def getval(self, value):
         if value is None:

base/te_utils.py

@@ -1,11 +1,14 @@
 #!/usr/bin/env python\n
 # -*- coding: utf-8 -*-
 
+import sys
+import os
 import re
 import sublime
 import sublime_plugin
 from . import sqlodbccon
 from .te_sql_alias import SQLAlias
+sys.path.append(os.path.join(os.path.dirname(__file__), "../libs"))
 from ..libs.terminaltables.other_tables import WindowsTable as SingleTable
 
 
@@ -114,9 +117,9 @@ def te_reload_aliases_from_file():
         if global_alias.set_text_hash(text.encode('utf-8')):
             global_alias.aliases = {}
             te_get_all_aliases(text)
-            sublime.status_message('Aliases were reloaded.')
+            sublime.active_window().status_message('Aliases were reloaded.')
         else:
-            sublime.status_message('Text unchanged. Using old aliases.')
+            sublime.active_window().status_message('Text unchanged. Using old aliases.')
 
 
 def te_get_title():

messages.json

@@ -6,5 +6,6 @@
     "1.4.0": "messages/1.4.0.txt",
     "1.4.1": "messages/1.4.1.txt",
     "1.4.2": "messages/1.4.2.txt",
-    "1.5.0": "messages/1.5.0.txt"
+    "1.5.0": "messages/1.5.0.txt",
+    "1.5.1": "messages/1.5.1.txt"
 }

messages/1.5.1.txt

@@ -0,0 +1,3 @@
+TSQL Easy 1.5.1 changelog:
+
+* Fix loading of the terminaltables module