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

Commita4be395

Browse files
committed
Avoid using TEXT as a Bison symbol, since this provokes warnings on
Windows builds. In passing, fix an obsolete comment, per gripe fromGreg Stark.
1 parentbbde090 commita4be395

File tree

2 files changed

+36
-34
lines changed

2 files changed

+36
-34
lines changed

‎src/backend/parser/gram.y‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
*
1212
*
1313
* IDENTIFICATION
14-
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.598 2007/08/2101:11:15 tgl Exp $
14+
* $PostgreSQL: pgsql/src/backend/parser/gram.y,v 2.599 2007/08/2115:13:42 tgl Exp $
1515
*
1616
* HISTORY
1717
* AUTHORDATEMAJOR EVENT
@@ -433,7 +433,7 @@ static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args, List *args)
433433
STATISTICS STDIN STDOUT STORAGE STRICT_P STRIP_P SUBSTRING SUPERUSER_P
434434
SYMMETRIC SYSID SYSTEM_P
435435

436-
TABLE TABLESPACE TEMP TEMPLATE TEMPORARYTEXT THEN TIME TIMESTAMP
436+
TABLE TABLESPACE TEMP TEMPLATE TEMPORARYTEXT_P THEN TIME TIMESTAMP
437437
TO TRAILING TRANSACTION TREAT TRIGGER TRIM TRUE_P
438438
TRUNCATE TRUSTED TYPE_P
439439

