sáb out 29 15:16:50 BRST 2016

Author: mtxr

SQLToolsAPI/Connection.py

@@ -29,7 +29,7 @@ def __init__(self, name, options, settings={}, commandClass='ThreadCommand'):
 
         if cli_path is None:
             Log((
-                "'{0}' could not be found by Sublime Text.\n\n" +
+                "'{0}' could not be found.\n\n" +
                 "Please set the '{0}' path in your SQLTools settings " +
                 "before continue.").format(self.cli))
             return
@@ -38,14 +38,14 @@ def __init__(self, name, options, settings={}, commandClass='ThreadCommand'):
         self.rowsLimit = settings.get('show_records', {}).get('limit', 50)
         self.options   = options
         self.name      = name
-        self.type      = options['type']
-        self.database  = options['database']
-        self.host      = options['host'] if 'host' in options else None
-        self.port      = options['port'] if 'port' in options else None
-        self.username  = options['username'] if 'username' in options else None
-        self.encoding  = options['encoding'] if 'encoding' in options else None
-        self.password  = options['password'] if 'password' in options else None
-        self.service   = options['service'] if 'service' in options else None
+        self.type      = options.get('type', None)
+        self.database  = options.get('database', None)
+        self.host      = options.get('host', None)
+        self.port      = options.get('port', None)
+        self.username  = options.get('username', None)
+        self.encoding  = options.get('encoding', None)
+        self.password  = options.get('password', None)
+        self.service   = options.get('service', None)
 
     def __str__(self):
         return self.name

SQLToolsAPI/README.md

@@ -1,3 +1,3 @@
-## SQLTools API for plugins - v0.2.4
+## SQLTools API for plugins - v0.2.5
 
 Docs will be ready soon

SQLToolsAPI/Storage.py

@@ -1,4 +1,5 @@
 import os
+import shutil
 from . import Utils as U
 
 __version__ = "v0.1.0"
@@ -10,8 +11,9 @@ def __init__(self, filename, default=None):
         self.defaultFile = default
         self.items = {}
 
-        if not os.path.isfile(filename):
-            U.saveJson(self.defaults(), filename)
+        #copy entire file, to keep comments
+        if not os.path.isfile(filename) and default and os.path.isfile(default):
+            shutil.copyfile(default, filename)
 
         self.all()
 

SQLToolsAPI/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "v0.2.4"
+__version__ = "v0.2.5"
 
 
 __all__ = [