MonetDB: default - Merge with Dec2023 branch.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 04b05307b761 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/04b05307b761
Branch: default
Log Message:

Merge with Dec2023 branch.


diffs (89 lines):

diff --git a/clients/odbc/driver/ODBCQueries.h 
b/clients/odbc/driver/ODBCQueries.h
--- a/clients/odbc/driver/ODBCQueries.h
+++ b/clients/odbc/driver/ODBCQueries.h
@@ -302,7 +302,7 @@
 
 #define CHAR_OCTET_LENGTH(t)   
\
"cast(case when " #t ".type in 
('varchar','clob','char','json','url','xml') "   \
-"then 4 * " #t ".type_digits " 
\
+"then 4 * cast(" #t ".type_digits as bigint) " 
\
 "when " #t ".type = 'blob' then " #t ".type_digits "   
\
-"else cast(null as integer) "  
\
+"else null "   
\
"end as integer) as \"CHAR_OCTET_LENGTH\""
diff --git a/clients/odbc/driver/SQLTables.c b/clients/odbc/driver/SQLTables.c
--- a/clients/odbc/driver/SQLTables.c
+++ b/clients/odbc/driver/SQLTables.c
@@ -222,8 +222,8 @@ MNDBTables(ODBCStmt *stmt,
}
buf[j] = 0;
/* Some ODBC applications use different 
table type names.
-* Replace those names to valid MonetDB 
table type names
-* as defined in sys.tables_types */
+* Replace some SQL synonyms to valid 
MonetDB
+* table type names as defined in 
sys.table_types */
if (strcmp("BASE TABLE", buf) == 0) {
strcpy(buf, "TABLE");
} else
diff --git a/monetdb5/modules/atoms/Tests/startswith.test 
b/monetdb5/modules/atoms/Tests/startswith.test
--- a/monetdb5/modules/atoms/Tests/startswith.test
+++ b/monetdb5/modules/atoms/Tests/startswith.test
@@ -90,4 +90,4 @@ drop table bar
 query T
 select ['Camón Romasan'] startsWith ['camu', true];
 
-false
+False
diff --git a/sql/test/sys-schema/Tests/All b/sql/test/sys-schema/Tests/All
--- a/sql/test/sys-schema/Tests/All
+++ b/sql/test/sys-schema/Tests/All
@@ -20,5 +20,3 @@ webExamplesStringFunctions
 webExamplesUrlFunctions
 
 utilities
-
-HAVE_JDBCCLIENT_JAR?ValidateSystemCatalogTables
diff --git a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py 
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
deleted file mode 100755
--- a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.SQL.py
+++ /dev/null
@@ -1,27 +0,0 @@
-import os, sys
-from subprocess import run, PIPE, CalledProcessError
-
-HOST=os.getenv('HOST')
-MAPIPORT=os.getenv('MAPIPORT')
-TSTDB=os.getenv('TSTDB')
-TSTSRCBASE=os.getenv('TSTSRCBASE')
-TSTDIR=os.getenv('TSTDIR')
-CLIENT='org.monetdb.client.JdbcClient'
-USER='monetdb'
-PASSWORD='monetdb'
-
-
-if __name__ == '__main__':
-with open(os.path.join('.monetdb'), 'w') as f:
-f.write('\n'.join(['user=monetdb', 'password=monetdb']))
-cmd = ['java', CLIENT, '-h', HOST, '-p', MAPIPORT, '-d', TSTDB, '-f', 
os.path.join(TSTSRCBASE, TSTDIR, 'Tests', 'ValidateSystemCatalogTables.sql')]
-try:
-p = run(cmd, stdout=PIPE, stderr=PIPE, check=True, encoding='utf-8')
-pout = str(p.stdout)
-if pout != "":
-print(pout)
-perr = str(p.stderr)
-if perr != "":
-print(perr)
-except CalledProcessError as e:
-raise SystemExit(e.stderr)
diff --git a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.sql 
b/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.sql
deleted file mode 100644
--- a/sql/test/sys-schema/Tests/ValidateSystemCatalogTables.sql
+++ /dev/null
@@ -1,7 +0,0 @@
-\vsci_noheader
-\vsni_noheader
-\vsgi_noheader
-\vsi_noheader sys
-\vsi_noheader tmp
-\vdbi_noheader
-
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Pre-release version number update.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: c4581101f855 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/c4581101f855
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Dec2023
Log Message:

Pre-release version number update.


diffs (191 lines):

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 11.49.0
+current_version = 11.49.1
 commit = False
 tag = False
 
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 
 %global name MonetDB
-%global version 11.49.0
+%global version 11.49.1
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,49,0)
-  PRODUCTVERSION version(11,49,0)
+  FILEVERSION version(11,49,1)
+  PRODUCTVERSION version(11,49,1)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-  VALUE "FileVersion", sversion(11,49,0)
+  VALUE "FileVersion", sversion(11,49,1)
   VALUE "InternalName", "Mapi\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "Mapi.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB Client Libraries\0"
-  VALUE "ProductVersion", sversion(11,49,0)
+  VALUE "ProductVersion", sversion(11,49,1)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,49,0)
-  PRODUCTVERSION version(11,49,0)
+  FILEVERSION version(11,49,1)
+  PRODUCTVERSION version(11,49,1)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-  VALUE "FileVersion", sversion(11,49,0)
+  VALUE "FileVersion", sversion(11,49,1)
   VALUE "InternalName", "MonetODBC\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "MonetODBC.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB SQL Server\0"
-  VALUE "ProductVersion", sversion(11,49,0)
+  VALUE "ProductVersion", sversion(11,49,1)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,49,0)
- PRODUCTVERSION version(11,49,0)
+ FILEVERSION version(11,49,1)
+ PRODUCTVERSION version(11,49,1)
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
 BEGIN
 VALUE "CompanyName", "MonetDB B.V."
 VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,49,0)
+VALUE "FileVersion", sversion(11,49,1)
 VALUE "InternalName", "MonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
 VALUE "OriginalFilename", "MonetODBCs.dll"
 VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,49,0)
