MIME-Version: 1.0
References: 
 <CALDaNm1-Fx6Msw6zcRuSjgQdw6asdTyp2DwP-4TCKGYAT+ndsA@mail.gmail.com>
 <CAJpy0uAbEk55GCM1huYaZZWsPMDeLuOcUDTBP9ozdhjpV4ONxw@mail.gmail.com>
 <CAHGQGwGeg-JaD2s6TW7VpNJC_GyJRZ-cOkrp8uwnjN+=4mf=xw@mail.gmail.com>
In-Reply-To: 
 <CAHGQGwGeg-JaD2s6TW7VpNJC_GyJRZ-cOkrp8uwnjN+=4mf=xw@mail.gmail.com>
From: vignesh C <vignesh21@gmail.com>
Date: Fri, 17 Apr 2026 10:02:04 +0530
Message-ID: 
 <CALDaNm0SWi3z7M0aqYHqBsvcyS4u2U8tUEkEN=5MMhkdGOpRdg@mail.gmail.com>
Subject: Re: Fix tab completion after EXCEPT (...) in IMPORT FOREIGN SCHEMA
To: Fujii Masao <masao.fujii@gmail.com>
Cc: shveta malik <shveta.malik@gmail.com>,
	PostgreSQL Hackers <pgsql-hackers@lists.postgresql.org>
Content-Type: multipart/mixed; boundary="00000000000012c2a4064fa06fce"
Archived-At: 
 <https://www.postgresql.org/message-id/CALDaNm0SWi3z7M0aqYHqBsvcyS4u2U8tUEkEN%3D5MMhkdGOpRdg%40mail.gmail.com>
Precedence: bulk

--00000000000012c2a4064fa06fce
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

On Thu, 16 Apr 2026 at 22:39, Fujii Masao <masao.fujii@gmail.com> wrote:
>
> On Thu, Apr 16, 2026 at 1:00=E2=80=AFPM shveta malik <shveta.malik@gmail.=
com> wrote:
> >
> > On Wed, Apr 15, 2026 at 8:45=E2=80=AFPM vignesh C <vignesh21@gmail.com>=
 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 simpl=
er
> 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

--00000000000012c2a4064fa06fce
Content-Type: application/octet-stream;
	name="v2-0001-Fix-tab-completion-after-EXCEPT-in-IMPORT-FOREIGN.patch"
Content-Disposition: attachment;
	filename="v2-0001-Fix-tab-completion-after-EXCEPT-in-IMPORT-FOREIGN.patch"
Content-Transfer-Encoding: base64
Content-ID: <f_mo2euyw40>
X-Attachment-Id: f_mo2euyw40

