Changeset: 9654d00ece50 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/9654d00ece50
Branch: resource_management
Log Message:
merge with default
diffs (226 lines):
diff --git a/NT/mksqlwxs.py b/NT/mksqlwxs.py
--- a/NT/mksqlwxs.py
+++ b/NT/mksqlwxs.py
@@ -102,12 +102,12 @@ def main():
print(r' </DirectorySearch>')
print(r' </Property>')
print(r' <Property Id="GEOMMALEXISTS">')
- print(rf' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5-{version}" Depth="0">')
+ print(r' <DirectorySearch Id="CheckFileDir3"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
print(r' <FileSearch Id="CheckFile3" Name="geom.mal"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
print(r' <Property Id="GEOMLIBEXISTS">')
- print(rf' <DirectorySearch Id="CheckFileDir4"
Path="[INSTALLDIR]\lib\monetdb5-{version}" Depth="0">')
+ print(r' <DirectorySearch Id="CheckFileDir4"
Path="[INSTALLDIR]\lib\monetdb5" Depth="0">')
print(r' <FileSearch Id="CheckFile4" Name="_geom.dll"/>')
print(r' </DirectorySearch>')
print(r' </Property>')
diff --git a/clients/ChangeLog.Mar2025 b/clients/ChangeLog.Mar2025
--- a/clients/ChangeLog.Mar2025
+++ b/clients/ChangeLog.Mar2025
@@ -1,3 +1,8 @@
# ChangeLog file for clients
# This file is updated with Maddlog
+* Thu Aug 28 2025 Sjoerd Mullender <[email protected]>
+- We now try to figure out the size of the terminal window on Windows.
+ This means that mclient will, by default, format tabular output to
+ not wrap long lines, like is already done on Unix/Linux.
+
diff --git a/clients/NT/CMakeLists.txt b/clients/NT/CMakeLists.txt
--- a/clients/NT/CMakeLists.txt
+++ b/clients/NT/CMakeLists.txt
@@ -15,13 +15,9 @@
# generator does not allow for absolute install paths. That is why we use
# the "." as a relative path.
if(WIN32)
- configure_file(mclient.bat.in
- ${CMAKE_CURRENT_BINARY_DIR}/mclient.bat @ONLY)
- configure_file(msqldump.bat.in
- ${CMAKE_CURRENT_BINARY_DIR}/msqldump.bat @ONLY)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/mclient.bat
- ${CMAKE_CURRENT_BINARY_DIR}/msqldump.bat
+ mclient.bat
+ msqldump.bat
DESTINATION "."
COMPONENT server)
endif()
diff --git a/clients/NT/mclient.bat.in b/clients/NT/mclient.bat
rename from clients/NT/mclient.bat.in
rename to clients/NT/mclient.bat
--- a/clients/NT/mclient.bat.in
+++ b/clients/NT/mclient.bat
@@ -16,7 +16,7 @@ rem remove the final backslash from the
set MONETDB=%MONETDB:~0,-1%
rem extend the search path with our EXE and DLL folders
-set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5-@MONETDB_VERSION@;%PATH%
+set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5;%PATH%
if not "%1"=="/STARTED-FROM-MENU" goto skip
shift
diff --git a/clients/NT/msqldump.bat.in b/clients/NT/msqldump.bat
rename from clients/NT/msqldump.bat.in
rename to clients/NT/msqldump.bat
--- a/clients/NT/msqldump.bat.in
+++ b/clients/NT/msqldump.bat
@@ -15,7 +15,7 @@
@set MONETDB=%MONETDB:~0,-1%
@rem extend the search path with our EXE and DLL folders
-@set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5-@MONETDB_VERSION@;%PATH%
+@set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5;%PATH%
@rem start the real client
@"%MONETDB%\bin\msqldump.exe" %*
diff --git a/clients/mapiclient/mclient.c b/clients/mapiclient/mclient.c
--- a/clients/mapiclient/mclient.c
+++ b/clients/mapiclient/mclient.c
@@ -1690,6 +1690,14 @@ setWidth(void)
pagewidth = ws.ws_col;
pageheight = ws.ws_row;
} else
+#else
+#ifdef _MSC_VER
+ CONSOLE_SCREEN_BUFFER_INFO csbi;
+ if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE),
&csbi) != 0) {
+ pagewidth = csbi.srWindow.Right - csbi.srWindow.Left;
+ pageheight = csbi.srWindow.Bottom - csbi.srWindow.Top +
1;
+ } else
+#endif
#endif
{
pagewidth = pageheight = -1;
diff --git a/monetdb5/NT/CMakeLists.txt b/monetdb5/NT/CMakeLists.txt
--- a/monetdb5/NT/CMakeLists.txt
+++ b/monetdb5/NT/CMakeLists.txt
@@ -11,10 +11,8 @@
#]]
if(WIN32)
- configure_file(M5server.bat.in
- ${CMAKE_CURRENT_BINARY_DIR}/M5server.bat @ONLY)
install(FILES
- ${CMAKE_CURRENT_BINARY_DIR}/M5server.bat
+ M5server.bat
DESTINATION "."
COMPONENT server)
endif()
diff --git a/monetdb5/NT/M5server.bat.in b/monetdb5/NT/M5server.bat
rename from monetdb5/NT/M5server.bat.in
rename to monetdb5/NT/M5server.bat
--- a/monetdb5/NT/M5server.bat.in
+++ b/monetdb5/NT/M5server.bat
@@ -19,7 +19,7 @@ rem remove the final backslash from the
set MONETDB=%MONETDB:~0,-1%
rem extend the search path with our EXE and DLL folders
-set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5-@MONETDB_VERSION@;%PATH%
+set PATH=%MONETDB%\bin;%MONETDB%\lib\monetdb5;%PATH%
rem prepare the arguments to mserver5 to tell it where to put the dbfarm
diff --git a/sql/test/BugTracker-2025/Tests/7647-munion-optimizer-bug.test
b/sql/test/BugTracker-2025/Tests/7647-munion-optimizer-bug.test
--- a/sql/test/BugTracker-2025/Tests/7647-munion-optimizer-bug.test
+++ b/sql/test/BugTracker-2025/Tests/7647-munion-optimizer-bug.test
@@ -6,7 +6,7 @@ CREATE TABLE "test_bug_repro" (
"final_rank_driver_" BIGINT
)
-query I
+query I nosort
WITH "second_place_days" AS (
SELECT COUNT(DISTINCT "event_date_") AS "count" FROM "test_bug_repro" WHERE
"position_" = 2
),
@@ -29,3 +29,4 @@ WITH "second_place_days" AS (
SELECT COUNT(*) FROM "results"
----
3
+
diff --git a/sql/test/BugTracker-2025/Tests/7651-anti-join.test
b/sql/test/BugTracker-2025/Tests/7651-anti-join.test
--- a/sql/test/BugTracker-2025/Tests/7651-anti-join.test
+++ b/sql/test/BugTracker-2025/Tests/7651-anti-join.test
@@ -10,7 +10,8 @@ INSERT INTO t0(c0) VALUES(1)
statement ok
INSERT INTO t1(c0) VALUES(1)
-query I
-SELECT t0.c0 FROM t0 WHERE NOT EXISTS (SELECT 1 FROM t1 WHERE t0.c1);
+query I nosort
+SELECT t0.c0 FROM t0 WHERE NOT EXISTS (SELECT 1 FROM t1 WHERE t0.c1)
----
1
+
diff --git a/sql/test/BugTracker-2025/Tests/7652-anti-join-optimizer-bug.test
b/sql/test/BugTracker-2025/Tests/7652-anti-join-optimizer-bug.test
--- a/sql/test/BugTracker-2025/Tests/7652-anti-join-optimizer-bug.test
+++ b/sql/test/BugTracker-2025/Tests/7652-anti-join-optimizer-bug.test
@@ -8,6 +8,7 @@ SET "sql_optimizer"='0'
statement ok
INSERT INTO t0(c2, c0, c1) VALUES(45, 1, 1)
-query
+query II nosort
SELECT t0.c0, t0.c2 FROM t0 WHERE NOT EXISTS (SELECT 1 FROM (SELECT t0.c0) AS
subQuery(col_1) WHERE ( 1 AND ((t0.c0) IS NOT NULL)) )
----
+
diff --git
a/sql/test/BugTracker-2025/Tests/7674-rel_find_designated_index_crash.test
b/sql/test/BugTracker-2025/Tests/7674-rel_find_designated_index_crash.test
--- a/sql/test/BugTracker-2025/Tests/7674-rel_find_designated_index_crash.test
+++ b/sql/test/BugTracker-2025/Tests/7674-rel_find_designated_index_crash.test
@@ -34,3 +34,4 @@ DROP TABLE schema1.table1
statement ok
DROP SCHEMA schema1
+
diff --git a/sql/test/BugTracker-2025/Tests/7680-union-all.test
b/sql/test/BugTracker-2025/Tests/7680-union-all.test
--- a/sql/test/BugTracker-2025/Tests/7680-union-all.test
+++ b/sql/test/BugTracker-2025/Tests/7680-union-all.test
@@ -4,7 +4,7 @@ CREATE TABLE "cases" (caseid varchar(255
statement ok
INSERT INTO "cases" (caseid) VALUES ('DL1-1')
-query TT
+query TT nosort
SELECT
caseid as caseid,
caseid as "delivery.caseid"
@@ -23,10 +23,11 @@ SELECT
FROM
"cases"
order by caseid, "delivery.caseid"
------
+----
DL1-1
NULL
DL1-1
NULL
DL1-1
DL1-1
+
diff --git a/sql/test/BugTracker-2025/Tests/7682_trigger_crash.test
b/sql/test/BugTracker-2025/Tests/7682_trigger_crash.test
--- a/sql/test/BugTracker-2025/Tests/7682_trigger_crash.test
+++ b/sql/test/BugTracker-2025/Tests/7682_trigger_crash.test
@@ -22,3 +22,4 @@ CREATE OR REPLACE TRIGGER trigALogin AFT
statement ok
DROP TRIGGER trigALogin
+
diff --git a/sql/test/BugTracker-2025/Tests/7688_not_exists_null.test
b/sql/test/BugTracker-2025/Tests/7688_not_exists_null.test
--- a/sql/test/BugTracker-2025/Tests/7688_not_exists_null.test
+++ b/sql/test/BugTracker-2025/Tests/7688_not_exists_null.test
@@ -1,12 +1,12 @@
-
statement ok
create table a (i int, j int)
statement ok
insert into a values(0, 1), (2, 4)
-query II
+query II nosort
select * from (select cast(null as int), 0 ) b(i,j) where not exists (select 1
from a where a.i = b.i and a.j = b.j)
----
NULL
0
+
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
