Changeset: cb5f3578ef8c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb5f3578ef8c
Modified Files:
sql/test/pg_regress/Tests/reltime.sql
sql/test/pg_regress/Tests/reltime.stable.err
sql/test/pg_regress/Tests/reltime.stable.out
Branch: default
Log Message:
Improved test by inserting at least some rows in the table succesfully.
Approved new output.
diffs (184 lines):
diff --git a/sql/test/pg_regress/Tests/reltime.sql
b/sql/test/pg_regress/Tests/reltime.sql
--- a/sql/test/pg_regress/Tests/reltime.sql
+++ b/sql/test/pg_regress/Tests/reltime.sql
@@ -4,26 +4,25 @@
CREATE TABLE RELTIME_TBL (f1 interval second);
+INSERT INTO RELTIME_TBL (f1) VALUES (1);
+INSERT INTO RELTIME_TBL (f1) VALUES (10);
+INSERT INTO RELTIME_TBL (f1) VALUES (100);
+INSERT INTO RELTIME_TBL (f1) VALUES (1000);
+INSERT INTO RELTIME_TBL (f1) VALUES (10000);
+INSERT INTO RELTIME_TBL (f1) VALUES (100000);
+
INSERT INTO RELTIME_TBL (f1) VALUES ('@ 1 minute');
-
-INSERT INTO RELTIME_TBL (f1) VALUES ('@ 5 hour');
-
-INSERT INTO RELTIME_TBL (f1) VALUES ('@ 10 day');
-
-INSERT INTO RELTIME_TBL (f1) VALUES ('@ 34 year');
-
+INSERT INTO RELTIME_TBL (f1) VALUES ('@ 5 hours');
+INSERT INTO RELTIME_TBL (f1) VALUES ('@ 10 days');
+INSERT INTO RELTIME_TBL (f1) VALUES ('@ 34 years');
INSERT INTO RELTIME_TBL (f1) VALUES ('@ 3 months');
-
INSERT INTO RELTIME_TBL (f1) VALUES ('@ 14 seconds ago');
-
-- badly formatted reltimes
INSERT INTO RELTIME_TBL (f1) VALUES ('badly formatted reltime');
-
INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago');
-- test reltime operators
-
SELECT '' AS six, RELTIME_TBL.* FROM RELTIME_TBL;
SELECT '' AS five, RELTIME_TBL.* FROM RELTIME_TBL
@@ -50,3 +49,4 @@ SELECT '' AS fifteen, r1.*, r2.*
ORDER BY r1.f1, r2.f1;
DROP TABLE RELTIME_TBL;
+
diff --git a/sql/test/pg_regress/Tests/reltime.stable.err
b/sql/test/pg_regress/Tests/reltime.stable.err
--- a/sql/test/pg_regress/Tests/reltime.stable.err
+++ b/sql/test/pg_regress/Tests/reltime.stable.err
@@ -25,23 +25,23 @@ stderr of test 'reltime` in directory 's
# 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 >
+# 16:56:21 >
+# 16:56:21 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-7815" "--port=36055"
+# 16:56:21 >
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 1 minute');
ERROR = !wrong format (@ 1 minute)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 5 hour');
-ERROR = !wrong format (@ 5 hour)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 10 day');
-ERROR = !wrong format (@ 10 day)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
-QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 34 year');
-ERROR = !wrong format (@ 34 year)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
+QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 5 hours');
+ERROR = !wrong format (@ 5 hours)
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
+QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 10 days');
+ERROR = !wrong format (@ 10 days)
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
+QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 34 years');
+ERROR = !wrong format (@ 34 years)
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 3 months');
ERROR = !wrong format (@ 3 months)
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
@@ -53,33 +53,32 @@ ERROR = !wrong format (badly formatted r
MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
QUERY = INSERT INTO RELTIME_TBL (f1) VALUES ('@ 30 eons ago');
ERROR = !wrong format (@ 30 eons ago)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-6806/.s.monetdb.30547
QUERY = SELECT '' AS five, RELTIME_TBL.* FROM RELTIME_TBL
WHERE RELTIME_TBL.f1 <> cast('@ 10 days' as interval second);
ERROR = !wrong format (@ 10 days)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-6806/.s.monetdb.30547
QUERY = SELECT '' AS three, RELTIME_TBL.* FROM RELTIME_TBL
WHERE RELTIME_TBL.f1 <= cast('@ 5 hours' as interval second);
ERROR = !wrong format (@ 5 hours)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
QUERY = SELECT '' AS three, RELTIME_TBL.* FROM RELTIME_TBL
WHERE RELTIME_TBL.f1 < cast('@ 1 day' as interval second);
ERROR = !wrong format (@ 1 day)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
QUERY = SELECT '' AS one, RELTIME_TBL.* FROM RELTIME_TBL
WHERE RELTIME_TBL.f1 = cast('@ 34 years' as interval second);
ERROR = !wrong format (@ 34 years)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
QUERY = SELECT '' AS two, RELTIME_TBL.* FROM RELTIME_TBL
WHERE RELTIME_TBL.f1 >= cast('@ 1 month' as interval second);
ERROR = !wrong format (@ 1 month)
-MAPI = (monetdb) /var/tmp/mtest-27483/.s.monetdb.35395
+MAPI = (monetdb) /var/tmp/mtest-7815/.s.monetdb.36055
QUERY = SELECT '' AS five, RELTIME_TBL.* FROM RELTIME_TBL
WHERE RELTIME_TBL.f1 > cast('@ 3 seconds ago' as interval second);
ERROR = !wrong format (@ 3 seconds ago)
-
# 17:11:19 >
# 17:11:19 > "Done."
# 17:11:19 >
diff --git a/sql/test/pg_regress/Tests/reltime.stable.out
b/sql/test/pg_regress/Tests/reltime.stable.out
--- a/sql/test/pg_regress/Tests/reltime.stable.out
+++ b/sql/test/pg_regress/Tests/reltime.stable.out
@@ -25,11 +25,29 @@ Ready.
# 17:11:19 >
#CREATE TABLE RELTIME_TBL (f1 interval second);
+#INSERT INTO RELTIME_TBL (f1) VALUES (1);
+[ 1 ]
+#INSERT INTO RELTIME_TBL (f1) VALUES (10);
+[ 1 ]
+#INSERT INTO RELTIME_TBL (f1) VALUES (100);
+[ 1 ]
+#INSERT INTO RELTIME_TBL (f1) VALUES (1000);
+[ 1 ]
+#INSERT INTO RELTIME_TBL (f1) VALUES (10000);
+[ 1 ]
+#INSERT INTO RELTIME_TBL (f1) VALUES (100000);
+[ 1 ]
#SELECT '' AS six, RELTIME_TBL.* FROM RELTIME_TBL;
% .L2, sys.reltime_tbl # table_name
% six, f1 # name
% char, sec_interval # type
-% 0, 5 # length
+% 0, 10 # length
+[ "", 1.000 ]
+[ "", 10.000 ]
+[ "", 100.000 ]
+[ "", 1000.000 ]
+[ "", 10000.000 ]
+[ "", 100000.000 ]
#SELECT '' AS fifteen, r1.*, r2.*
# FROM RELTIME_TBL r1, RELTIME_TBL r2
# WHERE r1.f1 > r2.f1
@@ -37,7 +55,22 @@ Ready.
% .L2, sys.r1, sys.r2 # table_name
% fifteen, f1, f1 # name
% char, sec_interval, sec_interval # type
-% 0, 5, 5 # length
+% 0, 10, 9 # length
+[ "", 10.000, 1.000 ]
+[ "", 100.000, 1.000 ]
+[ "", 100.000, 10.000 ]
+[ "", 1000.000, 1.000 ]
+[ "", 1000.000, 10.000 ]
+[ "", 1000.000, 100.000 ]
+[ "", 10000.000, 1.000 ]
+[ "", 10000.000, 10.000 ]
+[ "", 10000.000, 100.000 ]
+[ "", 10000.000, 1000.000 ]
+[ "", 100000.000, 1.000 ]
+[ "", 100000.000, 10.000 ]
+[ "", 100000.000, 100.000 ]
+[ "", 100000.000, 1000.000 ]
+[ "", 100000.000, 10000.000 ]
#DROP TABLE RELTIME_TBL;
# 15:01:55 >
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
