|
9 | 9 | * |
10 | 10 | * |
11 | 11 | * IDENTIFICATION |
12 | | - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.75 2000/08/12 05:15:21 tgl Exp $ |
| 12 | + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.76 2000/08/22 13:01:20 ishii Exp $ |
13 | 13 | * |
14 | 14 | *------------------------------------------------------------------------- |
15 | 15 | */ |
|
31 | 31 | #include"parser/scansup.h" |
32 | 32 | #include"utils/builtins.h" |
33 | 33 |
|
| 34 | +#ifdef MULTIBYTE |
| 35 | +#include"mb/pg_wchar.h" |
| 36 | +#endif |
| 37 | + |
34 | 38 | externchar *parseString; |
35 | 39 | staticchar *parseCh; |
36 | 40 |
|
@@ -345,9 +349,17 @@ other. |
345 | 349 | BEGIN(INITIAL); |
346 | 350 | if (strlen(literalbuf) >= NAMEDATALEN) |
347 | 351 | { |
| 352 | +#ifdef MULTIBYTE |
| 353 | +int len; |
| 354 | +len =pg_mbcliplen(literalbuf,strlen(literalbuf),NAMEDATALEN-1); |
| 355 | +elog(NOTICE,"identifier\"%s\" will be truncated to\"%.*s\"", |
| 356 | + literalbuf, len, literalbuf); |
| 357 | +literalbuf[len] ='\0'; |
| 358 | +#else |
348 | 359 | elog(NOTICE,"identifier\"%s\" will be truncated to\"%.*s\"", |
349 | 360 | literalbuf, NAMEDATALEN-1, literalbuf); |
350 | 361 | literalbuf[NAMEDATALEN-1] ='\0'; |
| 362 | +#endif |
351 | 363 | } |
352 | 364 | yylval.str =pstrdup(literalbuf); |
353 | 365 | return IDENT; |
@@ -471,9 +483,17 @@ other. |
471 | 483 | yytext[i] =tolower(yytext[i]); |
472 | 484 | if (i >= NAMEDATALEN) |
473 | 485 | { |
| 486 | +#ifdef MULTIBYTE |
| 487 | +int len; |
| 488 | +len =pg_mbcliplen(yytext,i,NAMEDATALEN-1); |
| 489 | +elog(NOTICE,"identifier\"%s\" will be truncated to\"%.*s\"", |
| 490 | + yytext, len, yytext); |
| 491 | +yytext[len] ='\0'; |
| 492 | +#else |
474 | 493 | elog(NOTICE,"identifier\"%s\" will be truncated to\"%.*s\"", |
475 | 494 | yytext, NAMEDATALEN-1, yytext); |
476 | 495 | yytext[NAMEDATALEN-1] ='\0'; |
| 496 | +#endif |
477 | 497 | } |
478 | 498 | keyword =ScanKeywordLookup((char*)yytext); |
479 | 499 | if (keyword !=NULL) { |
|