pg.ddx.io  pgsql-hackers@postgresql.org mailing list archive  

help / color / mirror / Atom feed
From: bt22kawamotok <bt22kawamotok@oss.nttdata.com>
To: Shinya Kato <Shinya11.Kato@oss.nttdata.com>
Cc: pgsql-hackers@postgresql.org
Subject: Re: [PATCH]Feature improvement for MERGE tab completion
Date: Mon, 12 Sep 2022 17:25:44 +0900
Message-ID: <7d7eef0f596e449746766ff4fb7c9061@oss.nttdata.com> (raw)
In-Reply-To: <abe74f1c1d4e83df6e71cf854c7ea56b@oss.nttdata.com>
References: <9f1ad2a87a58cd5e7d64f3993130958d@oss.nttdata.com>
	<359a46c295eae938d84552c11818ab62@oss.nttdata.com>
	<c5730fb146c8ded48d537724e1456bfb@oss.nttdata.com>
	<abe74f1c1d4e83df6e71cf854c7ea56b@oss.nttdata.com>

> Thanks for updating!
> 
> Compile errors have occurred, so can you fix them?
> And I think we can eliminate similar redundancies in MERGE tab
> completion and I would like you to fix them.
> 
> For example,
> 
> 	else if (TailMatches("WHEN", "MATCHED"))
> 		COMPLETE_WITH("THEN", "AND");
> 	else if (TailMatches("WHEN", "NOT", "MATCHED"))
> 		COMPLETE_WITH("THEN", "AND");
> 
> above statement can be converted to the statement below.
> 
> 	else if (TailMatches("WHEN", "MATCHED") ||
> 			 TailMatches("WHEN", "NOT", "MATCHED"))
> 		COMPLETE_WITH("THEN", "AND");

Sorry for making such a silly mistake.
I create new path.
Please reviewing.

Kotaro Kawamoto

Attachments:


fix_tab_completion_merge_v3.patch (text/x-diff, 1.6K) download
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 62a39779b9..c1e455fab1 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -4068,7 +4068,7 @@ psql_completion(const char *text, int start, int end)
 	/* with [AS] alias */
 	else if (TailMatches("MERGE", "INTO", MatchAny, "AS", MatchAny))
 		COMPLETE_WITH("USING");
-	else if (TailMatches("MERGE", "INTO", MatchAny, MatchAny))
+	else if (TailMatches("MERGE", "INTO", MatchAny, MatchAny) && !TailMatches("AS"))
 		COMPLETE_WITH("USING");
 	else if (TailMatches("MERGE", "INTO", MatchAny, "AS", MatchAny, "USING"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables);
@@ -4095,12 +4095,16 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH("WHEN MATCHED", "WHEN NOT MATCHED");
 	else if (TailMatches("USING", MatchAny, MatchAny, "ON", MatchAny))
 		COMPLETE_WITH("WHEN MATCHED", "WHEN NOT MATCHED");
+	else if (TailMatches("USING", MatchAny, "ON", MatchAny, "WHEN") ||
+			 TailMatches("USING", MatchAny, "AS", MatchAny, "ON", MatchAny, "WHEN") ||
+			 TailMatches("USING", MatchAny, MatchAny, "ON", MatchAny, "WHEN"))
+		COMPLETE_WITH("MATCHED", "NOT MATCHED");
 	else if (TailMatches("WHEN", "MATCHED"))
 		COMPLETE_WITH("THEN", "AND");
 	else if (TailMatches("WHEN", "NOT", "MATCHED"))
 		COMPLETE_WITH("THEN", "AND");
 	else if (TailMatches("WHEN", "MATCHED", "THEN"))
-		COMPLETE_WITH("UPDATE", "DELETE");
+		COMPLETE_WITH("UPDATE", "DELETE", "DO NOTHING");
 	else if (TailMatches("WHEN", "NOT", "MATCHED", "THEN"))
 		COMPLETE_WITH("INSERT", "DO NOTHING");
 


view thread (21+ messages)  latest in thread

Message-ID: <7d7eef0f596e449746766ff4fb7c9061@oss.nttdata.com>
Permalink:  ../7d7eef0f596e449746766ff4fb7c9061@oss.nttdata.com/
Also on:    postgresql.org/message-id/7d7eef0f596e449746766ff4fb7c9061@oss.nttdata.com

 ·  · 

reply
Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Reply to all the recipients using the --to and --cc options:
  reply via email

  To: pgsql-hackers@postgresql.org
  Cc: bt22kawamotok@oss.nttdata.com, Shinya11.Kato@oss.nttdata.com
  Subject: Re: [PATCH]Feature improvement for MERGE tab completion
  In-Reply-To: <7d7eef0f596e449746766ff4fb7c9061@oss.nttdata.com>

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

This inbox is served by DDX for PostgreSQL; see mirroring instructions
for how to clone and mirror all data and code used for this inbox