From 075a85f15c62e8c03a3965394a4986a417ad27be Mon Sep 17 00:00:00 2001
From: Salvatore Mesoraca <salvatore.mesoraca@aiven.io>
Date: Wed, 11 Sep 2024 14:37:24 +0200
Subject: [PATCH] Allow SHOW COLUMNS to work with tables that contain dots in
 the name

---
 src/Parsers/ParserShowColumnsQuery.cpp | 22 +++++++---------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/Parsers/ParserShowColumnsQuery.cpp b/src/Parsers/ParserShowColumnsQuery.cpp
index 5d26d7bf1d4..9c31786ad57 100644
--- a/src/Parsers/ParserShowColumnsQuery.cpp
+++ b/src/Parsers/ParserShowColumnsQuery.cpp
@@ -1,6 +1,6 @@
 #include <Parsers/ParserShowColumnsQuery.h>
 
-#include <Parsers/ASTIdentifier_fwd.h>
+#include <Parsers/ASTIdentifier.h>
 #include <Parsers/ASTLiteral.h>
 #include <Parsers/ASTShowColumnsQuery.h>
 #include <Parsers/CommonParsers.h>
@@ -18,7 +18,6 @@ bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     ASTPtr from1;
     ASTPtr from2;
 
-    String from1_str;
     String from2_str;
 
     auto query = std::make_shared<ASTShowColumnsQuery>();
@@ -43,25 +42,18 @@ bool ParserShowColumnsQuery::parseImpl(Pos & pos, ASTPtr & node, Expected & expe
     else
         return false;
 
-    tryGetIdentifierNameInto(from1, from1_str);
-
-    bool abbreviated_form = from1_str.contains("."); // FROM database.table
-    if (abbreviated_form)
-    {
-        std::vector<String> split;
-        boost::split(split, from1_str, boost::is_any_of("."));
-        query->database = split[0];
-        query->table = split[1];
-    }
+    const auto * table_id = from1->as<ASTIdentifier>();
+    if (!table_id)
+        return false;
+    query->table = table_id->shortName();
+    if (table_id->compound())
+        query->database = table_id->name_parts[0];
     else
     {
         if (ParserKeyword(Keyword::FROM).ignore(pos, expected) || ParserKeyword(Keyword::IN).ignore(pos, expected))
             if (!ParserIdentifier().parse(pos, from2, expected))
                 return false;
-
         tryGetIdentifierNameInto(from2, from2_str);
-
-        query->table = from1_str;
         query->database = from2_str;
     }