Merging upstream version 1.25.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 7 insertions, 1 deletions

diff --git a/mycli/__init__.py b/mycli/__init__.py
index e10d6ee..8de33c0 100644
--- a/mycli/__init__.py
+++ b/mycli/__init__.py
@@ -1 +1 @@
-__version__ = '1.24.4'
+__version__ = '1.25.0'
diff --git a/mycli/main.py b/mycli/main.py
index c13ed78..08f0755 100755
--- a/mycli/main.py
+++ b/mycli/main.py
@@ -138,6 +138,7 @@ class MyCli(object):
         self.multi_line = c['main'].as_bool('multi_line')
         self.key_bindings = c['main']['key_bindings']
         special.set_timing_enabled(c['main'].as_bool('timing'))
+        self.beep_after_seconds = float(c['main']['beep_after_seconds'] or 0)
 
         FavoriteQueries.instance = FavoriteQueries.from_config(self.config)
 
@@ -721,6 +722,8 @@ class MyCli(object):
                             self.output(formatted, status)
                         except KeyboardInterrupt:
                             pass
+                        if self.beep_after_seconds > 0 and t >= self.beep_after_seconds:
+                            self.echo('\a', err=True, nl=False)
                         if special.is_timing_enabled():
                             self.echo('Time: %0.03fs' % t)
                     except KeyboardInterrupt:
diff --git a/mycli/myclirc b/mycli/myclirc
index c89caa0..2418342 100644
--- a/mycli/myclirc
+++ b/mycli/myclirc
@@ -30,6 +30,9 @@ log_level = INFO
 # Timing of sql statments and table rendering.
 timing = True
 
+# Beep after long-running queries are completed; 0 to disable.
+beep_after_seconds = 0
+
 # Table format. Possible values: ascii, double, github,
 # psql, plain, simple, grid, fancy_grid, pipe, orgtbl, rst, mediawiki, html,
 # latex, latex_booktabs, textile, moinmoin, jira, vertical, tsv, csv.