+VALUE "ProductVersion", sversion(11,49,1)
 END
 END
 BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
 
 set(MONETDB_VERSION_MAJOR "11")
 set(MONETDB_VERSION_MINOR "49")
-set(MONETDB_VERSION_PATCH "0")
+set(MONETDB_VERSION_PATCH "1")
 
 if(RELEASE_VERSION)
-  set(MONETDB_RELEASE "unreleased")
+  set(MONETDB_RELEASE "Dec2023")
 endif()
 set(MONETDB_VERSION 
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
 
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +

MonetDB: default - Merge with Dec2023 branch, not changing any f...

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 88783135c608 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/88783135c608
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: default
Log Message:

Merge with Dec2023 branch, not changing any files.

___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Updated library versions.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: dc2b9bd91b40 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/dc2b9bd91b40
Added Files:
debian/libmonetdb28.install
Removed Files:
debian/libmonetdb27.install
Modified Files:
cmake/monetdb-versions.cmake
debian/control
Branch: Dec2023
Log Message:

Updated library versions.


diffs (137 lines):

diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -40,37 +40,37 @@ set(MONETDB_VERSION "${MONETDB_VERSION_M
 
 # version of the GDK library (subdirectory gdk; also includes
 # common/options and common/utils)
-set(GDK_VERSION_MAJOR "27")
+set(GDK_VERSION_MAJOR "28")
 set(GDK_VERSION_MINOR "0")
-set(GDK_VERSION_PATCH "7")
+set(GDK_VERSION_PATCH "0")
 set(GDK_VERSION 
"${GDK_VERSION_MAJOR}.${GDK_VERSION_MINOR}.${GDK_VERSION_PATCH}")
 
 # version of the MAPI library (subdirectory clients/mapilib)
 set(MAPI_VERSION_MAJOR "26")
-set(MAPI_VERSION_MINOR "1")
+set(MAPI_VERSION_MINOR "2")
 set(MAPI_VERSION_PATCH "0")
 set(MAPI_VERSION 
"${MAPI_VERSION_MAJOR}.${MAPI_VERSION_MINOR}.${MAPI_VERSION_PATCH}")
 
 # version of the MONETDB5 library (subdirectory monetdb5, not including extras 
or sql)
-set(MONETDB5_VERSION_MAJOR "34")
+set(MONETDB5_VERSION_MAJOR "35")
 set(MONETDB5_VERSION_MINOR "0")
-set(MONETDB5_VERSION_PATCH "4")
+set(MONETDB5_VERSION_PATCH "0")
 set(MONETDB5_VERSION 
"${MONETDB5_VERSION_MAJOR}.${MONETDB5_VERSION_MINOR}.${MONETDB5_VERSION_PATCH}")
 
 # version of the MONETDBE library (subdirectory tools/monetdbe)
 set(MONETDBE_VERSION_MAJOR "26")
 set(MONETDBE_VERSION_MINOR "0")
-set(MONETDBE_VERSION_PATCH "4")
+set(MONETDBE_VERSION_PATCH "5")
 set(MONETDBE_VERSION 
"${MONETDBE_VERSION_MAJOR}.${MONETDBE_VERSION_MINOR}.${MONETDBE_VERSION_PATCH}")
 
 # version of the STREAM library (subdirectory common/stream)
 set(STREAM_VERSION_MAJOR "26")
-set(STREAM_VERSION_MINOR "1")
+set(STREAM_VERSION_MINOR "2")
 set(STREAM_VERSION_PATCH "0")
 set(STREAM_VERSION 
"${STREAM_VERSION_MAJOR}.${STREAM_VERSION_MINOR}.${STREAM_VERSION_PATCH}")
 
 # version of the SQL library (subdirectory sql)
 set(SQL_VERSION_MAJOR "14")
-set(SQL_VERSION_MINOR "0")
-set(SQL_VERSION_PATCH "5")
+set(SQL_VERSION_MINOR "1")
+set(SQL_VERSION_PATCH "0")
 set(SQL_VERSION 
"${SQL_VERSION_MAJOR}.${SQL_VERSION_MINOR}.${SQL_VERSION_PATCH}")
diff --git a/debian/control b/debian/control
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 12), cmake 
  libcfitsio-dev, libssl-dev (>= 1.1.1)
 Standards-Version: 3.8.0
 
-Package: libmonetdb27
+Package: libmonetdb28
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libmonetdb-stream26 (= ${source:Version})
@@ -34,7 +34,7 @@ Description: MonetDB core library
 Package: libmonetdb-dev
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb27 (= ${source:Version}),
+ libmonetdb28 (= ${source:Version}),
  libmonetdb-stream-dev (= ${source:Version})
 Description: MonetDB development files
  MonetDB is a database management system that is developed from a
@@ -131,7 +131,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, libmonetdb-client-odbc (= ${source:Version}),
  libmonetdb-client26 (= ${source:Version}),
  libmonetdb-stream26 (= ${source:Version}),
- libmonetdb27 (= ${source:Version}),
+ libmonetdb28 (= ${source:Version}),
  monetdb5-server (= ${source:Version}),
  libdbd-monetdb-perl (>= 1.0),
  php-monetdb (>= 1.0),
@@ -151,7 +151,7 @@ Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  libmonetdb-stream26 (= ${source:Version}),
- libmonetdb27 (= ${source:Version}),
+ libmonetdb28 (= ${source:Version}),
  monetdb5-server (= ${source:Version})
 Description: MonetDB5 SQL GIS support module
  MonetDB is a database management system that is developed from a
@@ -166,7 +166,7 @@ Package: libmonetdb5-server-cfitsio
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb27 (= ${source:Version}),
+ libmonetdb28 (= ${source:Version}),
  monetdb5-server (= ${source:Version})
 Description: MonetDB5 add on module for FITS files
  MonetDB is a database management system that is developed from a
@@ -182,7 +182,7 @@ Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser,
  libmonetdb-client26 (= ${source:Version}),
  libmonetdb-stream26 (= ${source:Version}),
- libmonetdb27 (= ${source:Version}),
+ libmonetdb28 (= ${source:Version}),
 Recommends: monetdb5-sql (= ${source:Version})
 Suggests: monetdb-client (= ${source:Version})
 Conflicts: monetdb5-server-hugeint (<< 11.38.0)