RnJvbSA3YzZlMTljMTRkMjBjMDJiMzNmMjI1MzE5NDdjZjljYTFjYjAwYTIxIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBWaWduZXNoIEMgPHZpZ25lc2gyMUBnbWFpbC5jb20+CkRhdGU6
IFdlZCwgMTUgQXByIDIwMjYgMTg6MzA6MDMgKzA1MzAKU3ViamVjdDogW1BBVENIIHYyXSBGaXgg
dGFiIGNvbXBsZXRpb24gYWZ0ZXIgRVhDRVBUKCkgaW4gSU1QT1JUIEZPUkVJR04gU0NIRU1BCgpU
YWIgY29tcGxldGlvbiBmb3IgSU1QT1JUIEZPUkVJR04gU0NIRU1BIGluY29ycmVjdGx5IHN1Z2dl
c3RlZCBGUk9NClNFUlZFUiBhZnRlciBFWENFUFQgKC4uLiksIGJlY2F1c2UgRVhDRVBUICguLi4p
IGlzIG5vdyBhbHNvIHZhbGlkIGluCkNSRUFURSBhbmQgQUxURVIgUFVCTElDQVRJT04uCgpQcmV2
aW91c2x5LCB0aGUgZ2VuZXJpYyBUYWlsTWF0Y2hlcygiRVhDRVBUIiwgIigqKSIpIGNoZWNrIHdh
cyBzYWZlCmJlY2F1c2Ugbm8gb3RoZXIgY29tbWFuZCB1c2VkICdFWENFUFQgKC4uLiknLiBBZnRl
ciBhZGRpbmcgc3VwcG9ydCBmb3IKJ0VYQ0VQVCAoLi4uKScgaW4gcHVibGljYXRpb24gY29tbWFu
ZHMsIHRoZSBzYW1lIGNvbXBsZXRpb24gcnVsZSBzdGFydGVkCm1hdGNoaW5nIHVucmVsYXRlZCBz
dGF0ZW1lbnRzIGFuZCBpbmNvcnJlY3RseSBvZmZlcmVkICdGUk9NIFNFUlZFUicKdGhlcmUgYXMg
d2VsbC4KCkZpeCB0aGlzIGJ5IHJlc3RyaWN0aW5nIHRoZSAnRVhDRVBUICguLi4pJyBjb21wbGV0
aW9uIHBhdGggdG8KJ0lNUE9SVCBGT1JFSUdOIFNDSEVNQScgdXNpbmcgTWF0Y2hlcygpLgoKVGhp
cyBlbnN1cmVzICdGUk9NIFNFUlZFUicgaXMgc3VnZ2VzdGVkIG9ubHkgZm9yIHZhbGlkCidJTVBP
UlQgRk9SRUlHTiBTQ0hFTUEnIHN5bnRheC4KLS0tCiBzcmMvYmluL3BzcWwvdGFiLWNvbXBsZXRl
LmluLmMgfCAyICstCiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24o
LSkKCmRpZmYgLS1naXQgYS9zcmMvYmluL3BzcWwvdGFiLWNvbXBsZXRlLmluLmMgYi9zcmMvYmlu
L3BzcWwvdGFiLWNvbXBsZXRlLmluLmMKaW5kZXggOTk5MGY4MTg5NDIuLmRiNjVkMTMwZmNiIDEw
MDY0NAotLS0gYS9zcmMvYmluL3BzcWwvdGFiLWNvbXBsZXRlLmluLmMKKysrIGIvc3JjL2Jpbi9w
c3FsL3RhYi1jb21wbGV0ZS5pbi5jCkBAIC00OTAwLDcgKzQ5MDAsNyBAQCBtYXRjaF9wcmV2aW91
c193b3JkcyhpbnQgcGF0dGVybl9pZCwKIAllbHNlIGlmIChNYXRjaGVzKCJJTVBPUlQiLCAiRk9S
RUlHTiIsICJTQ0hFTUEiLCBNYXRjaEFueSkpCiAJCUNPTVBMRVRFX1dJVEgoIkVYQ0VQVCAoIiwg
IkZST00gU0VSVkVSIiwgIkxJTUlUIFRPICgiKTsKIAllbHNlIGlmIChUYWlsTWF0Y2hlcygiTElN
SVQiLCAiVE8iLCAiKCopIikgfHwKLQkJCSBUYWlsTWF0Y2hlcygiRVhDRVBUIiwgIigqKSIpKQor
CQkJIE1hdGNoZXMoIklNUE9SVCIsICJGT1JFSUdOIiwgIlNDSEVNQSIsIE1hdGNoQW55LCAiRVhD
RVBUIiwgIigqKSIpKQogCQlDT01QTEVURV9XSVRIKCJGUk9NIFNFUlZFUiIpOwogCWVsc2UgaWYg
KFRhaWxNYXRjaGVzKCJGUk9NIiwgIlNFUlZFUiIsIE1hdGNoQW55KSkKIAkJQ09NUExFVEVfV0lU
SCgiSU5UTyIpOwotLSAKMi40My4wCgo=
--00000000000012c2a4064fa06fce--