database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-09-11 00:12:06 +03:00
Code Activity

When a TIMESTAMP, TIME, or INTERVAL precision is specified larger than our

Browse Source 
implementation limits, do not issue an ERROR; instead issue a NOTICE and use
the max supported value.  Per pgsql-general discussion of 28-Apr, this is
needed to allow easy porting from pre-7.3 releases where the limits were
higher.

Unrelated change in same area: accept GLOBAL TEMP/TEMPORARY as a synonym
for TEMPORARY, as per pgsql-hackers discussion of 15-Apr.  We previously
rejected it, but that was based on a misreading of the spec --- SQL92's
GLOBAL temp tables are really closer to what we have than their LOCAL ones.
This commit is contained in:
Tom Lane
2003-05-04 00:04:10 +00:00
parent fd9dd1b964
commit f1b3af29c1
1 changed files with 102 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
src/backend/parser/gram.y
View File

@@ -11,7 +11,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.373.2.1 2003/02/05 20:16:55 tgl Exp $ * $Header: /cvsroot/pgsql/src/backend/parser/gram.y,v 2.373.2.2 2003/05/04 00:04:10 tgl Exp $
* *
* HISTORY * HISTORY
* AUTHOR DATE MAJOR EVENT * AUTHOR DATE MAJOR EVENT
@@ -967,10 +967,17 @@ zone_value:
| ConstInterval '(' Iconst ')' Sconst opt_interval | ConstInterval '(' Iconst ')' Sconst opt_interval
{ {
A_Const *n = (A_Const *) makeStringConst($5, $1); A_Const *n = (A_Const *) makeStringConst($5, $1);
if (($3 < 0) || ($3 > MAX_INTERVAL_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"INTERVAL(%d) precision must be between %d and %d", "INTERVAL(%d) precision must not be negative",
$3, 0, MAX_INTERVAL_PRECISION); $3);
if ($3 > MAX_INTERVAL_PRECISION)
{
elog(NOTICE,
"INTERVAL(%d) precision reduced to maximum allowed, %d",
$3, MAX_INTERVAL_PRECISION);
$3 = MAX_INTERVAL_PRECISION;
}
if (($6 != INTERVAL_FULL_RANGE) if (($6 != INTERVAL_FULL_RANGE)
&& (($6 & ~(INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE))) != 0)) && (($6 & ~(INTERVAL_MASK(HOUR) | INTERVAL_MASK(MINUTE))) != 0))
@@ -1403,23 +1410,16 @@ CreateStmt: CREATE OptTemp TABLE qualified_name '(' OptTableElementList ')'
/* /*
* Redundancy here is needed to avoid shift/reduce conflicts, * Redundancy here is needed to avoid shift/reduce conflicts,
* since TEMP is not a reserved word. See also OptTempTableName. * since TEMP is not a reserved word. See also OptTempTableName.
*
* NOTE: we accept both GLOBAL and LOCAL options; since we have no modules
* the LOCAL keyword is really meaningless.
*/ */
OptTemp: TEMPORARY { $$ = TRUE; } OptTemp: TEMPORARY { $$ = TRUE; }
| TEMP { $$ = TRUE; } | TEMP { $$ = TRUE; }
| LOCAL TEMPORARY { $$ = TRUE; } | LOCAL TEMPORARY { $$ = TRUE; }
| LOCAL TEMP { $$ = TRUE; } | LOCAL TEMP { $$ = TRUE; }
| GLOBAL TEMPORARY | GLOBAL TEMPORARY { $$ = TRUE; }
{ | GLOBAL TEMP { $$ = TRUE; }
elog(ERROR,
"GLOBAL TEMPORARY TABLE is not currently supported");
$$ = TRUE;
}
| GLOBAL TEMP
{
elog(ERROR,
"GLOBAL TEMPORARY TABLE is not currently supported");
$$ = TRUE;
}
| /*EMPTY*/ { $$ = FALSE; } | /*EMPTY*/ { $$ = FALSE; }
; ;
@@ -1455,8 +1455,8 @@ columnDef: ColId Typename ColQualList opt_collate
if ($4 != NULL) if ($4 != NULL)
elog(NOTICE, elog(NOTICE,
"CREATE TABLE / COLLATE %s not yet implemented; " "CREATE TABLE / COLLATE %s not yet implemented; "
"clause ignored", $4); "clause ignored", $4);
$$ = (Node *)n; $$ = (Node *)n;
} }
@@ -3206,7 +3206,7 @@ RemoveOperStmt:
oper_argtypes: oper_argtypes:
Typename Typename
{ {
elog(ERROR,"parser: argument type missing (use NONE for unary operators)"); elog(ERROR, "parser: argument type missing (use NONE for unary operators)");
} }
| Typename ',' Typename | Typename ',' Typename
{ $$ = makeList2($1, $3); } { $$ = makeList2($1, $3); }
@@ -3704,7 +3704,7 @@ CreateDomainStmt:
if ($7 != NULL) if ($7 != NULL)
elog(NOTICE,"CREATE DOMAIN / COLLATE %s not yet " elog(NOTICE,"CREATE DOMAIN / COLLATE %s not yet "
"implemented; clause ignored", $7); "implemented; clause ignored", $7);
$$ = (Node *)n; $$ = (Node *)n;
} }
; ;
@@ -4291,15 +4291,11 @@ OptTempTableName:
} }
| GLOBAL TEMPORARY opt_table qualified_name | GLOBAL TEMPORARY opt_table qualified_name
{ {
elog(ERROR,
"GLOBAL TEMPORARY TABLE is not currently supported");
$$ = $4; $$ = $4;
$$->istemp = true; $$->istemp = true;
} }
| GLOBAL TEMP opt_table qualified_name | GLOBAL TEMP opt_table qualified_name
{ {
elog(ERROR,
"GLOBAL TEMPORARY TABLE is not currently supported");
$$ = $4; $$ = $4;
$$->istemp = true; $$->istemp = true;
} }
@@ -4889,10 +4885,17 @@ SimpleTypename:
| ConstInterval '(' Iconst ')' opt_interval | ConstInterval '(' Iconst ')' opt_interval
{ {
$$ = $1; $$ = $1;
if (($3 < 0) || ($3 > MAX_INTERVAL_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"INTERVAL(%d) precision must be between %d and %d", "INTERVAL(%d) precision must not be negative",
$3, 0, MAX_INTERVAL_PRECISION); $3);
if ($3 > MAX_INTERVAL_PRECISION)
{
elog(NOTICE,
"INTERVAL(%d) precision reduced to maximum allowed, %d",
$3, MAX_INTERVAL_PRECISION);
$3 = MAX_INTERVAL_PRECISION;
}
$$->typmod = INTERVAL_TYPMOD($3, $5); $$->typmod = INTERVAL_TYPMOD($3, $5);
} }
| type_name attrs | type_name attrs
@@ -5248,11 +5251,18 @@ ConstDatetime:
* - thomas 2001-09-06 * - thomas 2001-09-06
*/ */
$$->timezone = $5; $$->timezone = $5;
if (($3 < 0) || ($3 > MAX_TIMESTAMP_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"TIMESTAMP(%d)%s precision must be between %d and %d", "TIMESTAMP(%d)%s precision must not be negative",
$3, ($5 ? " WITH TIME ZONE": ""), 0, $3, ($5 ? " WITH TIME ZONE": ""));
if ($3 > MAX_TIMESTAMP_PRECISION)
{
elog(NOTICE,
"TIMESTAMP(%d)%s precision reduced to maximum allowed, %d",
$3, ($5 ? " WITH TIME ZONE": ""),
MAX_TIMESTAMP_PRECISION); MAX_TIMESTAMP_PRECISION);
$3 = MAX_TIMESTAMP_PRECISION;
}
$$->typmod = $3; $$->typmod = $3;
} }
| TIMESTAMP opt_timezone | TIMESTAMP opt_timezone
@@ -5280,11 +5290,18 @@ ConstDatetime:
$$ = SystemTypeName("timetz"); $$ = SystemTypeName("timetz");
else else
$$ = SystemTypeName("time"); $$ = SystemTypeName("time");
if (($3 < 0) || ($3 > MAX_TIME_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"TIME(%d)%s precision must be between %d and %d", "TIME(%d)%s precision must not be negative",
$3, ($5 ? " WITH TIME ZONE": ""), 0, $3, ($5 ? " WITH TIME ZONE": ""));
if ($3 > MAX_TIME_PRECISION)
{
elog(NOTICE,
"TIME(%d)%s precision reduced to maximum allowed, %d",
$3, ($5 ? " WITH TIME ZONE": ""),
MAX_TIME_PRECISION); MAX_TIME_PRECISION);
$3 = MAX_TIME_PRECISION;
}
$$->typmod = $3; $$->typmod = $3;
} }
| TIME opt_timezone | TIME opt_timezone
@@ -6073,10 +6090,17 @@ c_expr: columnref { $$ = (Node *) $1; }
s->val.val.str = "now"; s->val.val.str = "now";
s->typename = SystemTypeName("text"); s->typename = SystemTypeName("text");
d = SystemTypeName("timetz"); d = SystemTypeName("timetz");
if (($3 < 0) || ($3 > MAX_TIME_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"CURRENT_TIME(%d) precision must be between %d and %d", "CURRENT_TIME(%d) precision must not be negative",
$3, 0, MAX_TIME_PRECISION); $3);
if ($3 > MAX_TIME_PRECISION)
{
elog(NOTICE,
"CURRENT_TIME(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIME_PRECISION);
$3 = MAX_TIME_PRECISION;
}
d->typmod = $3; d->typmod = $3;
$$ = (Node *)makeTypeCast((Node *)s, d); $$ = (Node *)makeTypeCast((Node *)s, d);
@@ -6118,11 +6142,17 @@ c_expr: columnref { $$ = (Node *) $1; }
s->typename = SystemTypeName("text"); s->typename = SystemTypeName("text");
d = SystemTypeName("timestamptz"); d = SystemTypeName("timestamptz");
if (($3 < 0) || ($3 > MAX_TIMESTAMP_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"CURRENT_TIMESTAMP(%d) precision " "CURRENT_TIMESTAMP(%d) precision must not be negative",
"must be between %d and %d", $3);
$3, 0, MAX_TIMESTAMP_PRECISION); if ($3 > MAX_TIMESTAMP_PRECISION)
{
elog(NOTICE,
"CURRENT_TIMESTAMP(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIMESTAMP_PRECISION);
$3 = MAX_TIMESTAMP_PRECISION;
}
d->typmod = $3; d->typmod = $3;
$$ = (Node *)makeTypeCast((Node *)s, d); $$ = (Node *)makeTypeCast((Node *)s, d);
@@ -6163,10 +6193,17 @@ c_expr: columnref { $$ = (Node *) $1; }
s->val.val.str = "now"; s->val.val.str = "now";
s->typename = SystemTypeName("text"); s->typename = SystemTypeName("text");
d = SystemTypeName("time"); d = SystemTypeName("time");
if (($3 < 0) || ($3 > MAX_TIME_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"LOCALTIME(%d) precision must be between %d and %d", "LOCALTIME(%d) precision must not be negative",
$3, 0, MAX_TIME_PRECISION); $3);
if ($3 > MAX_TIME_PRECISION)
{
elog(NOTICE,
"LOCALTIME(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIME_PRECISION);
$3 = MAX_TIME_PRECISION;
}
d->typmod = $3; d->typmod = $3;
$$ = (Node *)makeTypeCast((Node *)s, d); $$ = (Node *)makeTypeCast((Node *)s, d);
@@ -6208,11 +6245,17 @@ c_expr: columnref { $$ = (Node *) $1; }
s->typename = SystemTypeName("text"); s->typename = SystemTypeName("text");
d = SystemTypeName("timestamp"); d = SystemTypeName("timestamp");
if (($3 < 0) || ($3 > MAX_TIMESTAMP_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"LOCALTIMESTAMP(%d) precision must be " "LOCALTIMESTAMP(%d) precision must not be negative",
"between %d and %d", $3);
$3, 0, MAX_TIMESTAMP_PRECISION); if ($3 > MAX_TIMESTAMP_PRECISION)
{
elog(NOTICE,
"LOCALTIMESTAMP(%d) precision reduced to maximum allowed, %d",
$3, MAX_TIMESTAMP_PRECISION);
$3 = MAX_TIMESTAMP_PRECISION;
}
d->typmod = $3; d->typmod = $3;
$$ = (Node *)makeTypeCast((Node *)s, d); $$ = (Node *)makeTypeCast((Node *)s, d);
@@ -6772,8 +6815,8 @@ qualified_name:
break; break;
default: default:
elog(ERROR, elog(ERROR,
"Improper qualified name " "Improper qualified name "
"(too many dotted names): %s", "(too many dotted names): %s",
NameListToString($1)); NameListToString($1));
break; break;
} }
@@ -6876,10 +6919,17 @@ AexprConst: Iconst
n->val.type = T_String; n->val.type = T_String;
n->val.val.str = $5; n->val.val.str = $5;
/* precision specified, and fields may be... */ /* precision specified, and fields may be... */
if (($3 < 0) || ($3 > MAX_INTERVAL_PRECISION)) if ($3 < 0)
elog(ERROR, elog(ERROR,
"INTERVAL(%d) precision must be between %d and %d", "INTERVAL(%d) precision must not be negative",
$3, 0, MAX_INTERVAL_PRECISION); $3);
if ($3 > MAX_INTERVAL_PRECISION)
{
elog(NOTICE,
"INTERVAL(%d) precision reduced to maximum allowed, %d",
$3, MAX_INTERVAL_PRECISION);
$3 = MAX_INTERVAL_PRECISION;
}
n->typename->typmod = INTERVAL_TYPMOD($3, $6); n->typename->typmod = INTERVAL_TYPMOD($3, $6);
$$ = (Node *)n; $$ = (Node *)n;
} }