@@ -245,7 +245,7 @@ Description: MonetDB SQL support for mon
 Package: monetdb-python3
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
- libmonetdb27 (= ${source:Version}),
+ libmonetdb28 (= ${source:Version}),
  monetdb5-server (= ${source:Version}), python3-numpy
 Description: Integration of MonetDB and Python, allowing use of Python from

MonetDB: Dec2023 - Moved contents of ChangeLog.Jun2023 and Chang...

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 1230526af30f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/1230526af30f
Removed Files:
ChangeLog.Jun2023
clients/ChangeLog.Jun2023
clients/mapilib/ChangeLog.Jun2023
clients/odbc/ChangeLog.Jun2023
common/stream/ChangeLog.Jun2023
gdk/ChangeLog.Jun2023
geom/ChangeLog.Jun2023
misc/ChangeLog.Jun2023
monetdb5/ChangeLog.Jun2023
sql/ChangeLog.Jun2023
testing/ChangeLog.Jun2023
tools/merovingian/ChangeLog.Jun2023
Modified Files:
ChangeLog-Archive
ChangeLog.Dec2023
MonetDB.spec
clients/mapiclient/mclient.1
clients/odbc/ChangeLog-Archive
clients/odbc/ChangeLog.Dec2023
debian/changelog
gdk/ChangeLog-Archive
gdk/ChangeLog.Dec2023
geom/ChangeLog-Archive
geom/ChangeLog.Dec2023
misc/packages/deb/changelog
misc/packages/rpm/changelog
monetdb5/ChangeLog-Archive
monetdb5/ChangeLog.Dec2023
sql/ChangeLog-Archive
sql/ChangeLog.Dec2023
tools/merovingian/client/monetdb.1
tools/merovingian/daemon/monetdbd.1.in
tools/mserver/mserver5.1.in
Branch: Dec2023
Log Message:

Moved contents of ChangeLog.Jun2023 and ChangeLog.Dec2023 to MonetDB.spec, 
debian/changelog and ChangeLog-Archive.


diffs (truncated from 2145 to 300 lines):

diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,28 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Dec  1 2023 Sjoerd Mullender  - 11.49.1-20231221
+- All binary packages are now signed with a new key with key fingerprint
+  DBCE 5625 94D7 1959 7B54  CE85 3F1A D47F 5521 A603.
+
+* Mon Oct 30 2023 Sjoerd Mullender  - 11.49.1-20231221
+- The ranges of merge partitions are now pushed down into the low
+  level GDK operations, giving them a handle to sometimes execute more
+  efficiently.
+
+* Thu Jul 27 2023 Niels Nes  - 11.49.1-20231221
+- Removed the PYTHON MAP external language option, as after a fork the
+  synchronization primitives could be in any state, leading to deadlocks.
+  During the upgrade function definitions will fallback to the normal
+  PYTHON language option.
+
+* Mon Jul 17 2023 Panagiotis Koutsourakis  - 
11.49.1-20231221
+- Implemented direct masking for strimp construction. The strimps
+  datastructure now keeps an array of 65K 64-bit integers that is zero
+  everywhere except at the indexes that correspond to header pairs. The
+  entry for the nth pair in order has the nth bit of the bitstring
+  on. These can be used to quickly construct bitstrings.
+
 * Fri Sep 29 2023 Sjoerd Mullender  - 11.47.11-20230929
 - Fixed an installation issue on Debian and Ubuntu introduced in the
   last build.
diff --git a/ChangeLog.Dec2023 b/ChangeLog.Dec2023
--- a/ChangeLog.Dec2023
+++ b/ChangeLog.Dec2023
@@ -1,24 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Fri Dec  1 2023 Sjoerd Mullender 
-- All binary packages are now signed with a new key with key fingerprint
-  DBCE 5625 94D7 1959 7B54  CE85 3F1A D47F 5521 A603.
-
-* Mon Oct 30 2023 Sjoerd Mullender 
-- The ranges of merge partitions are now pushed down into the low
-  level GDK operations, giving them a handle to sometimes execute more
-  efficiently.
-
-* Thu Jul 27 2023 Niels Nes 
-- Removed the PYTHON MAP external language option, as after a fork the
-  synchronization primitives could be in any state, leading to deadlocks.
-  During the upgrade function definitions will fallback to the normal
-  PYTHON language option.
-
-* Mon Jul 17 2023 Panagiotis Koutsourakis 
-- Implemented direct masking for strimp construction. The strimps
-  datastructure now keeps an array of 65K 64-bit integers that is zero
-  everywhere except at the indexes that correspond to header pairs. The
-  entry for the nth pair in order has the nth bit of the bitstring
-  on. These can be used to quickly construct bitstrings.
diff --git a/ChangeLog.Jun2023 b/ChangeLog.Jun2023
deleted file mode 100644
--- a/ChangeLog.Jun2023
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
 License: MPL-2.0
 URL: https://www.monetdb.org/
 BugURL: https://github.com/MonetDB/MonetDB/issues
-Source: 
https://www.monetdb.org/downloads/sources/Jun2023-SP3/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Dec2023/%{name}-%{version}.tar.bz2
 
 # The Fedora packaging document says we need systemd-rpm-macros for
 # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -915,6 +915,158 @@ fi
 %endif
 
 %changelog
+* Thu Dec 21 2023 Sjoerd Mullender  - 11.49.1-20231221
+- Rebuilt.
+- GH#6933: Add support for scalar function IFNULL(expr1, expr2)
+- GH#7044: Improve

MonetDB: Dec2023 - Setting tag Dec2023_1 for the release build.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: b79a1d3798b9 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b79a1d3798b9
Modified Files:
.hgtags
Branch: Dec2023
Log Message:

Setting tag Dec2023_1 for the release build.


