Skip to content
This repository was archived by the owner on Mar 12, 2020. It is now read-only.

Commit 51237d0

Browse files
committed
Fixes view focus and getFunctions
1 parent 5bfa043 commit 51237d0

File tree

3 files changed

+14
-8
lines changed

3 files changed

+14
-8
lines changed

SQLTools.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ def bootstrap():
3434
@staticmethod
3535
def setTablesIfNotEmpty(tables):
3636
if type(tables) is list and len(tables) == 0:
37-
sublime.message_dialog('Connection failed. Check your settings and try again.')
37+
# sublime.message_dialog('Connection failed. Check your settings and try again.')
3838
return
3939
ST.tables = tables
4040

@@ -130,7 +130,8 @@ def display(content, name="SQLTools Result"):
130130
views = STM.Window().views()
131131
for view in views:
132132
if view.name() == name:
133-
resultContainer = view;
133+
resultContainer = view
134+
STM.Window().focus_view(resultContainer)
134135
break;
135136
if not resultContainer:
136137
resultContainer = STM.Window().new_file()

SQLToolsModels.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ class Const:
1212
SGDB_FILENAME = "SQLToolsSGBD.{0}".format(SETTINGS_EXTENSION)
1313
CONNECTIONS_FILENAME = "SQLToolsConnections.{0}".format(SETTINGS_EXTENSION)
1414
USER_QUERIES_FILENAME = "SQLToolsSavedQueries.{0}".format(SETTINGS_EXTENSION)
15-
VERSION = "v0.3.0"
15+
VERSION = "v0.3.1"
1616
pass
1717

1818
class Log:
@@ -149,9 +149,11 @@ def getColumns(self, callback):
149149
pass
150150

151151
def getFunctions(self, callback):
152-
query = self.getOptionsForSgdbCli()['queries']['functions']['query']
153-
self.runCommand(self.builArgs('functions'), query, lambda result: Utils.getResultAsList(result, callback))
154-
152+
try:
153+
query = self.getOptionsForSgdbCli()['queries']['functions']['query']
154+
self.runCommand(self.builArgs('functions'), query, lambda result: Utils.getResultAsList(result, callback))
155+
except Exception:
156+
pass
155157

156158
def getTableRecords(self, tableName, callback):
157159
query = self.getOptionsForSgdbCli()['queries']['show records']['query'].format(tableName, self.rowsLimit)
@@ -212,7 +214,7 @@ def builArgs(self, queryName=None):
212214
argsType = 'list'
213215
cliOptions['args'] = ' '.join(cliOptions['args'])
214216

215-
Log.debug('Usgin cli args (%s) "%s"' %(argsType, cliOptions['args']))
217+
Log.debug('Usgin cli args ' + ' '.join(args + shlex.split(cliOptions['args'].format(**self.options))))
216218
return args + shlex.split(cliOptions['args'].format(**self.options))
217219

218220
def getOptionsForSgdbCli(self):

messages.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{
22
"install": "messages/install.md",
3-
"1.0.6": "messages/v1.0.6.md"
3+
"0.1.6": "messages/v0.1.6.md",
4+
"0.2.0": "messages/v0.2.0.md",
5+
"0.3.0": "messages/v0.3.0.md",
6+
"0.3.1": "messages/v0.3.0.md",
47
}

0 commit comments

Comments
 (0)