mirror/postgresql
2
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-12-27 08:39:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make LIKE throw an error if the escape character is at the end of the pattern

Browse Source 
(ie, has nothing to quote), rather than silently ignoring the character as has
been our historical behavior.  This is required by SQL spec and should help
reduce the sort of user confusion seen in bug #4436.  Per discussion.

This is not so much a bug fix as a definitional change, and it could break
existing applications; so not back-patched.  It might deserve being mentioned
as an incompatibility in the 8.4 release notes.
This commit is contained in:
Tom Lane 2008-09-26 02:16:40 +00:00
parent e8e746de34
commit 3d8fd75732
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/backend/utils/adt/like_match.c
View File

@ -1,13 +1,13 @@
/*-------------------------------------------------------------------------
*
* like_match.c
* like expression handling internal code.
* LIKE pattern matching internal code.
*
* This file is included by like.c four times, to provide natching code for
* single-byte encodings, UTF8, and for other multi-byte encodings,
* and case insensitive matches for single byte encodings.
* UTF8 is a special case because we can use a much more efficient version
* of NextChar than can be used for other multi-byte encodings.
* This file is included by like.c four times, to provide matching code for
* (1) single-byte encodings, (2) UTF8, (3) other multi-byte encodings,
* and (4) case insensitive matches in single byte encodings.
* (UTF8 is a special case because we can use a much more efficient version
* of NextChar than can be used for general multi-byte encodings.)
*
* Before the inclusion, we need to define following macros:
*
@ -19,7 +19,7 @@
* Copyright (c) 1996-2008, PostgreSQL Global Development Group
*
* IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.21 2008/03/01 03:26:34 tgl Exp $
* $PostgreSQL: pgsql/src/backend/utils/adt/like_match.c,v 1.22 2008/09/26 02:16:40 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@ -96,9 +96,14 @@ MatchText(char *t, int tlen, char *p, int plen)
{
if (*p == '\\')
{
/* Next byte must match literally, whatever it is */
/* Next pattern byte must match literally, whatever it is */
NextByte(p, plen);
if ((plen <= 0) || *p != *t)
/* ... and there had better be one, per SQL standard */
if (plen <= 0)
ereport(ERROR,
(errcode(ERRCODE_INVALID_ESCAPE_SEQUENCE),
errmsg("LIKE pattern must not end with escape character")));
if (*p != *t)
return LIKE_FALSE;
}
else if (*p == '%')