Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitefcecd9

Browse files
committed
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.
1 parentc84c3d8 commitefcecd9

File tree

14 files changed

+203
-253
lines changed

14 files changed

+203
-253
lines changed

‎doc/src/sgml/datatype.sgml‎

Lines changed: 36 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.54 2001/05/21 16:54:45 petere Exp $
2+
$Header: /cvsroot/pgsql/doc/src/sgml/datatype.sgml,v 1.55 2001/05/22 16:37:15 petere Exp $
33
-->
44

55
<chapter id="datatype">
@@ -2276,30 +2276,52 @@ SELECT * FROM test1 WHERE a;
22762276
Bit strings are strings of 1's and 0's. They can be used to store
22772277
or visualize bit masks. There are two SQL bit types:
22782278
<type>BIT(<replaceable>x</replaceable>)</type> and <type>BIT
2279-
VARYING(<replaceable>x</replaceable>)</type>; the
2280-
<replaceable>x</replaceable> specifies the maximum length.
2281-
<type>BIT</type> type data is automatically padded with 0's on the
2282-
right to the maximum length, <type>BIT VARYING</type> is of
2283-
variable length. <type>BIT</type> without length is equivalent
2284-
to <literal>BIT(1)</literal>, <type>BIT VARYING</type> means
2285-
unlimited length. Input data that is longer than the allowed
2286-
length will be truncated. Refer to <xref
2279+
VARYING(<replaceable>x</replaceable>)</type>; where
2280+
<replaceable>x</replaceable> is a positive integer.
2281+
</para>
2282+
2283+
<para>
2284+
<type>BIT</type> type data must match the length
2285+
<replaceable>x</replaceable> exactly; it is an error to attempt to
2286+
store shorter or longer bit strings. <type>BIT VARYING</type> is
2287+
of variable length up to the maximum length
2288+
<replaceable>x</replaceable>; longer strings will be rejected.
2289+
<type>BIT</type> without length is equivalent to
2290+
<literal>BIT(1)</literal>, <type>BIT VARYING</type> without length
2291+
specification means unlimited length.
2292+
</para>
2293+
2294+
<note>
2295+
<para>
2296+
Prior to PostgreSQL 7.2, <type>BIT</type> type data was
2297+
zero-padded on the right. This was changed to comply with the
2298+
SQL standard. To implement zero-padded bit strings, a
2299+
combination of the concatenation operator and the
2300+
<function>substring</function> function can be used.
2301+
</para>
2302+
</note>
2303+
2304+
<para>
2305+
Refer to <xref
22872306
linkend="sql-syntax-bit-strings"> for information about the syntax
22882307
of bit string constants. Bit-logical operators and string
22892308
manipulation functions are available; see <xref
22902309
linkend="functions">.
22912310
</para>
22922311

2293-
<informalexample>
2294-
<para>
2295-
Some examples:
2312+
<example>
2313+
<title>Using the bit string types</title>
2314+
22962315
<programlisting>
22972316
CREATE TABLE test (a BIT(3), b BIT VARYING(5));
22982317
INSERT INTO test VALUES (B'101', B'00');
2318+
INSERT INTO test VALUES (B'10', B'101');
2319+
<computeroutput>
2320+
ERROR: bit string length does not match type bit(3)
2321+
</computeroutput>
22992322
SELECT SUBSTRING(b FROM 1 FOR 2) FROM test;
23002323
</programlisting>
2301-
</para>
2302-
</informalexample>
2324+
</example>
23032325

23042326
</sect1>
23052327

‎src/backend/parser/analyze.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
* Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
77
* Portions Copyright (c) 1994, Regents of the University of California
88
*
9-
*$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.186 2001/05/18 21:24:19 momjian Exp $
9+
*$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.187 2001/05/22 16:37:15 petere Exp $
1010
*
1111
*-------------------------------------------------------------------------
1212
*/
@@ -3086,7 +3086,7 @@ transformColumnType(ParseState *pstate, ColumnDef *column)
30863086
typename->typmod=VARHDRSZ+
30873087
((NUMERIC_DEFAULT_PRECISION <<16) |NUMERIC_DEFAULT_SCALE);
30883088
break;
3089-
caseZPBITOID:
3089+
caseBITOID:
30903090
/* 'bit' -> 'bit(1)' */
30913091
typename->typmod=1;
30923092
break;

‎src/backend/parser/parse_coerce.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.56 2001/03/2203:59:41 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_coerce.c,v 2.57 2001/05/2216:37:16 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -452,7 +452,7 @@ TypeCategory(Oid inType)
452452
result=STRING_TYPE;
453453
break;
454454

455-
case (ZPBITOID):
455+
case (BITOID):
456456
case (VARBITOID):
457457
result=BITSTRING_TYPE;
458458
break;

‎src/backend/parser/parse_node.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.53 2001/03/2203:59:41 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/parser/parse_node.c,v 1.54 2001/05/2216:37:16 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -473,11 +473,11 @@ make_const(Value *value)
473473
break;
474474

475475
caseT_BitString:
476-
val=DirectFunctionCall3(zpbit_in,
476+
val=DirectFunctionCall3(bit_in,
477477
CStringGetDatum(strVal(value)),
478478
ObjectIdGetDatum(InvalidOid),
479479
Int32GetDatum(-1));
480-
typeid=ZPBITOID;
480+
typeid=BITOID;
481481
typelen=-1;
482482
typebyval= false;
483483
break;

‎src/backend/utils/adt/format_type.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
* Portions Copyright (c) 1994, Regents of the University of California
99
*
1010
* IDENTIFICATION
11-
* $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.12 2001/05/18 22:54:23 momjian Exp $
11+
* $Header: /cvsroot/pgsql/src/backend/utils/adt/format_type.c,v 1.13 2001/05/22 16:37:16 petere Exp $
1212
*
1313
*-------------------------------------------------------------------------
1414
*/
@@ -198,7 +198,7 @@ format_type_internal(Oid type_oid, int32 typemod)
198198
buf=pstrdup("character varying");
199199
break;
200200

201-
caseZPBITOID:
201+
caseBITOID:
202202
if (with_typemod)
203203
buf=psnprintf(5+MAX_INT32_LEN+1,"bit(%d)",
204204
(int)typemod);
@@ -262,7 +262,7 @@ type_maximum_size(Oid type_oid, int32 typemod)
262262
break;
263263

264264
caseVARBITOID:
265-
caseZPBITOID:
265+
caseBITOID:
266266
/* typemod is the (max) number of bits */
267267
return (typemod+ (BITS_PER_BYTE-1)) /BITS_PER_BYTE
268268
+2*sizeof(int32);

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp