Changeset: e148b462d347 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/e148b462d347
Modified Files:
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:
merged from Aug2024
diffs (84 lines):
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -48,12 +48,7 @@ jobs:
ref: ${{ github.ref }}
- name: install pymonetdb cryptography
- run: pip3 install --user --upgrade pymonetdb cryptography
- if: runner.os != 'macOS'
-
- - name: install pymonetdb cryptography
run: pip3 install --user --break-system-packages --upgrade pymonetdb
cryptography
- if: runner.os == 'macOS'
- name: make MonetDB on linux
run: |
diff --git a/monetdb5/mal/mal_function.c b/monetdb5/mal/mal_function.c
--- a/monetdb5/mal/mal_function.c
+++ b/monetdb5/mal/mal_function.c
@@ -790,7 +790,7 @@ chkDeclarations(MalBlkPtr mb)
blks[++top] = blkId;
}
if (blockExit(p) && top > 0) {
- if (dflow == blkId) {
+ if (dflow == blks[top]) {
dflow = -1;
} else
/*
diff --git a/sql/test/emptydb/Tests/check.SQL.py
b/sql/test/emptydb/Tests/check.SQL.py
--- a/sql/test/emptydb/Tests/check.SQL.py
+++ b/sql/test/emptydb/Tests/check.SQL.py
@@ -197,7 +197,7 @@ sys_fkeys = [
('querylog_history', 'id', 'id', 'querylog_catalog'),
('querylog_history', 'owner', 'name', 'users'),
('querylog_history', 'pipe', 'name', 'optimizers'),
-
+ ('remote_user_info', 'table_id', 'id', '_tables'),
('sessions', '"username"', 'name', 'users'),
('sessions', 'optimizer', 'name', 'optimizers'),
('statistics', 'column_id', 'id', '(SELECT id FROM sys._columns UNION ALL
SELECT id FROM tmp._columns) as c'),
diff --git a/sql/test/emptydb/Tests/check.stable.out
b/sql/test/emptydb/Tests/check.stable.out
--- a/sql/test/emptydb/Tests/check.stable.out
+++ b/sql/test/emptydb/Tests/check.stable.out
@@ -208,6 +208,7 @@ select 'missing reference in querylog_ca
select 'missing reference in querylog_history id', id, * from
sys.querylog_history where (id) not in (select id from sys.querylog_catalog);
select 'missing reference in querylog_history owner', owner, * from
sys.querylog_history where (owner) not in (select name from sys.users);
select 'missing reference in querylog_history pipe', pipe, * from
sys.querylog_history where (pipe) not in (select name from sys.optimizers);
+select 'missing reference in remote_user_info table_id', table_id, * from
sys.remote_user_info where (table_id) not in (select id from sys._tables);
select 'missing reference in sessions username', "username", * from
sys.sessions where ("username") not in (select name from sys.users);
select 'missing reference in sessions optimizer', optimizer, * from
sys.sessions where (optimizer) not in (select name from sys.optimizers);
select 'missing reference in statistics column_id', column_id, * from
sys.statistics where (column_id) not in (select id from (SELECT id FROM
sys._columns UNION ALL SELECT id FROM tmp._columns) as c);
@@ -6120,6 +6121,10 @@ select 'null in fkeys.delete_action', de
% %5, pipe, id, owner, defined, query, pipe, plan, mal,
optimize, start, stop, arguments, tuples, run, ship, cpu,
io # name
% varchar, varchar, oid, varchar, timestamp,
varchar, varchar, varchar, int, bigint, timestamp,
timestamp, varchar, bigint, bigint, bigint, int, int # type
% 0, 0, 3, 0, 26, 0, 0, 0, 1, 1,
26, 26, 0, 1, 1, 1, 1, 1 # length
+% .%4, sys.remote_user_info, sys.remote_user_info, sys.remote_user_info,
sys.remote_user_info # table_name
+% %4, table_id, table_id, username, password # name
+% varchar, int, int, varchar, varchar # type
+% 0, 1, 1, 0, 0 # length
% .%5, .sessions, .sessions, .sessions, .sessions,
.sessions, .sessions, .sessions, .sessions, .sessions,
.sessions, .sessions, .sessions, .sessions, .sessions,
.sessions, .sessions, .sessions # table_name
% %5, username, sessionid, username, login, idle,
optimizer, sessiontimeout, querytimeout, workerlimit, memorylimit,
language, peer, hostname, application, client, clientpid,
remark # name
% varchar, varchar, int, varchar, timestamp,
timestamp, varchar, int, int, int, int, varchar,
varchar, varchar, varchar, varchar, bigint, varchar
# type
diff --git a/sql/test/emptydb/Tests/check.stable.out.int128
b/sql/test/emptydb/Tests/check.stable.out.int128
--- a/sql/test/emptydb/Tests/check.stable.out.int128
+++ b/sql/test/emptydb/Tests/check.stable.out.int128
@@ -208,6 +208,7 @@ select 'missing reference in querylog_ca
select 'missing reference in querylog_history id', id, * from
sys.querylog_history where (id) not in (select id from sys.querylog_catalog);
select 'missing reference in querylog_history owner', owner, * from
sys.querylog_history where (owner) not in (select name from sys.users);
select 'missing reference in querylog_history pipe', pipe, * from
sys.querylog_history where (pipe) not in (select name from sys.optimizers);
+select 'missing reference in remote_user_info table_id', table_id, * from
sys.remote_user_info where (table_id) not in (select id from sys._tables);
select 'missing reference in sessions username', "username", * from
sys.sessions where ("username") not in (select name from sys.users);
select 'missing reference in sessions optimizer', optimizer, * from
sys.sessions where (optimizer) not in (select name from sys.optimizers);
select 'missing reference in statistics column_id', column_id, * from
sys.statistics where (column_id) not in (select id from (SELECT id FROM
sys._columns UNION ALL SELECT id FROM tmp._columns) as c);
@@ -6263,6 +6264,10 @@ select 'null in fkeys.delete_action', de
% %5, pipe, id, owner, defined, query, pipe, plan, mal,
optimize, start, stop, arguments, tuples, run, ship, cpu,
io # name
% varchar, varchar, oid, varchar, timestamp,
varchar, varchar, varchar, int, bigint, timestamp,
timestamp, varchar, bigint, bigint, bigint, int, int # type
% 0, 0, 3, 0, 26, 0, 0, 0, 1, 1,
26, 26, 0, 1, 1, 1, 1, 1 # length
+% .%4, sys.remote_user_info, sys.remote_user_info, sys.remote_user_info,
sys.remote_user_info # table_name
+% %4, table_id, table_id, username, password # name
+% varchar, int, int, varchar, varchar # type
+% 0, 1, 1, 0, 0 # length
% .%5, .sessions, .sessions, .sessions, .sessions,
.sessions, .sessions, .sessions, .sessions, .sessions,
.sessions, .sessions, .sessions, .sessions, .sessions,
.sessions, .sessions, .sessions # table_name
% %5, username, sessionid, username, login, idle,
optimizer, sessiontimeout, querytimeout, workerlimit, memorylimit,
language, peer, hostname, application, client, clientpid,
remark # name
% varchar, varchar, int, varchar, timestamp,
timestamp, varchar, int, int, int, int, varchar,
varchar, varchar, varchar, varchar, bigint, varchar
# type
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
