Merge pull request #1198 from FatBoyXPC/add-collapsed-output-to-special-commands

Add collapsed output special command

Author: amjith

mycli/AUTHORS

@@ -32,6 +32,7 @@ Contributors:
   * Daniel West
   * Daniël van Eeden
   * Fabrizio Gennari
+  * FatBoyXPC
   * François Pietka
   * Frederic Aoustin
   * Georgy Frolov

mycli/main.py

@@ -676,6 +676,7 @@ def one_iteration(text=None):
                     return
 
                 special.set_expanded_output(False)
+                special.set_forced_horizontal_output(False)
 
                 try:
                     text = self.handle_editor_command(text)
@@ -745,6 +746,9 @@ def one_iteration(text=None):
                     else:
                         max_width = None
 
+                    if special.forced_horizontal():
+                        max_width = None
+
                     formatted = self.format_output(title, cur, headers, special.is_expanded_output(), max_width)
 
                     t = time() - start

mycli/packages/special/iocommands.py

@@ -20,6 +20,7 @@
 
 TIMING_ENABLED = False
 use_expanded_output = False
+force_horizontal_output = False
 PAGER_ENABLED = True
 tee_file = None
 once_file = None
@@ -97,6 +98,14 @@ def set_expanded_output(val):
 def is_expanded_output():
     return use_expanded_output
 
+@export
+def set_forced_horizontal_output(val):
+    global force_horizontal_output
+    force_horizontal_output = val
+
+@export
+def forced_horizontal():
+    return force_horizontal_output
 
 _logger = logging.getLogger(__name__)
 

mycli/sqlexecute.py

@@ -298,6 +298,12 @@ def run(self, statement):
             if sql.endswith("\\G"):
                 special.set_expanded_output(True)
                 sql = sql[:-2].strip()
+            # \g is treated specially since we might want collapsed output when
+            # auto vertical output is enabled
+            elif sql.endswith('\\g'):
+                special.set_expanded_output(False)
+                special.set_forced_horizontal_output(True)
+                sql = sql[:-2].strip()
 
             cur = self.conn.cursor()
             try:  # Special command

test/test_sqlexecute.py

@@ -172,6 +172,11 @@ def test_favorite_query_expanded_output(executor):
     results = run(executor, "\\fd test-ae")
     assert_result_equal(results, status="test-ae: Deleted")
 
+@dbtest
+def test_collapsed_output_special_command(executor):
+    set_expanded_output(True)
+    results = run(executor, 'select 1\\g')
+    assert is_expanded_output() is False
 
 @dbtest
 def test_special_command(executor):