Changeset: 61a59b19d345 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/61a59b19d345
Branch: default
Log Message:
Merge with Mar2025 branch.
diffs (32 lines):
diff --git a/monetdb5/mal/Tests/tst032.maltest
b/monetdb5/mal/Tests/tst032.maltest
--- a/monetdb5/mal/Tests/tst032.maltest
+++ b/monetdb5/mal/Tests/tst032.maltest
@@ -36,7 +36,7 @@ 3
2
2
-statement ok
+statement error
bat.delete(b,k)
query II rowsort
@@ -45,5 +45,7 @@ io.print(b)
0
0
1
+3
+2
2
diff --git a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
--- a/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
+++ b/sql/jdbc/tests/Tests/Test_JdbcClient.SQL.py
@@ -63,7 +63,7 @@ if __name__ == '__main__':
perr = str(p.stderr)
if perr != "":
print(perr)
- if pout != 'START TRANSACTION;\n\nSET SCHEMA "sys";\n\nCREATE MERGE
TABLE "sys"."mt" (\n\t"id" INTEGER NOT NULL,\n\t"nm" VARCHAR(123) NOT
NULL,\n\tCONSTRAINT "mt_id_pkey" PRIMARY KEY ("id")\n);\n\nCREATE REMOTE TABLE
"sys"."remt" (\n\t"id" INTEGER NOT NULL,\n\t"nm" VARCHAR(123) NOT
NULL,\n\tCONSTRAINT "remt_id_pkey" PRIMARY KEY ("id")\n) ON
\'mapi:monetdb://localhost:42001/mdb3\';\n\nCREATE REPLICA TABLE "sys"."replt"
(\n\t"id" INTEGER NOT NULL,\n\t"nm" VARCHAR(123) NOT NULL,\n\tCONSTRAINT
"replt_id_pkey" PRIMARY KEY ("id")\n);\n\nCREATE TABLE "sys"."allnewtriples"
(\n\t"id" INTEGER NOT NULL,\n\t"subject" INTEGER NOT
NULL,\n\t"predicate" INTEGER NOT NULL,\n\t"object" INTEGER NOT
NULL,\n\t"explicit" BOOLEAN NOT NULL,\n\tCONSTRAINT
"allnewtriples_id_pkey" PRIMARY KEY ("id"),\n\tCONSTRAINT "unique_key" UNIQUE
("subject", "predicate", "object")\n);\nCREATE INDEX "allnewtriples_object_idx"
ON "sys"."allnewtriples" ("
object");\nCREATE INDEX "allnewtriples_predicate_idx" ON "sys"."allnewtriples"
("predicate");\nCREATE INDEX "allnewtriples_subject_idx" ON
"sys"."allnewtriples" ("subject");\n\nINSERT INTO "sys"."allnewtriples" VALUES
(1, 1, 1, 1, false);\nINSERT INTO "sys"."allnewtriples" VALUES (2, 1, 1, 2,
false);\nINSERT INTO "sys"."allnewtriples" VALUES (3, 1, 2, 1, false);\nINSERT
INTO "sys"."allnewtriples" VALUES (4, 2, 1, 1, false);\nINSERT INTO
"sys"."allnewtriples" VALUES (5, 1, 2, 2, false);\nINSERT INTO
"sys"."allnewtriples" VALUES (6, 2, 2, 1, false);\nINSERT INTO
"sys"."allnewtriples" VALUES (7, 2, 2, 2, false);\n\nCREATE TABLE
"sys"."foreign" (\n\t"id" INTEGER NOT NULL,\n\t"subject" INTEGER
NOT NULL,\n\t"predicate" INTEGER NOT NULL,\n\t"object" INTEGER
NOT NULL,\n\tCONSTRAINT "foreign_id_fkey" FOREIGN KEY ("id") REFERENCES
"sys"."allnewtriples" ("id") ON UPDATE RESTRICT ON DELETE
RESTRICT,\n\tCONSTRAINT "foreign_subject_predicate_object_fkey" FOREIG
N KEY ("subject", "predicate", "object") REFERENCES "sys"."allnewtriples"
("subject", "predicate", "object") ON UPDATE RESTRICT ON DELETE
RESTRICT\n);\n\nINSERT INTO "sys"."foreign" VALUES (1, 1, 1, 1);\nINSERT INTO
"sys"."foreign" VALUES (2, 2, 2, 2);\nINSERT INTO "sys"."foreign" VALUES (3, 1,
2, 2);\nINSERT INTO "sys"."foreign" VALUES (4, 2, 2, 1);\nINSERT INTO
"sys"."foreign" VALUES (5, 2, 1, 1);\nINSERT INTO "sys"."foreign" VALUES (6, 1,
2, 1);\nINSERT INTO "sys"."foreign" VALUES (7, 1, 1, 2);\n\nCREATE TABLE
"sys"."triples" (\n\t"id" INTEGER NOT NULL,\n\t"subject" INTEGER
NOT NULL,\n\t"predicate" INTEGER NOT NULL,\n\t"object" INTEGER
NOT NULL,\n\t"explicit" BOOLEAN NOT NULL,\n\tCONSTRAINT
"triples_subject_predicate_object_unique" UNIQUE ("subject", "predicate",
"object")\n);\nCREATE INDEX "triples_object_idx" ON "sys"."triples"
("object");\nCREATE INDEX "triples_predicate_idx" ON "sys"."triples"
("predicate");\nCREATE INDEX "triples_pr
edicate_object_idx" ON "sys"."triples" ("predicate", "object");\nCREATE INDEX
"triples_subject_idx" ON "sys"."triples" ("subject");\nCREATE INDEX
"triples_subject_object_idx" ON "sys"."triples" ("subject", "object");\nCREATE
INDEX "triples_subject_predicate_idx" ON "sys"."triples" ("subject",
"predicate");\n\nINSERT INTO "sys"."triples" VALUES (1, 1, 1, 1,
false);\nINSERT INTO "sys"."triples" VALUES (2, 1, 1, 2, false);\nINSERT INTO
"sys"."triples" VALUES (3, 1, 2, 1, false);\nINSERT INTO "sys"."triples" VALUES
(4, 2, 1, 1, false);\nINSERT INTO "sys"."triples" VALUES (5, 1, 2, 2,
false);\nINSERT INTO "sys"."triples" VALUES (6, 2, 2, 1, false);\nINSERT INTO
"sys"."triples" VALUES (7, 2, 2, 2, false);\n\ncreate or replace view
object_stats as select "object", cast(count(*) as bigint) as counts,
min("object") as min_value, max("object") as max_value from "triples" group by
"object" order by "object"\n;\n\ncreate view predicate_stats as select
"predicate", cast(count(*) as bigint) as co
unts, min("predicate") as min_value, max("predicate") as max_value from
"triples" group by "predicate" order by "predicate"\n;\n\ncreate view
subject_stats as select "subject", cast(count(*) as bigint) as counts,
min("subject") as min_value, max("subject") as max_value from "triples" group
by "subject" order by "subject"\n;\n\nCOMMIT;\n':
+ if pout != 'START TRANSACTION;\n\nSET SCHEMA "sys";\n\nCREATE MERGE
TABLE "sys"."mt" (\n\t"id" INTEGER NOT NULL,\n\t"nm" VARCHAR(123) NOT
NULL,\n\tCONSTRAINT "mt_id_pkey" PRIMARY KEY ("id")\n);\n\nCREATE REMOTE TABLE
"sys"."remt" (\n\t"id" INTEGER NOT NULL,\n\t"nm" VARCHAR(123) NOT
NULL,\n\tCONSTRAINT "remt_id_pkey" PRIMARY KEY ("id")\n) ON
\'monetdb://localhost.:42001/mdb3\';\n\nCREATE REPLICA TABLE "sys"."replt"
(\n\t"id" INTEGER NOT NULL,\n\t"nm" VARCHAR(123) NOT NULL,\n\tCONSTRAINT
"replt_id_pkey" PRIMARY KEY ("id")\n);\n\nCREATE TABLE "sys"."allnewtriples"
(\n\t"id" INTEGER NOT NULL,\n\t"subject" INTEGER NOT
NULL,\n\t"predicate" INTEGER NOT NULL,\n\t"object" INTEGER NOT
NULL,\n\t"explicit" BOOLEAN NOT NULL,\n\tCONSTRAINT
"allnewtriples_id_pkey" PRIMARY KEY ("id"),\n\tCONSTRAINT "unique_key" UNIQUE
("subject", "predicate", "object")\n);\nCREATE INDEX "allnewtriples_object_idx"
ON "sys"."allnewtriples" ("obje
ct");\nCREATE INDEX "allnewtriples_predicate_idx" ON "sys"."allnewtriples"
("predicate");\nCREATE INDEX "allnewtriples_subject_idx" ON
"sys"."allnewtriples" ("subject");\n\nINSERT INTO "sys"."allnewtriples" VALUES
(1, 1, 1, 1, false);\nINSERT INTO "sys"."allnewtriples" VALUES (2, 1, 1, 2,
false);\nINSERT INTO "sys"."allnewtriples" VALUES (3, 1, 2, 1, false);\nINSERT
INTO "sys"."allnewtriples" VALUES (4, 2, 1, 1, false);\nINSERT INTO
"sys"."allnewtriples" VALUES (5, 1, 2, 2, false);\nINSERT INTO
"sys"."allnewtriples" VALUES (6, 2, 2, 1, false);\nINSERT INTO
"sys"."allnewtriples" VALUES (7, 2, 2, 2, false);\n\nCREATE TABLE
"sys"."foreign" (\n\t"id" INTEGER NOT NULL,\n\t"subject" INTEGER
NOT NULL,\n\t"predicate" INTEGER NOT NULL,\n\t"object" INTEGER
NOT NULL,\n\tCONSTRAINT "foreign_id_fkey" FOREIGN KEY ("id") REFERENCES
"sys"."allnewtriples" ("id") ON UPDATE RESTRICT ON DELETE
RESTRICT,\n\tCONSTRAINT "foreign_subject_predicate_object_fkey" FOREIGN KE
Y ("subject", "predicate", "object") REFERENCES "sys"."allnewtriples"
("subject", "predicate", "object") ON UPDATE RESTRICT ON DELETE
RESTRICT\n);\n\nINSERT INTO "sys"."foreign" VALUES (1, 1, 1, 1);\nINSERT INTO
"sys"."foreign" VALUES (2, 2, 2, 2);\nINSERT INTO "sys"."foreign" VALUES (3, 1,
2, 2);\nINSERT INTO "sys"."foreign" VALUES (4, 2, 2, 1);\nINSERT INTO
"sys"."foreign" VALUES (5, 2, 1, 1);\nINSERT INTO "sys"."foreign" VALUES (6, 1,
2, 1);\nINSERT INTO "sys"."foreign" VALUES (7, 1, 1, 2);\n\nCREATE TABLE
"sys"."triples" (\n\t"id" INTEGER NOT NULL,\n\t"subject" INTEGER
NOT NULL,\n\t"predicate" INTEGER NOT NULL,\n\t"object" INTEGER
NOT NULL,\n\t"explicit" BOOLEAN NOT NULL,\n\tCONSTRAINT
"triples_subject_predicate_object_unique" UNIQUE ("subject", "predicate",
"object")\n);\nCREATE INDEX "triples_object_idx" ON "sys"."triples"
("object");\nCREATE INDEX "triples_predicate_idx" ON "sys"."triples"
("predicate");\nCREATE INDEX "triples_predic
ate_object_idx" ON "sys"."triples" ("predicate", "object");\nCREATE INDEX
"triples_subject_idx" ON "sys"."triples" ("subject");\nCREATE INDEX
"triples_subject_object_idx" ON "sys"."triples" ("subject", "object");\nCREATE
INDEX "triples_subject_predicate_idx" ON "sys"."triples" ("subject",
"predicate");\n\nINSERT INTO "sys"."triples" VALUES (1, 1, 1, 1,
false);\nINSERT INTO "sys"."triples" VALUES (2, 1, 1, 2, false);\nINSERT INTO
"sys"."triples" VALUES (3, 1, 2, 1, false);\nINSERT INTO "sys"."triples" VALUES
(4, 2, 1, 1, false);\nINSERT INTO "sys"."triples" VALUES (5, 1, 2, 2,
false);\nINSERT INTO "sys"."triples" VALUES (6, 2, 2, 1, false);\nINSERT INTO
"sys"."triples" VALUES (7, 2, 2, 2, false);\n\ncreate or replace view
object_stats as select "object", cast(count(*) as bigint) as counts,
min("object") as min_value, max("object") as max_value from "triples" group by
"object" order by "object"\n;\n\ncreate view predicate_stats as select
"predicate", cast(count(*) as bigint) as counts
, min("predicate") as min_value, max("predicate") as max_value from "triples"
group by "predicate" order by "predicate"\n;\n\ncreate view subject_stats as
select "subject", cast(count(*) as bigint) as counts, min("subject") as
min_value, max("subject") as max_value from "triples" group by "subject" order
by "subject"\n;\n\nCOMMIT;\n':
print(pout)
print("-D difference detected")
except CalledProcessError as e:
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
