public inbox for [email protected]  

help / color / mirror / Atom feed

From: vignesh C <[email protected]>
To: Fujii Masao <[email protected]>
Cc: shveta malik <[email protected]>
Cc: PostgreSQL Hackers <[email protected]>
Subject: Re: Fix tab completion after EXCEPT (...) in IMPORT FOREIGN SCHEMA
Date: Fri, 17 Apr 2026 10:02:04 +0530
Message-ID: <CALDaNm0SWi3z7M0aqYHqBsvcyS4u2U8tUEkEN=5MMhkdGOpRdg@mail.gmail.com> (raw)
In-Reply-To: <CAHGQGwGeg-JaD2s6TW7VpNJC_GyJRZ-cOkrp8uwnjN+=4mf=xw@mail.gmail.com>
References: <CALDaNm1-Fx6Msw6zcRuSjgQdw6asdTyp2DwP-4TCKGYAT+ndsA@mail.gmail.com>
	<CAJpy0uAbEk55GCM1huYaZZWsPMDeLuOcUDTBP9ozdhjpV4ONxw@mail.gmail.com>
	<CAHGQGwGeg-JaD2s6TW7VpNJC_GyJRZ-cOkrp8uwnjN+=4mf=xw@mail.gmail.com>

On Thu, 16 Apr 2026 at 22:39, Fujii Masao <[email protected]> wrote:
>
> On Thu, Apr 16, 2026 at 1:00 PM shveta malik <[email protected]> wrote:
> >
> > On Wed, Apr 15, 2026 at 8:45 PM vignesh C <[email protected]> wrote:
> > >
> > > Hi all,
> > >
> > > While reviewing tab completion behavior, I noticed an issue after
> > > EXCEPT (...) support was added to CREATE PUBLICATION.
> > > Currently, after typing:
> > > IMPORT FOREIGN SCHEMA public EXCEPT (t1)
> > >
> > > psql correctly suggests FROM SERVER. However, the existing completion
> > > rule uses a generic:
> > > TailMatches("EXCEPT", "(*)")
> > >
> > > Previously this was safe because no other command used EXCEPT (...).
> > > Now that CREATE PUBLICATION also supports EXCEPT (...), the same rule
> > > can incorrectly match publication commands and suggest FROM SERVER
> > > there as well.
> > >
> > > The attached patch fixes this by restricting the EXCEPT (...) path to
> > > IMPORT FOREIGN SCHEMA using HeadMatches(), while preserving the
> > > existing LIMIT TO (...) behavior.
>
> Thanks for the patch!
>
> - else if (TailMatches("LIMIT", "TO", "(*)") ||
> + else if (HeadMatches("IMPORT", "FOREIGN", "SCHEMA", MatchAny) &&
>   TailMatches("EXCEPT", "(*)"))
>   COMPLETE_WITH("FROM SERVER");
> + else if (TailMatches("LIMIT", "TO", "(*)"))
> + COMPLETE_WITH("FROM SERVER");
>
> Do we really need to split this into two conditions? Wouldn't it be simpler
> to keep a single condition?, for example:
>
> -------------------
> else if (TailMatches("LIMIT", "TO", "(*)") ||
> - TailMatches("EXCEPT", "(*)"))
> + Matches("IMPORT", "FOREIGN", "SCHEMA", MatchAny, "EXCEPT", "(*)"))
>   COMPLETE_WITH("FROM SERVER");
> -------------------

Yes, this is better. The attached v2 version patch has the changes for the same.

Regards,
Vignesh


Attachments:

  [application/octet-stream] v2-0001-Fix-tab-completion-after-EXCEPT-in-IMPORT-FOREIGN.patch (1.6K, 2-v2-0001-Fix-tab-completion-after-EXCEPT-in-IMPORT-FOREIGN.patch)
  download | inline diff:
From 7c6e19c14d20c02b33f22531947cf9ca1cb00a21 Mon Sep 17 00:00:00 2001
From: Vignesh C <[email protected]>
Date: Wed, 15 Apr 2026 18:30:03 +0530
Subject: [PATCH v2] Fix tab completion after EXCEPT() in IMPORT FOREIGN SCHEMA

Tab completion for IMPORT FOREIGN SCHEMA incorrectly suggested FROM
SERVER after EXCEPT (...), because EXCEPT (...) is now also valid in
CREATE and ALTER PUBLICATION.

Previously, the generic TailMatches("EXCEPT", "(*)") check was safe
because no other command used 'EXCEPT (...)'. After adding support for
'EXCEPT (...)' in publication commands, the same completion rule started
matching unrelated statements and incorrectly offered 'FROM SERVER'
there as well.

Fix this by restricting the 'EXCEPT (...)' completion path to
'IMPORT FOREIGN SCHEMA' using Matches().

This ensures 'FROM SERVER' is suggested only for valid
'IMPORT FOREIGN SCHEMA' syntax.
---
 src/bin/psql/tab-complete.in.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/bin/psql/tab-complete.in.c b/src/bin/psql/tab-complete.in.c
index 9990f818942..db65d130fcb 100644
--- a/src/bin/psql/tab-complete.in.c
+++ b/src/bin/psql/tab-complete.in.c
@@ -4900,7 +4900,7 @@ match_previous_words(int pattern_id,
 	else if (Matches("IMPORT", "FOREIGN", "SCHEMA", MatchAny))
 		COMPLETE_WITH("EXCEPT (", "FROM SERVER", "LIMIT TO (");
 	else if (TailMatches("LIMIT", "TO", "(*)") ||
-			 TailMatches("EXCEPT", "(*)"))
+			 Matches("IMPORT", "FOREIGN", "SCHEMA", MatchAny, "EXCEPT", "(*)"))
 		COMPLETE_WITH("FROM SERVER");
 	else if (TailMatches("FROM", "SERVER", MatchAny))
 		COMPLETE_WITH("INTO");
-- 
2.43.0

view thread (6+ messages)  latest in thread

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: [email protected]
  Cc: [email protected], [email protected], [email protected], [email protected]
  Subject: Re: Fix tab completion after EXCEPT (...) in IMPORT FOREIGN SCHEMA
  In-Reply-To: <CALDaNm0SWi3z7M0aqYHqBsvcyS4u2U8tUEkEN=5MMhkdGOpRdg@mail.gmail.com>

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

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