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

Commit6159ba3

Browse files
committed
AIX patch from Darren King and Univel patch from Billy Allie, mostly
related to grammar and parser issues, with one postmaster fix.
1 parent44030ef commit6159ba3

File tree

4 files changed

+16
-21
lines changed

4 files changed

+16
-21
lines changed

‎src/backend/parser/gram.y

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*
1111
*
1212
* IDENTIFICATION
13-
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.99 1998/01/25 04:12:28 scrappy Exp $
13+
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 1.100 1998/02/01 19:43:34 momjian Exp $
1414
*
1515
* HISTORY
1616
* AUTHORDATEMAJOR EVENT
@@ -125,8 +125,6 @@ Oidparam_type(int t); /* used in parse_expr.c */
125125
ExplainStmt, VariableSetStmt, VariableShowStmt, VariableResetStmt,
126126
CreateUserStmt, AlterUserStmt, DropUserStmt
127127

128-
%type <rtstmt>
129-
130128
%type <str>opt_database, location
131129

132130
%type <pboolean> user_createdb_clause, user_createuser_clause
@@ -261,7 +259,7 @@ Oidparam_type(int t); /* used in parse_expr.c */
261259
SECOND_P, SELECT, SET, SUBSTRING,
262260
TABLE, TIME, TIMESTAMP, TO, TRAILING, TRANSACTION, TRIM,
263261
UNION, UNIQUE, UPDATE, USING,
264-
VALUES, VARCHAR, VARYING,VERBOSE, VERSION,VIEW,
262+
VALUES, VARCHAR, VARYING, VIEW,
265263
WHERE, WITH, WORK, YEAR_P, ZONE
266264

267265
/* Keywords (in SQL3 reserved words) */
@@ -2222,7 +2220,7 @@ LockStmt: LOCK_P relation_name
22222220
c->typename->name = xlateSqlType("bool");
22232221

22242222
n->relname = $2;
2225-
n->whereClause = c;
2223+
n->whereClause =(Node *)c;
22262224
$$ = (Node *)n;
22272225
}
22282226
;
@@ -3284,8 +3282,9 @@ a_expr: attr opt_indirection
32843282
makeA_Expr(OP, "<", $1, $4),
32853283
makeA_Expr(OP, ">", $1, $6));
32863284
}
3287-
| a_expr IN { saved_In_Expr = lcons($1,saved_In_Expr); } '(' in_expr ')' { saved_In_Expr = lnext(saved_In_Expr); }
3285+
| a_expr IN { saved_In_Expr = lcons($1,saved_In_Expr); } '(' in_expr ')'
32883286
{
3287+
saved_In_Expr = lnext(saved_In_Expr);
32893288
if (nodeTag($5) == T_SubLink)
32903289
{
32913290
SubLink *n = (SubLink *)$5;
@@ -3297,8 +3296,9 @@ a_expr: attr opt_indirection
32973296
}
32983297
else$$ = $5;
32993298
}
3300-
| a_expr NOT IN { saved_In_Expr = lcons($1,saved_In_Expr); } '(' not_in_expr ')' { saved_In_Expr = lnext(saved_In_Expr); }
3299+
| a_expr NOT IN { saved_In_Expr = lcons($1,saved_In_Expr); } '(' not_in_expr ')'
33013300
{
3301+
saved_In_Expr = lnext(saved_In_Expr);
33023302
if (nodeTag($6) == T_SubLink)
33033303
{
33043304
SubLink *n = (SubLink *)$6;

‎src/backend/parser/parse_expr.c

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.12 1998/01/20 22:11:55 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_expr.c,v 1.13 1998/02/01 19:43:37 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -242,25 +242,24 @@ transformExpr(ParseState *pstate, Node *expr, int precedence)
242242
{
243243
SubLink*sublink= (SubLink*)expr;
244244
QueryTreeList*qtree;
245-
Query*subselect;
246245
List*llist;
247246

248247
qtree=parse_analyze(lcons(sublink->subselect,NIL),pstate);
249248
Assert(qtree->len==1);
250-
sublink->subselect= (Node*)subselect=qtree->qtrees[0];
249+
sublink->subselect= (Node*)qtree->qtrees[0];
251250

252251
foreach(llist,sublink->lefthand)
253252
lfirst(llist)=transformExpr(pstate,lfirst(llist),precedence);
254253

255254
if (length(sublink->lefthand)!=
256-
length(subselect->targetList))
255+
length(sublink->subselect->targetList))
257256
elog(ERROR,"Subselect has too many or too few fields.");
258257

259258
if (sublink->subLinkType!=EXISTS_SUBLINK)
260259
{
261260
char*op=lfirst(sublink->oper);
262261
List*left_expr=sublink->lefthand;
263-
List*right_expr=subselect->targetList;
262+
List*right_expr=sublink->subselect->targetList;
264263
List*elist;
265264

266265
sublink->oper=NIL;

‎src/backend/tcop/postgres.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.63 1998/01/26 01:41:35 scrappy Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/tcop/postgres.c,v 1.64 1998/02/01 19:43:46 momjian Exp $
1111
*
1212
* NOTES
1313
* this is the "main" module of the postgres backend and
@@ -492,7 +492,7 @@ pg_parse_and_plan(char *query_string,/* string to execute */
492492

493493
for (i=0;i<querytree_list->len;i++)
494494
{
495-
print(querytree_list->qtrees[i]);
495+
nodeDisplay(querytree_list->qtrees[i]);
496496
printf("\n");
497497
}
498498
}
@@ -1293,7 +1293,7 @@ PostgresMain(int argc, char *argv[])
12931293
if (IsUnderPostmaster== false)
12941294
{
12951295
puts("\nPOSTGRES backend interactive interface");
1296-
puts("$Revision: 1.63 $ $Date: 1998/01/26 01:41:35 $");
1296+
puts("$Revision: 1.64 $ $Date: 1998/02/01 19:43:46 $");
12971297
}
12981298

12991299
/* ----------------

‎src/backend/utils/adt/nabstime.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.39 1998/01/07 18:46:50 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/nabstime.c,v 1.40 1998/02/01 19:43:54 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -138,11 +138,9 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn)
138138
{
139139
tx=gmtime((time_t*)&time);
140140
};
141-
#else
142141
#endif
143142

144-
#ifdefDATEDEBUG
145-
#ifdefHAVE_INT_TIMEZONE
143+
#if defined(DATEDEBUG)&& defined(HAVE_INT_TIMEZONE)
146144
printf("datetime2tm- (localtime) %d.%02d.%02d %02d:%02d:%02d %s %s dst=%d\n",
147145
tx->tm_year,tx->tm_mon,tx->tm_mday,tx->tm_hour,tx->tm_min,tx->tm_sec,
148146
tzname[0],tzname[1],tx->tm_isdst);
@@ -151,8 +149,6 @@ abstime2tm(AbsoluteTime time, int *tzp, struct tm * tm, char *tzn)
151149
tx->tm_year,tx->tm_mon,tx->tm_mday,tx->tm_hour,tx->tm_min,tx->tm_sec,
152150
tx->tm_zone,tx->tm_isdst);
153151
#endif
154-
#else
155-
#endif
156152

157153
#ifdefUSE_POSIX_TIME
158154

0 commit comments

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