From b26dfb95222fddd25322bdddf3a5a58d3392d8b1 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Wed, 18 Sep 2002 21:35:25 +0000 Subject: Extend pg_cast castimplicit column to a three-way value; this allows us to be flexible about assignment casts without introducing ambiguity in operator/function resolution. Introduce a well-defined promotion hierarchy for numeric datatypes (int2->int4->int8->numeric->float4->float8). Change make_const to initially label numeric literals as int4, int8, or numeric (never float8 anymore). Explicitly mark Func and RelabelType nodes to indicate whether they came from a function call, explicit cast, or implicit cast; use this to do reverse-listing more accurately and without so many heuristics. Explicit casts to char, varchar, bit, varbit will truncate or pad without raising an error (the pre-7.2 behavior), while assigning to a column without any explicit cast will still raise an error for wrong-length data like 7.3. This more nearly follows the SQL spec than 7.2 behavior (we should be reporting a 'completion condition' in the explicit-cast cases, but we have no mechanism for that, so just do silent truncation). Fix some problems with enforcement of typmod for array elements; it didn't work at all in 'UPDATE ... SET array[n] = foo', for example. Provide a generalized array_length_coerce() function to replace the specialized per-array-type functions that used to be needed (and were missing for NUMERIC as well as all the datetime types). Add missing conversions int8<->float4, text<->numeric, oid<->int8. initdb forced. --- src/backend/utils/adt/numeric.c | 46 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) (limited to 'src/backend/utils/adt/numeric.c') diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c index 228c43c6c46..4ea0fec1c1a 100644 --- a/src/backend/utils/adt/numeric.c +++ b/src/backend/utils/adt/numeric.c @@ -5,7 +5,7 @@ * * 1998 Jan Wieck * - * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.53 2002/09/04 20:31:28 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/adt/numeric.c,v 1.54 2002/09/18 21:35:22 tgl Exp $ * * ---------- */ @@ -1709,6 +1709,50 @@ numeric_float4(PG_FUNCTION_ARGS) } +Datum +text_numeric(PG_FUNCTION_ARGS) +{ + text *str = PG_GETARG_TEXT_P(0); + int len; + char *s; + Datum result; + + len = (VARSIZE(str) - VARHDRSZ); + s = palloc(len + 1); + memcpy(s, VARDATA(str), len); + *(s + len) = '\0'; + + result = DirectFunctionCall3(numeric_in, CStringGetDatum(s), + ObjectIdGetDatum(0), Int32GetDatum(-1)); + + pfree(s); + + return result; +} + +Datum +numeric_text(PG_FUNCTION_ARGS) +{ + /* val is numeric, but easier to leave it as Datum */ + Datum val = PG_GETARG_DATUM(0); + char *s; + int len; + text *result; + + s = DatumGetCString(DirectFunctionCall1(numeric_out, val)); + len = strlen(s); + + result = (text *) palloc(VARHDRSZ + len); + + VARATT_SIZEP(result) = len + VARHDRSZ; + memcpy(VARDATA(result), s, len); + + pfree(s); + + PG_RETURN_TEXT_P(result); +} + + /* ---------------------------------------------------------------------- * * Aggregate functions -- cgit v1.2.3