Only render Indentifiers column if there is no Details column

Author: LinneaAndersson

cypher-shell/src/integration-test/java/org/neo4j/shell/commands/CypherShellVerboseIntegrationTest.java

@@ -13,6 +13,7 @@
 import org.neo4j.shell.cli.Format;
 import org.neo4j.shell.exception.CommandException;
 import org.neo4j.shell.prettyprint.PrettyConfig;
+import org.neo4j.shell.prettyprint.TablePlanFormatter;
 
 import static org.hamcrest.CoreMatchers.containsString;
 import static org.hamcrest.CoreMatchers.equalTo;
@@ -217,8 +218,24 @@ public void cypherWithQueryDetails() throws CommandException {
 
         //then
         String actual = linePrinter.output();
-        assertThat( actual, containsString( "Details" ) );
+        assertThat( actual, containsString( TablePlanFormatter.DETAILS ) );
         assertThat( actual, containsString( "n.age AS age" ) );
+        assertThat( actual, not( containsString( TablePlanFormatter.IDENTIFIERS ) ) );
+    }
+
+    @Test
+    public void cypherWithoutQueryDetails() throws CommandException {
+        // given
+        String serverVersion = shell.getServerVersion();
+        assumeTrue((minorVersion(serverVersion) == 0 && majorVersion(serverVersion) == 4) || majorVersion(serverVersion) < 4);
+
+        //when
+        shell.execute("EXPLAIN MATCH (n) with n.age AS age RETURN age");
+
+        //then
+        String actual = linePrinter.output();
+        assertThat( actual, not( containsString( TablePlanFormatter.DETAILS ) ) );
+        assertThat( actual, containsString( TablePlanFormatter.IDENTIFIERS ) );
     }
 
     @Test

cypher-shell/src/main/java/org/neo4j/shell/prettyprint/TablePlanFormatter.java

@@ -26,7 +26,7 @@
 import static org.neo4j.shell.prettyprint.OutputFormatter.NEWLINE;
 import static org.neo4j.shell.prettyprint.OutputFormatter.repeat;
 
-class TablePlanFormatter {
+public class TablePlanFormatter {
 
     private static final String UNNAMED_PATTERN_STRING = "  (UNNAMED|FRESHID|AGGREGATION|NODE|REL)(\\d+)";
     private static final Pattern UNNAMED_PATTERN = Pattern.compile(UNNAMED_PATTERN_STRING);
@@ -37,9 +37,9 @@ class TablePlanFormatter {
     private static final String PAGE_CACHE = "Cache H/M";
     private static final String TIME = "Time (ms)";
     private static final String ORDER = "Ordered by";
-    private static final String IDENTIFIERS = "Identifiers";
+    public static final String IDENTIFIERS = "Identifiers";
     private static final String OTHER = "Other";
-    private static final String DETAILS = "Details";
+    public static final String DETAILS = "Details";
     private static final String SEPARATOR = ", ";
     private static final Pattern DEDUP_PATTERN = Pattern.compile("\\s*(\\S+)@\\d+");
     public static final int MAX_DETAILS_COLUMN_WIDTH = 100;
@@ -80,7 +80,8 @@ String formatPlan(@Nonnull Plan plan) {
         Map<String, Integer> columns = new HashMap<>();
         List<Line> lines = accumulate(plan, new Root(), columns);
 
-        List<String> headers = HEADERS.stream().filter(columns::containsKey).collect(Collectors.toList());
+        // Remove Identifiers column if we have a Details column
+        List<String> headers = HEADERS.stream().filter(header -> columns.containsKey(header) && !(header.equals(IDENTIFIERS) && columns.containsKey(DETAILS))).collect(Collectors.toList());
 
         StringBuilder result = new StringBuilder((2 + NEWLINE.length() + headers.stream().mapToInt(h -> width(h, columns)).sum()) * (lines.size() * 2 + 3));