diffs (8 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -818,3 +818,4 @@ 5683fd900f28d65ad7c98d1ed1efd992023a7fa4
 c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: default - Merge with Dec2023 branch.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 87e9f956e042 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/87e9f956e042
Modified Files:
MonetDB.spec
cmake/monetdb-versions.cmake
debian/control
Branch: default
Log Message:

Merge with Dec2023 branch.


diffs (truncated from 2290 to 300 lines):

diff --git a/.hgtags b/.hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -818,3 +818,4 @@ 5683fd900f28d65ad7c98d1ed1efd992023a7fa4
 c5b17681b55e6ca155db28be59913699e561502a Dec2023_root
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_17
 c9e6096e7519636a4e840c7a0c2e27cccb7dc0fe Jun2023_SP3_release
+1230526af30f40eeea30fb87c47c3e414920561f Dec2023_1
diff --git a/ChangeLog-Archive b/ChangeLog-Archive
--- a/ChangeLog-Archive
+++ b/ChangeLog-Archive
@@ -1,6 +1,28 @@
 # DO NOT EDIT THIS FILE -- MAINTAINED AUTOMATICALLY
 # This file contains past ChangeLog entries
 
+* Fri Dec  1 2023 Sjoerd Mullender  - 11.49.1-20231221
+- All binary packages are now signed with a new key with key fingerprint
+  DBCE 5625 94D7 1959 7B54  CE85 3F1A D47F 5521 A603.
+
+* Mon Oct 30 2023 Sjoerd Mullender  - 11.49.1-20231221
+- The ranges of merge partitions are now pushed down into the low
+  level GDK operations, giving them a handle to sometimes execute more
+  efficiently.
+
+* Thu Jul 27 2023 Niels Nes  - 11.49.1-20231221
+- Removed the PYTHON MAP external language option, as after a fork the
+  synchronization primitives could be in any state, leading to deadlocks.
+  During the upgrade function definitions will fallback to the normal
+  PYTHON language option.
+
+* Mon Jul 17 2023 Panagiotis Koutsourakis  - 
11.49.1-20231221
+- Implemented direct masking for strimp construction. The strimps
+  datastructure now keeps an array of 65K 64-bit integers that is zero
+  everywhere except at the indexes that correspond to header pairs. The
+  entry for the nth pair in order has the nth bit of the bitstring
+  on. These can be used to quickly construct bitstrings.
+
 * Fri Sep 29 2023 Sjoerd Mullender  - 11.47.11-20230929
 - Fixed an installation issue on Debian and Ubuntu introduced in the
   last build.
diff --git a/ChangeLog.Dec2023 b/ChangeLog.Dec2023
--- a/ChangeLog.Dec2023
+++ b/ChangeLog.Dec2023
@@ -1,24 +1,3 @@
 # ChangeLog file for devel
 # This file is updated with Maddlog
 
-* Fri Dec  1 2023 Sjoerd Mullender 
-- All binary packages are now signed with a new key with key fingerprint
-  DBCE 5625 94D7 1959 7B54  CE85 3F1A D47F 5521 A603.
-
-* Mon Oct 30 2023 Sjoerd Mullender 
-- The ranges of merge partitions are now pushed down into the low
-  level GDK operations, giving them a handle to sometimes execute more
-  efficiently.
-
-* Thu Jul 27 2023 Niels Nes 
-- Removed the PYTHON MAP external language option, as after a fork the
-  synchronization primitives could be in any state, leading to deadlocks.
-  During the upgrade function definitions will fallback to the normal
-  PYTHON language option.
-
-* Mon Jul 17 2023 Panagiotis Koutsourakis 
-- Implemented direct masking for strimp construction. The strimps
-  datastructure now keeps an array of 65K 64-bit integers that is zero
-  everywhere except at the indexes that correspond to header pairs. The
-  entry for the nth pair in order has the nth bit of the bitstring
-  on. These can be used to quickly construct bitstrings.
diff --git a/ChangeLog.Jun2023 b/ChangeLog.Jun2023
deleted file mode 100644
--- a/ChangeLog.Jun2023
+++ /dev/null
@@ -1,3 +0,0 @@
-# ChangeLog file for devel
-# This file is updated with Maddlog
-
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -89,7 +89,7 @@ Group: Applications/Databases
 License: MPL-2.0
 URL: https://www.monetdb.org/
 BugURL: https://github.com/MonetDB/MonetDB/issues
-Source: 
https://www.monetdb.org/downloads/sources/Jun2023-SP3/%{name}-%{version}.tar.bz2
+Source: 
https://www.monetdb.org/downloads/sources/Dec2023/%{name}-%{version}.tar.bz2
 
 # The Fedora packaging document says we need systemd-rpm-macros for
 # the _unitdir and _tmpfilesdir macros to exist; however on RHEL 7
@@ -915,6 +915,158 @@ fi
 %endif
 
 %changelog
+* Thu Dec 21 2023 Sjoerd Mullender  - 11.49.1-20231221
+- Rebuilt.
+- GH#6933: Add support for scalar function IFNULL(expr1, expr2)
+- GH#7044: Improve error message regarding 3-level SQL names
+- GH#7261: Misleading error message
+- GH#7274: Aggregate function ST_Collect crashes mserver5
+- GH#7376: Concurrency Issue: Second Python UDF Awaits Completion of First
+  UDF
+- GH#7391: SQL 2023 : greatest/least functions with unlimited arguments
+  (not only 2)
+- GH#7403: Join not recognized between two row_number() columns
+- GH#7413: MonetDB server crashes in `BATcalcbetween_intern`
+
+* Tue Dec 19 2023 Sjoerd Mullender  - 11.49.1-20231221
+- monetdb5: Removed MAL functions bat.reuse and bat.reuseMap.
+
+* Tue Dec 12 2023 Lucas Pereira  - 
11.49.1-20231221
+- gdk: Introduced options wal_max_dropped, wal_max_file_age and
+  wal_max_file_size that control the write-ahead log file rotation.
+
+* Wed Dec

MonetDB: Dec2023 - Post release build.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 4937cae438ee for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/4937cae438ee
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: Dec2023
Log Message:

Post release build.


diffs (191 lines):

diff --git a/.bumpversion.cfg b/.bumpversion.cfg
--- a/.bumpversion.cfg
+++ b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 11.49.1
+current_version = 11.49.2
 commit = False
 tag = False
 
diff --git a/MonetDB.spec b/MonetDB.spec
--- a/MonetDB.spec
+++ b/MonetDB.spec
@@ -7,7 +7,7 @@
 # Copyright 1997 - July 2008 CWI, August 2008 - 2023 MonetDB B.V.
 
 %global name MonetDB
-%global version 11.49.1
+%global version 11.49.2
 %{!?buildno: %global buildno %(date +%Y%m%d)}
 
 # Use bcond_with to add a --with option; i.e., "without" is default.
diff --git a/clients/mapilib/mapi.rc b/clients/mapilib/mapi.rc
--- a/clients/mapilib/mapi.rc
+++ b/clients/mapilib/mapi.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,49,1)
-  PRODUCTVERSION version(11,49,1)
+  FILEVERSION version(11,49,2)
+  PRODUCTVERSION version(11,49,2)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB Application Interface DLL\0"
-  VALUE "FileVersion", sversion(11,49,1)
+  VALUE "FileVersion", sversion(11,49,2)
   VALUE "InternalName", "Mapi\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "Mapi.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB Client Libraries\0"
