Changeset: 1869c48e297d for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1869c48e297d
Modified Files:
sql/test/pg_regress/Tests/oid.sql
sql/test/pg_regress/Tests/oid.stable.err
sql/test/pg_regress/Tests/oid.stable.out
Branch: default
Log Message:
Checked oid.sql and updated oid.stable.*
diffs (213 lines):
diff --git a/sql/test/pg_regress/Tests/oid.sql
b/sql/test/pg_regress/Tests/oid.sql
--- a/sql/test/pg_regress/Tests/oid.sql
+++ b/sql/test/pg_regress/Tests/oid.sql
@@ -7,13 +7,15 @@ CREATE TABLE OID_TBL(f1 oid);
INSERT INTO OID_TBL(f1) VALUES ('1234');
INSERT INTO OID_TBL(f1) VALUES ('1235');
INSERT INTO OID_TBL(f1) VALUES ('987');
-INSERT INTO OID_TBL(f1) VALUES ('-1040');
+INSERT INTO OID_TBL(f1) VALUES ('-1040'); -- negative oids are not allowed
in MonetDB, so this should fail
INSERT INTO OID_TBL(f1) VALUES ('99999999');
INSERT INTO OID_TBL(f1) VALUES ('5 ');
INSERT INTO OID_TBL(f1) VALUES (' 10 ');
-- leading/trailing hard tab is also allowed
INSERT INTO OID_TBL(f1) VALUES (' 15 ');
+SELECT '' AS seven, OID_TBL.* FROM OID_TBL;
+
-- bad inputs
INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
@@ -21,23 +23,24 @@ INSERT INTO OID_TBL(f1) VALUES ('99asdfa
INSERT INTO OID_TBL(f1) VALUES ('5 d');
INSERT INTO OID_TBL(f1) VALUES (' 5d');
INSERT INTO OID_TBL(f1) VALUES ('5 5');
-INSERT INTO OID_TBL(f1) VALUES (' ');
+INSERT INTO OID_TBL(f1) VALUES (' '); -- in MonetDB this one is accepted
INSERT INTO OID_TBL(f1) VALUES (' - 500');
INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');
INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385');
-SELECT '' AS six, OID_TBL.* FROM OID_TBL;
+DELETE FROM OID_TBL WHERE f1 = ' ';
+SELECT '' AS seven, OID_TBL.* FROM OID_TBL;
SELECT '' AS one, o.* FROM OID_TBL o WHERE o.f1 = 1234;
-SELECT '' AS five, o.* FROM OID_TBL o WHERE o.f1 <> '1234';
+SELECT '' AS six, o.* FROM OID_TBL o WHERE o.f1 <> '1234';
-SELECT '' AS three, o.* FROM OID_TBL o WHERE o.f1 <= '1234';
+SELECT '' AS five, o.* FROM OID_TBL o WHERE o.f1 <= '1234';
-SELECT '' AS two, o.* FROM OID_TBL o WHERE o.f1 < '1234';
+SELECT '' AS four, o.* FROM OID_TBL o WHERE o.f1 < '1234';
-SELECT '' AS four, o.* FROM OID_TBL o WHERE o.f1 >= '1234';
+SELECT '' AS three, o.* FROM OID_TBL o WHERE o.f1 >= '1234';
-SELECT '' AS three, o.* FROM OID_TBL o WHERE o.f1 > '1234';
+SELECT '' AS two, o.* FROM OID_TBL o WHERE o.f1 > '1234';
DROP TABLE OID_TBL;
diff --git a/sql/test/pg_regress/Tests/oid.stable.err
b/sql/test/pg_regress/Tests/oid.stable.err
--- a/sql/test/pg_regress/Tests/oid.stable.err
+++ b/sql/test/pg_regress/Tests/oid.stable.err
@@ -25,44 +25,40 @@ stderr of test 'oid` in directory 'sql/t
# cmdline opt mal_listing = 0
# cmdline opt gdk_debug = 536870922
-# 17:11:19 >
-# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
-# 17:11:19 >
+# 11:47:28 >
+# 11:47:28 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-25307" "--port=34790"
+# 11:47:28 >
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
-QUERY = INSERT INTO OID_TBL(f1) VALUES ('-1040');
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
+QUERY = INSERT INTO OID_TBL(f1) VALUES ('-1040'); -- negative oids are not
allowed in MonetDB, so this should fail
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
-QUERY = INSERT INTO OID_TBL(f1) VALUES (' 10 ');
-
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
-QUERY = INSERT INTO OID_TBL(f1) VALUES (' 15 ');
-
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES ('asdfasd');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES ('99asdfasd');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES ('5 d');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES (' 5d');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES ('5 5');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES (' - 500');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES ('32958209582039852935');
-MAPI = (monetdb) /var/tmp/mtest-28099/.s.monetdb.35512
+MAPI = (monetdb) /var/tmp/mtest-25307/.s.monetdb.34790
QUERY = INSERT INTO OID_TBL(f1) VALUES ('-23582358720398502385');
+
+
# 17:11:19 >
# 17:11:19 > "Done."
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/oid.stable.out
b/sql/test/pg_regress/Tests/oid.stable.out
--- a/sql/test/pg_regress/Tests/oid.stable.out
+++ b/sql/test/pg_regress/Tests/oid.stable.out
@@ -40,11 +40,13 @@ Ready.
[ 1 ]
#INSERT INTO OID_TBL(f1) VALUES ('5 ');
[ 1 ]
-#INSERT INTO OID_TBL(f1) VALUES (' ');
-[ 1 ]
-#SELECT '' AS six, OID_TBL.* FROM OID_TBL;
+#INSERT INTO OID_TBL(f1) VALUES (' 10 ');
+[ 1 ]
+#INSERT INTO OID_TBL(f1) VALUES (' 15 ');
+[ 1 ]
+#SELECT '' AS seven, OID_TBL.* FROM OID_TBL;
% .L, sys.oid_tbl # table_name
-% six, f1 # name
+% seven, f1 # name
% char, oid # type
% 0, 10 # length
[ "", 1234@0 ]
@@ -52,7 +54,24 @@ Ready.
[ "", 987@0 ]
[ "", 99999999@0 ]
[ "", 5@0 ]
-[ "", NULL ]
+[ "", 10@0 ]
+[ "", 15@0 ]
+#INSERT INTO OID_TBL(f1) VALUES (' '); -- in MonetDB this one is accepted
+[ 1 ]
+#DELETE FROM OID_TBL WHERE f1 = ' ';
+[ 1 ]
+#SELECT '' AS six, OID_TBL.* FROM OID_TBL;
+% .L, sys.oid_tbl # table_name
+% seven, f1 # name
+% char, oid # type
+% 0, 10 # length
+[ "", 1234@0 ]
+[ "", 1235@0 ]
+[ "", 987@0 ]
+[ "", 99999999@0 ]
+[ "", 5@0 ]
+[ "", 10@0 ]
+[ "", 15@0 ]
#SELECT '' AS one, o.* FROM OID_TBL o WHERE o.f1 = 1234;
% .L, sys.o # table_name
% one, f1 # name
@@ -61,30 +80,37 @@ Ready.
[ "", 1234@0 ]
#SELECT '' AS five, o.* FROM OID_TBL o WHERE o.f1 <> '1234';
% .L, sys.o # table_name
-% five, f1 # name
+% six, f1 # name
% char, oid # type
% 0, 10 # length
[ "", 1235@0 ]
+[ "", 987@0 ]
[ "", 99999999@0 ]
[ "", 5@0 ]
+[ "", 10@0 ]
+[ "", 15@0 ]
#SELECT '' AS three, o.* FROM OID_TBL o WHERE o.f1 <= '1234';
% .L, sys.o # table_name
-% three, f1 # name
+% five, f1 # name
% char, oid # type
% 0, 6 # length
[ "", 1234@0 ]
[ "", 987@0 ]
[ "", 5@0 ]
+[ "", 10@0 ]
+[ "", 15@0 ]
#SELECT '' AS two, o.* FROM OID_TBL o WHERE o.f1 < '1234';
% .L, sys.o # table_name
-% two, f1 # name
+% four, f1 # name
% char, oid # type
% 0, 5 # length
[ "", 987@0 ]
[ "", 5@0 ]
+[ "", 10@0 ]
+[ "", 15@0 ]
#SELECT '' AS four, o.* FROM OID_TBL o WHERE o.f1 >= '1234';
% .L, sys.o # table_name
-% four, f1 # name
+% three, f1 # name
% char, oid # type
% 0, 10 # length
[ "", 1234@0 ]
@@ -92,7 +118,7 @@ Ready.
[ "", 99999999@0 ]
#SELECT '' AS three, o.* FROM OID_TBL o WHERE o.f1 > '1234';
% .L, sys.o # table_name
-% three, f1 # name
+% two, f1 # name
% char, oid # type
% 0, 10 # length
[ "", 1235@0 ]
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
