Skip to content

Commit bcba09e

Browse files
tglsfdctglsfdc
committed
Ooops, missed that a couple of contrib modules have calls to byteacmp.
Add bytea.h inclusions as needed. Some of the contrib regression tests need to be de-hexified, too. Per buildfarm.
1 parent 5b8ee5c commit bcba09e

20 files changed

+54
-51
lines changed

‎contrib/btree_gin/btree_gin.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.2 2009/06/11 14:48:50 momjian Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gin/btree_gin.c,v 1.3 2009/08/04 18:49:50 tgl Exp $
33
*/
44
#include "postgres.h"
55

@@ -8,6 +8,7 @@
88
#include "fmgr.h"
99
#include "access/skey.h"
1010
#include "utils/builtins.h"
11+
#include "utils/bytea.h"
1112
#include "utils/cash.h"
1213
#include "utils/date.h"
1314
#include "utils/inet.h"

‎contrib/btree_gin/expected/bytea.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
set enable_seqscan=off;
2+
-- ensure consistent test output regardless of the default bytea format
3+
SET bytea_output TO escape;
24
CREATE TABLE test_bytea (
35
i bytea
46
);

‎contrib/btree_gin/sql/bytea.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
set enable_seqscan=off;
2+
-- ensure consistent test output regardless of the default bytea format
3+
SET bytea_output TO escape;
24

35
CREATE TABLE test_bytea (
46
i bytea

‎contrib/btree_gist/btree_bit.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.10 2009/06/11 14:48:50 momjian Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_bit.c,v 1.11 2009/08/04 18:49:50 tgl Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_var.h"
6-
#include "utils/builtins.h"
6+
#include "utils/bytea.h"
77
#include "utils/varbit.h"
88

99

‎contrib/btree_gist/btree_bytea.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*
2-
* $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.9 2009/06/11 14:48:50 momjian Exp $
2+
* $PostgreSQL: pgsql/contrib/btree_gist/btree_bytea.c,v 1.10 2009/08/04 18:49:50 tgl Exp $
33
*/
44
#include "btree_gist.h"
55
#include "btree_utils_var.h"
6-
#include "utils/builtins.h"
6+
#include "utils/bytea.h"
77

88

99
/*

‎contrib/citext/expected/citext.out

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -737,18 +737,6 @@ SELECT 'f'::citext::"char" = 'f'::"char" AS t;
737737
t
738738
(1 row)
739739

740-
SELECT 'foo'::bytea::citext = 'foo' AS t;
741-
t
742-
---
743-
t
744-
(1 row)
745-
746-
SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
747-
t
748-
---
749-
t
750-
(1 row)
751-
752740
SELECT '100'::money::citext = '$100.00' AS t;
753741
t
754742
---

‎contrib/citext/expected/citext_1.out

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -737,18 +737,6 @@ SELECT 'f'::citext::"char" = 'f'::"char" AS t;
737737
t
738738
(1 row)
739739

740-
SELECT 'foo'::bytea::citext = 'foo' AS t;
741-
t
742-
---
743-
t
744-
(1 row)
745-
746-
SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
747-
t
748-
---
749-
t
750-
(1 row)
751-
752740
SELECT '100'::money::citext = '$100.00' AS t;
753741
t
754742
---

‎contrib/citext/sql/citext.sql

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,6 @@ SELECT 'f'::citext::char = 'f'::char AS t;
226226
SELECT 'f'::"char"::citext = 'f' AS t;
227227
SELECT 'f'::citext::"char" = 'f'::"char" AS t;
228228

229-
SELECT 'foo'::bytea::citext = 'foo' AS t;
230-
SELECT 'foo'::citext::bytea = 'foo'::bytea AS t;
231-
232229
SELECT '100'::money::citext = '$100.00' AS t;
233230
SELECT '100'::citext::money = '100'::money AS t;
234231

‎contrib/pgcrypto/expected/blowfish.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- Blowfish cipher
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46
-- some standard Blowfish testvalues
57
SELECT encode(encrypt(
68
decode('0000000000000000', 'hex'),

‎contrib/pgcrypto/expected/init.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
SET client_min_messages = warning;
99
\set ECHO none
1010
RESET client_min_messages;
11+
-- ensure consistent test output regardless of the default bytea format
12+
SET bytea_output TO escape;
1113
-- check for encoding fn's
1214
SELECT encode('foo', 'hex');
1315
encode

‎contrib/pgcrypto/expected/pgp-armor.out

Lines changed: 21 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,52 @@
11
--
22
-- PGP Armor
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46
select armor('');
57
armor
68
-----------------------------
79
-----BEGIN PGP MESSAGE-----
8-
9-
=twTO
10-
-----END PGP MESSAGE-----
11-
10+
11+
=twTO
12+
-----END PGP MESSAGE-----
13+
1214
(1 row)
1315

1416
select armor('test');
1517
armor
1618
-----------------------------
1719
-----BEGIN PGP MESSAGE-----
18-
19-
dGVzdA==
20-
=+G7Q
21-
-----END PGP MESSAGE-----
22-
20+
21+
dGVzdA==
22+
=+G7Q
23+
-----END PGP MESSAGE-----
24+
2325
(1 row)
2426

2527
select dearmor(armor(''));
2628
dearmor
2729
---------
28-
30+
2931
(1 row)
3032

3133
select dearmor(armor('zooka'));
3234
dearmor
3335
---------
34-
zooka
36+
zooka
3537
(1 row)
3638

3739
select armor('0123456789abcdef0123456789abcdef0123456789abcdef
3840
0123456789abcdef0123456789abcdef0123456789abcdef');
3941
armor
4042
------------------------------------------------------------------------------
41-
-----BEGIN PGP MESSAGE-----
42-
43+
-----BEGIN PGP MESSAGE-----
44+
4345
MDEyMzQ1Njc4OWFiY2RlZjAxMjM0NTY3ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmCjAxMjM0NTY3
44-
ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==
45-
=JFw5
46-
-----END PGP MESSAGE-----
47-
46+
ODlhYmNkZWYwMTIzNDU2Nzg5YWJjZGVmMDEyMzQ1Njc4OWFiY2RlZg==
47+
=JFw5
48+
-----END PGP MESSAGE-----
49+
4850
(1 row)
4951

5052
-- lots formatting
@@ -60,7 +62,7 @@ em9va2E=
6062
-----END PGP MESSAGE-----');
6163
dearmor
6264
---------
63-
zooka
65+
zooka
6466
(1 row)
6567

6668
-- lots messages
@@ -88,7 +90,7 @@ d3Jvbmc=
8890
');
8991
dearmor
9092
---------
91-
right
93+
right
9294
(1 row)
9395

9496
-- bad crc

‎contrib/pgcrypto/expected/pgp-encrypt.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- PGP encrypt
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46
select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
57
pgp_sym_decrypt
68
-----------------

‎contrib/pgcrypto/expected/pgp-pubkey-encrypt.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- PGP Public Key Encryption
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46
-- successful encrypt/decrypt
57
select pgp_pub_decrypt(
68
pgp_pub_encrypt('Secret msg', dearmor(pubkey)),

‎contrib/pgcrypto/expected/rijndael.out

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- AES / Rijndael-128 cipher
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46
-- some standard Rijndael testvalues
57
SELECT encode(encrypt(
68
decode('00112233445566778899aabbccddeeff', 'hex'),

‎contrib/pgcrypto/sql/blowfish.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- Blowfish cipher
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46

57
-- some standard Blowfish testvalues
68
SELECT encode(encrypt(

‎contrib/pgcrypto/sql/init.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@ SET client_min_messages = warning;
1212
\set ECHO all
1313
RESET client_min_messages;
1414

15+
-- ensure consistent test output regardless of the default bytea format
16+
SET bytea_output TO escape;
17+
1518
-- check for encoding fn's
1619
SELECT encode('foo', 'hex');
1720
SELECT decode('666f6f', 'hex');

‎contrib/pgcrypto/sql/pgp-armor.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- PGP Armor
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46

57
select armor('');
68
select armor('test');

‎contrib/pgcrypto/sql/pgp-encrypt.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- PGP encrypt
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46

57
select pgp_sym_decrypt(pgp_sym_encrypt('Secret.', 'key'), 'key');
68

‎contrib/pgcrypto/sql/pgp-pubkey-encrypt.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- PGP Public Key Encryption
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46

57
-- successful encrypt/decrypt
68
select pgp_pub_decrypt(

‎contrib/pgcrypto/sql/rijndael.sql

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
--
22
-- AES / Rijndael-128 cipher
33
--
4+
-- ensure consistent test output regardless of the default bytea format
5+
SET bytea_output TO escape;
46

57
-- some standard Rijndael testvalues
68
SELECT encode(encrypt(

0 commit comments

Comments
 (0)