v.1.5.0 pyodbc update, osx support, st2 dropped

Author: tosher

Default (Linux).sublime-keymap

@@ -3,8 +3,8 @@
     { "keys": ["ctrl+shift+f11"], "command": "tsql_easy_set_active_server" },
     { "keys": ["ctrl+alt+c"], "command": "tsql_easy_open_console" },
     { "keys": ["ctrl+alt+o"], "command": "tsql_easy_open_server_object" },
-    { "keys": ["r"], "command": "tsql_easy_activity_monitor", "args": {"is_refresh": true}, "context": [{"key": "setting.te_activity_monitor", "operand": true}] },
-    { "keys": ["r"], "command": "tsql_easy_long_queries", "args": {"is_refresh": true}, "context": [{"key": "setting.te_long_queries", "operand": true}] },
+    { "keys": ["r"], "command": "tsql_easy_activity_monitor_refresh", "context": [{"key": "setting.te_activity_monitor", "operand": true}] },
+    { "keys": ["r"], "command": "tsql_easy_long_queries_refresh", "context": [{"key": "setting.te_long_queries", "operand": true}] },
     { "keys": ["enter"], "command": "tsql_easy_show_query", "context": [{"key": "setting.te_activity_monitor", "operand": true} ] },
     { "keys": ["enter"], "command": "tsql_easy_show_query", "context": [{"key": "setting.te_long_queries", "operand": true} ] }
 ]

Default (OSX).sublime-keymap

@@ -3,8 +3,8 @@
     { "keys": ["ctrl+alt+f11"], "command": "tsql_easy_set_active_server" },
     { "keys": ["ctrl+alt+c"], "command": "tsql_easy_open_console" },
     { "keys": ["ctrl+alt+o"], "command": "tsql_easy_open_server_object" },
-    { "keys": ["r"], "command": "tsql_easy_activity_monitor", "args": {"is_refresh": true}, "context": [{"key": "setting.te_activity_monitor", "operand": true}] },
-    { "keys": ["r"], "command": "tsql_easy_long_queries", "args": {"is_refresh": true}, "context": [{"key": "setting.te_long_queries", "operand": true}] },
+    { "keys": ["r"], "command": "tsql_easy_activity_monitor_refresh", "context": [{"key": "setting.te_activity_monitor", "operand": true}] },
+    { "keys": ["r"], "command": "tsql_easy_long_queries_refresh", "context": [{"key": "setting.te_long_queries", "operand": true}] },
     { "keys": ["enter"], "command": "tsql_easy_show_query", "context": [{"key": "setting.te_activity_monitor", "operand": true} ] },
     { "keys": ["enter"], "command": "tsql_easy_show_query", "context": [{"key": "setting.te_long_queries", "operand": true} ] }
 ]

Default (Windows).sublime-keymap

@@ -3,8 +3,8 @@
     { "keys": ["ctrl+alt+f11"], "command": "tsql_easy_set_active_server" },
     { "keys": ["ctrl+alt+c"], "command": "tsql_easy_open_console" },
     { "keys": ["ctrl+alt+o"], "command": "tsql_easy_open_server_object" },
-    { "keys": ["r"], "command": "tsql_easy_activity_monitor", "args": {"is_refresh": true}, "context": [{"key": "setting.te_activity_monitor", "operand": true}] },
-    { "keys": ["r"], "command": "tsql_easy_long_queries", "args": {"is_refresh": true}, "context": [{"key": "setting.te_long_queries", "operand": true}] },
+    { "keys": ["r"], "command": "tsql_easy_activity_monitor_refresh", "context": [{"key": "setting.te_activity_monitor", "operand": true}] },
+    { "keys": ["r"], "command": "tsql_easy_long_queries_refresh", "context": [{"key": "setting.te_long_queries", "operand": true}] },
     { "keys": ["enter"], "command": "tsql_easy_show_query", "context": [{"key": "setting.te_activity_monitor", "operand": true} ] },
     { "keys": ["enter"], "command": "tsql_easy_show_query", "context": [{"key": "setting.te_long_queries", "operand": true} ] }
 ]

Main.sublime-menu

