diff options
| author | Tom Lane | 2003-07-27 04:53:12 +0000 |
|---|---|---|
| committer | Tom Lane | 2003-07-27 04:53:12 +0000 |
| commit | b6a1d25b0aa179c86e0607d4c0c3b647dc5bbb87 (patch) | |
| tree | 7881c788c3f659b45eb371c0e40fbaf188051cb0 /src/test/regress/expected/inet.out | |
| parent | 524cfad23f31db70a23fc1fe748c050838d5fad0 (diff) | |
Error message editing in utils/adt. Again thanks to Joe Conway for doing
the bulk of the heavy lifting ...
Diffstat (limited to 'src/test/regress/expected/inet.out')
| -rw-r--r-- | src/test/regress/expected/inet.out | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/test/regress/expected/inet.out b/src/test/regress/expected/inet.out index e4295923281..b9ed16cd4fb 100644 --- a/src/test/regress/expected/inet.out +++ b/src/test/regress/expected/inet.out @@ -24,16 +24,19 @@ INSERT INTO INET_TBL (c, i) VALUES ('10:23::8000/113', '10:23::ffff'); INSERT INTO INET_TBL (c, i) VALUES ('::ffff:1.2.3.4', '::4.3.2.1/24'); -- check that CIDR rejects invalid input: INSERT INTO INET_TBL (c, i) VALUES ('192.168.1.2/24', '192.168.1.226'); -ERROR: invalid CIDR value '192.168.1.2/24': has bits set to right of mask +ERROR: invalid cidr value: "192.168.1.2/24" +DETAIL: Value has bits set to right of mask. INSERT INTO INET_TBL (c, i) VALUES ('1234::1234::1234', '::1.2.3.4'); -ERROR: invalid CIDR value '1234::1234::1234' +ERROR: invalid input syntax for cidr: "1234::1234::1234" -- check that CIDR rejects invalid input when converting from text: INSERT INTO INET_TBL (c, i) VALUES (cidr('192.168.1.2/24'), '192.168.1.226'); -ERROR: invalid CIDR value '192.168.1.2/24': has bits set to right of mask +ERROR: invalid cidr value: "192.168.1.2/24" +DETAIL: Value has bits set to right of mask. INSERT INTO INET_TBL (c, i) VALUES (cidr('ffff:ffff:ffff:ffff::/24'), '::192.168.1.226'); -ERROR: invalid CIDR value 'ffff:ffff:ffff:ffff::/24': has bits set to right of mask +ERROR: invalid cidr value: "ffff:ffff:ffff:ffff::/24" +DETAIL: Value has bits set to right of mask. SELECT '' AS ten, c AS cidr, i AS inet FROM INET_TBL; - ten | cidr | inet + ten | cidr | inet -----+--------------------+------------------ | 192.168.1.0/24 | 192.168.1.226/24 | 192.168.1.0/24 | 192.168.1.226 @@ -56,7 +59,7 @@ SELECT '' AS ten, c AS cidr, i AS inet FROM INET_TBL; -- now test some support functions SELECT '' AS ten, i AS inet, host(i), text(i), family(i) FROM INET_TBL; - ten | inet | host | text | family + ten | inet | host | text | family -----+------------------+---------------+------------------+-------- | 192.168.1.226/24 | 192.168.1.226 | 192.168.1.226/24 | 4 | 192.168.1.226 | 192.168.1.226 | 192.168.1.226/32 | 4 @@ -79,7 +82,7 @@ SELECT '' AS ten, i AS inet, host(i), text(i), family(i) FROM INET_TBL; SELECT '' AS ten, c AS cidr, broadcast(c), i AS inet, broadcast(i) FROM INET_TBL; - ten | cidr | broadcast | inet | broadcast + ten | cidr | broadcast | inet | broadcast -----+--------------------+------------------+------------------+--------------------------------------- | 192.168.1.0/24 | 192.168.1.255/24 | 192.168.1.226/24 | 192.168.1.255/24 | 192.168.1.0/24 | 192.168.1.255/24 | 192.168.1.226 | 192.168.1.226 @@ -102,7 +105,7 @@ SELECT '' AS ten, c AS cidr, broadcast(c), SELECT '' AS ten, c AS cidr, network(c) AS "network(cidr)", i AS inet, network(i) AS "network(inet)" FROM INET_TBL; - ten | cidr | network(cidr) | inet | network(inet) + ten | cidr | network(cidr) | inet | network(inet) -----+--------------------+--------------------+------------------+------------------ | 192.168.1.0/24 | 192.168.1.0/24 | 192.168.1.226/24 | 192.168.1.0/24 | 192.168.1.0/24 | 192.168.1.0/24 | 192.168.1.226 | 192.168.1.226/32 @@ -171,7 +174,7 @@ SELECT '' AS ten, i, c, i << c AS sb, i <<= c AS sbe, i >> c AS sup, i >>= c AS spe FROM INET_TBL; - ten | i | c | lt | le | eq | ge | gt | ne | sb | sbe | sup | spe + ten | i | c | lt | le | eq | ge | gt | ne | sb | sbe | sup | spe -----+------------------+--------------------+----+----+----+----+----+----+----+-----+-----+----- | 192.168.1.226/24 | 192.168.1.0/24 | f | f | f | t | t | t | f | t | f | t | 192.168.1.226 | 192.168.1.0/24 | f | f | f | t | t | t | t | t | f | f |