aboutsummaryrefslogtreecommitdiff
path: root/src/include/parser/parse_coerce.h
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/include/parser/parse_coerce.h
parentc84c3d8fea316359f2336be7287d7037c3b3e46c (diff)
downloadpostgresql-efcecd9eca884776137b156a3f1f93c23b98a648.tar.gz
postgresql-efcecd9eca884776137b156a3f1f93c23b98a648.zip
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/include/parser/parse_coerce.h')
-rw-r--r--src/include/parser/parse_coerce.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index d8c7e430cd9..f81a3be8307 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -7,7 +7,7 @@
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
* Portions Copyright (c) 1994, Regents of the University of California
*
- * $Id: parse_coerce.h,v 1.27 2001/03/22 04:00:57 momjian Exp $
+ * $Id: parse_coerce.h,v 1.28 2001/05/22 16:37:17 petere Exp $
*
*-------------------------------------------------------------------------
*/
@@ -69,7 +69,7 @@ typedef enum CATEGORY
|| ((t) == CIRCLEOID) \
|| ((t) == INETOID) \
|| ((t) == CIDROID) \
- || ((t) == ZPBITOID) \
+ || ((t) == BITOID) \
|| ((t) == VARBITOID) )
@@ -101,8 +101,8 @@ typedef enum CATEGORY
|| ((a) == INT4OID && (b) == RELTIMEOID) \
|| ((a) == INETOID && (b) == CIDROID) \
|| ((a) == CIDROID && (b) == INETOID) \
- || ((a) == ZPBITOID && (b) == VARBITOID) \
- || ((a) == VARBITOID && (b) == ZPBITOID))
+ || ((a) == BITOID && (b) == VARBITOID) \
+ || ((a) == VARBITOID && (b) == BITOID))
/* IS_HIGHER_TYPE()
* These types are the most general in each of the type categories.