Changeset: 56fea284cd29 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=56fea284cd29
Added Files:
sql/test/pg_regress/Tests/loadwisconsin.sql
Modified Files:
sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
sql/test/pg_regress/Tests/All
sql/test/pg_regress/Tests/limit.sql
sql/test/pg_regress/Tests/limit.stable.err
sql/test/pg_regress/Tests/limit.stable.out
Branch: default
Log Message:
Approve one more pg_regress test
diffs (truncated from 31242 to 300 lines):
diff --git a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
b/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
--- a/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
+++ b/sql/backends/monet5/generator/Tests/crash.Bug-3609.stable.err
@@ -30,10 +30,11 @@ stderr of test 'crash.Bug-3609` in direc
# 22:37:46 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-5645" "--port=33733"
# 22:37:46 >
-MAPI = (monetdb) /var/tmp/mtest-30674/.s.monetdb.31568
+MAPI = (monetdb) /var/tmp/mtest-2737/.s.monetdb.36093
QUERY = select generate_series(0,2,1);
+
# 22:37:46 >
# 22:37:46 > "Done."
# 22:37:46 >
diff --git a/sql/test/pg_regress/Tests/All b/sql/test/pg_regress/Tests/All
--- a/sql/test/pg_regress/Tests/All
+++ b/sql/test/pg_regress/Tests/All
@@ -87,7 +87,8 @@ arrays
#ToDo portals_p2
#ToDo foreign_key
#ToDo cluster
-#ToDo limit
+loadwisconsin
+limit
#ToDo plpgsql
#ToDo copy2
#ToDo temp
diff --git a/sql/test/pg_regress/Tests/limit.sql
b/sql/test/pg_regress/Tests/limit.sql
--- a/sql/test/pg_regress/Tests/limit.sql
+++ b/sql/test/pg_regress/Tests/limit.sql
@@ -1,32 +1,32 @@
--
-- LIMIT
-- Check the LIMIT/OFFSET feature of SELECT
---
+-- using the wisconsin test set
-SELECT ''::text AS two, unique1, unique2, stringu1
+SELECT '' AS two, unique1, unique2, stringu1
FROM onek WHERE unique1 > 50
ORDER BY unique1 LIMIT 2;
-SELECT ''::text AS five, unique1, unique2, stringu1
+SELECT '' AS five, unique1, unique2, stringu1
FROM onek WHERE unique1 > 60
ORDER BY unique1 LIMIT 5;
-SELECT ''::text AS two, unique1, unique2, stringu1
+SELECT '' AS two, unique1, unique2, stringu1
FROM onek WHERE unique1 > 60 AND unique1 < 63
ORDER BY unique1 LIMIT 5;
-SELECT ''::text AS three, unique1, unique2, stringu1
+SELECT '' AS three, unique1, unique2, stringu1
FROM onek WHERE unique1 > 100
ORDER BY unique1 LIMIT 3 OFFSET 20;
-SELECT ''::text AS zero, unique1, unique2, stringu1
+SELECT '' AS zero, unique1, unique2, stringu1
FROM onek WHERE unique1 < 50
ORDER BY unique1 DESC LIMIT 8 OFFSET 99;
-SELECT ''::text AS eleven, unique1, unique2, stringu1
+SELECT '' AS eleven, unique1, unique2, stringu1
FROM onek WHERE unique1 < 50
ORDER BY unique1 DESC LIMIT 20 OFFSET 39;
-SELECT ''::text AS ten, unique1, unique2, stringu1
+SELECT '' AS ten, unique1, unique2, stringu1
FROM onek
ORDER BY unique1 OFFSET 990;
-SELECT ''::text AS five, unique1, unique2, stringu1
+SELECT '' AS five, unique1, unique2, stringu1
FROM onek
ORDER BY unique1 OFFSET 990 LIMIT 5;
-SELECT ''::text AS five, unique1, unique2, stringu1
+SELECT '' AS five, unique1, unique2, stringu1
FROM onek
ORDER BY unique1 LIMIT 5 OFFSET 900;
diff --git a/sql/test/pg_regress/Tests/limit.stable.err
b/sql/test/pg_regress/Tests/limit.stable.err
--- a/sql/test/pg_regress/Tests/limit.stable.err
+++ b/sql/test/pg_regress/Tests/limit.stable.err
@@ -29,10 +29,13 @@ stderr of test 'limit` in directory 'sql
# 17:11:19 > "mclient" "-lsql" "-ftest" "-Eutf-8" "-i" "-e"
"--host=/var/tmp/mtest-1142" "--port=38959"
# 17:11:19 >
-#--
-#-- LIMIT
-#-- Check the LIMIT/OFFSET feature of SELECT
-#--
+MAPI = (monetdb) /var/tmp/mtest-5419/.s.monetdb.33993
+QUERY = SELECT '' AS five, unique1, unique2, stringu1
+ FROM onek
+ ORDER BY unique1 OFFSET 990 LIMIT 5;
+
+ ! from onek
+ ! order by unique1 of"
# 17:11:19 >
# 17:11:19 > "Done."
diff --git a/sql/test/pg_regress/Tests/limit.stable.out
b/sql/test/pg_regress/Tests/limit.stable.out
--- a/sql/test/pg_regress/Tests/limit.stable.out
+++ b/sql/test/pg_regress/Tests/limit.stable.out
@@ -33,20 +33,20 @@ Ready.
#SELECT ''::text AS two, unique1, unique2, stringu1
# FROM onek WHERE unique1 > 50
# ORDER BY unique1 LIMIT 2;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% two, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 2, 3, 16 # length
[ "", 51, 76, "ZBAAAA" ]
[ "", 52, 985, "ACAAAA" ]
#SELECT ''::text AS five, unique1, unique2, stringu1
# FROM onek WHERE unique1 > 60
# ORDER BY unique1 LIMIT 5;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% five, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 2, 3, 16 # length
[ "", 61, 560, "JCAAAA" ]
[ "", 62, 633, "KCAAAA" ]
[ "", 63, 296, "LCAAAA" ]
@@ -56,20 +56,20 @@ Ready.
#SELECT ''::text AS two, unique1, unique2, stringu1
# FROM onek WHERE unique1 > 60 AND unique1 < 63
# ORDER BY unique1 LIMIT 5;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% two, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 2, 3, 16 # length
[ "", 61, 560, "JCAAAA" ]
[ "", 62, 633, "KCAAAA" ]
#SELECT ''::text AS three, unique1, unique2, stringu1
# FROM onek WHERE unique1 > 100
# ORDER BY unique1 LIMIT 3 OFFSET 20;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% three, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 3, 3, 16 # length
[ "", 121, 700, "REAAAA" ]
[ "", 122, 519, "SEAAAA" ]
[ "", 123, 777, "TEAAAA" ]
@@ -77,18 +77,17 @@ Ready.
#SELECT ''::text AS zero, unique1, unique2, stringu1
# FROM onek WHERE unique1 < 50
# ORDER BY unique1 DESC LIMIT 8 OFFSET 99;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% zero, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
-
-#SELECT ''::text AS eleven, unique1, unique2, stringu1
+% char, int, int, char # type
+% 0, 1, 1, 16 # length
+#SELECT '' AS eleven, unique1, unique2, stringu1
# FROM onek WHERE unique1 < 50
# ORDER BY unique1 DESC LIMIT 20 OFFSET 39;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% eleven, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 2, 3, 16 # length
[ "", 10, 520, "KAAAAA" ]
[ "", 9, 49, "JAAAAA" ]
[ "", 8, 653, "IAAAAA" ]
@@ -104,10 +103,10 @@ Ready.
#SELECT ''::text AS ten, unique1, unique2, stringu1
# FROM onek
# ORDER BY unique1 OFFSET 990;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% ten, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 3, 3, 16 # length
[ "", 990, 369, "CMAAAA" ]
[ "", 991, 426, "DMAAAA" ]
[ "", 992, 363, "EMAAAA" ]
@@ -118,27 +117,13 @@ Ready.
[ "", 997, 21, "JMAAAA" ]
[ "", 998, 549, "KMAAAA" ]
[ "", 999, 152, "LMAAAA" ]
-
-#SELECT ''::text AS five, unique1, unique2, stringu1
-# FROM onek
-# ORDER BY unique1 OFFSET 990 LIMIT 5;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
-% five, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
-[ "", 990, 369, "CMAAAA" ]
-[ "", 991, 426, "DMAAAA" ]
-[ "", 992, 363, "EMAAAA" ]
-[ "", 993, 661, "FMAAAA" ]
-[ "", 994, 695, "GMAAAA" ]
-
-#SELECT ''::text AS five, unique1, unique2, stringu1
+#SELECT '' AS five, unique1, unique2, stringu1
# FROM onek
# ORDER BY unique1 LIMIT 5 OFFSET 900;
-% sys.L0, sys.L0, sys.L0, sys.L0 # table_name
+% .L, sys.onek, sys.onek, sys.onek # table_name
% five, unique1, unique2, stringu1 # name
-% ?, ?, ?, ? # type
-% ?, ?, ?, ? # length
+% char, int, int, char # type
+% 0, 3, 3, 16 # length
[ "", 900, 913, "QIAAAA" ]
[ "", 901, 931, "RIAAAA" ]
[ "", 902, 702, "SIAAAA" ]
diff --git a/sql/test/pg_regress/Tests/loadwisconsin.sql
b/sql/test/pg_regress/Tests/loadwisconsin.sql
new file mode 100644
--- /dev/null
+++ b/sql/test/pg_regress/Tests/loadwisconsin.sql
@@ -0,0 +1,31012 @@
+-- Testing server 'MySQL 3.23.40' at 2001-08-20 14:37:48
+START TRANSACTION;
+
+create table onek (unique1 int NOT NULL,unique2 int NOT NULL,two int,four
int,ten int,twenty int,hundred int NOT NULL,thousand int,twothousand
int,fivethous int,tenthous int,odd int,even int,stringu1 char(16),stringu2
char(16),string4 char(16),UNIQUE (unique1),UNIQUE (unique2));-- ,INDEX hundred1
(hundred));
+create table tenk1 (unique1 int NOT NULL,unique2 int NOT NULL,two int,four
int,ten int,twenty int,hundred int NOT NULL,thousand int,twothousand
int,fivethous int,tenthous int,odd int,even int,stringu1 char(16),stringu2
char(16),string4 char(16),UNIQUE (unique1),UNIQUE (unique2));-- ,INDEX hundred2
(hundred));
+create table tenk2 (unique1 int NOT NULL,unique2 int NOT NULL,two int,four
int,ten int,twenty int,hundred int NOT NULL,thousand int,twothousand
int,fivethous int,tenthous int,odd int,even int,stringu1 char(16),stringu2
char(16),string4 char(16),UNIQUE (unique1),UNIQUE (unique2));-- ,INDEX hundred3
(hundred));
+create table Bprime (unique1 int NOT NULL,unique2 int NOT NULL,two int,four
int,ten int,twenty int,hundred int NOT NULL,thousand int,twothousand
int,fivethous int,tenthous int,odd int,even int,stringu1 char(16),stringu2
char(16),string4 char(16),UNIQUE (unique1),UNIQUE (unique2));-- ,INDEX hundred4
(hundred));
+-- Time for create_table (3): 0 wallclock secs ( 0.00 usr 0.00 sys + 0.00
cusr 0.00 csys = 0.00 CPU)
+
+insert into onek values
(147,0,1,3,7,7,7,47,147,147,147,14,15,'RFAAAA','AAAAAA','AAAAxx');
+insert into onek values
(931,1,1,3,1,11,1,31,131,431,931,2,3,'VJAAAA','BAAAAA','HHHHxx');
+insert into onek values
(714,2,0,2,4,14,4,14,114,214,714,8,9,'MBAAAA','CAAAAA','OOOOxx');
+insert into onek values
(711,3,1,3,1,11,1,11,111,211,711,2,3,'JBAAAA','DAAAAA','VVVVxx');
+insert into onek values
(883,4,1,3,3,3,3,83,83,383,883,6,7,'ZHAAAA','EAAAAA','AAAAxx');
+insert into onek values
(439,5,1,3,9,19,9,39,39,439,439,18,19,'XQAAAA','FAAAAA','HHHHxx');
+insert into onek values
(670,6,0,2,0,10,0,70,70,170,670,0,1,'UZAAAA','GAAAAA','OOOOxx');
+insert into onek values
(543,7,1,3,3,3,3,43,143,43,543,6,7,'XUAAAA','HAAAAA','VVVVxx');
+insert into onek values
(425,8,1,1,5,5,5,25,25,425,425,10,11,'JQAAAA','IAAAAA','AAAAxx');
+insert into onek values
(800,9,0,0,0,0,0,0,0,300,800,0,1,'UEAAAA','JAAAAA','HHHHxx');
+insert into onek values
(489,10,1,1,9,9,9,89,89,489,489,18,19,'VSAAAA','KAAAAA','OOOOxx');
+insert into onek values
(494,11,0,2,4,14,4,94,94,494,494,8,9,'ATAAAA','LAAAAA','VVVVxx');
+insert into onek values
(880,12,0,0,0,0,0,80,80,380,880,0,1,'WHAAAA','MAAAAA','AAAAxx');
+insert into onek values
(611,13,1,3,1,11,1,11,11,111,611,2,3,'NXAAAA','NAAAAA','HHHHxx');
+insert into onek values
(226,14,0,2,6,6,6,26,26,226,226,12,13,'SIAAAA','OAAAAA','OOOOxx');
+insert into onek values
(774,15,0,2,4,14,4,74,174,274,774,8,9,'UDAAAA','PAAAAA','VVVVxx');
+insert into onek values
(298,16,0,2,8,18,8,98,98,298,298,16,17,'MLAAAA','QAAAAA','AAAAxx');
+insert into onek values
(682,17,0,2,2,2,2,82,82,182,682,4,5,'GAAAAA','RAAAAA','HHHHxx');
+insert into onek values
(864,18,0,0,4,4,4,64,64,364,864,8,9,'GHAAAA','SAAAAA','OOOOxx');
+insert into onek values
(183,19,1,3,3,3,3,83,183,183,183,6,7,'BHAAAA','TAAAAA','VVVVxx');
+insert into onek values
(885,20,1,1,5,5,5,85,85,385,885,10,11,'BIAAAA','UAAAAA','AAAAxx');
+insert into onek values
(997,21,1,1,7,17,7,97,197,497,997,14,15,'JMAAAA','VAAAAA','HHHHxx');
+insert into onek values
(966,22,0,2,6,6,6,66,166,466,966,12,13,'ELAAAA','WAAAAA','OOOOxx');
+insert into onek values
(389,23,1,1,9,9,9,89,189,389,389,18,19,'ZOAAAA','XAAAAA','VVVVxx');
+insert into onek values
(846,24,0,2,6,6,6,46,46,346,846,12,13,'OGAAAA','YAAAAA','AAAAxx');
+insert into onek values
(206,25,0,2,6,6,6,6,6,206,206,12,13,'YHAAAA','ZAAAAA','HHHHxx');
+insert into onek values
(239,26,1,3,9,19,9,39,39,239,239,18,19,'FJAAAA','ABAAAA','OOOOxx');
+insert into onek values
(365,27,1,1,5,5,5,65,165,365,365,10,11,'BOAAAA','BBAAAA','VVVVxx');
+insert into onek values
(204,28,0,0,4,4,4,4,4,204,204,8,9,'WHAAAA','CBAAAA','AAAAxx');
+insert into onek values
(690,29,0,2,0,10,0,90,90,190,690,0,1,'OAAAAA','DBAAAA','HHHHxx');
+insert into onek values
(69,30,1,1,9,9,9,69,69,69,69,18,19,'RCAAAA','EBAAAA','OOOOxx');
+insert into onek values
(358,31,0,2,8,18,8,58,158,358,358,16,17,'UNAAAA','FBAAAA','VVVVxx');
+insert into onek values
(269,32,1,1,9,9,9,69,69,269,269,18,19,'JKAAAA','GBAAAA','AAAAxx');
+insert into onek values
(663,33,1,3,3,3,3,63,63,163,663,6,7,'NZAAAA','HBAAAA','HHHHxx');
+insert into onek values
(608,34,0,0,8,8,8,8,8,108,608,16,17,'KXAAAA','IBAAAA','OOOOxx');
+insert into onek values
(398,35,0,2,8,18,8,98,198,398,398,16,17,'IPAAAA','JBAAAA','VVVVxx');
+insert into onek values
(330,36,0,2,0,10,0,30,130,330,330,0,1,'SMAAAA','KBAAAA','AAAAxx');
+insert into onek values
(529,37,1,1,9,9,9,29,129,29,529,18,19,'JUAAAA','LBAAAA','HHHHxx');
+insert into onek values
(555,38,1,3,5,15,5,55,155,55,555,10,11,'JVAAAA','MBAAAA','OOOOxx');
+insert into onek values
(746,39,0,2,6,6,6,46,146,246,746,12,13,'SCAAAA','NBAAAA','VVVVxx');
+insert into onek values
(558,40,0,2,8,18,8,58,158,58,558,16,17,'MVAAAA','OBAAAA','AAAAxx');
+insert into onek values
(574,41,0,2,4,14,4,74,174,74,574,8,9,'CWAAAA','PBAAAA','HHHHxx');
+insert into onek values
(343,42,1,3,3,3,3,43,143,343,343,6,7,'FNAAAA','QBAAAA','OOOOxx');
+insert into onek values
(120,43,0,0,0,0,0,20,120,120,120,0,1,'QEAAAA','RBAAAA','VVVVxx');
+insert into onek values
(461,44,1,1,1,1,1,61,61,461,461,2,3,'TRAAAA','SBAAAA','AAAAxx');
+insert into onek values
(754,45,0,2,4,14,4,54,154,254,754,8,9,'ADAAAA','TBAAAA','HHHHxx');
+insert into onek values
(772,46,0,0,2,12,2,72,172,272,772,4,5,'SDAAAA','UBAAAA','OOOOxx');
+insert into onek values
(749,47,1,1,9,9,9,49,149,249,749,18,19,'VCAAAA','VBAAAA','VVVVxx');
+insert into onek values
(386,48,0,2,6,6,6,86,186,386,386,12,13,'WOAAAA','WBAAAA','AAAAxx');
+insert into onek values
(9,49,1,1,9,9,9,9,9,9,9,18,19,'JAAAAA','XBAAAA','HHHHxx');
+insert into onek values
(771,50,1,3,1,11,1,71,171,271,771,2,3,'RDAAAA','YBAAAA','OOOOxx');
+insert into onek values
(470,51,0,2,0,10,0,70,70,470,470,0,1,'CSAAAA','ZBAAAA','VVVVxx');
+insert into onek values
(238,52,0,2,8,18,8,38,38,238,238,16,17,'EJAAAA','ACAAAA','AAAAxx');
+insert into onek values
(86,53,0,2,6,6,6,86,86,86,86,12,13,'IDAAAA','BCAAAA','HHHHxx');
+insert into onek values
(56,54,0,0,6,16,6,56,56,56,56,12,13,'ECAAAA','CCAAAA','OOOOxx');
+insert into onek values
(767,55,1,3,7,7,7,67,167,267,767,14,15,'NDAAAA','DCAAAA','VVVVxx');
+insert into onek values
(363,56,1,3,3,3,3,63,163,363,363,6,7,'ZNAAAA','ECAAAA','AAAAxx');
+insert into onek values
(655,57,1,3,5,15,5,55,55,155,655,10,11,'FZAAAA','FCAAAA','HHHHxx');
+insert into onek values
(394,58,0,2,4,14,4,94,194,394,394,8,9,'EPAAAA','GCAAAA','OOOOxx');
+insert into onek values
(223,59,1,3,3,3,3,23,23,223,223,6,7,'PIAAAA','HCAAAA','VVVVxx');
+insert into onek values
(946,60,0,2,6,6,6,46,146,446,946,12,13,'KKAAAA','ICAAAA','AAAAxx');
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
