Changeset: 19ff96a54dde for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/19ff96a54dde
Added Files:
sql/test/VOC/Tests/VOCcreate_user.test
sql/test/VOC/Tests/VOCdrop.reqtests
sql/test/VOC/Tests/VOCdrop.test
sql/test/VOC/Tests/VOCdrop_user.reqtests
sql/test/VOC/Tests/VOCdrop_user.test
sql/test/VOC/Tests/VOCinsert.reqtests
sql/test/VOC/Tests/VOCinsert.test
sql/test/VOC/Tests/VOCmanual_examples.reqtests
sql/test/VOC/Tests/VOCmanual_examples.test
sql/test/VOC/Tests/VOCquery.reqtests
sql/test/VOC/Tests/VOCquery.test
sql/test/VOC/Tests/VOCschema.reqtests
sql/test/VOC/Tests/VOCschema.test
Removed Files:
sql/test/VOC/Tests/VOC.SQL.py
sql/test/VOC/Tests/VOC.timeout
sql/test/VOC/Tests/VOCinsert.stable.out
sql/test/VOC/Tests/VOCmanual_examples.stable.out
sql/test/VOC/Tests/VOCquery.stable.out
sql/test/VOC/VOCcreate_user.sql
sql/test/VOC/VOCdrop.sql
sql/test/VOC/VOCdrop_user.sql
sql/test/VOC/VOCinsert.sql
sql/test/VOC/VOCmanual_examples.sql
sql/test/VOC/VOCquery.sql
sql/test/VOC/VOCschema.sql
sql/test/VOC/load.sh
sql/test/VOC/run.all
Modified Files:
sql/test/VOC/Tests/All
Branch: Jan2022
Log Message:
Converted VOC tests.
diffs (truncated from 69928 to 300 lines):
diff --git a/sql/test/VOC/Tests/All b/sql/test/VOC/Tests/All
--- a/sql/test/VOC/Tests/All
+++ b/sql/test/VOC/Tests/All
@@ -1,3 +1,9 @@
-VOC
+VOCcreate_user
+USER=voc&PASSWD=voc?VOCschema
+USER=voc&PASSWD=voc?VOCinsert
+USER=voc&PASSWD=voc?VOCquery
+USER=voc&PASSWD=voc?VOCmanual_examples
+USER=voc&PASSWD=voc?VOCdrop
+VOCdrop_user
median.Bug-3096
double_is_null.Bug-3116
diff --git a/sql/test/VOC/Tests/VOC.SQL.py b/sql/test/VOC/Tests/VOC.SQL.py
deleted file mode 100644
--- a/sql/test/VOC/Tests/VOC.SQL.py
+++ /dev/null
@@ -1,23 +0,0 @@
-import os
-
-from MonetDBtesting.sqltest import SQLTestCase
-d = os.environ['RELSRCDIR']
-
-with SQLTestCase() as tc:
- tc.connect(username='monetdb', password='monetdb')
- with open(os.path.join(d, os.pardir, 'VOCcreate_user.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
- tc.connect(username='voc', password='voc')
- with open(os.path.join(d, os.pardir, 'VOCschema.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
- with open(os.path.join(d, os.pardir, 'VOCinsert.sql')) as f:
- tc.execute(query=None, client='mclient',
stdin=f).assertMatchStableOut(fout=os.path.join(d,'VOCinsert.stable.out'))
- with open(os.path.join(d, os.pardir, 'VOCquery.sql')) as f:
- tc.execute(query=None, client='mclient',
stdin=f).assertMatchStableOut(fout=os.path.join(d,'VOCquery.stable.out'))
- with open(os.path.join(d, os.pardir, 'VOCmanual_examples.sql')) as f:
- tc.execute(query=None, client='mclient',
stdin=f).assertMatchStableOut(fout=os.path.join(d,'VOCmanual_examples.stable.out'))
- with open(os.path.join(d, os.pardir, 'VOCdrop.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
- tc.connect(username='monetdb', password='monetdb')
- with open(os.path.join(d, os.pardir, 'VOCdrop_user.sql')) as f:
- tc.execute(query=None, client='mclient', stdin=f).assertSucceeded()
diff --git a/sql/test/VOC/Tests/VOC.timeout b/sql/test/VOC/Tests/VOC.timeout
deleted file mode 100644
--- a/sql/test/VOC/Tests/VOC.timeout
+++ /dev/null
@@ -1,1 +0,0 @@
-3
diff --git a/sql/test/VOC/Tests/VOCcreate_user.test
b/sql/test/VOC/Tests/VOCcreate_user.test
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCcreate_user.test
@@ -0,0 +1,15 @@
+statement ok
+START TRANSACTION
+
+statement ok
+CREATE USER "voc" WITH PASSWORD 'voc' NAME 'VOC_EXPLORER' SCHEMA "sys"
+
+statement ok
+CREATE SCHEMA "voc" AUTHORIZATION "voc"
+
+statement ok
+ALTER USER "voc" SET SCHEMA "voc"
+
+statement ok
+commit
+
diff --git a/sql/test/VOC/Tests/VOCdrop.reqtests
b/sql/test/VOC/Tests/VOCdrop.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCdrop.reqtests
@@ -0,0 +1,1 @@
+VOCschema
diff --git a/sql/test/VOC/Tests/VOCdrop.test b/sql/test/VOC/Tests/VOCdrop.test
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCdrop.test
@@ -0,0 +1,30 @@
+statement ok
+START TRANSACTION
+
+statement ok
+drop table total cascade
+
+statement ok
+drop table soldiers cascade
+
+statement ok
+drop table seafarers cascade
+
+statement ok
+drop table passengers cascade
+
+statement ok
+drop table invoices cascade
+
+statement ok
+drop table impotenten cascade
+
+statement ok
+drop table craftsmen cascade
+
+statement ok
+drop table voyages cascade
+
+statement ok
+commit
+
diff --git a/sql/test/VOC/Tests/VOCdrop_user.reqtests
b/sql/test/VOC/Tests/VOCdrop_user.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCdrop_user.reqtests
@@ -0,0 +1,1 @@
+VOCcreate_user
diff --git a/sql/test/VOC/Tests/VOCdrop_user.test
b/sql/test/VOC/Tests/VOCdrop_user.test
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCdrop_user.test
@@ -0,0 +1,15 @@
+statement ok
+START TRANSACTION
+
+statement ok
+ALTER USER "voc" SET SCHEMA "sys"
+
+statement ok
+DROP SCHEMA "voc"
+
+statement ok
+DROP USER "voc"
+
+statement ok
+commit
+
diff --git a/sql/test/VOC/Tests/VOCinsert.reqtests
b/sql/test/VOC/Tests/VOCinsert.reqtests
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCinsert.reqtests
@@ -0,0 +1,1 @@
+VOCschema
diff --git a/sql/test/VOC/Tests/VOCinsert.stable.out
b/sql/test/VOC/Tests/VOCinsert.stable.out
deleted file mode 100644
--- a/sql/test/VOC/Tests/VOCinsert.stable.out
+++ /dev/null
@@ -1,8 +0,0 @@
-[ 8115 ]
-[ 2349 ]
-[ 938 ]
-[ 3782 ]
-[ 2813 ]
-[ 4468 ]
-[ 4177 ]
-[ 2454 ]
diff --git a/sql/test/VOC/Tests/VOCinsert.test
b/sql/test/VOC/Tests/VOCinsert.test
new file mode 100644
--- /dev/null
+++ b/sql/test/VOC/Tests/VOCinsert.test
@@ -0,0 +1,29183 @@
+statement ok
+START TRANSACTION
+
+statement ok
+COPY 8115 RECORDS INTO "voc"."voyages" FROM stdin USING DELIMITERS
E'\t',E'\n','"'
+<COPY_INTO_DATA>
+1 "" 1 "" "AMSTERDAM" "Jan Jakobsz. Schellinger"
260 NULL "1594" NULL NULL "A" NULL 1595-04-02 "Texel"
NULL NULL true 1596-06-06 "Engano" NULL "from 04-08
till 11-08 in the Mosselbaai; from 13-09 till 07-10 in the Ampalazabaai; from
09-10 till 13-12 in S. Augustins Bay, where before departure 127 of the 249 men
were still alive; 11-01 till 21-01 at Ste. Marie I.; from 23-01 till 12-02 in
the Bay of Antongil. The AMSTERDAM was set on fire near Bawean, 11-01-1597."
+2 "" 1 "" "DUIFJE" "Simon Lambrechtsz. Mau"
50 "pinas" "1594" NULL NULL "A" NULL 1595-04-02 "Texel"
NULL NULL true 1596-06-06 "Engano" 5001 "HOLLANDIA on
26-10-1595; he was succeeded by Hendrik Jansz."
+3 "" 1 "" "HOLLANDIA" "Jan Dignumsz. van Kwadijk+"
460 NULL "1594" NULL NULL "A" NULL 1595-04-02 "Texel"
NULL NULL true 1596-06-06 "Engano" 5002 "Jan Dignumsz.
died on 29-05-1595 and Mau was his successor."
+4 "" 1 "" "MAURITIUS" "Jan Jansz. Molenaar" 460
NULL "1594" NULL NULL "A" NULL 1595-04-02 "Texel" NULL
NULL true 1596-06-06 "Engano" 5003 "Jan Jansz. died on
25-12-1596 and Hendrik Jansz. was his successor."
+5 "" 1 "" "LANGEBARK" "Hans Huibrechtsz. Tonneman"
300 NULL NULL NULL NULL NULL NULL 1598-03-25
"Zeeland" NULL NULL true 1599-03-01 "Bantam" 5010
"other."
+6 "" 1 "" "MAAN" NULL NULL NULL NULL NULL
NULL NULL NULL 1598-03-25 "Zeeland" NULL NULL true
NULL NULL NULL NULL
+7 "" 1 "" "ZON" NULL 140 NULL NULL NULL
NULL NULL NULL 1598-03-25 "Zeeland" NULL NULL true
1599-02-01 "Bantam" 5011 NULL
+8 "" 1 "" "LEEUW" "Stokmans" 400 NULL NULL
NULL NULL NULL NULL 1598-03-28 "Veere" NULL NULL true
1599-06-30 "Atjeh" 5012 "01-04 till 17-04 at Torbay; from 11-05 till
19-05 at S. Nicolas; from 21-06 till 05-09 before Fernando de Noronha; from
17-11 till 18-11 in St. Helena Bay; from 21-11 till 07-12 in the Saldanha Bay;
from 13-02 till 24-03 in S. Augustins Bay; from 10-04 till 27-04 at Mayotte;
from 29-04 till 08-05 at Anjouan."
+9 "" 1 "" "LEEUWIN" "Frederik de Houtman" 250
NULL NULL NULL NULL NULL NULL 1598-03-28 "Veere" NULL
NULL true 1599-06-30 "Atjeh" 5013 NULL
+26 "" 1 "" "HOOP" "Jakob Jansz. Huidekoper" 50
"jacht" NULL NULL NULL NULL NULL 1598-09-13 "Zeeland"
NULL NULL true NULL NULL NULL NULL
+27 "" 1 "" "MAURITIUS" "Huigen Jansz. van Troyen"
250 NULL NULL NULL NULL NULL NULL 1598-09-13
"Zeeland" NULL NULL true 1601-01-29 "Djaratan" 5022
"A"
+28 "" 1 "" "WASSENDE MAAN" "Kornelis Heinsz." 500
NULL NULL NULL NULL NULL NULL 1599-04-06 "Texel" NULL
NULL true 1600-03-13 "Bantam" 5017 "till 16-05 at Maio I.;
from 02-07 till 17-07 before Corsico; from 27-10 till 10-11 Sonnebaai
(Madagascar) and from 17-11 till 21-12 in the Bay of Antongil."
+29 "" 1 "" "MORGENSTER" "Kornelis Jansz. Melknap"
400 NULL NULL NULL NULL NULL NULL 1599-04-06 "Texel"
NULL NULL true 1600-03-13 "Bantam" 5019 NULL
+30 "" 1 "" "ZON" "Kornelis Jansz. Schouten" 580
NULL NULL NULL NULL NULL NULL 1599-04-06 "Texel" NULL
NULL true 1600-03-13 "Bantam" 5022 NULL
+31 "" 2 "" "FRIESLAND" "Jakob Pietersz." 180
"jacht" NULL NULL NULL NULL NULL 1599-12-21 "Texel" NULL
NULL true 1600-09-01 "Bantam" 5016 "Squadron (0031-0034)
of the fleet of Van Neck which sailed later under command of vice-admiraal
Jakob Willekens aboard the MAURITIUS."
+32 "" 3 "" "HOLLANDIA" "Pieter Klaasz. Nek" 460
NULL "1594" NULL NULL "A" NULL 1599-12-21 "Texel" NULL
NULL true 1600-09-01 "Bantam" 5026 NULL
+33 "" 3 "" "OVERIJSSEL" "Thijmen Michielsz." 50
"jacht" "1594" NULL NULL "A" NULL 1599-12-21 "Texel" NULL
NULL true 1600-09-01 "Bantam" 5028 NULL
+34 "" 3 "" "MAURITIUS" "Govert Jansz." 460 NULL
"1594" NULL NULL "A" NULL 1599-12-21 "Texel" NULL NULL
true 1600-09-01 "Bantam" 5018 NULL
+35 "" 1 "" "HOF VAN HOLLAND" "Jakob Dirksz." 360
NULL NULL NULL NULL NULL NULL 1599-12-21 "Texel" NULL
NULL true 1600-08-06 "Bantam" 5024 "Fleet (0035-0038)
under command of admiraal Pieter Both aboard the NEDERLAND and vice-admiraal
Paulus van Caerden aboard the VERENIGDE LANDEN, equipped by the Nieuwe
Brabantsche Compagnie."
+36 "" 1 "" "VERENIGDE LANDEN" "Klaas Gerritsz."
NULL NULL NULL NULL NULL NULL NULL 1599-12-21 "Texel"
NULL NULL true 1600-08-06 "Bantam" 5025 NULL
+37 "" 1 "" "NASSAU" "Frederik Kornelisz." NULL
NULL NULL NULL NULL NULL NULL 1599-12-21 "Texel" NULL
NULL true 1600-08-06 "Bantam" 5020 NULL
+38 "" 1 "" "NEDERLAND" "Ernst van Ommeren" NULL
NULL NULL NULL NULL NULL NULL 1599-12-21 "Texel" NULL
NULL true 1600-08-06 "Bantam" 5021 NULL
+39 "" 1 "" "ZWARTE AREND" NULL 600 NULL NULL
NULL NULL NULL NULL 1600-06-28 "Texel" NULL NULL true
1601-10-01 "Bantam" 5032 "Fleet (0039-0040) under command of
admiraal Guilleaume Seneschel aboard the ZWARTE AREND, equipped by the Nieuwe
Brabantsche Compagnie. From 01-07 till 06-07 at the Downs; from 12-07 till
14-07 at Portland; from 29-09 till 31-09 at Annabon."
+40 "" 1 "" "WITTE AREND" NULL 600 NULL NULL
NULL NULL NULL NULL 1600-06-28 "Texel" NULL NULL true
1601-10-01 "Bantam" 5031 NULL
+41 "" 1 "" "AMSTERDAM" "Simon Lambrechtsz. Mau"
900 NULL "1600" NULL NULL NULL NULL 1600-06-28 "Texel"
NULL NULL true 1601-03-30 "Bantam" 5042 "Fleet
(0041-0046) under command of Van Neck aboard the AM-STERDAM and Foreest aboard
the DORDRECHT, equipped by the Oude Oostindische Compagnie. From 01-10 till
10-10 at Annabon whereafter the fleet was divided into 2 squadrons: 1 squadron
under command of Van Neck, consisted of the AMSTERDAM, the GOUDA, the DELFT and
the other under command of Foreest, consisted of the LEIDEN, the DOR-DRECHT and
the HAARLEM."
+42 "" 1 "" "DELFT" "Simon Jansz. Hoen" 300 "jacht"
NULL NULL NULL NULL NULL 1600-06-28 "Texel" NULL NULL
true 1601-03-30 "Bantam" 5023 NULL
+43 "" 1 "" "DORDRECHT" "Dirk Mol" 900 NULL
"1600" NULL NULL NULL NULL 1600-06-28 "Texel" NULL NULL
true 1601-08-09 "Bantam" 5033 NULL
+44 "" 1 "" "GOUDA" "Klaas Kornelisz." 280 "jacht"
"1600" NULL NULL NULL NULL 1600-06-28 "Texel" NULL NULL
true 1601-03-30 "Bantam" 5043 NULL
+45 "" 1 "" "HAARLEM" "Kornelis Klaasz." 350
NULL "1600" NULL NULL NULL NULL 1600-06-28 "Texel" NULL
NULL true 1601-08-09 "Bantam" NULL "Left behind at Patani
in September 1603 as unseaworthy."
+46 "" 1 "" "LEIDEN" "Hendrik Jansz." 280
NULL NULL NULL NULL NULL NULL 1600-06-28 "Texel" NULL
NULL true 1601-08-09 "Bantam" 5056 NULL
+47 "" 2 "" "LANGEBARK" "Nikolaas Anthonisz." 300
NULL NULL NULL NULL NULL NULL 1601-01-28 "Zeeland"
NULL NULL true 1601-08-23 "Atjeh" 5029 "number of deaths 5."
+48 "" 1 "" "MIDDELBURG" "Hans Huibrechtsz. Tonneman"
400 NULL NULL NULL NULL NULL NULL 1601-01-28
"Zeeland" NULL NULL true 1601-08-23 "Atjeh" 5044 "The
master died at Patani in 1602."
+49 "" 1 "" "ZEELANDIA" "Kornelis Bastiaansz." 600
NULL NULL NULL NULL NULL NULL 1601-01-28 "Zeeland"
NULL NULL true 1601-08-23 "Atjeh" 5030 NULL
+50 "" 2 "" "ZON" "Kornelis Adriaansz. Valk" 140
NULL NULL NULL NULL NULL NULL 1601-01-28 "Zeeland"
NULL NULL true 1601-08-23 "Atjeh" 5045 NULL
+51 "" 2 "" "GELDERLAND" "Jan Bruin" 360 NULL
NULL NULL NULL NULL NULL 1601-04-23 "Texel" NULL NULL
true 1601-12-26 "Bantam" 5040 "Bouwer, equipped by the Oude
Oostindische Compagnie. From 27-09 till 20-10 at Mauritius."
+52 "" 1 "" "DUIFJE" "Willem Kornelisz. Schouten"
60 "jacht" NULL NULL NULL NULL NULL 1611-04-23 "Texel"
NULL NULL true 1601-12-26 "Bantam" 5039 NULL
+53 "" 2 "" "UTRECHT" "Jan Martensz." 240 NULL
NULL NULL NULL NULL NULL 1601-04-23 "Texel" NULL NULL
true 1601-12-26 "Bantam" NULL NULL
+54 "" 1 "" "WACHTER" "Gerrit Hendriksz. Roobol"
130 "jacht" NULL NULL NULL NULL NULL 1601-04-23 "Texel"
NULL NULL true 1601-12-26 "Bantam" NULL NULL
+55 "" 2 "" "ZEELANDIA" "Jan Kornelisz." 360
NULL NULL NULL NULL NULL NULL 1601-04-23 "Texel" NULL
NULL true 1601-12-26 "Bantam" 5041 NULL
+56 "" 1 "" "ALKMAAR" "Pieter Stokmans" NULL
NULL NULL NULL NULL NULL NULL 1601-04-23 "Texel" NULL
NULL true 1602-02-22 "Bantam" 5050 "Fleet (0056-0063)
under command of admiraal Jakob van Heemskerk aboard the AMSTERDAM, equipped by
the Eerste Verenigde Compagnie op Oost-Indie. From 24-06 till 01-07 at Fernando
Noronha; from 10-11 till 08-12 at Mayotte."
+57 "" 2 "" "AMSTERDAM" NULL 500 NULL NULL
NULL NULL NULL NULL 1601-04-23 "Texel" NULL NULL true
1602-02-22 "Bantam" 5034 NULL
+58 "" 1 "" "ENKHUIZEN" "Willem van Westzanen" NULL
"jacht" NULL NULL NULL NULL NULL 1601-04-23 "Texel" NULL
NULL true 1602-02-22 "Bantam" 5035 NULL
+59 "" 1 "" "HOORN" NULL NULL NULL NULL NULL
NULL NULL NULL 1601-04-23 "Texel" NULL NULL true
1602-02-22 "Bantam" 5036 NULL
+60 "" 1 "" "GROENE LEEUW" NULL NULL "jacht" NULL
NULL NULL NULL NULL 1601-04-23 "Texel" NULL NULL true
1602-02-22 "Bantam" 5037 NULL
+61 "" 1 "" "RODE LEEUW" "Pieter Klaasz." NULL
"jacht" NULL NULL NULL NULL NULL 1601-04-23 "Texel" NULL
NULL true NULL NULL NULL NULL
+62 "" 1 "" "WITTE LEEUW" NULL 540 "jacht" NULL
NULL NULL "A" NULL 1601-04-23 "Texel" NULL NULL true
1602-02-22 "Bantam" 5051 NULL
+63 "" 1 "" "ZWARTE LEEUW" "Adriaan Blok" NULL NULL
NULL NULL NULL NULL NULL 1601-04-22 "Wielingen" NULL
NULL true 1602-04-04 "Bantam" 5038 NULL
+64 "" 1 "" "LAM" "Willem Jansz." NULL "jacht or
pinas" NULL NULL NULL NULL NULL 1601-05-05 "Veere"
NULL NULL true NULL "Atjeh" 5048 "Compagnie de Moucheron. T otal
number of those on board 225. From 10-05 till 15-05 at Dartmouth; from 14-06
till 20-06 at Portugal; from 02-08 till 11-08 at Corisco; from 17-08 till 30-08
at Cape Lopez; from 15-11 till 20-11 at St. Helena Bay. The SCHAAP took on
provisions from 21-02 till 04-04 at the Comoro and May 31th at Ceylon. The RAM
with vice-admiraal Guyon Le Fort on board via the Bay of Augustin and Ceylon."
+65 "" 1 "" "RAM" "Guyon Le Fort" 110 NULL NULL
NULL NULL NULL NULL 1601-05-05 "Veere" NULL NULL true
1602-09-16 "Atjeh" NULL "With the death of Le Fort (26-06) the RAM was
sold to the V.O.C. and put under the command of Sebald de Weert (see 0067-69)."
+66 "" 1 "" "SCHAAP" "Pieter Kornelisz." 110
NULL NULL NULL NULL NULL NULL 1601-05-05 "Veere" NULL
NULL true 1602-09-16 "Atjeh" 5049 NULL
+67 "" 1 "" "TER GOES" "Marten Jelisz. Spanjaard"
240 NULL NULL NULL NULL NULL "Z" 1602-03-31
"Wielingen" NULL NULL true 1602-11-28 "Ceylon" 5059
"fleet of Van Warwyck. The three ships of Zeeland preceded the rest of the
fleet. Took on provisions in the Bay of Antongil."
+68 "" 1 "" "VLISSINGEN" "Laurens Fransz. van
Vlissingen" 400 NULL NULL NULL NULL NULL "Z"
1602-03-31 "Wielingen" NULL NULL true 1602-11-28
"Ceylon" 5070 NULL
+69 "" 1 "" "ZIERIKZEE" "Govert Jansz." 760 NULL
NULL NULL NULL NULL "Z" 1602-03-31 "Wielingen" NULL
NULL true 1602-11-28 "Ceylon" 5061 NULL
+70 "" 1 "" "MAAGD VAN ENKHUIZEN" "Kornelis Pietersz."
320 NULL NULL NULL NULL NULL "E" 1602-06-17 "Texel"
NULL NULL true 1603-04-29 "Bantam" 5047 "The equipment
(0070-0081) of the `Fourteen ships' (without the jacht PAPEGAAITJE) under
admiraal Wybrand van Warwyck on the MAURITIUS.From June 24th till July 10th the
fleet lay off Plymouth; from October 11th till 21th off Annabon; and was on
December 12th near the Cape. December 14th the HOLLAND, the HOLLANDSE TUIN and
the STER left the main fleet, and set sail for Atjeh, the remainder sailed for
Bantam."
+71 "" 1 "" "HOLLANDIA" "Dirk Gerritsz. van Hoorn"
600 NULL NULL NULL NULL "A" "A" 1602-06-17 "Texel"
NULL NULL true 1603-03-10 "Atjeh" 5069 NULL
+72 "" 1 "" "MAAN" "Jan Kornelisz. Melknap" 500
NULL NULL NULL NULL NULL "A" 1602-06-17 "Texel" NULL
NULL true 1603-04-29 "Bantam" NULL NULL
+73 "" 1 "" "MAURITIUS" "Pieter Kornelisz. van Petten"
700 NULL NULL NULL NULL NULL "A" 1602-06-17 "Texel"
NULL NULL true 1603-04-29 "Bantam" 5052 NULL
+74 "" 1 "" "NASSAU" "Kornelis van de Venne" 320
NULL NULL NULL NULL NULL "A" 1602-06-17 "Texel" NULL
NULL true 1603-04-29 "Bantam" 5057 NULL
+75 "" 1 "" "PAPEGAAITJE" NULL 50 "jacht" NULL
NULL NULL NULL "E" 1602-06-17 "Texel" NULL NULL true
1603-04-29 "Bantam" NULL NULL
+76 "" 1 "" "STER" "Abraham Mathijsz." 360 NULL
NULL NULL NULL NULL "A" 1602-06-17 "Texel" NULL NULL
true 1603-03-10 "Atjeh" 5058 NULL
+77 "" 1 "" "HOLLANDSE TUIN" "Hendrik Haak" 360
NULL NULL NULL NULL NULL "E" 1602-06-17 "Texel" NULL
NULL true 1603-03-10 "Atjeh" 5060 NULL
+78 "" 2 "" "ZON" "(GROTE) Kornelis Jansz. Schouten"
580 NULL NULL NULL NULL NULL "A" 1602-06-17 "Texel"
NULL NULL true 1603-04-29 "Bantam" NULL NULL
+79 "" 1 "" "EENDRACHT" "Adriaan Kornelisz. Haai"
240 NULL NULL NULL NULL NULL "D" 1602-06-18 "Maas"
NULL NULL true 1603-04-29 "Bantam" 5046 NULL
+80 "" 1 "" "ERASMUS" "Klaas Jansz. van Dijk" 540
NULL NULL NULL NULL NULL "R" 1602-06-18 "Maas" NULL
NULL true 1603-04-29 "Bantam" 5055 NULL
+81 "" 1 "" "ROTTERDAM" "Pieter Klaasz. Rochussen"
800 NULL NULL NULL NULL NULL "R" 1602-06-18 "Maas"
NULL NULL true 1603-04-29 "Bantam" 5053 NULL
+82 "" 1 "" "AMSTERDAM" "Arend Klaasz. Kalkbuis"
700 NULL NULL NULL NULL NULL "A" 1603-12-18 "Texel"
NULL NULL true 1604-12-31 "Bantam" 5067 NULL
+83 "" 2 "" "DELFT" "Willem Kornelisz. Schouten" 300
"jacht" NULL NULL NULL NULL "A" 1603-12-18 "Texel" NULL
NULL true 1605-01-01 "Atjeh" NULL "According to Commelin the
master was Willem Lok. The ship stayed in the Indies."
+84 "" 1 "" "DORDRECHT" "Hans Riemland" 900 NULL
NULL NULL NULL NULL "Z" 1603-12-18 "Wielingen" NULL
NULL true 1604-12-31 "Bantam" 5068 NULL
+85 "" 1 "" "DUIFJE" "Willem Jansz." 60 "jacht"
NULL NULL NULL "A" "A" 1603-12-18 "Texel" NULL NULL
true 1604-12-11 "Bantam" NULL "Stayed in the Indies."
+86 "" 1 "" "ENKHUIZEN" "Klaas Thijsz. Collet" 300
"jacht" NULL NULL NULL NULL "E" 1603-12-18 "Texel" NULL
NULL true 1605-08-21 "Bantam" NULL "Ran aground off
Halmaheira, 1607."
+87 "" 1 "" "GELDERLAND" "Jan Jansz. Mol" 500
NULL NULL NULL NULL NULL "A" 1603-12-18 "Texel" NULL
NULL true 1604-12-31 "Bantam" 5062 NULL
+88 "" 1 "" "HOF VAN HOLLAND" "Willem Lok" 360
NULL NULL NULL NULL NULL "A" 1603-12-18 "Texel" NULL
NULL true NULL "Madagascar" 5054 "Commelin the master was Willem
Kornelisz. Schouten."
+89 "" 1 "" "HOORN" "Dirk Klaasz. Mooilieven" 700
NULL NULL NULL NULL "H" "H" 1603-12-18 "Texel" NULL
NULL true 1604-12-31 "Bantam" 5066 "Took on provisions for
about one month at Mauritius. Mooilieven was succeeded by Jan Konnelisz. van
Avenhorn."
+90 "" 1 "" "MEDEMBLIK" "Dirk Klaasz. Mooilieven"
250 "jacht" NULL NULL NULL NULL "H" 1603-12-18 "Texel"
NULL NULL true 1604-07-01 "Bantam" 5074 NULL
+91 "" 1 "" "GEUNIEERDE PROVINCIEN" "Simon Jansz. Hoen"
700 NULL NULL NULL NULL "A" "A" 1603-12-18 "Texel"
NULL NULL true 1604-12-31 "Bantam" 5065 "took over the
cargo and sailed back home, the ME-DEMBLIK proceeded to Bantam."
+92 "" 1 "" "WESTFRIESLAND" "Jakob Jakobsz. Klunt" 700
NULL NULL NULL NULL "E" "E" 1603-12-18 "Texel" NULL
NULL true 1604-12-31 "Bantam" 5064 NULL
+93 "" 1 "" "ZEELANDIA" "Krijn Pietersz." 500
NULL NULL NULL NULL "Z" "Z" 1603-12-18 "Wielingen"
NULL NULL true 1604-07-01 "Cambodia" 5071 NULL
+94 "" 1 "" "GOUDA" "Kornelis Heinsz. Pronk" 260
NULL NULL NULL NULL "A" "A" 1604-07-02 "Texel" NULL
NULL true NULL NULL 5063 NULL
+95 "" 1 "" "EENDRACHT" "Adriaan Kornelisz. Haai"
240 NULL NULL NULL NULL NULL "D" 1605-05-12 NULL
NULL NULL true 1606-07-13 "Bantam" NULL "Sent to
Mauritius to collect ebony. According to Commelin departure 20-05-1605. At
Mauritius 22-05-1606 (see 5068 and 5069). Destroyed by fire on the coast of
Coromandel (1610)."
+96 "" 2 "" "WITTE LEEUW" "Wouter Jakobsz." 540
"jacht" NULL NULL NULL "A" "A" 1605-05-12 "Texel" NULL
NULL true 1606-05-01 "Johore" 5073 "was Gerrit Hendriksz.
Roobol; according to Mac Leod Klaas Jansz. Melknap."
+97 "" 1 "" "ZWARTE LEEUW" "Gerrit Hendriksz. Roobol"
600 NULL NULL NULL NULL "A" "A" 1605-05-12 "Texel"
NULL NULL true 1606-05-01 "Johore" 5075 "According to
Mac Leod the master was Abraham Mathijsz."
+98 "" 2 "" "MAURITIUS" "Gerrit Klaasz." 700
NULL NULL NULL NULL NULL "A" 1605-05-12 "Texel" NULL
NULL true 1606-05-01 "Johore" 5077 "According to Mac Leod
the master was Klaas Gerritsz."
+99 "" 1 "" "MIDDELBURG" "Simon Lambrechtsz. Mau."
600 NULL NULL NULL NULL NULL "A" 1605-05-12 "Texel"
NULL NULL true 1606-05-01 "Johore" 18 "-08-1606 burnt
in action before Malacca."
+100 "" 2 "" "NASSAU" "Abraham Mathijsz." 320
NULL NULL NULL NULL NULL "A" 1605-05-12 "Texel" NULL
NULL true 1606-05-01 "Johore" 22 "-08-1606 burnt in
action before Malacca. According to Commelin the master was Wouter Jakobsz.;
according to Mac Leod Walter Karelsz. There were also 15 blacks on board."
+101 "" 1 "" "ORANJE" "Dirk Klaasz. Mol" 700
NULL NULL NULL NULL NULL "A" 1605-05-12 "Texel" NULL
NULL true 1606-05-01 "Johore" 5078 "fleet was before
Johore where it started operations against the Portuguese. The ERASMUS, the
PRO-VINCIEN and probably the EENDRACHT departed not before 30-05 from the Maas.
The first 2 ships joined Matelieff on 14-07-1607 off Malacca, the EENDRACHT was
sent for Mauritius to collect ebony. In August 1610 this ship was destroyed by
fire on the coast of Coromandel. The ship probably never formed part of the
fleet of Matelieff. The GROTE ZON and the KLEINE ZON stayed in the Indies and
were broken up at Banda."
+102 "" 1 "" "GROTE ZON" "Klaas Jansz. Melknap" 540
NULL NULL NULL NULL NULL "A" 1605-05-12 "Texel" NULL
NULL true 1606-05-01 "Johore" 5083 "Purchased from the
Admirality of Amsterdam, 1604."
+103 "" 1 "" "AMSTERDAM" "Reinier Lambrechtsz." 700
NULL NULL NULL NULL "A" "Z" 1605-05-24 "Wielingen"
NULL NULL true 1606-05-01 "Johore" 5072 NULL
+104 "" 1 "" "KLEINE ZON" "Kornelis Jorisz." 220
NULL NULL NULL NULL "Z" "Z" 1605-05-24 "Wielingen"
NULL NULL true 1606-05-01 "Johore" NULL NULL
+105 "" 2 "" "ERASMUS" "Olivier Kornelisz." 540
NULL NULL NULL NULL NULL "R" 1605-05-30 "Goeree"
NULL NULL true 1606-07-14 "Johore" 5081 NULL
+106 "" 1 "" "GEUNIEERDE PROVINCIEN" "Anthonis Anthonisz.
(Zwarte Teun)" 400 NULL NULL NULL NULL "D" "D"
1605-05-30 "Goeree" NULL NULL true 1606-07-14
"Johore" 5076 NULL
+107 "" 1 "" "BANDA" "Jan Bruin" 600 NULL NULL
NULL NULL NULL "A" 1606-04-20 "Texel" NULL NULL true
1607-10-02 "Goa" 5088 "number of those on board was 1060. From 23-05
till 03-06 on the roadstead of the isle of Wight, the 3 ships from Zeeland
arrived here 25-05; 29-03 at Mozambique, where they started operations against
the Portuguese. When leaving, 26-05, the ZIERIKZEE ran aground and was lost;
the mainfleet was therefore unable to sail before June, 29th; from 08-06 till
17-07 at the Comoro I; from 04-08 till 26-08 again at Mozambique and 02-10 at
Goa."
+108 "" 1 "" "BANTAM" "Pieter Kornelisz. van Petten"
700 NULL NULL NULL NULL NULL "A" 1606-04-20 "Texel"
NULL NULL true 1607-10-02 "Goa" 5079 NULL
+109 "" 1 "" "CEYLON" "Willem Dirksz." 340
NULL NULL NULL NULL "A" "A" 1606-04-20 "Texel" NULL
NULL true 1607-10-02 "Goa" 5080 NULL
+110 "" 1 "" "CHINA" "Kornelis Maartensz." 420 NULL
NULL NULL NULL "H" "H" 1606-04-20 "Texel" NULL NULL
true 1607-10-02 "Goa" NULL "Riding at anchor off Ternate in 1608,
the ship was lost due to bad weather (July 1608)."
+111 "" 1 "" "PATANIA" "Dirk Albertsz. de Vries"
340 NULL NULL NULL NULL "E" "E" 1606-04-20 "Texel"
NULL NULL true 1607-10-02 "Goa" 5087 NULL
+112 "" 1 "" "TER VEERE" "Adriaan Looy" 700 NULL
NULL NULL NULL "Z" "Z" 1606-05-14 "Wielingen" NULL
NULL true 1607-10-02 "Goa" 5082 NULL
+113 "" 1 "" "WALCHEREN" "Arend Maartensz." 700
NULL NULL NULL NULL "Z" "Z" 1606-05-14 "Wielingen"
NULL NULL true 1607-10-02 "Goa" NULL "Riding at anchor off
Ternate in 1608, the ship was lost due to bad weather."
+114 "" 2 "" "ZIERIKZEE" "Adriaan Kornelisz." 760
NULL NULL NULL NULL "Z" "Z" 1606-05-14 "Wielingen"
NULL NULL true NULL NULL NULL "Foundered 1607 Cabacella
(Moz.)."
+115 "" 2 "" "GELDERLAND" NULL 500 NULL NULL
NULL NULL NULL "A" 1606-12-13 "Texel" NULL NULL true
NULL NULL NULL "The ship was forced by bad weather to take refuge in
the harbour of Vlissingen, July 19th and was lost, making its way out July
20th."
+116 "" 2 "" "GOUDA" "Jakob Gerritsz." 260 NULL
NULL NULL NULL "A" "A" 1606-12-13 "Texel" NULL NULL
true 1608-01-01 "Atjeh" 5084 NULL
+117 "" 1 "" "GELDERLAND" "Jan Jansz. Mol" 700
NULL NULL NULL NULL NULL "A" 1607-04-26 "Zeeland"
NULL NULL true 1607-10-26 "Malabar" 5085 NULL
+118 "" 1 "" "MIDDELBURG" "Kornelis Leendertsz. Krakeel"
800 NULL NULL NULL NULL NULL "Z" 1607-12-21
"Wielingen" NULL NULL true 1608-09-18 "Goa" 5096 NULL
+119 "" 1 "" "VALK" "Kornelis Adriaansz. Hooiwagen" 140
"jacht" NULL NULL NULL "Z" "Z" 1607-12-21 "Wielingen"
NULL NULL true 1608-09-18 "Goa" NULL "Captured by the
Spaniards off Manila, 25-04-1610."
+120 "" 2 "" "ZEELANDIA" "Willem Jakobsz. van
Arnemuiden" 500 NULL NULL NULL NULL "Z" "Z"
1607-12-21 "Wielingen" NULL NULL true 1608-09-18 "Goa"
5086 NULL
+121 "" 2 "" "AMSTERDAM" "Pieter Gerritsz." 700
NULL NULL NULL NULL "A" "A" 1607-12-22 "Texel" NULL
NULL true 1608-09-18 "Goa" NULL "Captured by the Spaniards off
Manilla, 25-04-1610."
+122 "" 1 "" "AREND" "Rutger Thomasz." 140 "jacht"
NULL NULL NULL "A" "A" 1607-12-22 "Texel" NULL NULL
true 1608-09-18 "Goa" NULL "Captured and burnt by the Spaniards
off Manilla 25-04-1610."
+123 "" 1 "" "DELFT" "Simon Maartensz. (Zwarte Simon)"
800 NULL NULL NULL NULL "D" "D" 1607-12-22
"Goeree" NULL NULL true 1608-09-18 "Goa" 5094 NULL
+124 "" 1 "" "GRIFFIOEN" "Kornelis Kornelisz. 't Hert"
140 "jacht" NULL NULL NULL "R" "R" 1607-12-22
"Goeree" NULL NULL true 1608-09-18 "Goa" NULL "The
ship stayed in the Indies."
+125 "" 2 "" "HOLLANDIA" "Simon Jansz. Hoen" 800
NULL NULL NULL NULL "A" "A" 1607-12-22 "Texel" NULL
NULL true 1608-09-18 "Goa" 5097 "illemsz. Verhoeff aboard the
GEUNIEERDE PROVINCIEN and vice-adm. Frans Hendriksz. Wittert aboard the
MIDDELBURG. The 3 Zeeland ships and the mainfleet met at Maio I. February 1608;
from 15-05 till 02-06 at St. Helena; 28-06 somewhere in the regions off the
Cape; from 28-06 till 23-08 the fleet started operations against the Portuguese
at Mozambique; from 18-09 till 02-10 off Goa."
+126 "" 2 "" "HOORN" "Maarten Jansz. Kloot" 700 NULL
NULL NULL NULL "H" "H" 1607-12-22 "Texel" NULL NULL
true 1608-09-18 "Goa" 5091 NULL
+127 "" 1 "" "RODE LEEUW MET PIJLEN" "Jan Walijchsz."
400 NULL NULL NULL NULL "A" "A" 1607-12-22 "Texel"
NULL NULL true 1608-09-18 "Goa" 5089 NULL
+128 "" 1 "" "PAUW" "Meeuwis Gijsbertsz." 140 "jacht"
NULL NULL NULL "A" "A" 1607-12-22 "Texel" NULL NULL
true 1608-09-18 "Goa" NULL "The ship stayed in the Indies."
+129 "" 2 "" "GEUNIEERDE PROVINCIEN" "Frans Jakobsz. de
Vries" 700 NULL NULL NULL NULL "A" "A" 1607-12-22
"Texel" NULL NULL true 1608-09-19 "Goa" 5092 "May 22th
1609 Frans \nJakobsz. de Vries was murdered by the inhabitants of Banda."
+130 "" 2 "" "ROTTERDAM" "Jan Kornelisz. de Wit" 800
NULL NULL NULL NULL "R" "R" 1607-12-22 "Goeree"
NULL NULL true 1608-09-19 "Goa" 5090 NULL
+131 "" 2 "" "MEDEMBLIK" "Jacques l'Hermite" 250
"jacht" NULL NULL NULL NULL "A" 1608-01-01 "Texel" NULL
NULL true NULL "Bantam" NULL "The ship was despatched to
bring news of the forthcoming Twelve Years' Truce; stayed in the Indies and was
wrecked near the Maledive Islands."
+132 "" 1 "" "HOOP" "Pieter Heeresz." 80 "jacht"
NULL NULL NULL "A" "A" 1608-04-15 "Texel" NULL NULL
true 1608-12-26 "Bantam" NULL "Captured by the Spaniards near
Manila, 15-07-1610."
+133 "" 1 "" "HALVE MAAN" "Henry Hudson" 80 "jacht"
NULL NULL NULL "A" "A" 1609-04-06 "Texel" NULL NULL
true NULL NULL NULL "Destined to explore the North-East passage to
the Indies; discovered Hudson Bay and returned 07-12 in Dartmouth. Further
information see I'Honore Naber."
+134 "" 1 "" "HAZEWIND" "Wemmer van Berchem" 120
"jacht" NULL NULL NULL "E" "E" 1609-08-01 "Texel" NULL
NULL true 1610-10-01 "Bantam" NULL "left Lissabon
05-02-1610, rounded the Cape 04-05, took on provisions from 25-06 till 06-07 at
Madagascar. It stayed in the Indies."
+135 "" 1 "" "WAPEN VAN AMSTERDAM" "Dirk Pietersz. Kalf"
800 NULL NULL NULL NULL "A" "A" 1610-01-30 "Texel"
1610-06-28 1610-08-10 true 1610-12-19 "Bantam" 5099
"scattered the fleet; from 19-09 till 16-10 the WAPEN VAN AMSTERDAM took on
provisions at Mauritius."
+136 "" 1 "" "BRAK" "Jakob IJsbrandsz." 100 "jacht"
NULL NULL NULL NULL "E" 1610-01-30 "Texel" NULL NULL
true NULL "Bantam" NULL "The BRAK lost sight of the fleet at
23-06; 03-08 at Mauritius. At 07-08-1613 the ship sailed aground near Macassar
and was lost."
+137 "" 2 "" "CEYLON" "Dirk Gerritsz. Smient" 340
NULL NULL NULL NULL "A" "A" 1610-01-30 "Texel" NULL
NULL true 1610-08-08 "Mauritius" 5093 "The CEYLON lost sight
of the fleet 03-07."
+138 "" 2 "" "TER GOES" "Kornelis Reiniersz." 240
NULL NULL NULL NULL "Z" "Z" 1610-01-30 "Wielingen"
NULL NULL true 1610-12-10 "Bantam" NULL "Lost sight of
the fleet; from 30-07 till 02-08 at the Bay of Antipara; 02-08 in the St. Lucia
Bay, where it took over the remaining cargo of the MAURITIUS (5077); 21-08
departure from Madagascar via the Bay of Antongil; from 27-10 till 08-12 at
Mauritius."
+139 "" 3 "" "WITTE LEEUW" "Klaas Rutgersz. Smit" 540
"jacht" NULL NULL NULL "A" "A" 1610-01-30 "Texel" NULL
NULL true 1610-11-16 "Bantam" 5100 "Lost sight of the
fleet; from 24-07 till 03-08 in the `Verhagensbaai'; from 29-08 till 27-09 at
Mayotte."
+140 "" 2 "" "ZWARTE LEEUW" "Kornelis Dirksz. Worst"
600 NULL NULL NULL NULL "A" "A" 1610-01-30 "Texel"
NULL NULL true 1610-11-16 "Bantam" 5102 "See 0139."
+141 "" 2 "" "ORANJE" "Kornelis Riemland" 700
NULL NULL NULL NULL "A" "Z" 1610-01-30 "Wielingen"
NULL NULL true 1610-11-16 "Bantam" 5095 "See 0139."
+142 "" 1 "" "VLISSINGEN" "Jan Kornelisz. 't Hert"
600 NULL NULL NULL NULL "Z" "Z" 1610-01-30
"Wielingen" NULL NULL true 1610-11-16 "Bantam" 5101
"See 0139."
+143 "" 3 "" "GOUDA" "Albert Hermansz." 260 NULL
NULL NULL NULL "A" "A" 1610-12-28 "Texel" 1611-06-04
NULL true 1611-08-24 "Bantam" NULL "Fleet (0143-0144)
under the command of Hendrik Brouwer aboard the RODE LEEUW MET PIJLEN sailed
the southern passage for the first time (latitude ca. 36' south), which was
made obligatory in 1616. The GOUDA was captured by the Spaniards near Tidore,
04-05-1612."
+144 "" 2 "" "RODE LEEUW MET PULEN" "Kornelis Maartensz. 't
Kind" 400 NULL NULL NULL NULL "A" "A" 1610-12-28
"Texel" 1611-06-04 NULL true 1611-08-18 "Bantam" NULL
"unseaworthiness, abandoned by its crew and set on fire, August 1615."
+145 "" 2 "" "TER VEERE" "Willem Jakobsz. van
Arnemuiden" 700 NULL NULL NULL NULL "Z" "Z"
1610-12-28 "Wielingen" NULL NULL true 1611-09-05
"Bantam" 5103 NULL
+146 "" 2 "" "BANDA" "Roelof Thijsz." 800 NULL
NULL NULL NULL NULL "A" 1611-03-16 "Texel" NULL NULL
true 1612-02-02 "Bantam" 5105 "in St. Lucia Bay; from 15-12
till 23-12 at Mauritius. According to Commelin the master of the BANDA was
Roelof Harmensz."
+147 "" 2 "" "BANTAM" "Kornelis Arendse" 900
NULL NULL NULL NULL NULL "E" 1611-05-02 "Texel" NULL
NULL true 1612-03-02 "Bantam" 5098 NULL
+148 "" 2 "" "HALVE MAAN" "Melis Andriesz." 80
"jacht" NULL NULL NULL "A" "A" 1611-05-02 "Texel" NULL
NULL true 1612-02-02 "Bantam" NULL NULL
+149 "" 1 "" "GROTE AEOLUS" "Bouwe Bouwesz." 300
NULL NULL NULL NULL "A" "A" 1611-12-29 "Texel" NULL
NULL true 1612-11-28 "Bantam" NULL "Capsized near Makian
31-01-1613; 15 survivors."
+150 "" 3 "" "CEYLON" "Klaas Jansz." 340 NULL
NULL NULL NULL "A" "A" 1611-12-29 "Texel" NULL NULL
true 1612-11-28 "Bantam" NULL NULL
+151 "" 1 "" "DUIFJE" "Serpent" 50 "jacht"
NULL NULL NULL "A" "A" 1611-12-29 "Texel" NULL NULL
true 1612-10-24 "Bantam" NULL "Ran aground near Surat and
lost, 17-07-1617."
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
