rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partial support for mixed case in PL/pgSQL. 

Left are identifiers that contain non-alnum/_ chars.
So e.g. whitespaces in identifiers are still not
supported.

Jan
This commit is contained in:
Jan Wieck 1999-01-28 11:48:31 +00:00
parent b946244c1c
commit c42b959fb3
4 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pl/plpgsql/src/gram.y
View File

@ -4,7 +4,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.1 1998/08/24 19:14:47 momjian Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/gram.y,v 1.2 1999/01/28 11:48:30 wieck Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -344,7 +344,7 @@ decl_aliasitem : T_WORD
char *name; char *name;
plpgsql_ns_setlocal(false); plpgsql_ns_setlocal(false);
name = plpgsql_tolower(pstrdup(yytext)); name = plpgsql_tolower(yytext);
if (name[0] != '$') { if (name[0] != '$') {
elog(ERROR, "can only alias positional parameters"); elog(ERROR, "can only alias positional parameters");
} }
@ -374,7 +374,7 @@ decl_varname : T_WORD
decl_renname : T_WORD decl_renname : T_WORD
{ {
$$ = plpgsql_tolower(pstrdup(yytext)); $$ = plpgsql_tolower(yytext);
} }
; ;

14
src/pl/plpgsql/src/pl_comp.c
View File

@ -3,7 +3,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.4 1998/11/27 20:07:22 vadim Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_comp.c,v 1.5 1999/01/28 11:48:31 wieck Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -537,7 +537,7 @@ plpgsql_parse_word(char *word)
* We do our lookups case insensitive * We do our lookups case insensitive
* ---------- * ----------
*/ */
cp = plpgsql_tolower(pstrdup(word)); cp = plpgsql_tolower(word);
/* ---------- /* ----------
* Special handling when compiling triggers * Special handling when compiling triggers
@ -657,7 +657,7 @@ plpgsql_parse_dblword(char *string)
* Convert to lower case and separate the words * Convert to lower case and separate the words
* ---------- * ----------
*/ */
word1 = plpgsql_tolower(pstrdup(string)); word1 = plpgsql_tolower(string);
word2 = strchr(word1, '.'); word2 = strchr(word1, '.');
*word2++ = '\0'; *word2++ = '\0';
@ -783,7 +783,7 @@ plpgsql_parse_tripword(char *string)
* Convert to lower case and separate the words * Convert to lower case and separate the words
* ---------- * ----------
*/ */
word1 = plpgsql_tolower(pstrdup(string)); word1 = plpgsql_tolower(string);
word2 = strchr(word1, '.'); word2 = strchr(word1, '.');
*word2++ = '\0'; *word2++ = '\0';
word3 = strchr(word2, '.'); word3 = strchr(word2, '.');
@ -893,7 +893,7 @@ plpgsql_parse_wordtype(char *word)
* We do our lookups case insensitive * We do our lookups case insensitive
* ---------- * ----------
*/ */
cp = plpgsql_tolower(pstrdup(word)); cp = plpgsql_tolower(word);
*(strchr(cp, '%')) = '\0'; *(strchr(cp, '%')) = '\0';
/* ---------- /* ----------
@ -988,7 +988,7 @@ plpgsql_parse_dblwordtype(char *string)
* Convert to lower case and separate the words * Convert to lower case and separate the words
* ---------- * ----------
*/ */
word1 = plpgsql_tolower(pstrdup(string)); word1 = plpgsql_tolower(string);
word2 = strchr(word1, '.'); word2 = strchr(word1, '.');
*word2++ = '\0'; *word2++ = '\0';
*(strchr(word2, '%')) = '\0'; *(strchr(word2, '%')) = '\0';
@ -1123,7 +1123,7 @@ plpgsql_parse_wordrowtype(char *string)
* Get the word in lower case and fetch the pg_class tuple. * Get the word in lower case and fetch the pg_class tuple.
* ---------- * ----------
*/ */
word1 = plpgsql_tolower(pstrdup(string)); word1 = plpgsql_tolower(string);
cp = strchr(word1, '%'); cp = strchr(word1, '%');
*cp = '\0'; *cp = '\0';

43
src/pl/plpgsql/src/pl_funcs.c
View File

@ -3,7 +3,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.2 1998/09/01 04:40:24 momjian Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/pl_funcs.c,v 1.3 1999/01/28 11:48:31 wieck Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -189,6 +189,7 @@ plpgsql_ns_additem(int itemtype, int itemno, char *name)
if (name == NULL) if (name == NULL)
name = ""; name = "";
name = plpgsql_tolower(name);
if (ns->items_used == ns->items_alloc) if (ns->items_used == ns->items_alloc)
{ {
@ -320,22 +321,48 @@ plpgsql_ns_rename(char *oldname, char *newname)
/* ---------- /* ----------
* plpgsql_tolower Translate a string in place to * plpgsql_tolower Translate a string to lower case
* lower case * but honor "" escaping.
* ---------- * ----------
*/ */
char * char *
plpgsql_tolower(char *s) plpgsql_tolower(char *s)
{ {
char *cp; char *ret;
char *cp;
for (cp = s; *cp; cp++) ret = palloc(strlen(s) + 1);
cp = ret;
while (*s)
{ {
if (isupper(*cp)) if (*s == '"')
*cp = tolower(*cp); {
s++;
while (*s)
{
if (*s == '"')
break;
*cp++ = *s++;
}
if (*s != '"')
{
plpgsql_comperrinfo();
elog(ERROR, "unterminated \"");
}
s++;
}
else
{
if (isupper(*s))
*cp++ = tolower(*s++);
else
*cp++ = *s++;
}
} }
*cp = '\0';
return s; return ret;
} }

6
src/pl/plpgsql/src/scan.l
View File

@ -4,7 +4,7 @@
* procedural language * procedural language
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.1 1998/08/24 19:14:49 momjian Exp $ * $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.2 1999/01/28 11:48:31 wieck Exp $
* *
* This software is copyrighted by Jan Wieck - Hamburg. * This software is copyrighted by Jan Wieck - Hamburg.
* *
@ -46,8 +46,8 @@ static void plpgsql_input(char *buf, int *result, int max);
#define YY_INPUT(buf,res,max) plpgsql_input(buf, &res, max) #define YY_INPUT(buf,res,max) plpgsql_input(buf, &res, max)
%} %}
WS [[:alpha:]_] WS [[:alpha:]_"]
WC [[:alnum:]_] WC [[:alnum:]_"]
%x IN_STRING IN_COMMENT %x IN_STRING IN_COMMENT