-  VALUE "ProductVersion", sversion(11,49,1)
+  VALUE "ProductVersion", sversion(11,49,2)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/driver/driver.rc b/clients/odbc/driver/driver.rc
--- a/clients/odbc/driver/driver.rc
+++ b/clients/odbc/driver/driver.rc
@@ -6,8 +6,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
 #define sversion(major,minor,patch)#major "." #minor "." #patch "\0"
 
 1 VERSIONINFO
-  FILEVERSION version(11,49,1)
-  PRODUCTVERSION version(11,49,1)
+  FILEVERSION version(11,49,2)
+  PRODUCTVERSION version(11,49,2)
   FILEFLAGSMASK 0x3fL
   FILEFLAGS 0
   FILEOS VOS_NT_WINDOWS32
@@ -21,14 +21,14 @@ BEGIN
   VALUE "Comments", "\0"
   VALUE "CompanyName", "MonetDB B.V.\0"
   VALUE "FileDescription", "MonetDB ODBC Driver DLL\0"
-  VALUE "FileVersion", sversion(11,49,1)
+  VALUE "FileVersion", sversion(11,49,2)
   VALUE "InternalName", "MonetODBC\0"
   VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023\0"
   VALUE "LegalTrademarks", "\0"
   VALUE "OriginalFilename", "MonetODBC.dll\0"
   VALUE "PrivateBuild", "\0"
   VALUE "ProductName", "MonetDB SQL Server\0"
-  VALUE "ProductVersion", sversion(11,49,1)
+  VALUE "ProductVersion", sversion(11,49,2)
   VALUE "SpecialBuild", "\0"
 END
   END
diff --git a/clients/odbc/winsetup/setup.rc b/clients/odbc/winsetup/setup.rc
--- a/clients/odbc/winsetup/setup.rc
+++ b/clients/odbc/winsetup/setup.rc
@@ -65,8 +65,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION version(11,49,1)
- PRODUCTVERSION version(11,49,1)
+ FILEVERSION version(11,49,2)
+ PRODUCTVERSION version(11,49,2)
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -83,12 +83,12 @@ BEGIN
 BEGIN
 VALUE "CompanyName", "MonetDB B.V."
 VALUE "FileDescription", "MonetDB ODBC Setup DLL"
-VALUE "FileVersion", sversion(11,49,1)
+VALUE "FileVersion", sversion(11,49,2)
 VALUE "InternalName", "MonetODBCs.dll"
 VALUE "LegalCopyright", "Copyright (c) MonetDB B.V. 2008-2023"
 VALUE "OriginalFilename", "MonetODBCs.dll"
 VALUE "ProductName", "MonetDB SQL Server"
-VALUE "ProductVersion", sversion(11,49,1)
+VALUE "ProductVersion", sversion(11,49,2)
 END
 END
 BLOCK "VarFileInfo"
diff --git a/cmake/monetdb-versions.cmake b/cmake/monetdb-versions.cmake
--- a/cmake/monetdb-versions.cmake
+++ b/cmake/monetdb-versions.cmake
@@ -10,10 +10,10 @@
 
 set(MONETDB_VERSION_MAJOR "11")
 set(MONETDB_VERSION_MINOR "49")
-set(MONETDB_VERSION_PATCH "1")
+set(MONETDB_VERSION_PATCH "2")
 
 if(RELEASE_VERSION)
-  set(MONETDB_RELEASE "Dec2023")
+  set(MONETDB_RELEASE "unreleased")
 endif()
 set(MONETDB_VERSION 
"${MONETDB_VERSION_MAJOR}.${MONETDB_VERSION_MINOR}.${MONETDB_VERSION_PATCH}")
 
diff --git a/gdk/libbat.rc b/gdk/libbat.rc
--- a/gdk/libbat.rc
+++ b/gdk/libbat.rc
@@ -6,8 +6,8 @@ LANGUAGE

MonetDB: default - Merge with Dec2023 branch, not changing any f...

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 8bb8976fac2c for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/8bb8976fac2c
Modified Files:
.bumpversion.cfg
MonetDB.spec
clients/mapilib/mapi.rc
clients/odbc/driver/driver.rc
clients/odbc/winsetup/setup.rc
cmake/monetdb-versions.cmake
gdk/libbat.rc
monetdb5/tools/libmonetdb5.rc
Branch: default
Log Message:

Merge with Dec2023 branch, not changing any files..

___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Correct typo

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: fed0c93e0419 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/fed0c93e0419
Modified Files:
geom/ChangeLog-Archive
Branch: Dec2023
Log Message:

Correct typo


diffs (12 lines):

diff --git a/geom/ChangeLog-Archive b/geom/ChangeLog-Archive
--- a/geom/ChangeLog-Archive
+++ b/geom/ChangeLog-Archive
@@ -15,7 +15,7 @@
   used in the implementation of the filter functions ST_Intersects and
   ST_Dwithin for geometric points.
 - Improves shapefile support by replacing functions SHPattach,
