Fixed options not being applied. Moved cli settings to sublime-settings file

Author: mtxr

SQLTools.sublime-settings

@@ -22,5 +22,119 @@
         "indent_tabs"     : false,
         "indent_width"    : 4,
         "reindent"        : true
+    },
+    /**
+     * Client options for you SGBD.
+     * In this file, the section cli has the names you can use here. Eg: "pgsql": "psql"
+     * So here, you must have "psql with the same sections listed bellow (options, before, args and queries)"
+     *
+     * Avoid changing the brackets content in "args"
+     */
+    "cli_options": {
+        "pgsql": {
+            "options": [],
+            "before": [],
+            "args": "-h {host} -p {port} -U {username} -d {database}",
+            "queries": {
+                "desc" : {
+                    "query": "SELECT  '|' || CASE WHEN n.nspname = current_schema() THEN quote_ident(c.relname) ELSE quote_ident(n.nspname)||'.'||quote_ident(c.relname) END ||'|' AS tblname FROM pg_catalog.pg_class AS c INNER JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 'pg_toast', 'information_schema') ORDER BY n.nspname = current_schema() DESC, pg_catalog.pg_table_is_visible(c.oid) DESC, n.nspname, c.relname",
+                    "options": ["-t", "--no-psqlrc"],
+                    "format" : "|%s|"
+                },
+                "desc table": {
+                    "query": "\\d+ %s",
+                    "options": [],
+                    "format" : "|%s|"
+                },
+                "show records": {
+                    "query": "select * from {0} limit {1}",
+                    "options": [],
+                    "format" : "|%s|"
+                },
+                "columns": {
+                    "query": "SELECT DISTINCT '|' || table_name || '.' || column_name || '|' FROM information_schema.columns WHERE table_schema = CURRENT_SCHEMA() GROUP BY table_name, column_name;",
+                    "options": ["-t", "--no-psqlrc"],
+                    "format" : "|%s|"
+                }
+            }
+        },
+        "oracle": {
+            "options": ["-S"],
+            "before": [
+                "set sqlprompt ''",
+                "set colsep '|'",
+                "set pagesize 100",
+                "set linesize 500",
+                "set tab off"
+            ],
+            "args": "{username}/{password}@\"(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)(HOST={host})(PORT={port})))(CONNECT_DATA=(SERVICE_NAME={service})))\"",
+            "queries": {
+                "desc" : {
+                    "query": "select CONCAT(CONCAT('| ', table_name), ' |') as tables from user_tables;",
+                    "options": ["-S"],
+                    "format" : "|%s|"
+                },
+                "desc table": {
+                    "query": "desc %s;",
+                    "options": ["-S"],
+                    "format" : "|%s|"
+                },
+                "show records": {
+                    "query": "select * from {0} limit {1};",
+                    "options": ["-S"],
+                    "format" : "|%s|"
+                }
+            }
+        },
+        "mysql": {
+            "options": ["-f", "--table"],
+            "before": [],
+            "args": "-h{host} -P{port} -u\"{username}\" -p\"{password}\" -D\"{database}\"",
+            "queries": {
+                "desc" : {
+                    "query": "show tables",
+                    "options": ["-f", "--table", "--skip-column-names"],
+                    "format" : "|%s|"
+                },
+                "desc table": {
+                    "query": "desc `%s`",
+                    "options": ["-f", "--table"],
+                    "format" : "|%s|"
+                },
+                "show records": {
+                    "query": "select * from `{0}` limit {1}",
+                    "options": ["-f", "--table"],
+                    "format" : "|%s|"
+                },
+                "columns": {
+                    "query": "SELECT table_name, column_name FROM information_schema.columns WHERE table_schema = DATABASE();",
+                    "options": ["-f", "--table"],
+                    "format" : "|%s|"
+                }
+            }
+        },
+        "vertica": {
+            "options": [],
+            "before" : [],
+            "args": "-h {host} -p {port} -U \"{username}\" -w \"{password}\" -d \"{database}\"",
+            "queries": {
+                "desc" : {
+                    "query": "\\dt",
+                    "options": ["-t"],
+                    "format" : "|%s|"
+                },
+                "desc table": {
+                    "query": "\\d %s",
+                    "options": [],
+                    "format" : "|%s|"
+                },
+                "show records": {
+                    "query": "select * from {0} limit {1}",
+                    "options": [],
+                    "format" : "|%s|"
+                }
+            }
+        }
     }