@@ -39,63 +39,20 @@
                             },
                             { "caption": "-" },
                             {
-                                "command": "open_file",
-                                "args": {"file": "${packages}/TSQLEasy/TSQLEasy.sublime-settings"},
-                                "caption": "Settings - Default"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {"file": "${packages}/User/TSQLEasy.sublime-settings"},
-                                "caption": "Settings – User"
-                            },
-                            { "caption": "-" },
-                            {
-                                "command": "open_file",
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/TSQLEasy/Default (Windows).sublime-keymap",
-                                    "platform": "Windows"
+                                    "base_file": "${packages}/TSQLEasy/TSQLEasy.sublime-settings",
+                                    "default": "{\n\t$0\n}\n"
                                 },
-                                "caption": "Key Bindings – Default"
+                                "caption": "Settings"
                             },
                             {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/TSQLEasy/Default (OSX).sublime-keymap",
-                                    "platform": "OSX"
-                                },
-                                "caption": "Key Bindings – Default"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/TSQLEasy/Default (Linux).sublime-keymap",
-                                    "platform": "Linux"
-                                },
-                                "caption": "Key Bindings – Default"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/User/Default (Windows).sublime-keymap",
-                                    "platform": "Windows"
-                                },
-                                "caption": "Key Bindings – User"
-                            },
-                            {
-                                "command": "open_file",
-                                "args": {
-                                    "file": "${packages}/User/Default (OSX).sublime-keymap",
-                                    "platform": "OSX"
-                                },
-                                "caption": "Key Bindings – User"
-                            },
-                            {
-                                "command": "open_file",
+                                "command": "edit_settings",
                                 "args": {
-                                    "file": "${packages}/User/Default (Linux).sublime-keymap",
-                                    "platform": "Linux"
+                                    "base_file": "${packages}/TSQLEasy/Default ($platform).sublime-keymap",
+                                    "default": "[\n\t$0\n]\n"
                                 },
-                                "caption": "Key Bindings – User"
+                                "caption": "Key Bindings"
                             }
                         ]
                     }

README.md

@@ -1,8 +1,10 @@
 # Sublime Text plugin: TSQL Easy
 
