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

Commitc01a56d

Browse files
committed
Fix for views and outnodes.
1 parent5646604 commitc01a56d

File tree

3 files changed

+10
-10
lines changed

3 files changed

+10
-10
lines changed

‎src/backend/nodes/read.c

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.7 1998/01/06 18:52:18 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.8 1998/01/07 08:07:58 momjian Exp $
1212
*
1313
* HISTORY
1414
* AUTHORDATEMAJOR EVENT
@@ -94,7 +94,9 @@ nodeTokenType(char *token, int length)
9494

9595
retval= (*token!='.') ?T_Integer :T_Float;
9696
}
97-
elseif (isalpha(*token)||*token=='_')
97+
/* make "" == NULL, not T_String. Is this a problem? 1998/1/7 bjm */
98+
elseif (isalpha(*token)||*token=='_'||
99+
(token[0]=='\"'&&token[1]=='\"'))
98100
retval=ATOM_TOKEN;
99101
elseif (*token=='(')
100102
retval=LEFT_PAREN;
@@ -147,8 +149,8 @@ lsptok(char *string, int *length)
147149
{
148150
for (local_str++;*local_str!='\"'; (*length)++,local_str++)
149151
;
150-
if (*length==2)
151-
*length-=2;/* if "", return zero length */
152+
if (*length==1)
153+
*length=0;/* if "", return zero length */
152154
else
153155
(*length)++;
154156
local_str++;

‎src/backend/nodes/readfuncs.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.15 1998/01/06 23:19:49 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.16 1998/01/07 08:08:02 momjian Exp $
1111
*
1212
* NOTES
1313
* Most of the read functions for plan nodes are tested. (In fact, they
@@ -187,7 +187,6 @@ _readSortClause()
187187
local_node=makeNode(SortClause);
188188

189189
token=lsptok(NULL,&length);/* skip the :resdom */
190-
token=lsptok(NULL,&length);/* get resdom */
191190
local_node->resdom=nodeRead(true);
192191

193192
token=lsptok(NULL,&length);/* skip :opoid */
@@ -211,7 +210,6 @@ _readGroupClause()
211210
local_node=makeNode(GroupClause);
212211

213212
token=lsptok(NULL,&length);/* skip the :entry */
214-
token=lsptok(NULL,&length);/* get entry */
215213
local_node->entry=nodeRead(true);
216214

217215
token=lsptok(NULL,&length);/* skip :grpOpoid */

‎src/backend/rewrite/rewriteDefine.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/rewrite/rewriteDefine.c,v 1.10 1998/01/05 03:32:44 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.11 1998/01/07 08:08:08 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -115,7 +115,7 @@ InsertRule(char *rulname,
115115
is_instead="t";
116116

117117
if (evqual==NULL)
118-
evqual="nil";
118+
evqual="\"\"";
119119

120120
if (IsDefinedRewriteRule(rulname))
121121
elog(ABORT,"Attempt to insert rule '%s' failed: already exists",
@@ -245,7 +245,7 @@ DefineQueryRewrite(RuleStmt *stmt)
245245
eslot_string,
246246
event_qualP,
247247
true,
248-
"nil");
248+
"\"\"");
249249
prs2_addToRelation(ev_relid,ruleId,event_type,event_attno, TRUE,
250250
event_qual,NIL);
251251

0 commit comments

Comments
 (0)

[8]ページ先頭

©2009-2025 Movatter.jp