summaryrefslogtreecommitdiff
path: root/src/backend/parser
diff options
context:
space:
mode:
authorPeter Eisentraut <peter_e@gmx.net>2001-05-22 16:37:17 +0000
committerPeter Eisentraut <peter_e@gmx.net>2001-05-22 16:37:17 +0000
commitefcecd9eca884776137b156a3f1f93c23b98a648 (patch)
treec4b92145e8a25105c68da19114e6952ea7d9241c /src/backend/parser
parentc84c3d8fea316359f2336be7287d7037c3b3e46c (diff)
downloadpostgresql-efcecd9eca884776137b156a3f1f93c23b98a648.tar.gz
Make bit and bit varying types reject too long input. (They already tried
to do that, but inconsistently.) Make bit type reject too short input, too, per SQL. Since it no longer zero pads, 'zpbit*' has been renamed to 'bit*' in the source, hence initdb.
Diffstat (limited to 'src/backend/parser')
-rw-r--r--src/backend/parser/analyze.c4
-rw-r--r--src/backend/parser/parse_coerce.c4
-rw-r--r--src/backend/parser/parse_node.c6
3 files changed, 7 insertions, 7 deletions
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 4afd395f5a..0b6faf6422 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -6,7 +6,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.186 2001/05/18 21:24:19 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.187 2001/05/22 16:37:15 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -3086,7 +3086,7 @@ transformColumnType(ParseState *pstate, ColumnDef *column)
typename->typmod = VARHDRSZ +
((NUMERIC_DEFAULT_PRECISION << 16) | NUMERIC_DEFAULT_SCALE);
break;
- case ZPBITOID:
+ case BITOID:
/* 'bit' -> 'bit(1)' */
typename->typmod = 1;
break;
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 1e7c8af7b0..38f044217e 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.56 2001/03/22 03:59:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.57 2001/05/22 16:37:16 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -452,7 +452,7 @@ TypeCategory(Oid inType)
result = STRING_TYPE;
break;
- case (ZPBITOID):
+ case (BITOID):
case (VARBITOID):
result = BITSTRING_TYPE;
break;
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index b23dd7f1b9..1c9933c2f1 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.53 2001/03/22 03:59:41 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.54 2001/05/22 16:37:16 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -473,11 +473,11 @@ make_const(Value *value)
break;
case T_BitString:
- val = DirectFunctionCall3(zpbit_in,
+ val = DirectFunctionCall3(bit_in,
CStringGetDatum(strVal(value)),
ObjectIdGetDatum(InvalidOid),
Int32GetDatum(-1));
- typeid = ZPBITOID;
+ typeid = BITOID;
typelen = -1;
typebyval = false;
break;