You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by ko...@apache.org on 2022/12/05 13:01:48 UTC
svn commit: r1905758 - in /subversion/branches/pristines-on-demand-on-mwf: INSTALL build/generator/gen_win_dependencies.py configure.ac get-deps.sh subversion/libsvn_subr/sqlite.c subversion/libsvn_wc/wc-queries.sql
Author: kotkov
Date: Mon Dec 5 13:01:48 2022
New Revision: 1905758
URL: http://svn.apache.org/viewvc?rev=1905758&view=rev
Log:
On the 'pristines-on-demand-on-mwf' branch: Bump the minimum required
SQLite version to 3.24.0, as that is required for UPSERT syntax [1].
Bump the recommended version to the latest available 3.39.x patch version,
which is 3.39.4.
[1] https://www.sqlite.org/lang_UPSERT.html
* subversion/libsvn_subr/sqlite.c
(): Bump minimum required SQLite version to 3.24.0.
* subversion/libsvn_wc/wc-queries.sql
(): Remove a TODO comment.
* build/generator/gen_win_dependencies.py
(_find_sqlite): Bump minimum required SQLite version to 3.24.0.
* configure.ac
(SQLITE_MINIMUM_VER): Bump to 3.24.0.
(SQLITE_RECOMMENDED_VER): Bump to 3.39.4.
(SQLITE_RECOMMENDED_VER_REL_YEAR): Change to 2022.
* get-deps.sh
(SQLITE_VERSION): Bump to 3.39.4.
(SQLITE_VERSION_REL_YEAR): Change to 2022.
* INSTALL
(C.2.SQLite): Bump minimum required SQLite version to 3.24.0.
(E.1.Prerequisites): Bump the minimum and recommended SQLite versions.
Modified:
subversion/branches/pristines-on-demand-on-mwf/INSTALL
subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py
subversion/branches/pristines-on-demand-on-mwf/configure.ac
subversion/branches/pristines-on-demand-on-mwf/get-deps.sh
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/sqlite.c
subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-queries.sql
Modified: subversion/branches/pristines-on-demand-on-mwf/INSTALL
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/INSTALL?rev=1905758&r1=1905757&r2=1905758&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/INSTALL (original)
+++ subversion/branches/pristines-on-demand-on-mwf/INSTALL Mon Dec 5 13:01:48 2022
@@ -262,7 +262,7 @@ I. INTRODUCTION
2. SQLite (REQUIRED)
- Subversion requires SQLite version 3.8.2 or above. You can meet this
+ Subversion requires SQLite version 3.24.0 or above. You can meet this
dependency several ways:
* Use an SQLite amalgamation file.
* Specify an SQLite installation to use.
@@ -841,8 +841,8 @@ II. INSTALLATION
1.4 or later (1.2 for apr-iconv). If you are building from a Subversion
checkout and have not downloaded Apache 2, then get these 3 libraries
from https://www.apache.org/dist/apr/.
- * SQLite 3.8.2 or higher from https://www.sqlite.org/download.html
- (3.8.11.1 or higher recommended)
+ * SQLite 3.24.0 or higher from https://www.sqlite.org/download.html
+ (3.39.4 or higher recommended)
* ZLib 1.2 or higher is required and can be obtained from
http://www.zlib.net/
* Either a Subversion client binary from
Modified: subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py?rev=1905758&r1=1905757&r2=1905758&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py (original)
+++ subversion/branches/pristines-on-demand-on-mwf/build/generator/gen_win_dependencies.py Mon Dec 5 13:01:48 2022
@@ -1482,7 +1482,7 @@ class GenDependenciesBase(gen_base.Gener
def _find_sqlite(self, show_warnings):
"Find the Sqlite library and version"
- minimal_sqlite_version = (3, 8, 2)
+ minimal_sqlite_version = (3, 24, 0)
# For SQLite we support 3 scenarios:
# - Installed in standard directory layout
Modified: subversion/branches/pristines-on-demand-on-mwf/configure.ac
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/configure.ac?rev=1905758&r1=1905757&r2=1905758&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/configure.ac (original)
+++ subversion/branches/pristines-on-demand-on-mwf/configure.ac Mon Dec 5 13:01:48 2022
@@ -178,10 +178,10 @@ SVN_FIND_APACHE(20051115, $apache_whitel
dnl Search for SQLite. If you change SQLITE_URL from a .zip to
dnl something else also update build/ac-macros/sqlite.m4 to reflect
dnl the correct command to unpack the downloaded file.
-SQLITE_MINIMUM_VER="3.8.2"
-SQLITE_RECOMMENDED_VER="3.8.11.1"
+SQLITE_MINIMUM_VER="3.24.0"
+SQLITE_RECOMMENDED_VER="3.39.4"
dnl Used to construct the SQLite download URL.
-SQLITE_RECOMMENDED_VER_REL_YEAR="2015"
+SQLITE_RECOMMENDED_VER_REL_YEAR="2022"
SQLITE_URL="https://www.sqlite.org/$SQLITE_RECOMMENDED_VER_REL_YEAR/sqlite-amalgamation-$(printf %d%02d%02d%02d $(echo ${SQLITE_RECOMMENDED_VER} | sed -e 's/\./ /g')).zip"
SVN_LIB_SQLITE(${SQLITE_MINIMUM_VER}, ${SQLITE_RECOMMENDED_VER},
Modified: subversion/branches/pristines-on-demand-on-mwf/get-deps.sh
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/get-deps.sh?rev=1905758&r1=1905757&r2=1905758&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/get-deps.sh (original)
+++ subversion/branches/pristines-on-demand-on-mwf/get-deps.sh Mon Dec 5 13:01:48 2022
@@ -36,9 +36,9 @@ APU_VERSION=${APU_VERSION:-"1.5.1"}
PY3C_VERSION=${PY3C_VERSION:='1.1'}
SERF_VERSION=${SERF_VERSION:-"1.3.8"}
ZLIB_VERSION=${ZLIB_VERSION:-"1.2.8"}
-SQLITE_VERSION=${SQLITE_VERSION:-"3.8.11.1"}
+SQLITE_VERSION=${SQLITE_VERSION:-"3.39.4"}
# Used to construct the SQLite download URL.
-SQLITE_VERSION_REL_YEAR=2015
+SQLITE_VERSION_REL_YEAR=2022
HTTPD_VERSION=${HTTPD_VERSION:-"2.4.10"}
APR_ICONV_VERSION=${APR_ICONV_VERSION:-"1.2.1"}
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/sqlite.c
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/sqlite.c?rev=1905758&r1=1905757&r2=1905758&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/sqlite.c (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_subr/sqlite.c Mon Dec 5 13:01:48 2022
@@ -65,8 +65,8 @@ extern int (*const svn_sqlite3__api_conf
# include <sqlite3.h>
#endif
-#if !SQLITE_VERSION_AT_LEAST(3,8,2)
-#error SQLite is too old -- version 3.8.2 is the minimum required version
+#if !SQLITE_VERSION_AT_LEAST(3,24,0)
+#error SQLite is too old -- version 3.24.0 is the minimum required version
#endif
#ifndef SQLITE_DETERMINISTIC
Modified: subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-queries.sql
URL: http://svn.apache.org/viewvc/subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-queries.sql?rev=1905758&r1=1905757&r2=1905758&view=diff
==============================================================================
--- subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-queries.sql (original)
+++ subversion/branches/pristines-on-demand-on-mwf/subversion/libsvn_wc/wc-queries.sql Mon Dec 5 13:01:48 2022
@@ -892,9 +892,6 @@ INSERT OR IGNORE INTO pristine (checksum
VALUES (?1, ?2, ?3, 0, ?4)
-- STMT_UPSERT_PRISTINE_F31
-/* ### Probably need to bump the minimum SQLite version for UPSERT support
- https://www.sqlite.org/lang_UPSERT.html
- */
INSERT INTO pristine (checksum, md5_checksum, size, refcount)
VALUES (?1, ?2, ?3, 0)
ON CONFLICT(checksum) DO UPDATE SET size=?3