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.

Author: petere

doc/src/sgml/datatype.sgml

@@ -1,5 +1,5 @@
 <!--
-$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.54 2001/05/21 16:54:45 petere Exp $
+$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.55 2001/05/22 16:37:15 petere Exp $
 -->
 
  <chapter id="datatype">
@@ -2276,30 +2276,52 @@ SELECT * FROM test1 WHERE a;
     Bit strings are strings of 1's and 0's.  They can be used to store
     or visualize bit masks.  There are two SQL bit types:
     <type>BIT(<replaceable>x</replaceable>)</type> and <type>BIT
-    VARYING(<replaceable>x</replaceable>)</type>; the
-    <replaceable>x</replaceable> specifies the maximum length.
-    <type>BIT</type> type data is automatically padded with 0's on the
-    right to the maximum length, <type>BIT VARYING</type> is of
-    variable length.  <type>BIT</type> without length is equivalent
-    to <literal>BIT(1)</literal>, <type>BIT VARYING</type> means
-    unlimited length.  Input data that is longer than the allowed
-    length will be truncated.  Refer to <xref
+    VARYING(<replaceable>x</replaceable>)</type>; where
+    <replaceable>x</replaceable> is a positive integer.
+   </para>
+
+   <para>
+    <type>BIT</type> type data must match the length
+    <replaceable>x</replaceable> exactly; it is an error to attempt to
+    store shorter or longer bit strings.  <type>BIT VARYING</type> is
+    of variable length up to the maximum length
+    <replaceable>x</replaceable>; longer strings will be rejected.
+    <type>BIT</type> without length is equivalent to
+    <literal>BIT(1)</literal>, <type>BIT VARYING</type> without length
+    specification means unlimited length.
+   </para>
+
+   <note>
+    <para>
+     Prior to PostgreSQL 7.2, <type>BIT</type> type data was
+     zero-padded on the right.  This was changed to comply with the
+     SQL standard.  To implement zero-padded bit strings, a
+     combination of the concatenation operator and the
+     <function>substring</function> function can be used.
+    </para>
+   </note>
+
+   <para>
+    Refer to <xref
     linkend="sql-syntax-bit-strings"> for information about the syntax
     of bit string constants.  Bit-logical operators and string
     manipulation functions are available; see <xref
     linkend="functions">.
    </para>
 
-   <informalexample>
-    <para>
-     Some examples:
+   <example>
+    <title>Using the bit string types</title>
+
 <programlisting>
 CREATE TABLE test (a BIT(3), b BIT VARYING(5));
 INSERT INTO test VALUES (B'101', B'00');
+INSERT INTO test VALUES (B'10', B'101');
+<computeroutput>
+ERROR:  bit string length does not match type bit(3)
+</computeroutput>
 SELECT SUBSTRING(b FROM 1 FOR 2) FROM test;
 </programlisting>
-    </para>
-   </informalexample>
+   </example>
 
   </sect1>
 

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;

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;

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;

src/backend/utils/adt/format_type.c

@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.12 2001/05/18 22:54:23 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.13 2001/05/22 16:37:16 petere Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -198,7 +198,7 @@ format_type_internal(Oid type_oid, int32 typemod)
 				buf = pstrdup("character varying");
 			break;
 
-		case ZPBITOID:
+		case BITOID:
 			if (with_typemod)
 				buf = psnprintf(5 + MAX_INT32_LEN + 1, "bit(%d)",
 								(int) typemod);
@@ -262,7 +262,7 @@ type_maximum_size(Oid type_oid, int32 typemod)
 			break;
 
 		case VARBITOID:
-		case ZPBITOID:
+		case BITOID:
 			/* typemod is the (max) number of bits */
 			return (typemod + (BITS_PER_BYTE - 1)) / BITS_PER_BYTE
 				+ 2 * sizeof(int32);