Message-ID: <7466db64eb6abae93e583faf8ca4004d60c163c4.camel@cybertec.at>
Subject: Re: pgsql: SQL-standard function body
From: Laurenz Albe <laurenz.albe@cybertec.at>
To: Peter Eisentraut <peter@eisentraut.org>,
	pgsql-committers@lists.postgresql.org
Date: Sat, 10 Apr 2021 03:38:31 +0200
In-Reply-To: <cee01d26fe55bc086b3bcf10bfe4e8d450e2f608.camel@cybertec.at>
References: <E1lUEF5-00027L-N4@gemulon.postgresql.org>
	 <cee01d26fe55bc086b3bcf10bfe4e8d450e2f608.camel@cybertec.at>
Content-Type: multipart/mixed; boundary="=-7OiknZT12MkpWmL1WQnJ"
User-Agent: Evolution 3.36.5 (3.36.5-2.fc32) 
MIME-Version: 1.0
Archived-At: 
 <https://www.postgresql.org/message-id/7466db64eb6abae93e583faf8ca4004d60c163c4.camel%40cybertec.at>
Precedence: bulk


--=-7OiknZT12MkpWmL1WQnJ
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit

On Fri, 2021-04-09 at 19:44 +0200, I wrote:
> > SQL-standard function body
> > 
> > psql needs some new intelligence to keep track of function body
> > boundaries so that it doesn't send off statements when it sees
> > semicolons that are inside a function body.
> 
> This causes psql to fail to recognize the semicolon in the following
> statement as the end of a statement:
> 
>   IMPORT FOREIGN SCHEMA x FROM SERVER y INTO z OPTIONS (case 'lower');
> 
> The cause is the "case", which is recognized as the start of a function
> body.
> 
> Would it be an option to recognize BEGIN and CASE as starting a
> function body only if they are *not* inside parentheses, like in
> the attached?

Here is an improved patch, which treats END in the same fashion
(not properly indented for readability).

Yours,
Laurenz Albe

--=-7OiknZT12MkpWmL1WQnJ
Content-Disposition: attachment;
	filename="0001-Improve-parsing-of-SQL-standard-functions-in-psql.patch"
Content-Type: text/x-patch;
	name="0001-Improve-parsing-of-SQL-standard-functions-in-psql.patch";
	charset="UTF-8"
Content-Transfer-Encoding: base64

RnJvbSBiMGFhZjA0MGE0MmUzYTAzNmJhNDNjOTg5MWUwN2JhZDczYzM1YTVlIE1vbiBTZXAgMTcg
MDA6MDA6MDAgMjAwMQpGcm9tOiBMYXVyZW56IEFsYmUgPGxhdXJlbnouYWxiZUBjeWJlcnRlYy5h
dD4KRGF0ZTogU2F0LCAxMCBBcHIgMjAyMSAwMzozNTozOSArMDIwMApTdWJqZWN0OiBbUEFUQ0hd
IEltcHJvdmUgcGFyc2luZyBvZiBTUUwgc3RhbmRhcmQgZnVuY3Rpb25zIGluIHBzcWwKCkhhbmRs
ZSBCRUdJTiwgQ0FTRSBhbmQgRU5EIGFzIHNwZWNpYWwgb25seSBpZiB3ZSBhcmUgbm90IGluc2lk
ZSBwYXJlbnRoZXNlcy4KVGhhdCBhbGxvd3Mgc3RhdGVtZW50cyBsaWtlIHRoZSBmb2xsb3dpbmcg
dG8gYmUgcGFyc2VkIGNvcnJlY3RseToKCiAgQUxURVIgRk9SRUlHTiBUQUJMRSB4IE9QVElPTlMg
KEFERCBjYXNlICd1cHBlcicpOwotLS0KIHNyYy9mZV91dGlscy9wc3Fsc2Nhbi5sIHwgMyArKysK
IDEgZmlsZSBjaGFuZ2VkLCAzIGluc2VydGlvbnMoKykKCmRpZmYgLS1naXQgYS9zcmMvZmVfdXRp
bHMvcHNxbHNjYW4ubCBiL3NyYy9mZV91dGlscy9wc3Fsc2Nhbi5sCmluZGV4IDRlYzU3ZTk2YTku
LmNhZjY0MTIxNjQgMTAwNjQ0Ci0tLSBhL3NyYy9mZV91dGlscy9wc3Fsc2Nhbi5sCisrKyBiL3Ny
Yy9mZV91dGlscy9wc3Fsc2Nhbi5sCkBAIC04NzEsNiArODcxLDggQEAgb3RoZXIJCQkuCiAKIHtp
ZGVudGlmaWVyfQl7CiAJCQkJCWN1cl9zdGF0ZS0+aWRlbnRpZmllcl9jb3VudCsrOworCQkJCQlp
ZiAoY3VyX3N0YXRlLT5wYXJlbl9kZXB0aCA9PSAwKQorCQkJCQl7CiAJCQkJCWlmIChwZ19zdHJj
YXNlY21wKHl5dGV4dCwgImJlZ2luIikgPT0gMAogCQkJCQkJfHwgcGdfc3RyY2FzZWNtcCh5eXRl
eHQsICJjYXNlIikgPT0gMCkKIAkJCQkJewpAQCAtODgyLDYgKzg4NCw3IEBAIG90aGVyCQkJLgog
CQkJCQkJaWYgKGN1cl9zdGF0ZS0+YmVnaW5fZGVwdGggPiAwKQogCQkJCQkJCWN1cl9zdGF0ZS0+
YmVnaW5fZGVwdGgtLTsKIAkJCQkJfQorCQkJCQl9CiAJCQkJCUVDSE87CiAJCQkJfQogCi0tIAoy
LjI2LjMKCg==


--=-7OiknZT12MkpWmL1WQnJ--