diff options
| author | Bruce Momjian <bruce@momjian.us> | 1996-12-04 14:23:16 +0000 |
|---|---|---|
| committer | Bruce Momjian <bruce@momjian.us> | 1996-12-04 14:23:16 +0000 |
| commit | 64397b758fb60df19e8c6d6fb7957c20a77d8a36 (patch) | |
| tree | 24f9a1b483eea11d02b12e17c3367e6107647afa | |
| parent | 9005a38bdb01bf3294bd9e30e645f00a6d569cd9 (diff) | |
| download | postgresql-64397b758fb60df19e8c6d6fb7957c20a77d8a36.tar.gz postgresql-64397b758fb60df19e8c6d6fb7957c20a77d8a36.zip | |
Remove duplicate patch for COUNT fix.
| -rw-r--r-- | src/backend/parser/scan.l | 19 | ||||
| -rw-r--r-- | src/man/create_aggregate.l | 5 |
2 files changed, 3 insertions, 21 deletions
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l index 00f5928fbb9..8e77d749f2a 100644 --- a/src/backend/parser/scan.l +++ b/src/backend/parser/scan.l @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.7 1996/12/03 17:01:35 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/parser/scan.l,v 1.8 1996/12/04 14:23:11 momjian Exp $ * *------------------------------------------------------------------------- */ @@ -164,22 +164,7 @@ other . if (keyword != NULL) { return (keyword->value); } else { - if (tolower(((char *)yytext)[0]) == 'a' && - strcasecmp((char *)yytext,"avg") == 0) - yylval.str = pstrdup("avg"); - else if (tolower(((char *)yytext)[0]) == 'c' && - strcasecmp((char *)yytext,"count") == 0) - yylval.str = pstrdup("count"); - else if (tolower(((char *)yytext)[0]) == 'm' && - strcasecmp((char *)yytext,"max") == 0) - yylval.str = pstrdup("max"); - else if (tolower(((char *)yytext)[0]) == 'm' && - strcasecmp((char *)yytext,"min") == 0) - yylval.str = pstrdup("min"); - else if (tolower(((char *)yytext)[0]) == 's' && - strcasecmp((char *)yytext,"sum") == 0) - yylval.str = pstrdup("sum"); - else yylval.str = pstrdup((char*)yytext); + yylval.str = pstrdup((char*)yytext); return (IDENT); } } diff --git a/src/man/create_aggregate.l b/src/man/create_aggregate.l index 615d92c3362..a1b4e4db257 100644 --- a/src/man/create_aggregate.l +++ b/src/man/create_aggregate.l @@ -1,6 +1,6 @@ .\" This is -*-nroff-*- .\" XXX standard disclaimer belongs here.... -.\" $Header: /cvsroot/pgsql/src/man/Attic/create_aggregate.l,v 1.2 1996/12/03 05:06:35 momjian Exp $ +.\" $Header: /cvsroot/pgsql/src/man/Attic/create_aggregate.l,v 1.3 1996/12/04 14:23:16 momjian Exp $ .TH "CREATE AGGREGATE" SQL 11/05/95 Postgres95 Postgres95 .SH NAME create aggregate \(em define a new aggregate @@ -70,9 +70,6 @@ Aggregates also require two initial conditions, one for each transition function. These are specified and stored in the database as fields of type .IR text . -.PP -For compatability, aggregates named "avg", "count", "max", "min", -and "sum" are lowercased on input. .SH EXAMPLE This .IR avg |