Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oYKdD-0008Qv-GS for pgsql-hackers@arkaria.postgresql.org; Wed, 14 Sep 2022 05:08:15 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1oYKdC-00036O-Ea for pgsql-hackers@arkaria.postgresql.org; Wed, 14 Sep 2022 05:08:14 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oYKdC-000343-0e for pgsql-hackers@lists.postgresql.org; Wed, 14 Sep 2022 05:08:14 +0000 Received: from oss.nttdata.com ([49.212.34.109]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oYKd8-0002x1-VV for pgsql-hackers@postgresql.org; Wed, 14 Sep 2022 05:08:12 +0000 Received: from oss.nttdata.com (localhost [127.0.0.1]) by oss.nttdata.com (Postfix) with ESMTPA id 4A0A760710; Wed, 14 Sep 2022 14:08:07 +0900 (JST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.7 at oss.nttdata.com MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=_cb7c86cef3e4ac3c25ddf42f3c740eea" Content-Transfer-Encoding: 7bit Date: Wed, 14 Sep 2022 14:08:07 +0900 From: bt22kawamotok To: Shinya Kato Cc: pgsql-hackers@postgresql.org Subject: Re: [PATCH]Feature improvement for MERGE tab completion In-Reply-To: <5b2e2880da33f6356931beb5c0d68c84@oss.nttdata.com> References: <9f1ad2a87a58cd5e7d64f3993130958d@oss.nttdata.com> <359a46c295eae938d84552c11818ab62@oss.nttdata.com> <7d7eef0f596e449746766ff4fb7c9061@oss.nttdata.com> <6c943aa7b6064b56e7ebeb901f7c24b4@oss.nttdata.com> <5b2e2880da33f6356931beb5c0d68c84@oss.nttdata.com> User-Agent: Roundcube Webmail/1.4.11 Message-ID: X-Sender: bt22kawamotok@oss.nttdata.com List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --=_cb7c86cef3e4ac3c25ddf42f3c740eea Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=US-ASCII; format=flowed > When I tried to apply this patch, I got the following warning, please > fix it. > Other than that, I think everything is fine. > > $ git apply fix_tab_completion_merge_v4.patch > fix_tab_completion_merge_v4.patch:38: trailing whitespace. > else if (TailMatches("USING", MatchAny, "ON", MatchAny) || > fix_tab_completion_merge_v4.patch:39: indent with spaces. > TailMatches("USING", MatchAny, "AS", MatchAny, "ON", > MatchAny) || > fix_tab_completion_merge_v4.patch:40: indent with spaces. > TailMatches("USING", MatchAny, MatchAny, "ON", > MatchAny)) > fix_tab_completion_merge_v4.patch:53: trailing whitespace. > else if (TailMatches("WHEN", "MATCHED") || > warning: 4 lines add whitespace errors. Thanks for reviewing. I fixed the problem and make patch v5. Please check it. Regards, Kotaro Kawamoto --=_cb7c86cef3e4ac3c25ddf42f3c740eea Content-Transfer-Encoding: base64 Content-Type: text/x-diff; name=fix_tab_completion_merge_v5.patch Content-Disposition: attachment; filename=fix_tab_completion_merge_v5.patch; size=4856 ZGlmZiAtLWdpdCBhL3NyYy9iaW4vcHNxbC90YWItY29tcGxldGUuYyBiL3NyYy9iaW4vcHNxbC90 YWItY29tcGxldGUuYwppbmRleCA2MmEzOTc3OWI5Li5hMDMzMmM3NmE0IDEwMDY0NAotLS0gYS9z cmMvYmluL3BzcWwvdGFiLWNvbXBsZXRlLmMKKysrIGIvc3JjL2Jpbi9wc3FsL3RhYi1jb21wbGV0 ZS5jCkBAIC00MDYzLDIzICs0MDYzLDI4IEBAIHBzcWxfY29tcGxldGlvbihjb25zdCBjaGFyICp0 ZXh0LCBpbnQgc3RhcnQsIGludCBlbmQpCiAJCUNPTVBMRVRFX1dJVEhfU0NIRU1BX1FVRVJZKFF1 ZXJ5X2Zvcl9saXN0X29mX21lcmdldGFyZ2V0cyk7CiAJZWxzZSBpZiAoVGFpbE1hdGNoZXMoIk1F UkdFIiwgIklOVE8iLCBNYXRjaEFueSkpCiAJCUNPTVBMRVRFX1dJVEgoIlVTSU5HIiwgIkFTIik7 Ci0JZWxzZSBpZiAoVGFpbE1hdGNoZXMoIk1FUkdFIiwgIklOVE8iLCBNYXRjaEFueSwgIlVTSU5H IikpCisJZWxzZSBpZiAoVGFpbE1hdGNoZXMoIk1FUkdFIiwgIklOVE8iLCBNYXRjaEFueSwgIlVT SU5HIikgfHwKKwkJCSBUYWlsTWF0Y2hlcygiTUVSR0UiLCAiSU5UTyIsIE1hdGNoQW55LCBNYXRj aEFueSwgIlVTSU5HIikgfHwKKwkJCSBUYWlsTWF0Y2hlcygiTUVSR0UiLCAiSU5UTyIsIE1hdGNo QW55LCAiQVMiLCBNYXRjaEFueSwgIlVTSU5HIikpCiAJCUNPTVBMRVRFX1dJVEhfU0NIRU1BX1FV RVJZKFF1ZXJ5X2Zvcl9saXN0X29mX3RhYmxlcyk7CiAJLyogd2l0aCBbQVNdIGFsaWFzICovCi0J ZWxzZSBpZiAoVGFpbE1hdGNoZXMoIk1FUkdFIiwgIklOVE8iLCBNYXRjaEFueSwgIkFTIiwgTWF0 Y2hBbnkpKQorCWVsc2UgaWYgKFRhaWxNYXRjaGVzKCJNRVJHRSIsICJJTlRPIiwgTWF0Y2hBbnks ICJBUyIsIE1hdGNoQW55KSB8fAorCQkJIFRhaWxNYXRjaGVzKCJNRVJHRSIsICJJTlRPIiwgTWF0 Y2hBbnksIE1hdGNoQW55RXhjZXB0KCJBUyIpKSkKIAkJQ09NUExFVEVfV0lUSCgiVVNJTkciKTsK LQllbHNlIGlmIChUYWlsTWF0Y2hlcygiTUVSR0UiLCAiSU5UTyIsIE1hdGNoQW55LCBNYXRjaEFu eSkpCi0JCUNPTVBMRVRFX1dJVEgoIlVTSU5HIik7Ci0JZWxzZSBpZiAoVGFpbE1hdGNoZXMoIk1F UkdFIiwgIklOVE8iLCBNYXRjaEFueSwgIkFTIiwgTWF0Y2hBbnksICJVU0lORyIpKQotCQlDT01Q TEVURV9XSVRIX1NDSEVNQV9RVUVSWShRdWVyeV9mb3JfbGlzdF9vZl90YWJsZXMpOwotCWVsc2Ug aWYgKFRhaWxNYXRjaGVzKCJNRVJHRSIsICJJTlRPIiwgTWF0Y2hBbnksIE1hdGNoQW55LCAiVVNJ TkciKSkKKwllbHNlIGlmIChUYWlsTWF0Y2hlcygiTUVSR0UiLCAiSU5UTyIsIE1hdGNoQW55LCAi QVMiLCBNYXRjaEFueSwgIlVTSU5HIikgfHwKKwkJCSBUYWlsTWF0Y2hlcygiTUVSR0UiLCAiSU5U TyIsIE1hdGNoQW55LCBNYXRjaEFueSwgIlVTSU5HIikpCiAJCUNPTVBMRVRFX1dJVEhfU0NIRU1B X1FVRVJZKFF1ZXJ5X2Zvcl9saXN0X29mX3RhYmxlcyk7CisJZWxzZSBpZiAoVGFpbE1hdGNoZXMo Ik1FUkdFIiwgIklOVE8iLCBNYXRjaEFueSwgIlVTSU5HIiwgTWF0Y2hBbnkpIHx8CisJCQkgVGFp bE1hdGNoZXMoIk1FUkdFIiwgIklOVE8iLCBNYXRjaEFueSwgTWF0Y2hBbnksICJVU0lORyIsIE1h dGNoQW55KSB8fAorCQkJIFRhaWxNYXRjaGVzKCJNRVJHRSIsICJJTlRPIiwgTWF0Y2hBbnksICJB UyIsIE1hdGNoQW55LCAiVVNJTkciLCBNYXRjaEFueSkpCisJCUNPTVBMRVRFX1dJVEgoIkFTIiwg Ik9OIik7CiAJLyogT04gKi8KLQllbHNlIGlmIChUYWlsTWF0Y2hlcygiTUVSR0UiLCAiSU5UTyIs IE1hdGNoQW55LCAiVVNJTkciLCBNYXRjaEFueSkpCi0JCUNPTVBMRVRFX1dJVEgoIk9OIik7Ci0J ZWxzZSBpZiAoVGFpbE1hdGNoZXMoIklOVE8iLCBNYXRjaEFueSwgIkFTIiwgTWF0Y2hBbnksICJV U0lORyIsIE1hdGNoQW55LCAiQVMiLCBNYXRjaEFueSkpCi0JCUNPTVBMRVRFX1dJVEgoIk9OIik7 Ci0JZWxzZSBpZiAoVGFpbE1hdGNoZXMoIklOVE8iLCBNYXRjaEFueSwgTWF0Y2hBbnksICJVU0lO RyIsIE1hdGNoQW55LCBNYXRjaEFueSkpCisJZWxzZSBpZiAoVGFpbE1hdGNoZXMoIk1FUkdFIiwg IklOVE8iLCBNYXRjaEFueSwgIlVTSU5HIiwgTWF0Y2hBbnksIE1hdGNoQW55RXhjZXB0KCJPTnxB UyIpKSB8fAorCQkJIFRhaWxNYXRjaGVzKCJNRVJHRSIsICJJTlRPIiwgTWF0Y2hBbnksICJVU0lO RyIsIE1hdGNoQW55LCAiQVMiLCBNYXRjaEFueSkgfHwKKwkJCSBUYWlsTWF0Y2hlcygiTUVSR0Ui LCAiSU5UTyIsIE1hdGNoQW55LCBNYXRjaEFueSwgIlVTSU5HIiwgTWF0Y2hBbnksIE1hdGNoQW55 RXhjZXB0KCJPTnxBUyIpKSB8fAorCQkJIFRhaWxNYXRjaGVzKCJNRVJHRSIsICJJTlRPIiwgTWF0 Y2hBbnksIE1hdGNoQW55LCAiVVNJTkciLCBNYXRjaEFueSwgIkFTIiwgTWF0Y2hBbnkpIHx8CisJ CQkgVGFpbE1hdGNoZXMoIk1FUkdFIiwgIklOVE8iLCBNYXRjaEFueSwgIkFTIiwgTWF0Y2hBbnks ICJVU0lORyIsIE1hdGNoQW55LCBNYXRjaEFueUV4Y2VwdCgiT058QVMiKSkgfHwKKwkJCSBUYWls TWF0Y2hlcygiTUVSR0UiLCAiSU5UTyIsIE1hdGNoQW55LCAiQVMiLCBNYXRjaEFueSwgIlVTSU5H IiwgTWF0Y2hBbnksICJBUyIsIE1hdGNoQW55KSkKIAkJQ09NUExFVEVfV0lUSCgiT04iKTsKIAkv KiBPTiBjb25kaXRpb24gKi8KIAllbHNlIGlmIChUYWlsTWF0Y2hlcygiSU5UTyIsIE1hdGNoQW55 LCAiVVNJTkciLCBNYXRjaEFueSwgIk9OIikpCkBAIC00MDg5LDE4ICs0MDk0LDI1IEBAIHBzcWxf Y29tcGxldGlvbihjb25zdCBjaGFyICp0ZXh0LCBpbnQgc3RhcnQsIGludCBlbmQpCiAJZWxzZSBp ZiAoVGFpbE1hdGNoZXMoIklOVE8iLCBNYXRjaEFueSwgTWF0Y2hBbnksICJVU0lORyIsIE1hdGNo QW55LCBNYXRjaEFueSwgIk9OIikpCiAJCUNPTVBMRVRFX1dJVEhfQVRUUihwcmV2Nl93ZCk7CiAJ LyogV0hFTiBbTk9UXSBNQVRDSEVEICovCi0JZWxzZSBpZiAoVGFpbE1hdGNoZXMoIlVTSU5HIiwg TWF0Y2hBbnksICJPTiIsIE1hdGNoQW55KSkKKwllbHNlIGlmIChUYWlsTWF0Y2hlcygiVVNJTkci LCBNYXRjaEFueSwgIk9OIiwgTWF0Y2hBbnkpIHx8CisJCQkgVGFpbE1hdGNoZXMoIlVTSU5HIiwg TWF0Y2hBbnksICJPTiIsIE1hdGNoQW55LCBNYXRjaEFueUV4Y2VwdCgiV2hlbiIpLCBNYXRjaEFu eUV4Y2VwdCgiV2hlbiIpKSB8fAorCQkJIFRhaWxNYXRjaGVzKCJVU0lORyIsIE1hdGNoQW55LCAi QVMiLCBNYXRjaEFueSwgIk9OIiwgTWF0Y2hBbnkpIHx8CisJCQkgVGFpbE1hdGNoZXMoIlVTSU5H IiwgTWF0Y2hBbnksICJBUyIsIE1hdGNoQW55LCAiT04iLCBNYXRjaEFueSwgTWF0Y2hBbnlFeGNl cHQoIldoZW4iKSwgTWF0Y2hBbnlFeGNlcHQoIldoZW4iKSkgfHwKKwkJCSBUYWlsTWF0Y2hlcygi VVNJTkciLCBNYXRjaEFueSwgTWF0Y2hBbnksICJPTiIsIE1hdGNoQW55KSB8fAorCQkJIFRhaWxN YXRjaGVzKCJVU0lORyIsIE1hdGNoQW55LCBNYXRjaEFueSwgIk9OIiwgTWF0Y2hBbnksIE1hdGNo QW55RXhjZXB0KCJXaGVuIiksIE1hdGNoQW55RXhjZXB0KCJXaGVuIikpKQogCQlDT01QTEVURV9X SVRIKCJXSEVOIE1BVENIRUQiLCAiV0hFTiBOT1QgTUFUQ0hFRCIpOwotCWVsc2UgaWYgKFRhaWxN YXRjaGVzKCJVU0lORyIsIE1hdGNoQW55LCAiQVMiLCBNYXRjaEFueSwgIk9OIiwgTWF0Y2hBbnkp KQotCQlDT01QTEVURV9XSVRIKCJXSEVOIE1BVENIRUQiLCAiV0hFTiBOT1QgTUFUQ0hFRCIpOwot CWVsc2UgaWYgKFRhaWxNYXRjaGVzKCJVU0lORyIsIE1hdGNoQW55LCBNYXRjaEFueSwgIk9OIiwg TWF0Y2hBbnkpKQotCQlDT01QTEVURV9XSVRIKCJXSEVOIE1BVENIRUQiLCAiV0hFTiBOT1QgTUFU Q0hFRCIpOwotCWVsc2UgaWYgKFRhaWxNYXRjaGVzKCJXSEVOIiwgIk1BVENIRUQiKSkKLQkJQ09N UExFVEVfV0lUSCgiVEhFTiIsICJBTkQiKTsKLQllbHNlIGlmIChUYWlsTWF0Y2hlcygiV0hFTiIs ICJOT1QiLCAiTUFUQ0hFRCIpKQorCWVsc2UgaWYgKFRhaWxNYXRjaGVzKCJVU0lORyIsIE1hdGNo QW55LCAiT04iLCBNYXRjaEFueSwgIldIRU4iKSB8fAorCQkJIFRhaWxNYXRjaGVzKCJVU0lORyIs IE1hdGNoQW55LCAiT04iLCBNYXRjaEFueSwgTWF0Y2hBbnksIE1hdGNoQW55LCAiV0hFTiIpIHx8 CisJCQkgVGFpbE1hdGNoZXMoIlVTSU5HIiwgTWF0Y2hBbnksICJBUyIsIE1hdGNoQW55LCAiT04i LCBNYXRjaEFueSwgIldIRU4iKSB8fAorCQkJIFRhaWxNYXRjaGVzKCJVU0lORyIsIE1hdGNoQW55 LCAiQVMiLCBNYXRjaEFueSwgIk9OIiwgTWF0Y2hBbnksIE1hdGNoQW55LCBNYXRjaEFueSwgIldI RU4iKSB8fAorCQkJIFRhaWxNYXRjaGVzKCJVU0lORyIsIE1hdGNoQW55LCBNYXRjaEFueSwgIk9O IiwgTWF0Y2hBbnksICJXSEVOIikgfHwKKwkJCSBUYWlsTWF0Y2hlcygiVVNJTkciLCBNYXRjaEFu eSwgTWF0Y2hBbnksICJPTiIsIE1hdGNoQW55LCBNYXRjaEFueSwgTWF0Y2hBbnksICJXSEVOIikp CisJCUNPTVBMRVRFX1dJVEgoIk1BVENIRUQiLCAiTk9UIE1BVENIRUQiKTsKKwllbHNlIGlmIChU YWlsTWF0Y2hlcygiV0hFTiIsICJNQVRDSEVEIikgfHwKKwkJCSBUYWlsTWF0Y2hlcygiV0hFTiIs ICJOT1QiLCAiTUFUQ0hFRCIpKQogCQlDT01QTEVURV9XSVRIKCJUSEVOIiwgIkFORCIpOwogCWVs c2UgaWYgKFRhaWxNYXRjaGVzKCJXSEVOIiwgIk1BVENIRUQiLCAiVEhFTiIpKQotCQlDT01QTEVU RV9XSVRIKCJVUERBVEUiLCAiREVMRVRFIik7CisJCUNPTVBMRVRFX1dJVEgoIlVQREFURSIsICJE RUxFVEUiLCAiRE8gTk9USElORyIpOwogCWVsc2UgaWYgKFRhaWxNYXRjaGVzKCJXSEVOIiwgIk5P VCIsICJNQVRDSEVEIiwgIlRIRU4iKSkKIAkJQ09NUExFVEVfV0lUSCgiSU5TRVJUIiwgIkRPIE5P VEhJTkciKTsKIAo= --=_cb7c86cef3e4ac3c25ddf42f3c740eea--