Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit7a84053

Browse files
committed
I send a simple patch for PL/pgSQL parser which allow now to use
whitespaces in identifers of any kind(table names,attributenames,variables ...) in Pl/pgSQL procedural language.Explicit definitionof bug can be found in Re: [HACKERS] Bug of PL/pgSQL parserTODO item completed: o -Fix PL/PgSQL to handle quoted mixed-case identifierseutm
1 parent7ef5634 commit7a84053

File tree

1 file changed

+35
-4
lines changed

1 file changed

+35
-4
lines changed

‎src/pl/plpgsql/src/scan.l

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* procedural language
55
*
66
* IDENTIFICATION
7-
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.18 2002/07/30 16:33:08 tgl Exp $
7+
* $Header: /cvsroot/pgsql/src/pl/plpgsql/src/Attic/scan.l,v 1.19 2002/08/04 03:59:09 momjian Exp $
88
*
99
* This software is copyrighted by Jan Wieck - Hamburg.
1010
*
@@ -61,9 +61,9 @@ static void plpgsql_input(char *buf, int *result, int max);
6161

6262
%optionyylineno
6363

64-
65-
WS [\200-\377_A-Za-z"]
66-
WC [\200-\377_A-Za-z0-9"]
64+
DQUOTE\"([^\"])*\"
65+
WS [\200-\377_A-Za-z]
66+
WC [\200-\377_A-Za-z0-9]
6767

6868
%xIN_STRINGIN_COMMENT
6969

@@ -155,17 +155,48 @@ dump{ return O_DUMP;}
155155
* ----------
156156
*/
157157
{WS}{WC}*{returnplpgsql_parse_word(yytext);}
158+
{DQUOTE}*{returnplpgsql_parse_word(yytext);}
159+
158160
{WS}{WC}*\.{WS}{WC}*{returnplpgsql_parse_dblword(yytext);}
161+
{WS}{WC}*\.{DQUOTE}*{returnplpgsql_parse_dblword(yytext);}
162+
{DQUOTE}*\.{WS}{WC}*{returnplpgsql_parse_dblword(yytext);}
163+
{DQUOTE}*\.{DQUOTE}*{returnplpgsql_parse_dblword(yytext);}
164+
159165
{WS}{WC}*\.{WS}{WC}*\.{WS}{WC}*{returnplpgsql_parse_tripword(yytext); }
166+
{WS}{WC}*\.{WS}{WC}*\.{DQUOTE}*{returnplpgsql_parse_tripword(yytext); }
167+
{WS}{WC}*\.{DQUOTE}*\.{WS}{WC}*{returnplpgsql_parse_tripword(yytext); }
168+
{WS}{WC}*\.{DQUOTE}*\.{DQUOTE}*{returnplpgsql_parse_tripword(yytext); }
169+
{DQUOTE}*\.{WS}{WC}*\.{WS}{WC}*{returnplpgsql_parse_tripword(yytext); }
170+
{DQUOTE}*\.{WS}{WC}*\.{DQUOTE}*{returnplpgsql_parse_tripword(yytext); }
171+
{DQUOTE}*\.{DQUOTE}*\.{WS}{WC}*{returnplpgsql_parse_tripword(yytext); }
172+
{DQUOTE}*\.{DQUOTE}*\.{DQUOTE}*{returnplpgsql_parse_tripword(yytext); }
173+
160174
{WS}{WC}*%TYPE{returnplpgsql_parse_wordtype(yytext);}
175+
{DQUOTE}*%TYPE{returnplpgsql_parse_wordtype(yytext);}
176+
161177
{WS}{WC}*\.{WS}{WC}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
178+
{WS}{WC}*\.{DQUOTE}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
179+
{DQUOTE}*\.{WS}{WC}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
180+
{DQUOTE}*\.{DQUOTE}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
181+
162182
{WS}{WC}*%ROWTYPE{returnplpgsql_parse_wordrowtype(yytext);}
183+
{DQUOTE}*%ROWTYPE{returnplpgsql_parse_wordrowtype(yytext);}
163184

164185
\$[0-9]+{returnplpgsql_parse_word(yytext);}
186+
165187
\$[0-9]+\.{WS}{WC}*{returnplpgsql_parse_dblword(yytext);}
188+
\$[0-9]+\.{DQUOTE}*{returnplpgsql_parse_dblword(yytext);}
189+
166190
\$[0-9]+\.{WS}{WC}*\.{WS}{WC}*{returnplpgsql_parse_tripword(yytext); }
191+
\$[0-9]+\.{WS}{WC}*\.{DQUOTE}*{returnplpgsql_parse_tripword(yytext); }
192+
\$[0-9]+\.{DQUOTE}*\.{WS}{WC}*{returnplpgsql_parse_tripword(yytext); }
193+
\$[0-9]+\.{DQUOTE}*\.{DQUOTE}*{returnplpgsql_parse_tripword(yytext); }
194+
167195
\$[0-9]+%TYPE{returnplpgsql_parse_wordtype(yytext);}
196+
168197
\$[0-9]+\.{WS}{WC}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
198+
\$[0-9]+\.{DQUOTE}*%TYPE{returnplpgsql_parse_dblwordtype(yytext); }
199+
169200
\$[0-9]+%ROWTYPE{returnplpgsql_parse_wordrowtype(yytext);}
170201

171202
[0-9]+{return T_NUMBER;}

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp