Add setting in config to control truncating field values. (#1285)

* Add setting in config to truncate field value.

* Black.

* Changelog.

* Fix tests.

4 files changed, 62 insertions, 31 deletions

diff --git a/tests/features/steps/auto_vertical.py b/tests/features/steps/auto_vertical.py
index 1643ea5e..d7cdccd4 100644
--- a/tests/features/steps/auto_vertical.py
+++ b/tests/features/steps/auto_vertical.py
@@ -24,11 +24,11 @@ def step_see_small_results(context):
         context,
         dedent(
             """\
-        +------------+\r
-        | ?column?   |\r
-        |------------|\r
-        | 1          |\r
-        +------------+\r
+        +----------+\r
+        | ?column? |\r
+        |----------|\r
+        | 1        |\r
+        +----------+\r
         SELECT 1\r
         """
         ),
diff --git a/tests/features/steps/basic_commands.py b/tests/features/steps/basic_commands.py
index 07e9ec17..7ca20f06 100644
--- a/tests/features/steps/basic_commands.py
+++ b/tests/features/steps/basic_commands.py
@@ -118,11 +118,11 @@ def step_see_found(context):
         + "\r"
         + dedent(
             """
-            +------------+\r
-            | ?column?   |\r
-            |------------|\r
-            | found      |\r
-            +------------+\r
+            +----------+\r
+            | ?column? |\r
+            |----------|\r
+            | found    |\r
+            +----------+\r
             SELECT 1\r
         """
         )
diff --git a/tests/features/steps/expanded.py b/tests/features/steps/expanded.py
index 265ea39b..ac84c41c 100644
--- a/tests/features/steps/expanded.py
+++ b/tests/features/steps/expanded.py
@@ -58,11 +58,11 @@ def step_see_data(context, which):
             context,
             dedent(
                 """\
-                +-----+-----+--------+\r
-                | x   | y   | z      |\r
-                |-----+-----+--------|\r
-                | 1   | 1.0 | 1.0000 |\r
-                +-----+-----+--------+\r
+                +---+-----+--------+\r
+                | x | y   | z      |\r
+                |---+-----+--------|\r
+                | 1 | 1.0 | 1.0000 |\r
+                +---+-----+--------+\r
                 SELECT 1\r
             """
             ),
diff --git a/tests/test_main.py b/tests/test_main.py
index c48accbe..2526062f 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -61,16 +61,47 @@ def test_format_output():
     )
     expected = [
         "Title",
-        "+---------+---------+",
-        "| head1   | head2   |",
-        "|---------+---------|",
-        "| abc     | def     |",
-        "+---------+---------+",
+        "+-------+-------+",
+        "| head1 | head2 |",
+        "|-------+-------|",
+        "| abc   | def   |",
+        "+-------+-------+",
         "test status",
     ]
     assert list(results) == expected
 
 
+def test_format_output_truncate_on():
+    settings = OutputSettings(
+        table_format="psql", dcmlfmt="d", floatfmt="g", max_field_width=10
+    )
+    results = format_output(
+        None,
+        [("first field value", "second field value")],
+        ["head1", "head2"],
+        None,
+        settings,
+    )
+    expected = [
+        "+------------+------------+",
+        "| head1      | head2      |",
+        "|------------+------------|",
+        "| first f... | second ... |",
+        "+------------+------------+",
+    ]
+    assert list(results) == expected
+
+
+def test_format_output_truncate_off():
+    settings = OutputSettings(
+        table_format="psql", dcmlfmt="d", floatfmt="g", max_field_width=None
+    )
+    long_field_value = ("first field " * 100).strip()
+    results = format_output(None, [(long_field_value,)], ["head1"], None, settings)
+    lines = list(results)
+    assert lines[3] == f"| {long_field_value} |"
+
+
 @dbtest
 def test_format_array_output(executor):
     statement = """
@@ -83,12 +114,12 @@ def test_format_array_output(executor):
     """
     results = run(executor, statement)
     expected = [
-        "+----------------+------------------------+--------------+",
-        "| bigint_array   | nested_numeric_array   | 配列         |",
-        "|----------------+------------------------+--------------|",
-        "| {1,2,3}        | {{1,2},{3,4}}          | {å,魚,текст} |",
-        "| {}             | <null>                 | {<null>}     |",
-        "+----------------+------------------------+--------------+",
+        "+--------------+----------------------+--------------+",
+        "| bigint_array | nested_numeric_array | 配列         |",
+        "|--------------+----------------------+--------------|",
+        "| {1,2,3}      | {{1,2},{3,4}}        | {å,魚,текст} |",
+        "| {}           | <null>               | {<null>}     |",
+        "+--------------+----------------------+--------------+",
         "SELECT 2",
     ]
     assert list(results) == expected
@@ -128,11 +159,11 @@ def test_format_output_auto_expand():
     )
     table = [
         "Title",
-        "+---------+---------+",
-        "| head1   | head2   |",
-        "|---------+---------|",
-        "| abc     | def     |",
-        "+---------+---------+",
+        "+-------+-------+",
+        "| head1 | head2 |",
+        "|-------+-------|",
+        "| abc   | def   |",
+        "+-------+-------+",
         "test status",
     ]
     assert list(table_results) == table