-  SHPpartialimport, ahd SHPimport with SHPload.
+  SHPpartialimport, and SHPimport with SHPload.
 - Introduces functions ST_DistanceGeographic, ST_DwithinGeographic,
   ST_IntersectsGeographic, ST_CoversGeographic, ST_Collects with geodesic
   semantics. ST_Transform can be used to convert geodetic into geographic
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

monetdb-java: default - There is no MCL_{MAJOR,MINOR} to replace.

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 6c2aa6fb034e for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/6c2aa6fb034e
Modified Files:
build.xml
build_jre17.xml
Branch: default
Log Message:

There is no MCL_{MAJOR,MINOR} to replace.


diffs (24 lines):

diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -253,8 +253,6 @@ Copyright 1997 - July 2008 CWI, August 2
 
 
 
-
-
 
 
 
diff --git a/build_jre17.xml b/build_jre17.xml
--- a/build_jre17.xml
+++ b/build_jre17.xml
@@ -256,8 +256,6 @@ Copyright 1997 - July 2008 CWI, August 2
 
 
 
-
-
 
 
 
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

monetdb-java: default - No need to create MonetVersion.java befo...

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: a03de7b24ae8 for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/a03de7b24ae8
Modified Files:
Makefile
Branch: default
Log Message:

No need to create MonetVersion.java before running ant.


diffs (19 lines):

diff --git a/Makefile b/Makefile
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-all: src/main/java/org/monetdb/jdbc/MonetVersion.java
+all: src/main/java/org/monetdb/jdbc/MonetVersion.java.in
ant -f build.xml distjdbc distmerocontrol
cd tests; ant -f build.xml jar_jdbctests
 
@@ -7,9 +7,6 @@ jre17jars: src/main/java/org/monetdb/jdb
ant -f build_jre17.xml distjdbc
rm -rf build
 
-src/main/java/org/monetdb/jdbc/MonetVersion.java: build.properties 
src/main/java/org/monetdb/jdbc/MonetVersion.java.in
-   . ./build.properties; sed -e 
"s/@JDBC_MAJOR@/$$JDBC_MAJOR/g;s/@JDBC_MINOR@/$$JDBC_MINOR/g;s/@JDBC_VER_SUFFIX@/$$JDBC_VER_SUFFIX
 $$buildno/g" src/main/java/org/monetdb/jdbc/MonetVersion.java.in > 
src/main/java/org/monetdb/jdbc/MonetVersion.java
-
 testsjar:
cd tests; ant -f build.xml jar_jdbctests
 
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

monetdb-java: default - Remove last references to MCL_MAJOR and ...

2023-12-21 Thread Sjoerd Mullender via checkin-list 
Changeset: 5f3e19ef251a for monetdb-java
URL: https://dev.monetdb.org/hg/monetdb-java/rev/5f3e19ef251a
Modified Files:
build.xml
build_jre17.xml
Branch: default
Log Message:

Remove last references to MCL_MAJOR and MCL_MINOR.


diffs (24 lines):

diff --git a/build.xml b/build.xml
--- a/build.xml
+++ b/build.xml
@@ -49,8 +49,6 @@ Copyright 1997 - July 2008 CWI, August 2
 value="${jardir}/jdbcclient.${jre.version}.jar" />
   
-  
   
 
diff --git a/build_jre17.xml b/build_jre17.xml
--- a/build_jre17.xml
+++ b/build_jre17.xml
@@ -52,8 +52,6 @@ Copyright 1997 - July 2008 CWI, August 2
 value="${jardir}/jdbcclient.${jre.version}.jar" />
   
-  
   
 
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Add tests for request 7391

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: de4028931ba3 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/de4028931ba3
Added Files:
sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
Modified Files:
sql/test/BugTracker-2023/Tests/All
Branch: Dec2023
Log Message:

Add tests for request 7391


diffs (72 lines):

diff --git a/sql/test/BugTracker-2023/Tests/All 
b/sql/test/BugTracker-2023/Tests/All
--- a/sql/test/BugTracker-2023/Tests/All
+++ b/sql/test/BugTracker-2023/Tests/All
@@ -10,6 +10,7 @@ rollback-alter-drop-col-crash-7385
 view-on-alias-crash-7386
 alter-inc-seq-crash-7387
 misc-crashes-7390
+greatest-least-multi-arg-7391
 union-query-7401
 join-on-row_number-over-7403
 between-crash-7413
diff --git a/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test 
b/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
@@ -0,0 +1,56 @@
+query I
+SELECT greatest(3, 4, 2, 1);
+
+4
+
+query I
+SELECT least(3, 4, 2, 1);
+
+1
+
+query I
+SELECT greatest(3, 4, '0', '5');
+
+5
+
+query I
+SELECT least(3, 4, 1, 2, '0', '5');
+
+0
+
+query R
+SELECT greatest(3.321, 4.4321, '0.210', '5.54321', -6.54321);
+
+5.543
+
+query R
+SELECT least(3.321, 4.4321, '0.210', '5.54321', -6.54321);
+
+-6.543
+
+statement error conversion of string 'A' to type bte failed.
+SELECT greatest(3, 4, '0', '5', 'A', 'z');
+
+statement error conversion of string 'A' to type bte failed.
+SELECT least(3, 4, 1, 2, '0', '5', 'A', 'z');
+
+query T
+SELECT greatest('!', 3, 4, '0', '5', 'A', 'z');
+
+z
+
+query T
+SELECT least('!', 3, 4, 1, 2, '0', '5', 'A', 'z');
+
+!
+
+query T
+SELECT greatest('!', 'z3', 'z4', 'z0', 'z5', 'A', 'z');
+
+z5
+
+query T
+SELECT least('!z3', '!z4', '!0', '!5', 'A', 'z');
+
+!0
+
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Add tests for request 6933

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: 43f5390a57d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/43f5390a57d0
Added Files:
sql/test/BugTracker-2023/Tests/ifnull-6933.test
Modified Files:
sql/test/BugTracker-2023/Tests/All
Branch: Dec2023
Log Message:

Add tests for request 6933


diffs (53 lines):

diff --git a/sql/test/BugTracker-2023/Tests/All 
b/sql/test/BugTracker-2023/Tests/All
--- a/sql/test/BugTracker-2023/Tests/All
+++ b/sql/test/BugTracker-2023/Tests/All
@@ -1,3 +1,4 @@
+ifnull-6933
 ambiguous-identifiers-7372
 temp-table-foreign-key-crash-7378
 update-mask-id-crash-7379
