v1.6.3 connection rework

Author: tosher

README.md

@@ -58,3 +58,8 @@ Activity monitor
 Long running queries
 
 ![SQL request](https://raw.githubusercontent.com/wiki/tosher/TSQLEasy/images/tsql_easy_scr3.png)
+
+## External dependencies
+
+* [Terminaltables](https://robpol86.github.io/terminaltables/index.html)
+* [Sqlparse](https://github.com/andialbrecht/sqlparse)

TSQLEasy.sublime-settings

@@ -27,7 +27,7 @@
     "te_result_in_tab": false,
     "te_result_in_new_tab": false,
     "te_show_request_in_result": false,
-    "te_syntax": "Packages/TSQLEasy/TSQL.tmLanguage",
+    "te_syntax": "Packages/TSQLEasy/TSQL.sublime-syntax",
     "te_report_syntax": "Packages/Markdown/Markdown.tmLanguage",
     "te_activity_monitor_min_pid": 50, // show/hide system processes
 

base/sqlodbccon.py

@@ -5,6 +5,7 @@
 import os.path
 import sublime
 
+
 odbc_lib_path = os.path.normpath(
     os.path.join(
         os.path.dirname(__file__),
@@ -26,7 +27,7 @@
     print('TSQLEasy: PyODBC is not available: %s' % e)
 
 
-class SQLCon:
+class SQLCon(object):
 
     defaultschema = None
 
@@ -47,7 +48,7 @@ def __init__(self, dsn=None, server='127.0.0.1', driver='SQL Server', serverport
         self.sqlconnection = None
         self.sqlcursor = None
         self.dbconnect()
-        self.defaultschema = self._get_default_schema()
+        # self.defaultschema = self._get_default_schema()
 
     def _get_connection_string(self):
         if not self.dsn:
@@ -70,11 +71,11 @@ def _get_connection_string(self):
 
         return connection_string
 
-    def _get_default_schema(self):
-        if self.sqlconnection is not None:
-            self.dbexec('SELECT SCHEMA_NAME()')
-            if self.sqldataset:
-                return self.sqldataset[0][0]
+    # def _get_default_schema(self):
+    #     if self.sqlconnection is not None:
+    #         self.dbexec('SELECT SCHEMA_NAME()')
+    #         if self.sqldataset:
+    #             return self.sqldataset[0][0]
 
     def dbconnect(self):
         self.sqlconnection = None
@@ -84,10 +85,14 @@ def dbconnect(self):
             # self.sqlconnection.setencoding('utf-8')
             if self.autocommit:
                 self.sqlconnection.autocommit = True
+            self.post_connection_setup()
             self.sqlcursor = self.sqlconnection.cursor()
         except Exception:
             raise
 
+    def post_connection_setup(self):
+        pass
+
     def dbdisconnect(self):
         if self.sqlconnection:
             self.sqlconnection.close()
@@ -121,3 +126,51 @@ def dbexec(self, sql_string, sql_params=None):
                 raise(e)
         except Exception as e:
             raise(e)
+
+
+class ConSQLServer(SQLCon):
+    defaultschema = None
+
+    def __init__(self, dsn=None, driver='SQL Server', server='127.0.0.1', serverport=1433,
+                 username="", password="", database="",
+                 sleepsecs=5, autocommit=True, timeout=0):
+
+        # super(ConSQLServer, self).__init__(
+        super().__init__(
+            dsn=dsn, driver=driver, server=server, serverport=serverport,
+            username=username, password=password, database=database,
+            sleepsecs=sleepsecs, autocommit=autocommit, timeout=timeout)
+
+        self.defaultschema = self._get_default_schema()
+
+    def _get_default_schema(self):
+        if self.sqlconnection is not None:
+            self.dbexec('SELECT SCHEMA_NAME()')
+            if self.sqldataset:
+                return self.sqldataset[0][0]
+
+
+class ConPostgreSQLServer(SQLCon):
+    defaultschema = None
+
+    def __init__(self, dsn=None, driver='"PostgreSQL Unicode(x64)"', server='127.0.0.1', serverport=5432,
+                 username="", password="", database="",
+                 sleepsecs=5, autocommit=True, timeout=0):
+
+        # super(ConSQLServer, self).__init__(
+        super().__init__(
+            dsn=dsn, driver=driver, server=server, serverport=serverport,
+            username=username, password=password, database=database,
+            sleepsecs=sleepsecs, autocommit=autocommit, timeout=timeout)
+
+        self.defaultschema = self._get_default_schema()
+
+    def _get_default_schema(self):
+        if self.sqlconnection is not None:
+            self.dbexec('SELECT current_schema();')
+            if self.sqldataset:
+                return self.sqldataset[0][0]
+
+    def post_connection_setup(self):
+        self.sqlconnection.setdecoding(pyodbc.SQL_WCHAR, encoding='utf-8')
+        self.sqlconnection.setencoding(encoding='utf-8')

base/te_activity_monitor.py

@@ -62,6 +62,11 @@ def show(self, view):
         view.set_scratch(True)
         view.set_read_only(True)
 
+    def is_visible(self, *args):
+        if utils.ConDispatcher.is_sqlserver():
+            return True
+        return False
+
 
 class TsqlEasyActivityMonitorRefreshCommand(TsqlEasyActivityMonitorCommand):
 

base/te_long_queries.py

@@ -58,6 +58,11 @@ def show(self, view):
         view.set_scratch(True)
         view.set_read_only(True)
 
+    def is_visible(self, *args):
+        if utils.ConDispatcher.is_sqlserver():
+            return True
+        return False
+
 
 class TsqlEasyLongQueriesRefreshCommand(TsqlEasyLongQueriesCommand):
 

base/te_open_server_obj.py

@@ -27,8 +27,9 @@ def run(self, edit):
         if chars_before:
             word_cursor = ''.join([chars_before, word_cursor])
 
-        sqlreq = "exec sp_helptext @objname = ?"
-        sqlcon = utils.te_get_connection()
+        sqlreq = "exec sp_helptext @objname = ?"  # TODO: sqlsrv, postgres..
+        # sqlcon = utils.te_get_connection()
+        sqlcon = utils.te_sql_info().get_connection()
         if sqlcon.sqlconnection is not None:
             sqlcon.dbexec(sqlreq, [word_cursor])
             text = ''
@@ -52,3 +53,8 @@ def run(self, edit):
                         new_view.set_line_endings('unix')
         else:
             self.view.window().status_message('No connection to SQL server')
+
+    def is_visible(self, *args):
+        if utils.ConDispatcher.is_sqlserver():
+            return True
+        return False

base/te_show_query.py

@@ -58,7 +58,8 @@ def get_query(self, row_id):
             self.view.window().status_message('Error: Unknown mode')
 
         if row_id:
-            sqlcon = utils.te_get_connection()
+            # sqlcon = utils.te_get_connection()
+            sqlcon = utils.te_sql_info().get_connection()
             if sqlcon.sqlconnection is not None and sql_query:
                 sqlcon.dbexec(sql_query, (row_id,))
                 rows = sqlcon.sqldataset

base/te_sql_alias.py

@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import hashlib
+from . import tsql_keywords
 
 
 class SQLAlias():
@@ -11,16 +12,24 @@ class SQLAlias():
     def __init__(self):
         pass
 
+    def is_valid_alias(self, val):
+        if val.startswith('@'):
+            return False
+        if val.upper() in tsql_keywords.all_keywords:
+            return False
+        # print('"{}" is valid alias name'.format(val))
+        return True
+
     def set_alias(self, alias, name):
-        if self.aliases.get(alias, '') != name:
+        if self.is_valid_alias(alias) and self.is_valid_alias(name) and alias not in self.aliases:
             self.aliases[alias] = name
 
     def get_alias(self, alias):
         return self.aliases.get(alias, '')
 
     def alias_list(self):
         for alias in self.aliases:
-            print('[%s] => <%s>' % (self.aliases[alias], alias))
+            print('[{table}] => <{alias}>'.format(table=self.aliases[alias], alias=alias))
 
     def set_text_hash(self, text):
         text_hash = hashlib.md5(text).hexdigest()

base/te_sql_exec.py

@@ -17,7 +17,8 @@ class TsqlEasyExecSqlCommand(sublime_plugin.TextCommand):
     res_view = None
 
     def run(self, view, query=None):
-        self.sqlcon = utils.te_get_connection()
+        # self.sqlcon = utils.te_get_connection()
+        self.sqlcon = utils.te_sql_info().get_connection()
         self.view.set_line_endings('windows')
         if query:
             self.sql_query = query

base/te_table_info.py

@@ -181,7 +181,8 @@ def run(self, edit):
         if not self.res_view:
             self.res_view = sublime.active_window().create_output_panel(panel_name)
 
-        self.sqlcon = utils.te_get_connection()
+        # self.sqlcon = utils.te_get_connection()
+        self.sqlcon = utils.te_sql_info().get_connection()
         try:
             self.sqlcon.dbexec(self.DDL_CMD.format(table=table))
         except Exception as e:
@@ -216,3 +217,8 @@ def getval(self, value):
             return '{null}'
         else:
             return str(value)
+
+    def is_visible(self, *args):
+        if utils.ConDispatcher.is_sqlserver():
+            return True
+        return False