Merge pull request #262 from dbcli/amjith/expanded_output_separator_fix

Make the horizontal separator in expanded mode a constant length.

2 files changed, 4 insertions, 15 deletions

diff --git a/pgcli/packages/expanded.py b/pgcli/packages/expanded.py
index 103c39a9..9648d887 100644
--- a/pgcli/packages/expanded.py
+++ b/pgcli/packages/expanded.py
@@ -3,22 +3,11 @@ from .tabulate import _text_type
 def pad(field, total, char=u" "):
     return field + (char * (total - len(field)))
 
-def get_separator(num, header_len, data_len):
-    total_len = header_len + data_len + 1
-
-    sep = u"-[ RECORD {0} ]".format(num)
-    if len(sep) < header_len:
-        sep = pad(sep, header_len - 1, u"-") + u"+"
-
-    if len(sep) < total_len:
-        sep = pad(sep, total_len, u"-")
-
-    return sep + u"\n"
-
 def expanded_table(rows, headers):
     header_len = max([len(x) for x in headers])
     max_row_len = 0
     results = []
+    sep = u"-[ RECORD {0} ]-------------------------\n"
 
     padded_headers = [pad(x, header_len) + u" |" for x in headers]
     header_len += 2
@@ -36,7 +25,7 @@ def expanded_table(rows, headers):
 
     output = []
     for i, result in enumerate(results):
-        output.append(get_separator(i, header_len, max_row_len))
+        output.append(sep.format(i))
         output.append(result)
         output.append('\n')
 
diff --git a/tests/test_expanded.py b/tests/test_expanded.py
index 6f2c6591..4025dfa4 100644
--- a/tests/test_expanded.py
+++ b/tests/test_expanded.py
@@ -4,10 +4,10 @@ import pytest
 def test_expanded_table_renders():
     input = [("hello", 123),("world", 456)]
 
-    expected = """-[ RECORD 0 ]
+    expected = """-[ RECORD 0 ]-------------------------
 name | hello
 age  | 123
--[ RECORD 1 ]
+-[ RECORD 1 ]-------------------------
 name | world
 age  | 456
 """