diff --git a/src/DataTypes/DataTypeMap.cpp b/src/DataTypes/DataTypeMap.cpp
index acd26ca338b..1f246af74d3 100644
--- a/src/DataTypes/DataTypeMap.cpp
+++ b/src/DataTypes/DataTypeMap.cpp
@@ -85,10 +85,7 @@ std::string DataTypeMap::doGetName() const
 std::string DataTypeMap::doGetPrettyName(size_t indent) const
 {
     WriteBufferFromOwnString s;
-    s << "Map(\n"
-      << fourSpaceIndent(indent + 1) << key_type->getPrettyName(indent + 1) << ",\n"
-      << fourSpaceIndent(indent + 1) << value_type->getPrettyName(indent + 1) << '\n'
-      << fourSpaceIndent(indent) << ')';
+    s << "Map(" << key_type->getPrettyName(indent) << ", " << value_type->getPrettyName(indent) << ')';
     return s.str();
 }
 
diff --git a/src/DataTypes/DataTypeTuple.cpp b/src/DataTypes/DataTypeTuple.cpp
index fd2e5e6a784..a26f0df630e 100644
--- a/src/DataTypes/DataTypeTuple.cpp
+++ b/src/DataTypes/DataTypeTuple.cpp
@@ -98,21 +98,38 @@ std::string DataTypeTuple::doGetPrettyName(size_t indent) const
 {
     size_t size = elems.size();
     WriteBufferFromOwnString s;
-    s << "Tuple(\n";
 
-    for (size_t i = 0; i != size; ++i)
+    /// If the Tuple is named, we will output it in multiple lines with indentation.
+    if (have_explicit_names)
     {
-        if (i != 0)
-            s << ",\n";
+        s << "Tuple(\n";
 
-        s << fourSpaceIndent(indent + 1);
-        if (have_explicit_names)
-            s << backQuoteIfNeed(names[i]) << ' ';
+        for (size_t i = 0; i != size; ++i)
+        {
+            if (i != 0)
+                s << ",\n";
 
-        s << elems[i]->getPrettyName(indent + 1);
+            s << fourSpaceIndent(indent + 1)
+                << backQuoteIfNeed(names[i]) << ' '
+                << elems[i]->getPrettyName(indent + 1);
+        }
+
+        s << ')';
+    }
+    else
+    {
+        s << "Tuple(\n";
+
+        for (size_t i = 0; i != size; ++i)
+        {
+            if (i != 0)
+                s << ", ";
+            s << elems[i]->getPrettyName(indent);
+        }
+
+        s << ')';
     }
 
-    s << '\n' << fourSpaceIndent(indent) << ')';
     return s.str();
 }