+
 }

SQLToolsModels.py

@@ -9,6 +9,7 @@
 class Const:
     SETTINGS_EXTENSION    = "sublime-settings"
     SETTINGS_FILENAME     = "SQLTools.{0}".format(SETTINGS_EXTENSION)
+    SGDB_FILENAME         = "SQLToolsSGBD.{0}".format(SETTINGS_EXTENSION)
     CONNECTIONS_FILENAME  = "SQLToolsConnections.{0}".format(SETTINGS_EXTENSION)
     USER_QUERIES_FILENAME = "SQLToolsSavedQueries.{0}".format(SETTINGS_EXTENSION)
     pass
@@ -76,7 +77,6 @@ def getSavedQuery(alias):
 class Connection:
 
     def __init__(self, name, options):
-        self.cliSettings = sublime.load_settings('{0}.settings'.format(options['type']))
         self.cli         = sublime.load_settings(Const.SETTINGS_FILENAME).get('cli')[options['type']]
         self.rowsLimit   = sublime.load_settings(Const.SETTINGS_FILENAME).get('show_records').get('limit', 50)
         self.options     = options
@@ -115,28 +115,28 @@ def loadDefaultConnectionName():
         return default
 
     def getTables(self, callback):
-        query   = self.cliSettings.get('queries')['desc']['query']
+        query   = self.getOptionsForSgdbCli()['queries']['desc']['query']
         self.runCommand(self.builArgs('desc'), query, lambda result: Utils.getResultAsList(result, callback))
 
     def getColumns(self, callback):
         try:
-            query   = self.cliSettings.get('queries')['columns']['query']
+            query   = self.getOptionsForSgdbCli()['queries']['columns']['query']
             self.runCommand(self.builArgs('columns'), query, lambda result: Utils.getResultAsList(result, callback))
         except Exception:
             pass
 
     def getTableRecords(self, tableName, callback):
-        query   = self.cliSettings.get('queries')['show records']['query'].format(tableName, self.rowsLimit)
+        query   = self.getOptionsForSgdbCli()['queries']['show records']['query'].format(tableName, self.rowsLimit)
         self.runCommand(self.builArgs('show records'), query, lambda result: callback(result))
 
     def getTableDescription(self, tableName, callback):
-        query   = self.cliSettings.get('queries')['desc table']['query'] % tableName
+        query   = self.getOptionsForSgdbCli()['queries']['desc table']['query'] % tableName
         self.runCommand(self.builArgs('desc table'), query, lambda result: callback(result))
 
     def execute(self, queries, callback):
         queryToRun = ''
 
-        for query in self.cliSettings.get('before'):
+        for query in self.getOptionsForSgdbCli()['before']:
             queryToRun += query + "\n"
 
         if type(queries) is str:
@@ -165,11 +165,19 @@ def runCommand(self, args, query, callback):
 
 
     def builArgs(self, queryName=None):
+        cliOptions = self.getOptionsForSgdbCli()
         args  = [self.cli]
-        if queryName and len(self.cliSettings.get('queries')[queryName]['options']) > 0:
-            args = args + self.cliSettings.get('queries')[queryName]['options']
 
-        return args + shlex.split(self.cliSettings.get('args').format(**self.options))
+        if len(cliOptions['options']) > 0:
+            args = args + ' '.join(cliOptions['options'])
+
+        if queryName and len(cliOptions['queries'][queryName]['options']) > 0:
+            args = args + cliOptions['queries'][queryName]['options']
+
+        return args + shlex.split(cliOptions['args'].format(**self.options))
+
+    def getOptionsForSgdbCli(self):
+        return sublime.load_settings(Const.SETTINGS_FILENAME).get('cli_options')[self.type]
 
 
 class Selection: