Changeset: e14ed64aa17e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e14ed64aa17e
Modified Files:
sql/test/pg_regress/Tests/inet.sql
sql/test/pg_regress/Tests/inet.stable.err
sql/test/pg_regress/Tests/inet.stable.out
Branch: default
Log Message:
Approved new output after implementation of <<= and >>= as fix for bug 3645
diffs (163 lines):
diff --git a/sql/test/pg_regress/Tests/inet.sql
b/sql/test/pg_regress/Tests/inet.sql
--- a/sql/test/pg_regress/Tests/inet.sql
+++ b/sql/test/pg_regress/Tests/inet.sql
@@ -50,8 +50,8 @@ SELECT '' AS six, c AS cidr, i AS inet F
SELECT '' AS ten, i, c,
i < c AS lt, i <= c AS le, i = c AS eq
, i >= c AS ge, i > c AS gt, i <> c AS ne
--- i << c AS sb, i <<= c AS sbe,
--- i >> c AS sup, i >>= c AS spe
+ , i << c AS sb, i <<= c AS sbe
+ , i >> c AS sup, i >>= c AS spe
FROM INET_TBL;
-- check the conversion to/from text and set_netmask
diff --git a/sql/test/pg_regress/Tests/inet.stable.err
b/sql/test/pg_regress/Tests/inet.stable.err
--- a/sql/test/pg_regress/Tests/inet.stable.err
+++ b/sql/test/pg_regress/Tests/inet.stable.err
@@ -30,82 +30,76 @@ stderr of test 'inet` in directory 'sql/
# 12:56:44 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-27974" "--port=31190"
# 12:56:44 >
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.226/24');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.0/24');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.0/25');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.255/24');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('192.168.1', '192.168.1.255/25');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10', '10.1.2.3/8');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10.1.2', '10.1.2.3/24');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10.1', '10.1.2.3/16');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10', '10.1.2.3/8');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10', '11.1.2.3/8');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10', '9.1.2.3/8');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ''
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10:23::f1', '10:23::f1/64');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string ':23::f1'
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('10:23::8000/113', '10:23::ffff');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string
':23::8000/113'
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('::ffff:1.2.3.4', '::4.3.2.1/24');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string
'::ffff:1.2.3.4'
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES ('1234::1234::1234', '::1.2.3.4');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string '::1234::1234'
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = INSERT INTO INET_TBL (c, i) VALUES (cast('ffff:ffff:ffff:ffff::/24' as
inet), '::192.168.1.226');
ERROR = !GDKerror:!ERROR: Error while parsing, unexpected string
'ffff:ffff:ffff:ffff::/24'
!
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = SELECT '' AS ten, i AS inet, host(i), text(i), family(i) FROM INET_TBL;
ERROR = !SELECT: no such unary operator 'family(inet)'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
+MAPI = (monetdb) /var/tmp/mtest-9958/.s.monetdb.30018
QUERY = SELECT '' AS ten, set_masklen(inet(text(i)), 24) FROM INET_TBL;
ERROR = !SELECT: no such unary operator 'inet(clob)'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT * FROM inet_tbl WHERE i<<cast('192.168.1.0/24' as inet);
-ERROR = !SELECT: no such binary operator 'left_shift(inet,inet)'
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT * FROM inet_tbl WHERE i<<=cast('192.168.1.0/24' as inet);
-ERROR = !syntax error, unexpected '=' in: "select * from inet_tbl where i<<="
# 12:56:45 >
diff --git a/sql/test/pg_regress/Tests/inet.stable.out
b/sql/test/pg_regress/Tests/inet.stable.out
--- a/sql/test/pg_regress/Tests/inet.stable.out
+++ b/sql/test/pg_regress/Tests/inet.stable.out
@@ -99,16 +99,32 @@ Ready.
#-- i << c AS sb, i <<= c AS sbe,
#-- i >> c AS sup, i >>= c AS spe
# FROM INET_TBL;
-% .L, sys.inet_tbl, sys.inet_tbl, sys.L, sys.L, sys.L, sys.L, sys.L,
sys.L # table_name
-% ten, i, c, lt, le, eq, ge, gt, ne # name
-% char, inet, inet, boolean, boolean, boolean,
boolean, boolean, boolean # type
-% 0, 0, 0, 5, 5, 5, 5, 5, 5 # length
-[ "", 192.168.1.226, 192.168.1.0/26, false, false, false, true, true,
true ]
-[ "", 10.1.2.3/8, 10.0.0.0, false, false, false, true, true,
true ]
-[ "", 10.1.2.3, 10.1.2.3, false, true, true, true, false,
false ]
-[ "", 192.168.1.226, 192.168.1.2/30, false, false, false, true, true,
true ]
-[ "", 192.168.1.226, 192.168.1.2/30, false, false, false, true, true,
true ]
+% .L, sys.inet_tbl, sys.inet_tbl, sys.L, sys.L, sys.L, sys.L, sys.L,
sys.L, sys.L, sys.L, sys.L, sys.L # table_name
+% ten, i, c, lt, le, eq, ge, gt, ne, sb,
sbe, sup, spe # name
+% char, inet, inet, boolean, boolean, boolean,
boolean, boolean, boolean, boolean, boolean,
boolean, boolean # type
+% 0, 0, 0, 5, 5, 5, 5, 5, 5, 5,
5, 5, 5 # length
+[ "", 192.168.1.226, 192.168.1.0/26, false, false, false, true, true,
true, false, false, false, false ]
+[ "", 10.1.2.3/8, 10.0.0.0, false, false, false, true, true,
true, false, false, true, true ]
+[ "", 10.1.2.3, 10.1.2.3, false, true, true, true, false,
false, false, true, false, true ]
+[ "", 192.168.1.226, 192.168.1.2/30, false, false, false, true, true,
true, false, false, false, false ]
+[ "", 192.168.1.226, 192.168.1.2/30, false, false, false, true, true,
true, false, false, false, false ]
#CREATE INDEX inet_idx1 ON inet_tbl(i);
+#SELECT * FROM inet_tbl WHERE i<<cast('192.168.1.0/24' as inet);
+% sys.inet_tbl, sys.inet_tbl # table_name
+% c, i # name
+% inet, inet # type
+% 0, 0 # length
+[ 192.168.1.0/26, 192.168.1.226 ]
+[ 192.168.1.2/30, 192.168.1.226 ]
+[ 192.168.1.2/30, 192.168.1.226 ]
+#SELECT * FROM inet_tbl WHERE i<<=cast('192.168.1.0/24' as inet);
+% sys.inet_tbl, sys.inet_tbl # table_name
+% c, i # name
+% inet, inet # type
+% 0, 0 # length
+[ 192.168.1.0/26, 192.168.1.226 ]
+[ 192.168.1.2/30, 192.168.1.226 ]
+[ 192.168.1.2/30, 192.168.1.226 ]
#DROP INDEX inet_idx1;
#DROP TABLE INET_TBL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