diff --git a/sql/test/BugTracker-2023/Tests/ifnull-6933.test 
b/sql/test/BugTracker-2023/Tests/ifnull-6933.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2023/Tests/ifnull-6933.test
@@ -0,0 +1,40 @@
+statement ok
+create unlogged table t6933 (i int, c varchar(8));
+
+statement ok
+insert into t6933 values (1, 'aa1'), (2, null), (null, 'bb2'), (null, null);
+
+query ITTTIT
+select i, c, IFNULL(i, c) as "IFNULL(i,c)", IFNULL(c, i) as "IFNULL(c,i)", 
ifnull(i, 999) as "ifnull(i,999)", ifnull(c, 'has null') as "ifnull(c,'x')" 
from t6933;
+
+1
+aa1
+1
+aa1
+1
+aa1
+2
+NULL
+2
+2
+2
+has null
+NULL
+bb2
+bb2
+bb2
+999
+bb2
+NULL
+NULL
+NULL
+NULL
+999
+has null
+
+statement error syntax error, unexpected ',', expecting ')' or OR in: "select 
i, c, ifnull(i, c,"
+select i, c, IFNULL(i, c, 999) as "IFNULL(i,c,999)" from t6933;
+
+statement ok
+drop table t6933;
+
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Add test for geom issue 7274

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: 760922b8fe99 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/760922b8fe99
Added Files:
sql/test/BugTracker-2023/Tests/empty-result-aggr-crash-7274.test
Modified Files:
sql/test/BugTracker-2023/Tests/All
Branch: Dec2023
Log Message:

Add test for geom issue 7274


diffs (30 lines):

diff --git a/sql/test/BugTracker-2023/Tests/All 
b/sql/test/BugTracker-2023/Tests/All
--- a/sql/test/BugTracker-2023/Tests/All
+++ b/sql/test/BugTracker-2023/Tests/All
@@ -1,4 +1,5 @@
 ifnull-6933
+HAVE_GEOM?empty-result-aggr-crash-7274
 ambiguous-identifiers-7372
 temp-table-foreign-key-crash-7378
 update-mask-id-crash-7379
diff --git a/sql/test/BugTracker-2023/Tests/empty-result-aggr-crash-7274.test 
b/sql/test/BugTracker-2023/Tests/empty-result-aggr-crash-7274.test
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2023/Tests/empty-result-aggr-crash-7274.test
@@ -0,0 +1,16 @@
+statement ok
+START TRANSACTION
+
+statement ok
+CREATE TABLE t7274 ( "id" INTEGER, "g"  GEOMETRY )
+
+query IT
+select id, st_collect(g) as g from t7274  where false  group by id
+
+
+statement ok
+create table t7274b as  select id, st_collect(g) as g from t7274  where false  
group by id
+
+statement ok
+ROLLBACK
+
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Remove trailing ; from SQL statements

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: f61a60b61e09 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/f61a60b61e09
Modified Files:
sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
sql/test/BugTracker-2023/Tests/ifnull-6933.test
sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
Branch: Dec2023
Log Message:

Remove trailing ; from SQL statements


diffs (162 lines):

diff --git a/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test 
b/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
--- a/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
+++ b/sql/test/BugTracker-2023/Tests/greatest-least-multi-arg-7391.test
@@ -1,56 +1,56 @@
 query I
-SELECT greatest(3, 4, 2, 1);
+SELECT greatest(3, 4, 2, 1)
 
 4
 
 query I
-SELECT least(3, 4, 2, 1);
+SELECT least(3, 4, 2, 1)
 
 1
 
 query I
-SELECT greatest(3, 4, '0', '5');
+SELECT greatest(3, 4, '0', '5')
 
 5
 
 query I
-SELECT least(3, 4, 1, 2, '0', '5');
+SELECT least(3, 4, 1, 2, '0', '5')
 
 0
 
 query R
-SELECT greatest(3.321, 4.4321, '0.210', '5.54321', -6.54321);
+SELECT greatest(3.321, 4.4321, '0.210', '5.54321', -6.54321)
 
 5.543
 
 query R
-SELECT least(3.321, 4.4321, '0.210', '5.54321', -6.54321);
+SELECT least(3.321, 4.4321, '0.210', '5.54321', -6.54321)
 
 -6.543
 
 statement error conversion of string 'A' to type bte failed.
-SELECT greatest(3, 4, '0', '5', 'A', 'z');
+SELECT greatest(3, 4, '0', '5', 'A', 'z')
 
 statement error conversion of string 'A' to type bte failed.
-SELECT least(3, 4, 1, 2, '0', '5', 'A', 'z');
+SELECT least(3, 4, 1, 2, '0', '5', 'A', 'z')
 
 query T
-SELECT greatest('!', 3, 4, '0', '5', 'A', 'z');
+SELECT greatest('!', 3, 4, '0', '5', 'A', 'z')
 
 z
 
 query T
-SELECT least('!', 3, 4, 1, 2, '0', '5', 'A', 'z');
+SELECT least('!', 3, 4, 1, 2, '0', '5', 'A', 'z')
 
 !
 
 query T
-SELECT greatest('!', 'z3', 'z4', 'z0', 'z5', 'A', 'z');
+SELECT greatest('!', 'z3', 'z4', 'z0', 'z5', 'A', 'z')
 
 z5
 
 query T
-SELECT least('!z3', '!z4', '!0', '!5', 'A', 'z');
+SELECT least('!z3', '!z4', '!0', '!5', 'A', 'z')
 
 !0
 
diff --git a/sql/test/BugTracker-2023/Tests/ifnull-6933.test 
b/sql/test/BugTracker-2023/Tests/ifnull-6933.test
--- a/sql/test/BugTracker-2023/Tests/ifnull-6933.test
+++ b/sql/test/BugTracker-2023/Tests/ifnull-6933.test
@@ -1,11 +1,11 @@
 statement ok
-create unlogged table t6933 (i int, c varchar(8));
+create unlogged table t6933 (i int, c varchar(8))
 
 statement ok
-insert into t6933 values (1, 'aa1'), (2, null), (null, 'bb2'), (null, null);
+insert into t6933 values (1, 'aa1'), (2, null), (null, 'bb2'), (null, null)
 
 query ITTTIT
-select i, c, IFNULL(i, c) as "IFNULL(i,c)", IFNULL(c, i) as "IFNULL(c,i)", 
ifnull(i, 999) as "ifnull(i,999)", ifnull(c, 'has null') as "ifnull(c,'x')" 
from t6933;
+select i, c, IFNULL(i, c) as "IFNULL(i,c)", IFNULL(c, i) as "IFNULL(c,i)", 
ifnull(i, 999) as "ifnull(i,999)", ifnull(c, 'has null') as "ifnull(c,'x')" 
from t6933
 
 1
 aa1
@@ -33,8 +33,8 @@ 999
 has null
 
 statement error syntax error, unexpected ',', expecting ')' or OR in: "select 
i, c, ifnull(i, c,"
-select i, c, IFNULL(i, c, 999) as "IFNULL(i,c,999)" from t6933;
+select i, c, IFNULL(i, c, 999) as "IFNULL(i,c,999)" from t6933
 
 statement ok
-drop table t6933;
+drop table t6933
 
diff --git a/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test 
b/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
--- a/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
+++ b/sql/test/BugTracker-2023/Tests/misc-crashes-7390.test
@@ -33,7 +33,7 @@ SELECT * FROM v0
 NULL
 
 query I
-SELECT row_number ( ) OVER ( ORDER BY 10 * 10 , ( CASE WHEN ( 10 IS NULL ) 
THEN 4 ELSE 10 END ) DESC NULLS FIRST ) FROM v0;
+SELECT row_number ( ) OVER ( ORDER BY 10 * 10 , ( CASE WHEN ( 10 IS NULL ) 
THEN 4 ELSE 10 END ) DESC NULLS FIRST ) FROM v0
 
 1
 
@@ -75,7 +75,7 @@ 122500
 5
 
 statement ok
-DROP TABLE v0;
+DROP TABLE v0
 
 -- 05.sql
 statement ok
@@ -173,10 +173,10 @@ DROP TABLE v0
 
 -- 11.sql
 statement ok
-CREATE TABLE v0(v1 BIGINT UNIQUE PRIMARY KEY);
+CREATE TABLE v0(v1 BIGINT UNIQUE PRIMARY KEY)
 
 statement error 42000!PARTITION BY: subqueries not allowed in PARTITION BY 
clause
-UPDATE v0 SET v1 = v1 * 73 WHERE v1 = (SELECT SUM(v1) OVER (PARTITION BY 52, 
(NOT EXISTS (SELECT 0 + (SELECT v1 WHERE v1 * v1 * v1 GROUP BY v1) AS v3 WHERE 
v1 = 'x' OR 'x' OR v1)), v1, 37 ORDER BY v1 NULLS LAST) IS NOT NULL AS v2 GROUP 
BY v1 HAVING v1 > 'x') AND NOT ((v1 = 66 AND v1 < 'x') AND v1 = 50) AND 35 >= 
65;
+UPDATE v0 SET v1 = v1 * 73 WHERE v1 = (SELECT SUM(v1) OVER (PARTITION BY 52, 
(NOT EXISTS (SELECT 0 + (SELECT v1 WHERE v1 * v1 * v1 GROUP BY v1) AS v3 WHERE 
v1 = 'x' OR 'x' OR v1)), v1, 37 ORDER BY v1 NULLS LAST) IS NOT NULL AS v2 GROUP 
BY v1 HAVING v1 > 'x') AND NOT ((v1 = 66 AND v1 < 'x') AND v1 = 50) AND 35 >= 65
 
 statement ok
 DROP TABLE v0
@@ -189,7 +189,7 @@ statement ok
 INSERT INTO v0 (v1) VALUES (2),(10),(99),(1.10)

MonetDB: Dec2023 - Add cleanup

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: 385cd616e00a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/385cd616e00a
Modified Files:
sql/test/BugTracker-2023/Tests/between-crash-7413.test
Branch: Dec2023
Log Message:

Add cleanup


diffs (10 lines):

diff --git a/sql/test/BugTracker-2023/Tests/between-crash-7413.test 
b/sql/test/BugTracker-2023/Tests/between-crash-7413.test
--- a/sql/test/BugTracker-2023/Tests/between-crash-7413.test
+++ b/sql/test/BugTracker-2023/Tests/between-crash-7413.test
@@ -7,3 +7,6 @@ INSERT INTO v0 (v1) VALUES (NULL) , (3) 
 statement ok
 DELETE FROM v0 WHERE v1 <= (SELECT 2 AS zero WHERE (v1 BETWEEN 1 AND (SELECT 
MAX (v1) FROM v0 name)) >= v1)
 
+statement ok
+DROP TABLE v0
+
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org

MonetDB: Dec2023 - Improve text

2023-12-21 Thread Martin van Dinther via checkin-list 
Changeset: 7ad54bfd8c3f for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/7ad54bfd8c3f
Modified Files:
sql/ChangeLog-Archive
Branch: Dec2023
Log Message:

Improve text


diffs (16 lines):

diff --git a/sql/ChangeLog-Archive b/sql/ChangeLog-Archive
--- a/sql/ChangeLog-Archive
+++ b/sql/ChangeLog-Archive
@@ -3,9 +3,9 @@
 
 * Tue Dec  5 2023 Lucas Pereira  - 
11.49.1-20231221
 - Introduction of table returning function `persist_unlogged(schema
-  string, table string)` that attempts to persist data in disk if
-  "schema"."table" is unlogged table in insert only mode.  If persist
-  attempt is successful, the count of the persisted rows is returned,
+  string, table string)` that attempts to persist data to disk if the
+  "schema"."table" is an unlogged table and set to insert only mode.  If
+  persist attempt is successful, the count of persisted rows is returned,
   otherwise the count is 0.
 
 * Thu Aug 24 2023 Martin van Dinther  
- 11.49.1-20231221
___
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org