Changeset: efa6dddc75c5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=efa6dddc75c5
Modified Files:
sql/test/pg_regress/Tests/case.sql
sql/test/pg_regress/Tests/case.stable.err
sql/test/pg_regress/Tests/case.stable.out
Branch: default
Log Message:
Improved (actually corrected) the case.sql tests. Approved new stable outputs.
diffs (154 lines):
diff --git a/sql/test/pg_regress/Tests/case.sql
b/sql/test/pg_regress/Tests/case.sql
--- a/sql/test/pg_regress/Tests/case.sql
+++ b/sql/test/pg_regress/Tests/case.sql
@@ -59,7 +59,7 @@ SELECT '6' AS "One",
END AS "Two WHEN with default";
-- Test for cases involving untyped literals in test expression
-SELECT CASE 'a' WHEN 'a' THEN 1 ELSE 2 COMMIT;
+SELECT CASE 'a' WHEN 'a' THEN 1 ELSE 2 END;
--
-- Examples of targets involving tables
@@ -130,21 +130,21 @@ SELECT '' AS "Two", *
UPDATE CASE_TBL
SET i = CASE WHEN i >= 3 THEN (- i)
- ELSE (2 * i) COMMIT;
+ ELSE (2 * i) END;
SELECT * FROM CASE_TBL;
UPDATE CASE_TBL
SET i = CASE WHEN i >= 2 THEN (2 * i)
- ELSE (3 * i) COMMIT;
+ ELSE (3 * i) END;
SELECT * FROM CASE_TBL;
UPDATE CASE_TBL
- SET i = CASE WHEN b.i >= 2 THEN (2 * j)
- ELSE (3 * j) END
- FROM CASE2_TBL b
- WHERE j = -CASE_TBL.i;
+ SET i = CASE WHEN b.i >= 2 THEN (2 * i)
+ ELSE (3 * i) END
+-- FROM CASE2_TBL b
+ WHERE i = -CASE_TBL.i;
SELECT * FROM CASE_TBL;
@@ -154,4 +154,3 @@ SELECT * FROM CASE_TBL;
DROP TABLE CASE_TBL;
DROP TABLE CASE2_TBL;
-
diff --git a/sql/test/pg_regress/Tests/case.stable.err
b/sql/test/pg_regress/Tests/case.stable.err
--- a/sql/test/pg_regress/Tests/case.stable.err
+++ b/sql/test/pg_regress/Tests/case.stable.err
@@ -29,32 +29,6 @@ stderr of test 'case` in directory 'sql/
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = SELECT CASE 'a' WHEN 'a' THEN 1 ELSE 2 COMMIT;
-ERROR = !syntax error, unexpected COMMIT, expecting END in: "select case 'a'
when 'a' then 1 else 2 commit"
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = UPDATE CASE_TBL
- SET i = CASE WHEN i >= 3 THEN (- i)
- ELSE (2 * i) COMMIT;
-ERROR = !syntax error, unexpected COMMIT, expecting END in: "update case_tbl
- ! set i = case when i >= 3 then (- i)
- ! else (2 * "
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = UPDATE CASE_TBL
- SET i = CASE WHEN i >= 2 THEN (2 * i)
- ELSE (3 * i) COMMIT;
-ERROR = !syntax error, unexpected COMMIT, expecting END in: "update case_tbl
- ! set i = case when i >= 2 then (2 * i)
- ! else (3 "
-MAPI = (monetdb) /var/tmp/mtest-29915/.s.monetdb.37487
-QUERY = UPDATE CASE_TBL
- SET i = CASE WHEN b.i >= 2 THEN (2 * j)
- ELSE (3 * j) END
- FROM CASE2_TBL b
- WHERE j = -CASE_TBL.i;
-ERROR = !syntax error, unexpected FROM, expecting SCOLON in: "update case_tbl
- ! set i = case when b.i >= 2 then (2 * j)
- ! else ("
# 17:11:19 >
# 17:11:19 > "Done."
diff --git a/sql/test/pg_regress/Tests/case.stable.out
b/sql/test/pg_regress/Tests/case.stable.out
--- a/sql/test/pg_regress/Tests/case.stable.out
+++ b/sql/test/pg_regress/Tests/case.stable.out
@@ -108,6 +108,12 @@ Ready.
% char, tinyint # type
% 1, 1 # length
[ "6", 6 ]
+#SELECT CASE 'a' WHEN 'a' THEN 1 ELSE 2 END;
+% .L # table_name
+% isnull_=_single_value # name
+% tinyint # type
+% 1 # length
+[ 1 ]
#SELECT '' AS "Five",
# CASE
# WHEN i >= 3 THEN i
@@ -269,33 +275,41 @@ Ready.
% 0, 1, 24, 1, 2 # length
[ "", 4, NULL, 2, -2 ]
[ "", 4, NULL, 2, -4 ]
+#UPDATE CASE_TBL
+# SET i = CASE WHEN i >= 3 THEN (- i)
+# ELSE (2 * i) END;
+[ 4 ]
#SELECT * FROM CASE_TBL;
% sys.case_tbl, sys.case_tbl # table_name
% i, f # name
% int, double # type
-% 1, 24 # length
-[ 1, 10.1 ]
-[ 2, 20.2 ]
-[ 3, -30.3 ]
-[ 4, NULL ]
+% 2, 24 # length
+[ 2, 10.1 ]
+[ 4, 20.2 ]
+[ -3, -30.3 ]
+[ -4, NULL ]
+#UPDATE CASE_TBL
+# SET i = CASE WHEN i >= 2 THEN (2 * i)
+# ELSE (3 * i) END;
+[ 4 ]
#SELECT * FROM CASE_TBL;
% sys.case_tbl, sys.case_tbl # table_name
% i, f # name
% int, double # type
-% 1, 24 # length
-[ 1, 10.1 ]
-[ 2, 20.2 ]
-[ 3, -30.3 ]
-[ 4, NULL ]
+% 3, 24 # length
+[ 4, 10.1 ]
+[ 8, 20.2 ]
+[ -9, -30.3 ]
+[ -12, NULL ]
#SELECT * FROM CASE_TBL;
% sys.case_tbl, sys.case_tbl # table_name
% i, f # name
% int, double # type
-% 1, 24 # length
-[ 1, 10.1 ]
-[ 2, 20.2 ]
-[ 3, -30.3 ]
-[ 4, NULL ]
+% 3, 24 # length
+[ 4, 10.1 ]
+[ 8, 20.2 ]
+[ -9, -30.3 ]
+[ -12, NULL ]
#DROP TABLE CASE_TBL;
#DROP TABLE CASE2_TBL;
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
