Merge branch 'master' into system-error

4 files changed, 31 insertions, 24 deletions

diff --git a/pgcli/completion_refresher.py b/pgcli/completion_refresher.py
index 0f33357f..388bb295 100644
--- a/pgcli/completion_refresher.py
+++ b/pgcli/completion_refresher.py
@@ -53,7 +53,7 @@ class CompletionRefresher(object):
         if settings.get('single_connection'):
             executor = pgexecute
         else:
-            # Create a new pgexecute method to popoulate the completions.
+            # Create a new pgexecute method to populate the completions.
             executor = pgexecute.copy()
         # If callbacks is a single function then push it into a list.
         if callable(callbacks):
diff --git a/pgcli/key_bindings.py b/pgcli/key_bindings.py
index 6e2afe35..dbb4035c 100644
--- a/pgcli/key_bindings.py
+++ b/pgcli/key_bindings.py
@@ -12,6 +12,8 @@ def pgcli_bindings(pgcli):
     """Custom key bindings for pgcli."""
     kb = KeyBindings()
 
+    tab_insert_text = ' ' * 4
+
     @kb.add('f2')
     def _(event):
         """Enable/Disable SmartCompletion Mode."""
@@ -33,13 +35,20 @@ def pgcli_bindings(pgcli):
 
     @kb.add('tab')
     def _(event):
-        """Force autocompletion at cursor."""
+        """Force autocompletion at cursor on non-empty lines."""
+
         _logger.debug('Detected <Tab> key.')
-        b = event.app.current_buffer
-        if b.complete_state:
-            b.complete_next()
+
+        buff = event.app.current_buffer
+        doc = buff.document
+
+        if doc.on_first_line or doc.current_line.strip():
+            if buff.complete_state:
+                buff.complete_next()
+            else:
+                buff.start_completion(select_first=True)
         else:
-            b.start_completion(select_first=True)
+            buff.insert_text(tab_insert_text, fire_event=False)
 
     @kb.add('escape')
     def _(event):
diff --git a/pgcli/main.py b/pgcli/main.py
index 856f28e3..8078c5ce 100644
--- a/pgcli/main.py
+++ b/pgcli/main.py
@@ -556,7 +556,7 @@ class PGCli(object):
             logger.error("sql: %r, error: %r", text, e)
             logger.error("traceback: %r", traceback.format_exc())
             self._handle_server_closed_connection(text)
-        except PgCliQuitError as e:
+        except (PgCliQuitError, EOFError) as e:
             raise
         except Exception as e:
             logger.error("sql: %r, error: %r", text, e)
@@ -618,7 +618,7 @@ class PGCli(object):
         self.prompt_app = self._build_cli(history)
 
         if not self.less_chatty:
-            print('Server: PostgreSQL', self.pgexecute.get_server_version())
+            print('Server: PostgreSQL', self.pgexecute.server_version)
             print('Version:', __version__)
             print('Chat: https://gitter.im/dbcli/pgcli')
             print('Mail: https://groups.google.com/forum/#!forum/pgcli')
diff --git a/pgcli/pgexecute.py b/pgcli/pgexecute.py
index 1188dbae..4deaf279 100644
--- a/pgcli/pgexecute.py
+++ b/pgcli/pgexecute.py
@@ -205,22 +205,18 @@ class PGExecute(object):
         """Returns a clone of the current executor."""
         return self.__class__(**self._conn_params)
 
-    def get_server_version(self):
-        if self.server_version:
-            return self.server_version
-        with self.conn.cursor() as cur:
-            _logger.debug('Version Query. sql: %r', self.version_query)
-            cur.execute(self.version_query)
-            result = cur.fetchone()
-            if result:
-                # full version string looks like this:
-                # PostgreSQL 10.3 on x86_64-apple-darwin17.3.0, compiled by Apple LLVM version 9.0.0 (clang-900.0.39.2), 64-bit  # noqa
-                # let's only retrieve version number
-                version_parts = result[0].split()
-                self.server_version = version_parts[1]
-            else:
-                self.server_version = ''
-            return self.server_version
+    def get_server_version(self, cursor):
+        _logger.debug('Version Query. sql: %r', self.version_query)
+        cursor.execute(self.version_query)
+        result = cursor.fetchone()
+        server_version = ''
+        if result:
+            # full version string looks like this:
+            # PostgreSQL 10.3 on x86_64-apple-darwin17.3.0, compiled by Apple LLVM version 9.0.0 (clang-900.0.39.2), 64-bit  # noqa
+            # let's only retrieve version number
+            version_parts = result[0].split()
+            server_version = version_parts[1]
+        return server_version
 
     def connect(self, database=None, user=None, password=None, host=None,
                 port=None, dsn=None, **kwargs):
@@ -278,6 +274,8 @@ class PGExecute(object):
         self.pid = pid
         self.superuser = db_parameters.get('is_superuser') == '1'
 
+        self.server_version = self.get_server_version(cursor)
+
         register_date_typecasters(conn)
         register_json_typecasters(self.conn, self._json_typecaster)
         register_hstore_typecaster(self.conn)