Changeset: 24cf6e0cf97c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=24cf6e0cf97c
Modified Files:
sql/test/VOC/Tests/VOC.SQL.py
sql/test/VOC/Tests/VOC.stable.out
sql/test/VOC/Tests/double_is_null.Bug-3116.stable.out
sql/test/VOC/Tests/median.Bug-3096.stable.out
sql/test/VOC/VOCinsert.sql
Branch: Nov2019
Log Message:
Use COPY INTO instead of INSERT; reduce output size by not echoing data.
diffs (truncated from 116861 to 300 lines):
diff --git a/sql/test/VOC/Tests/VOC.SQL.py b/sql/test/VOC/Tests/VOC.SQL.py
--- a/sql/test/VOC/Tests/VOC.SQL.py
+++ b/sql/test/VOC/Tests/VOC.SQL.py
@@ -6,18 +6,18 @@ except ImportError:
d = os.environ['RELSRCDIR']
-def client(file, user, passwd):
+def client(file, user, passwd, echo=None):
sys.stdout.flush()
sys.stderr.flush()
c = process.client(lang = 'sql',
user = user, passwd = passwd,
args = [os.path.join(d, os.pardir, file)],
- log = True)
+ log=True, echo=echo)
c.communicate()
client('VOCcreate_user.sql', 'monetdb', 'monetdb')
client('VOCschema.sql', 'voc', 'voc')
-client('VOCinsert.sql', 'voc', 'voc')
+client('VOCinsert.sql', 'voc', 'voc', echo=False)
client('VOCquery.sql', 'voc', 'voc')
client('VOCmanual_examples.sql', 'voc', 'voc')
client('VOCdrop.sql', 'voc', 'voc')
diff --git a/sql/test/VOC/Tests/VOC.stable.out
b/sql/test/VOC/Tests/VOC.stable.out
--- a/sql/test/VOC/Tests/VOC.stable.out
+++ b/sql/test/VOC/Tests/VOC.stable.out
@@ -52,58391 +52,123 @@ stdout of test 'VOC` in directory 'sql/t
#CREATE SCHEMA "voc" AUTHORIZATION "voc";
#ALTER USER "voc" SET SCHEMA "voc";
#commit;
-
-# 17:10:01 >
-# 17:10:01 > Mtimeout -timeout 120 mclient -lsql -ftest -e --host=ottar
--port=37097 --database=mTests_test_VOC
../../../../../../../scratch1/sjoerd/src/MonetDB/candidate/sql/test/VOC/Tests/../VOCschema.sql
-# 17:10:01 >
-
-#START TRANSACTION;
-#CREATE TABLE "voyages" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "boatname" varchar(50),
-# "master" varchar(50),
-# "tonnage" integer,
-# "type_of_boat" varchar(30),
-# "built" varchar(15),
-# "bought" varchar(15),
-# "hired" varchar(15),
-# "yard" char(1),
-# "chamber" char(1),
-# "departure_date" date,
-# "departure_harbour" varchar(30),
-#CREATE TABLE "craftsmen" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "onboard_at_departure" integer,
-# "death_at_cape" integer,
-# "left_at_cape" integer,
-# "onboard_at_cape" integer,
-# "death_during_voyage" integer,
-# "onboard_at_arrival" integer
-#);
-#CREATE TABLE "impotenten" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "onboard_at_departure" integer,
-# "death_at_cape" integer,
-# "left_at_cape" integer,
-# "onboard_at_cape" integer,
-# "death_during_voyage" integer,
-# "onboard_at_arrival" integer
-#);
-#CREATE TABLE "invoices" (
-# "number" integer,
-# "number_sup" char(1),
-# "trip" integer,
-# "trip_sup" char(1),
-# "invoice" integer,
-# "chamber" char(1)
-#);
-#CREATE TABLE "passengers" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "onboard_at_departure" integer,
-# "death_at_cape" integer,
-# "left_at_cape" integer,
-# "onboard_at_cape" integer,
-# "death_during_voyage" integer,
-# "onboard_at_arrival" integer
-#);
-#CREATE TABLE "seafarers" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "onboard_at_departure" integer,
-# "death_at_cape" integer,
-# "left_at_cape" integer,
-# "onboard_at_cape" integer,
-# "death_during_voyage" integer,
-# "onboard_at_arrival" integer
-#);
-#CREATE TABLE "soldiers" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "onboard_at_departure" integer,
-# "death_at_cape" integer,
-# "left_at_cape" integer,
-# "onboard_at_cape" integer,
-# "death_during_voyage" integer,
-# "onboard_at_arrival" integer
-#);
-#CREATE TABLE "total" (
-# "number" integer NOT NULL,
-# "number_sup" char(1) NOT NULL,
-# "trip" integer,
-# "trip_sup" char(1),
-# "onboard_at_departure" integer,
-# "death_at_cape" integer,
-# "left_at_cape" integer,
-# "onboard_at_cape" integer,
-# "death_during_voyage" integer,
-# "onboard_at_arrival" integer
-#);
-#commit;
-
-# 17:10:01 >
-# 17:10:01 > Mtimeout -timeout 120 mclient -lsql -ftest -e --host=ottar
--port=37097 --database=mTests_test_VOC
../../../../../../../scratch1/sjoerd/src/MonetDB/candidate/sql/test/VOC/Tests/../VOCinsert.sql
-# 17:10:01 >
-
-#START TRANSACTION;
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (6, '', 1, '', 'MAAN', NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, '1598-03-25', 'Zeeland', NULL, NULL, true, NULL, NULL,
NULL, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (7, '', 1, '', 'ZON', NULL, 140, NULL, NULL,
NULL, NULL, NULL, NULL, '1598-03-25', 'Zeeland', NULL, NULL, true,
'1599-02-01', 'Bantam', 5011, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (26, '', 1, '', 'HOOP', 'Jakob Jansz.
Huidekoper', 50, 'jacht', NULL, NULL, NULL, NULL, NULL, '1598-09-13',
'Zeeland', NULL, NULL, true, NULL, NULL, NULL, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (57, '', 2, '', 'AMSTERDAM', NULL, 500, NULL,
NULL, NULL, NULL, NULL, NULL, '1601-04-23', 'Texel', NULL, NULL, true,
'1602-02-22', 'Bantam', 5034, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (59, '', 1, '', 'HOORN', NULL, NULL, NULL, NULL,
NULL, NULL, NULL, NULL, '1601-04-23', 'Texel', NULL, NULL, true, '1602-02-22',
'Bantam', 5036, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (61, '', 1, '', 'RODE LEEUW', 'Pieter Klaasz.',
NULL, 'jacht', NULL, NULL, NULL, NULL, NULL, '1601-04-23', 'Texel', NULL, NULL,
true, NULL, NULL, NULL, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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).');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (75, '', 1, '', 'PAPEGAAITJE', NULL, 50,
'jacht', NULL, NULL, NULL, NULL, 'E', '1602-06-17', 'Texel', NULL, NULL, true,
'1603-04-29', 'Bantam', NULL, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (94, '', 1, '', 'GOUDA', 'Kornelis Heinsz.
Pronk', 260, NULL, NULL, NULL, NULL, 'A', 'A', '1604-07-02', 'Texel', NULL,
NULL, true, NULL, NULL, 5063, NULL);
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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).');
-[ 1 ]
-#INSERT INTO "voyages" VALUES (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.');
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
