diff options
Diffstat (limited to 'src/backend')
| -rw-r--r-- | src/backend/lib/stringinfo.c | 4 | ||||
| -rw-r--r-- | src/backend/nodes/outfuncs.c | 8 | ||||
| -rw-r--r-- | src/backend/nodes/print.c | 4 | ||||
| -rw-r--r-- | src/backend/nodes/read.c | 22 | ||||
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 6 |
5 files changed, 23 insertions, 21 deletions
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c index 72d8ce59d48..710826439fe 100644 --- a/src/backend/lib/stringinfo.c +++ b/src/backend/lib/stringinfo.c @@ -9,7 +9,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/lib/stringinfo.c,v 1.7 1998/01/06 18:52:09 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/lib/stringinfo.c,v 1.8 1998/01/07 15:32:19 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -78,7 +78,7 @@ appendStringInfo(StringInfo str, char *buffer) Assert(str != NULL); if (buffer == NULL) - buffer = "\"\""; + buffer = "<>"; /* * do we have enough space to append the new string? (don't forget to diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c index ce4d1e7cc3b..8f0daf30405 100644 --- a/src/backend/nodes/outfuncs.c +++ b/src/backend/nodes/outfuncs.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.19 1998/01/07 05:54:11 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/outfuncs.c,v 1.20 1998/01/07 15:32:25 momjian Exp $ * * NOTES * Every (plan) node in POSTGRES has an associated "out" routine which @@ -282,7 +282,7 @@ _outPlanInfo(StringInfo str, Plan *node) sprintf(buf, " :width %d ", node->plan_width); appendStringInfo(str, buf); appendStringInfo(str, " :state "); - appendStringInfo(str, node->state ? "not-NULL" : "\"\""); + appendStringInfo(str, node->state ? "not-NULL" : "<>"); appendStringInfo(str, " :qptargetlist "); _outNode(str, node->targetlist); appendStringInfo(str, " :qpqual "); @@ -727,7 +727,7 @@ _outConst(StringInfo str, Const *node) appendStringInfo(str, " :constvalue "); if (node->constisnull) { - appendStringInfo(str, "\"\""); + appendStringInfo(str, "<>"); } else { @@ -1538,7 +1538,7 @@ _outNode(StringInfo str, void *obj) { if (obj == NULL) { - appendStringInfo(str, "\"\""); + appendStringInfo(str, "<>"); return; } diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c index aa39f6b2cee..861733cb362 100644 --- a/src/backend/nodes/print.c +++ b/src/backend/nodes/print.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.12 1997/12/18 12:53:56 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/print.c,v 1.13 1998/01/07 15:32:29 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -164,7 +164,7 @@ print_expr(Node *expr, List *rtable) { if (expr == NULL) { - printf("nil"); + printf("<>"); return; } diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c index a3b314386ba..34b8cfb27e3 100644 --- a/src/backend/nodes/read.c +++ b/src/backend/nodes/read.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.8 1998/01/07 08:07:58 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/nodes/read.c,v 1.9 1998/01/07 15:32:31 momjian Exp $ * * HISTORY * AUTHOR DATE MAJOR EVENT @@ -94,9 +94,8 @@ nodeTokenType(char *token, int length) retval = (*token != '.') ? T_Integer : T_Float; } - /* make "" == NULL, not T_String. Is this a problem? 1998/1/7 bjm */ else if (isalpha(*token) || *token == '_' || - (token[0] == '\"' && token[1] == '\"')) + (token[0] == '<' && token[1] == '>')) retval = ATOM_TOKEN; else if (*token == '(') retval = LEFT_PAREN; @@ -145,16 +144,19 @@ lsptok(char *string, int *length) return (NULL); *length = 1; - if (*local_str == '\"') + if (*local_str == '"') { - for (local_str++; *local_str != '\"'; (*length)++, local_str++) + for (local_str++; *local_str != '"'; (*length)++, local_str++) ; - if (*length == 1) - *length = 0; /* if "", return zero length */ - else - (*length)++; + (*length)++; local_str++; } + /* NULL */ + else if (local_str[0] == '<' && local_str[1] == '>' ) + { + *length = 0; + local_str += 2; + } else if (*local_str == ')' || *local_str == '(' || *local_str == '}' || *local_str == '{') { @@ -231,7 +233,7 @@ nodeRead(bool read_car_only) case AT_SYMBOL: break; case ATOM_TOKEN: - if (!strncmp(token, "\"\"", 2)) + if (!strncmp(token, "<>", 2)) { this_value = NULL; diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index 37ffb52ef33..9b913dca94b 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.11 1998/01/07 08:08:08 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.12 1998/01/07 15:32:37 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -115,7 +115,7 @@ InsertRule(char *rulname, is_instead = "t"; if (evqual == NULL) - evqual = "\"\""; + evqual = "<>"; if (IsDefinedRewriteRule(rulname)) elog(ABORT, "Attempt to insert rule '%s' failed: already exists", @@ -245,7 +245,7 @@ DefineQueryRewrite(RuleStmt *stmt) eslot_string, event_qualP, true, - "\"\""); + "<>"); prs2_addToRelation(ev_relid, ruleId, event_type, event_attno, TRUE, event_qual, NIL); |