Changeset: a3e9d74c824d for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a3e9d74c824d
Modified Files:
sql/test/pg_regress/Tests/timestamp.sql
sql/test/pg_regress/Tests/timestamptz.sql
sql/test/ssqq/Tests/insert_query.stable.out
sql/test/ssqq/Tests/insert_queue.stable.out
sql/test/ssqq/Tests/insert_quser.stable.out
sql/test/ssqq/insert_query.sql
sql/test/ssqq/insert_queue.sql
sql/test/ssqq/insert_quser.sql
Branch: gdk_tracer
Log Message:
more recovery from default
diffs (154 lines):
diff --git a/sql/test/pg_regress/Tests/timestamp.sql
b/sql/test/pg_regress/Tests/timestamp.sql
--- a/sql/test/pg_regress/Tests/timestamp.sql
+++ b/sql/test/pg_regress/Tests/timestamp.sql
@@ -27,8 +27,6 @@ INSERT INTO TIMESTAMP_TBL VALUES (cast(t
INSERT INTO TIMESTAMP_TBL VALUES (cast(sql_sub(test_current_date, 24*60*60.0)
as timestamp));
--INSERT INTO TIMESTAMP_TBL VALUES ('tomorrow');
INSERT INTO TIMESTAMP_TBL VALUES (cast(sql_add(test_current_date, 24*60*60.0)
as timestamp));
-INSERT INTO TIMESTAMP_TBL VALUES ('tomorrow EST');
-INSERT INTO TIMESTAMP_TBL VALUES ('tomorrow zulu');
--SELECT d1 FROM TIMESTAMP_TBL;
SELECT count(*) AS One FROM TIMESTAMP_TBL WHERE d1 = cast(test_current_date as
timestamp);
@@ -36,10 +34,15 @@ SELECT count(*) AS One FROM TIMESTAMP_TB
SELECT count(*) AS One FROM TIMESTAMP_TBL WHERE d1 =
cast(sql_sub(test_current_date, 24*60*60.0) as timestamp);
SELECT count(*) AS None FROM TIMESTAMP_TBL WHERE d1 = cast(test_now as
timestamp);
+INSERT INTO TIMESTAMP_TBL VALUES ('tomorrow EST');
+INSERT INTO TIMESTAMP_TBL VALUES ('tomorrow zulu');
+
DELETE FROM TIMESTAMP_TBL;
-- verify uniform transaction time within transaction block
START TRANSACTION;
+DECLARE test_now timestamp(2);
+SET test_now = now;
INSERT INTO TIMESTAMP_TBL VALUES (test_now);
INSERT INTO TIMESTAMP_TBL VALUES (test_now);
SELECT count(*) AS two FROM TIMESTAMP_TBL WHERE d1 <= cast(test_now as
timestamp);
diff --git a/sql/test/pg_regress/Tests/timestamptz.sql
b/sql/test/pg_regress/Tests/timestamptz.sql
--- a/sql/test/pg_regress/Tests/timestamptz.sql
+++ b/sql/test/pg_regress/Tests/timestamptz.sql
@@ -21,8 +21,6 @@ INSERT INTO TIMESTAMPTZ_TBL VALUES (cast
INSERT INTO TIMESTAMPTZ_TBL VALUES (cast(sql_sub(test_current_date,
24*60*60.0) as timestamptz));
--INSERT INTO TIMESTAMPTZ_TBL VALUES ('tomorrow');
INSERT INTO TIMESTAMPTZ_TBL VALUES (cast(sql_add(test_current_date,
24*60*60.0) as timestamptz));
-INSERT INTO TIMESTAMPTZ_TBL VALUES ('tomorrow EST');
-INSERT INTO TIMESTAMPTZ_TBL VALUES ('tomorrow zulu');
--SELECT d1 FROM TIMESTAMPTZ_TBL;
SELECT count(*) AS One FROM TIMESTAMPTZ_TBL WHERE d1 = cast(test_current_date
as timestamptz);
@@ -30,10 +28,15 @@ SELECT count(*) AS One FROM TIMESTAMPTZ_
SELECT count(*) AS One FROM TIMESTAMPTZ_TBL WHERE d1 =
cast(sql_sub(test_current_date, 24*60*60.0)as timestamptz);
SELECT count(*) AS None FROM TIMESTAMPTZ_TBL WHERE d1 = cast(test_now as
timestamptz);
+INSERT INTO TIMESTAMPTZ_TBL VALUES ('tomorrow EST');
+INSERT INTO TIMESTAMPTZ_TBL VALUES ('tomorrow zulu');
+
DELETE FROM TIMESTAMPTZ_TBL;
-- verify uniform transaction time within transaction block
START TRANSACTION;
+DECLARE test_now timestamp(2) with time zone;
+SET test_now = now;
INSERT INTO TIMESTAMPTZ_TBL VALUES (test_now);
INSERT INTO TIMESTAMPTZ_TBL VALUES (test_now);
SELECT count(*) AS two FROM TIMESTAMPTZ_TBL WHERE d1 <= cast(test_now as
timestamptz);
diff --git a/sql/test/ssqq/Tests/insert_query.stable.out
b/sql/test/ssqq/Tests/insert_query.stable.out
--- a/sql/test/ssqq/Tests/insert_query.stable.out
+++ b/sql/test/ssqq/Tests/insert_query.stable.out
@@ -70,8 +70,8 @@ stdout of test 'insert_query` in directo
% . # table_name
% single_value # name
% int # type
-% 2 # length
-[ -1 ]
+% 1 # length
+[ NULL ]
#select * from query;
% sys.query, sys.query, sys.query, sys.query, sys.query,
sys.query, sys.query, sys.query, sys.query, sys.query #
table_name
% query_id, quser_id, query_text, is_example, is_refused,
aborted, returned_error, num_results, header, result_set # name
diff --git a/sql/test/ssqq/Tests/insert_queue.stable.out
b/sql/test/ssqq/Tests/insert_queue.stable.out
--- a/sql/test/ssqq/Tests/insert_queue.stable.out
+++ b/sql/test/ssqq/Tests/insert_queue.stable.out
@@ -59,8 +59,8 @@ stdout of test 'insert_queue` in directo
% . # table_name
% single_value # name
% int # type
-% 2 # length
-[ -1 ]
+% 1 # length
+[ NULL ]
#select queue_id, query_id, queue_number, os_version, monetdb_version,
start_query, query_ready from ssqq_queue;
% sys.ssqq_queue, sys.ssqq_queue, sys.ssqq_queue, sys.ssqq_queue,
sys.ssqq_queue, sys.ssqq_queue, sys.ssqq_queue # table_name
% queue_id, query_id, queue_number, os_version,
monetdb_version, start_query, query_ready # name
diff --git a/sql/test/ssqq/Tests/insert_quser.stable.out
b/sql/test/ssqq/Tests/insert_quser.stable.out
--- a/sql/test/ssqq/Tests/insert_quser.stable.out
+++ b/sql/test/ssqq/Tests/insert_quser.stable.out
@@ -42,8 +42,8 @@ stdout of test 'insert_quser` in directo
% . # table_name
% single_value # name
% int # type
-% 2 # length
-[ -1 ]
+% 1 # length
+[ NULL ]
#select * from quser;
% sys.quser, sys.quser, sys.quser, sys.quser, sys.quser,
sys.quser # table_name
% quser_id, user_name, uid, emailaddress, password, enabled
# name
@@ -81,8 +81,8 @@ stdout of test 'insert_quser` in directo
% . # table_name
% single_value # name
% int # type
-% 2 # length
-[ -1 ]
+% 1 # length
+[ NULL ]
#select * from quser;
% sys.quser, sys.quser, sys.quser, sys.quser, sys.quser,
sys.quser # table_name
% quser_id, user_name, uid, emailaddress, password, enabled
# name
diff --git a/sql/test/ssqq/insert_query.sql b/sql/test/ssqq/insert_query.sql
--- a/sql/test/ssqq/insert_query.sql
+++ b/sql/test/ssqq/insert_query.sql
@@ -26,6 +26,8 @@ set id_result = -1;
set id_result = insert_query(2, NULL, 0, NULL);
+declare id_result int;
+
select id_result;
select * from query;
diff --git a/sql/test/ssqq/insert_queue.sql b/sql/test/ssqq/insert_queue.sql
--- a/sql/test/ssqq/insert_queue.sql
+++ b/sql/test/ssqq/insert_queue.sql
@@ -18,6 +18,8 @@ set id_result = -1;
set id_result = insert_queue(10, 'monet', 'linux');
+declare id_result int;
+
select id_result;
select queue_id, query_id, queue_number, os_version, monetdb_version,
start_query, query_ready from ssqq_queue;
diff --git a/sql/test/ssqq/insert_quser.sql b/sql/test/ssqq/insert_quser.sql
--- a/sql/test/ssqq/insert_quser.sql
+++ b/sql/test/ssqq/insert_quser.sql
@@ -10,6 +10,8 @@ set id_result = -1;
set id_result = insert_quser(NULL, NULL, NULL, NULL);
+declare id_result int;
+
select id_result;
select * from quser;
@@ -34,6 +36,8 @@ set id_result = -1;
set id_result = insert_quser('user1', '[email protected]', 3, 'nosecret');
+declare id_result int;
+
select id_result;
select * from quser;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