-[TSQL Easy](https://github.com/tosher/TSQLEasy) is a plugin for Sublime Text editor (ver. 2/3) that adds possibility to read/write/execute sql requests to Microsoft SQL Server and some IDE-like functionality.
+[TSQL Easy](https://github.com/tosher/TSQLEasy) is a plugin for Sublime Text 3 editor that adds possibility to read/write/execute sql requests to Microsoft SQL Server and some IDE-like functionality.
 Server connections based on [pyODBC](https://code.google.com/p/pyodbc/) library.
 
+**NOTE**: Sublime text 2 is not supported anymore. Please use Sublime text 3.
+
 ## Main features
 * Manage connections to SQL Servers.
 * Execute sql requests on SQL Server.
@@ -11,19 +13,20 @@ Server connections based on [pyODBC](https://code.google.com/p/pyodbc/) library.
 * Possibility to receive code of procedure, functions by text under cursor.
 * Possibility to open local files with the same name as stored procedure (function, etc.): **ProcedureName** -> **ProcedureName.sql**.
 * Improved syntax highlighting for TSQL.
-* Reports: **Activity monitor**, **Long running queries**
+* Reports: 
+    - Activity monitor
+    - Long running queries
 
 **Warning!** Server connection required for full functionality or use fake server with empty **driver** value for work offline without completions, etc.
 
 ### PyODBC
-Now, package includes pyODBC (3.0.7) binaries:
+Now, package includes [pyODBC](https://code.google.com/p/pyodbc/) (4.0.22) binaries:
 
-* Windows: ST2/3 x32/x64
-* Linux: ST2/3 x64
-* Pull requests are welcome! :)
+* Windows: ST3 x64 (x32 with old pyodbc 3.0.7)
+* Linux: ST3 x64
+* OSX: ST3 x64
 
 ## Commands
-
 * Open console - open new console for sql requests
 * Server select - change predefined sql server connection
 * Execute - execute the request (<kbd>F5</kbd>)
@@ -40,6 +43,6 @@ The easiest way to install this is with [Package Control](http://wbond.net/subli
  * If you just went and installed Package Control, you probably need to restart Sublime Text before doing this next bit.
  * Bring up the Command Palette (<kbd>Command</kbd>+<kbd>Shift</kbd>+<kbd>p</kbd> on OS X, <kbd>Ctrl</kbd>+<kbd>Shift</kbd>+<kbd>p</kbd> on Linux/Windows).
  * Select "Package Control: Install Package" (it'll take a few seconds)
- * Select TSQL Easy when the list appears.
+ * Select `TSQL Easy` when the list appears.
 
-Package Control will automatically keep **TSQL Easy** up to date with the latest version.
+Package Control will automatically keep `TSQL Easy` up to date with the latest version.

TSQLEasy.sublime-settings

@@ -2,31 +2,34 @@
     "te_sql_server":
     {
         "Main": {
-            "driver": "SQL Server",
+            "dsn": "", // based on system connectivity settings, use odbc `dsn` or `server` name/ip
+            "driver": "SQL Server", // FreeTDS
             "server": "127.0.0.1",
             "server_port": 1433,
             "username": "",
             "password": "",
             "database": "",
-            "autocommit": true
+            "autocommit": true,
+            "timeout": 0
             },
         "Offline": {
             "driver": ""
             }
     },
     "te_server_active": "Main",
-    "te_encodings":
-    {
-        "main_profile": "utf-8"
-    },
-    "te_sql_profile": "main_profile",
-    "te_procedure_path": [],
+    // deprecated
+    // "te_encodings":
+    // {
+    //     "main_profile": "utf-8"
+    // },
+    // "te_sql_profile": "main_profile",
+    "te_procedure_path": [], // pathes to local source files
     "te_result_in_tab": false,
     "te_result_in_new_tab": false,
     "te_show_request_in_result": false,
     "te_syntax": "Packages/TSQLEasy/TSQL.tmLanguage",
     "te_report_syntax": "Packages/Markdown/Markdown.tmLanguage",
-    "te_activity_monitor_min_pid": 50,
+    "te_activity_monitor_min_pid": 50, // show/hide system processes
 
     "te_activity_monitor_columns": [
         { "prop": "spid", "colname": "SPID", "align": "right" },

base/__init__.py

@@ -0,0 +1,28 @@
+#!/usr/bin/env python\n
+# -*- coding: utf-8 -*-
+
+from .te_set_active_server import TsqlEasySetActiveServerCommand
+from .te_utils import TsqlEasyInsertTextCommand
+from .te_sql_exec import TsqlEasyExecSqlCommand
+from .te_open_console import TsqlEasyOpenConsoleCommand
+from .te_open_server_obj import TsqlEasyOpenServerObjectCommand
+from .te_open_local_obj import TsqlEasyOpenLocalObjectCommand
+from .te_activity_monitor import TsqlEasyActivityMonitorCommand
+from .te_activity_monitor import TsqlEasyActivityMonitorRefreshCommand
+from .te_long_queries import TsqlEasyLongQueriesCommand
+from .te_long_queries import TsqlEasyLongQueriesRefreshCommand
+from .te_show_query import TsqlEasyShowQueryCommand
+
+__all__ = [
+    'TsqlEasySetActiveServerCommand',
+    'TsqlEasyInsertTextCommand',
+    'TsqlEasyExecSqlCommand',
+    'TsqlEasyOpenConsoleCommand',
+    'TsqlEasyOpenServerObjectCommand',
+    'TsqlEasyOpenLocalObjectCommand',
+    'TsqlEasyActivityMonitorCommand',
+    'TsqlEasyActivityMonitorRefreshCommand',
+    'TsqlEasyLongQueriesCommand',
+    'TsqlEasyLongQueriesRefreshCommand',
+    'TsqlEasyShowQueryCommand'
+]

sqlodbccon.py renamed to base/sqlodbccon.py

@@ -5,14 +5,20 @@
 import os.path
 import sublime
 
-pythonver = sys.version_info[0]
+odbc_lib_path = os.path.normpath(
+    os.path.join(
+        os.path.dirname(__file__),
+        '..',
+        'lib',
+        'st3_%s_%s' % (sublime.platform(), sublime.arch())
+    )
+)
 
-st_version = 2
-if int(sublime.version()) > 3000:
-    st_version = 3
-
-odbc_lib_path = os.path.join(os.path.dirname(__file__), 'lib', 'st%d_%s_%s' % (st_version, sublime.platform(), sublime.arch()))
 sys.path.append(odbc_lib_path)
+
+# macos workable hint to use system lib
+# sys.path.append('~/.pyenv/versions/3.3.6/lib/python3.3/site-packages')
+
 try:
     import pyodbc
     print('TSQLEasy: PyODBC was loaded successfully.')
@@ -75,6 +81,7 @@ def dbconnect(self):
         self.sqlcursor = None
         try:
             self.sqlconnection = pyodbc.connect(self.connection_string, autocommit=self.autocommit, timeout=self.timeout)
+            # self.sqlconnection.setencoding('utf-8')
             if self.autocommit:
                 self.sqlconnection.autocommit = True
             self.sqlcursor = self.sqlconnection.cursor()
@@ -102,7 +109,7 @@ def dbexec(self, sql_string, sql_params=None):
         try:
             self.sqlcursor.execute(sql_string, sql_params)
         except Exception as e:
-            raise
+            raise Exception('Error while request execution: %s, query: %s, params: %s' % (e, sql_string, sql_params))
 
         try:
             self.sqlcolumns = self.sqlcursor.description
@@ -111,6 +118,6 @@ def dbexec(self, sql_string, sql_params=None):
             if str(e).startswith('No results'):
                 pass
             else:
-                raise
+                raise(e)
         except Exception as e:
-            raise
+            raise(e)

base/te_activity_monitor.py

@@ -0,0 +1,79 @@
+#!/usr/bin/env python\n
+# -*- coding: utf-8 -*-
+
+from datetime import datetime
+import sublime
+import sublime_plugin
+from . import te_utils as utils
+
+
+class TsqlEasyActivityMonitorCommand(sublime_plugin.TextCommand):
+    # OUTER APPLY Fn_get_sql(sp.sql_handle)
+    # NOTE: pyodbc return empty result with comment like:
+    # -- OUTER APPLY sys.dm_exec_sql_text(sp.sql_handle)
+    sql_query = '''
+    SELECT
+        sp.spid,
+        /* TEXT as query, */
+        Db_name(sp.dbid) as dbname,
+        sp.cpu,
+        sp.memusage,
+        sp.status,
+        sp.loginame,
+        sp.hostname,
+        sp.blocked,
+        sp.waittime,
+        sp.lastwaittype,
+        sp.waitresource,
+        convert(varchar(255), sp.login_time) as login_time,
+        convert(varchar(255), sp.last_batch) as last_batch,
+        sp.cmd,
+        sp.open_tran,
+        sp.program_name
+    FROM sys.sysprocesses as sp
+    /* OUTER APPLY sys.dm_exec_sql_text(sp.sql_handle) */
+    WHERE sp.spid > ?
+    ORDER BY sp.spid
+    '''
+
+    def run(self, edit):
+        view = self.prepare_view(edit)
+        self.show(view)
+
+    def set_title(self, view):
+        current_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+        self.title = 'Activity monitor (at %s)' % current_time
+        view.set_name(self.title)
+
+    def prepare_view(self, edit):
+        view = self.view.window().new_file()
+        view.settings().set('te_activity_monitor', True)
+        syntax_file = utils.te_get_setting('te_report_syntax', utils.DEFAULT_REPORT_SYNTAX)
+        view.set_syntax_file(syntax_file)
+        return view
+
+    def show(self, view):
+        self.set_title(view)
+        min_pid = utils.te_get_setting('te_activity_monitor_min_pid', 50)
+        sql_params = (min_pid,)
+        text = utils.te_show_data(title=self.title, sql_query=self.sql_query, sql_params=sql_params, setup_columns='te_activity_monitor_columns')
+        view.settings().set("word_wrap", False)
+        view.run_command('tsql_easy_insert_text', {'position': 0, 'text': text + '\n\n'})
+        view.set_scratch(True)
+        view.set_read_only(True)
+
+
+class TsqlEasyActivityMonitorRefreshCommand(TsqlEasyActivityMonitorCommand):
+
+    def prepare_view(self, edit):
+        view = self.view
+        view.set_read_only(False)
+        view.erase(edit, sublime.Region(0, view.size()))
+        return view
+
+    def is_visible(self, *args):
+        is_actmon = self.view.settings().get('te_activity_monitor', False)
+
+        if is_actmon:
+            return True
+        return False