@@ -2975,7 +2975,7 @@ DefineStmt:
29752975
n->vals =$7;
29762976
$$ = (Node *)n;
29772977
}
2978-
| CREATETEXT SEARCH PARSER any_name definition
2978+
| CREATETEXT_P SEARCH PARSER any_name definition
29792979
{
29802980
DefineStmt *n = makeNode(DefineStmt);
29812981
n->kind = OBJECT_TSPARSER;
@@ -2984,7 +2984,7 @@ DefineStmt:
29842984
n->definition =$6;
29852985
$$ = (Node *)n;
29862986
}
2987-
| CREATETEXT SEARCH DICTIONARY any_name definition
2987+
| CREATETEXT_P SEARCH DICTIONARY any_name definition
29882988
{
29892989
DefineStmt *n = makeNode(DefineStmt);
29902990
n->kind = OBJECT_TSDICTIONARY;
@@ -2993,7 +2993,7 @@ DefineStmt:
29932993
n->definition =$6;
29942994
$$ = (Node *)n;
29952995
}
2996-
| CREATETEXT SEARCH TEMPLATE any_name definition
2996+
| CREATETEXT_P SEARCH TEMPLATE any_name definition
29972997
{
29982998
DefineStmt *n = makeNode(DefineStmt);
29992999
n->kind = OBJECT_TSTEMPLATE;
@@ -3002,7 +3002,7 @@ DefineStmt:
30023002
n->definition =$6;
30033003
$$ = (Node *)n;
30043004
}
3005-
| CREATETEXT SEARCH CONFIGURATION any_name definition
3005+
| CREATETEXT_P SEARCH CONFIGURATION any_name definition
30063006
{
30073007
DefineStmt *n = makeNode(DefineStmt);
30083008
n->kind = OBJECT_TSCONFIGURATION;
@@ -3320,10 +3320,10 @@ drop_type:TABLE{ $$ = OBJECT_TABLE; }
33203320
| DOMAIN_P{$$ = OBJECT_DOMAIN; }
33213321
| CONVERSION_P{$$ = OBJECT_CONVERSION; }
33223322
| SCHEMA{$$ = OBJECT_SCHEMA; }
3323-
|TEXT SEARCH PARSER{$$ = OBJECT_TSPARSER; }
3324-
|TEXT SEARCH DICTIONARY{$$ = OBJECT_TSDICTIONARY; }
3325-
|TEXT SEARCH TEMPLATE{$$ = OBJECT_TSTEMPLATE; }
3326-
|TEXT SEARCH CONFIGURATION{$$ = OBJECT_TSCONFIGURATION; }
3323+
|TEXT_P SEARCH PARSER{$$ = OBJECT_TSPARSER; }
3324+
|TEXT_P SEARCH DICTIONARY{$$ = OBJECT_TSDICTIONARY; }
3325+
|TEXT_P SEARCH TEMPLATE{$$ = OBJECT_TSTEMPLATE; }
3326+
|TEXT_P SEARCH CONFIGURATION{$$ = OBJECT_TSCONFIGURATION; }
33273327
;
33283328

33293329
any_name_list:
@@ -3500,31 +3500,31 @@ CommentStmt:
35003500
n->comment =$7;
35013501
$$ = (Node *) n;
35023502
}
3503-
| COMMENT ONTEXT SEARCH PARSER any_name IS comment_text
3503+
| COMMENT ONTEXT_P SEARCH PARSER any_name IS comment_text
35043504
{
35053505
CommentStmt *n = makeNode(CommentStmt);
35063506
n->objtype = OBJECT_TSPARSER;
35073507
n->objname =$6;
35083508
n->comment =$8;
35093509
$$ = (Node *) n;
35103510
}
3511-
| COMMENT ONTEXT SEARCH DICTIONARY any_name IS comment_text
3511+
| COMMENT ONTEXT_P SEARCH DICTIONARY any_name IS comment_text
35123512
{
35133513
CommentStmt *n = makeNode(CommentStmt);
35143514
n->objtype = OBJECT_TSDICTIONARY;
35153515
n->objname =$6;
35163516
n->comment =$8;
35173517
$$ = (Node *) n;
35183518
}
3519-
| COMMENT ONTEXT SEARCH TEMPLATE any_name IS comment_text
3519+
| COMMENT ONTEXT_P SEARCH TEMPLATE any_name IS comment_text
35203520
{
35213521
CommentStmt *n = makeNode(CommentStmt);
35223522
n->objtype = OBJECT_TSTEMPLATE;
35233523
n->objname =$6;
35243524
n->comment =$8;
35253525
$$ = (Node *) n;
35263526
}
3527-
| COMMENT ONTEXT SEARCH CONFIGURATION any_name IS comment_text
3527+
| COMMENT ONTEXT_P SEARCH CONFIGURATION any_name IS comment_text
35283528
{
35293529
CommentStmt *n = makeNode(CommentStmt);
35303530
n->objtype = OBJECT_TSCONFIGURATION;
@@ -4693,31 +4693,31 @@ RenameStmt: ALTER AGGREGATE func_name aggr_args RENAME TO name
46934693
n->newname =$6;
46944694
$$ = (Node *)n;
46954695
}
4696-
| ALTERTEXT SEARCH PARSER any_name RENAME TO name
4696+
| ALTERTEXT_P SEARCH PARSER any_name RENAME TO name
46974697
{
46984698
RenameStmt *n = makeNode(RenameStmt);
46994699
n->renameType = OBJECT_TSPARSER;
47004700
n->object =$5;
47014701
n->newname =$8;
47024702
$$ = (Node *)n;
47034703
}
4704-
| ALTERTEXT SEARCH DICTIONARY any_name RENAME TO name
4704+
| ALTERTEXT_P SEARCH DICTIONARY any_name RENAME TO name
47054705
{
47064706
RenameStmt *n = makeNode(RenameStmt);
47074707
n->renameType = OBJECT_TSDICTIONARY;
47084708
n->object =$5;
47094709
n->newname =$8;
47104710
$$ = (Node *)n;
47114711
}
4712-
| ALTERTEXT SEARCH TEMPLATE any_name RENAME TO name
4712+
| ALTERTEXT_P SEARCH TEMPLATE any_name RENAME TO name
47134713
{
47144714
RenameStmt *n = makeNode(RenameStmt);
47154715
n->renameType = OBJECT_TSTEMPLATE;
47164716
n->object =$5;
47174717
n->newname =$8;
47184718
$$ = (Node *)n;
47194719
}
4720-
| ALTERTEXT SEARCH CONFIGURATION any_name RENAME TO name
4720+
| ALTERTEXT_P SEARCH CONFIGURATION any_name RENAME TO name
47214721
{
47224722
RenameStmt *n = makeNode(RenameStmt);
47234723
n->renameType = OBJECT_TSCONFIGURATION;
@@ -4897,15 +4897,15 @@ AlterOwnerStmt: ALTER AGGREGATE func_name aggr_args OWNER TO RoleId
48974897
n->newowner =$6;
48984898
$$ = (Node *)n;
48994899
}
4900-
| ALTERTEXT SEARCH DICTIONARY any_name OWNER TO RoleId
4900+
| ALTERTEXT_P SEARCH DICTIONARY any_name OWNER TO RoleId
49014901
{
49024902
AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
49034903
n->objectType = OBJECT_TSDICTIONARY;
49044904
n->object =$5;
49054905
n->newowner =$8;
49064906
$$ = (Node *)n;
49074907
}
4908-
| ALTERTEXT SEARCH CONFIGURATION any_name OWNER TO RoleId
4908+
| ALTERTEXT_P SEARCH CONFIGURATION any_name OWNER TO RoleId
49094909
{
49104910
AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
49114911
n->objectType = OBJECT_TSCONFIGURATION;
@@ -5513,7 +5513,7 @@ opt_as:AS{}
55135513
*****************************************************************************/
55145514

55155515
AlterTSDictionaryStmt:
5516-
ALTERTEXT SEARCH DICTIONARY any_name definition
5516+
ALTERTEXT_P SEARCH DICTIONARY any_name definition
55175517
{
55185518
AlterTSDictionaryStmt *n = makeNode(AlterTSDictionaryStmt);
55195519
n->dictname =$5;
@@ -5523,14 +5523,14 @@ AlterTSDictionaryStmt:
55235523
;
55245524

55255525
AlterTSConfigurationStmt:
5526-
ALTERTEXT SEARCH CONFIGURATION any_name definition
5526+
ALTERTEXT_P SEARCH CONFIGURATION any_name definition
55275527
{
55285528
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55295529
n->cfgname =$5;
55305530
n->options =$6;
55315531
$$ = (Node *)n;
55325532
}
5533-
| ALTERTEXT SEARCH CONFIGURATION any_name ADD_P MAPPING FOR name_list WITH any_name_list
5533+
| ALTERTEXT_P SEARCH CONFIGURATION any_name ADD_P MAPPING FOR name_list WITH any_name_list
55345534
{
55355535
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55365536
n->cfgname =$5;
@@ -5540,7 +5540,7 @@ AlterTSConfigurationStmt:
55405540
n->replace =false;
55415541
$$ = (Node*)n;
55425542
}
5543-
| ALTERTEXT SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list WITH any_name_list
5543+
| ALTERTEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list WITH any_name_list
55445544
{
55455545
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55465546
n->cfgname =$5;
@@ -5550,7 +5550,7 @@ AlterTSConfigurationStmt:
55505550
n->replace =false;
55515551
$$ = (Node*)n;
55525552
}
5553-
| ALTERTEXT SEARCH CONFIGURATION any_name ALTER MAPPING REPLACE any_name WITH any_name
5553+
| ALTERTEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING REPLACE any_name WITH any_name
55545554
{
55555555
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55565556
n->cfgname =$5;
@@ -5560,7 +5560,7 @@ AlterTSConfigurationStmt:
55605560
n->replace =true;
55615561
$$ = (Node*)n;
55625562
}
5563-
| ALTERTEXT SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list REPLACE any_name WITH any_name
5563+
| ALTERTEXT_P SEARCH CONFIGURATION any_name ALTER MAPPING FOR name_list REPLACE any_name WITH any_name
55645564
{
55655565
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55665566
n->cfgname =$5;
@@ -5570,15 +5570,15 @@ AlterTSConfigurationStmt:
55705570
n->replace =true;
55715571
$$ = (Node*)n;
55725572
}
5573-
| ALTERTEXT SEARCH CONFIGURATION any_name DROP MAPPING FOR name_list
5573+
| ALTERTEXT_P SEARCH CONFIGURATION any_name DROP MAPPING FOR name_list
55745574
{
55755575
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55765576
n->cfgname =$5;
55775577
n->tokentype =$9;
55785578
n->missing_ok =false;
55795579
$$ = (Node*)n;
55805580
}
5581-
| ALTERTEXT SEARCH CONFIGURATION any_name DROP MAPPING IF_P EXISTS FOR name_list
5581+
| ALTERTEXT_P SEARCH CONFIGURATION any_name DROP MAPPING IF_P EXISTS FOR name_list
55825582
{
55835583
AlterTSConfigurationStmt *n = makeNode(AlterTSConfigurationStmt);
55845584
n->cfgname =$5;
@@ -8562,9 +8562,11 @@ substr_list:
85628562
/*
85638563
* Since there are no cases where this syntax allows
85648564
* a textual FOR value, we forcibly cast the argument
8565-
* to int4. This is a kluge to avoid surprising results
8566-
* when the argument is, say, int8. It'd be better if
8567-
* there were not an implicit cast from int8 to text ...
8565+
* to int4. The possible matches in pg_proc are
8566+
* substring(text,int4) and substring(text,text),
8567+
* and we don't want the parser to choose the latter,
8568+
* which it is likely to do if the second argument
8569+
* is unknown or doesn't have an implicit cast to int4.
85688570
*/
85698571
A_Const *n = makeNode(A_Const);
85708572
n->val.type = T_Integer;
@@ -9234,7 +9236,7 @@ unreserved_keyword:
92349236
| TEMP
92359237
| TEMPLATE
92369238
| TEMPORARY
9237-
|TEXT
9239+
|TEXT_P
92389240
| TRANSACTION
92399241
| TRIGGER
92409242
| TRUNCATE

‎src/backend/parser/keywords.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.190 2007/08/2101:11:15 tgl Exp $
11+
* $PostgreSQL: pgsql/src/backend/parser/keywords.c,v 1.191 2007/08/2115:13:42 tgl Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -350,7 +350,7 @@ static const ScanKeyword ScanKeywords[] = {
350350
{"temp",TEMP,UNRESERVED_KEYWORD},
351351
{"template",TEMPLATE,UNRESERVED_KEYWORD},
352352
{"temporary",TEMPORARY,UNRESERVED_KEYWORD},
353-
{"text",TEXT,UNRESERVED_KEYWORD},
353+
{"text",TEXT_P,UNRESERVED_KEYWORD},
354354
{"then",THEN,RESERVED_KEYWORD},
355355
{"time",TIME,COL_NAME_KEYWORD},
356356
{"timestamp",TIMESTAMP,COL_NAME_KEYWORD},

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp