diff options
37 files changed, 202 insertions, 864 deletions
@@ -110,6 +110,9 @@ bdep init @install -d odb b install: ../odb-install/odb/ ``` +To test relocatable installation, add `config.install.relocatable=true` to +the `bdep-config-create` command above. + Note that if building manually (that is, without `bdep`) and in-source, then the checked out `odb/odb/version.hxx`, `libodb/odb/version.hxx`, and `libodb-*/odb/*/version.hxx` files will be overwritten during the build but diff --git a/libodb-boost/manifest b/libodb-boost/manifest index ef8ab78..7d83f2a 100644 --- a/libodb-boost/manifest +++ b/libodb-boost/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-boost -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: Boost ODB profile library license: GPL-2.0-only @@ -18,7 +18,7 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: libodb == $ diff --git a/libodb-boost/odb/boost/version.hxx.in b/libodb-boost/odb/boost/version.hxx.in index 15aed4e..3ecb886 100644 --- a/libodb-boost/odb/boost/version.hxx.in +++ b/libodb-boost/odb/boost/version.hxx.in @@ -61,14 +61,14 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // // NOTE: also hardcoded in *.options. // -#define ODB_BOOST_VERSION 2047600 -#define ODB_BOOST_VERSION_STR "2.5.0-b.26" +#define ODB_BOOST_VERSION 2047800 +#define ODB_BOOST_VERSION_STR "2.5.0-b.28" // libodb-boost version: odb interface version plus the bugfix version. Note // that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION // since if the Boost interface virsion is incremented then the bugfix version // must be incremented as well. // -#define LIBODB_BOOST_VERSION 2049976 +#define LIBODB_BOOST_VERSION 2049978 #endif // LIBODB_BOOST_VERSION diff --git a/libodb-boost/odb/boost/version.options b/libodb-boost/odb/boost/version.options index 904dcc5..b32b739 100644 --- a/libodb-boost/odb/boost/version.options +++ b/libodb-boost/odb/boost/version.options @@ -7,6 +7,6 @@ # --hxx-prologue '#include <odb/boost/version.hxx>' ---hxx-prologue '#if ODB_BOOST_VERSION != 2047600 // 2.5.0-b.26' +--hxx-prologue '#if ODB_BOOST_VERSION != 2047800 // 2.5.0-b.28' --hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions' --hxx-prologue '#endif' diff --git a/libodb-mssql/manifest b/libodb-mssql/manifest index 324cf80..1714926 100644 --- a/libodb-mssql/manifest +++ b/libodb-mssql/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-mssql -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: Microsoft SQL Server ODB runtime library license: other: ODB NCUEL ; Non-Commercial Use and Evaluation License. @@ -19,11 +19,11 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: libodb == $ -depends: * cli ^1.2.0- ? ($config.libodb_mssql.develop) +depends: * cli ^1.2.0 ? ($config.libodb_mssql.develop) tests: odb-tests == $ \ ? (!$defined(config.odb_tests.database)) config.odb_tests.database=mssql @@ -43,7 +43,7 @@ builds: none ; Requires proprietary software. # Instead of the default configuration (see odb-{tests,examples} for # background). # -custom-builds: latest ; Requires proprietary software. +custom-builds: default ; Requires proprietary software. custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. @@ -70,7 +70,7 @@ custom-build-config: # Instead of the multi configuration (see odb-tests for background). # -custom-multi-builds: latest ; Requires proprietary software. +custom-multi-builds: default ; Requires proprietary software. custom-multi-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-build-bot: -- see below. @@ -92,7 +92,7 @@ custom-multi-build-config: # {boost,qt5,qt6}-default configurations (see odb-{tests,examples} for # background). # -boost-custom-builds: latest ; Requires proprietary software. +boost-custom-builds: default ; Requires proprietary software. boost-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. @@ -122,7 +122,7 @@ boost-custom-build-config: }+ odb-examples \ -qt5-custom-builds: latest ; Requires proprietary software. +qt5-custom-builds: default ; Requires proprietary software. qt5-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. @@ -152,7 +152,7 @@ qt5-custom-build-config: }+ odb-examples \ -qt6-custom-builds: latest ; Requires proprietary software. +qt6-custom-builds: default ; Requires proprietary software. qt6-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. @@ -200,24 +200,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -236,24 +218,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -272,24 +236,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -308,24 +254,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -343,21 +271,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/libodb-mssql/odb/mssql/query.cxx b/libodb-mssql/odb/mssql/query.cxx index 6dd87e7..4dc94d5 100644 --- a/libodb-mssql/odb/mssql/query.cxx +++ b/libodb-mssql/odb/mssql/query.cxx @@ -196,7 +196,7 @@ namespace odb void query_base:: optimize () { - // Remove a single TRUE literal or one that is followe by one of + // Remove a single TRUE literal or one that is followed by one of // the other clauses. This avoids useless WHERE clauses like // // WHERE TRUE GROUP BY foo diff --git a/libodb-mssql/odb/mssql/version.hxx.in b/libodb-mssql/odb/mssql/version.hxx.in index 02a404f..2105bf4 100644 --- a/libodb-mssql/odb/mssql/version.hxx.in +++ b/libodb-mssql/odb/mssql/version.hxx.in @@ -55,6 +55,6 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_MSSQL_VERSION 2049976 +#define LIBODB_MSSQL_VERSION 2049978 #endif // LIBODB_MSSQL_VERSION diff --git a/libodb-mysql/manifest b/libodb-mysql/manifest index fd3b7b6..600b598 100644 --- a/libodb-mysql/manifest +++ b/libodb-mysql/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-mysql -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: MySQL ODB runtime library license: GPL-2.0-only @@ -17,13 +17,13 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 #depends: libmysqlclient >= 5.0.3 | libmariadb ^10.2.2 depends: libmysqlclient >= 5.0.3 depends: libodb == $ -depends: * cli ^1.2.0- ? ($config.libodb_mysql.develop) +depends: * cli ^1.2.0 ? ($config.libodb_mysql.develop) tests: odb-tests == $ \ ? (!$defined(config.odb_tests.database)) config.odb_tests.database=mysql @@ -78,7 +78,7 @@ multi-build-config: # Complements the default configuration (see odb-{tests,examples} for # background). # -custom-builds: latest ; Requires latest config with GCC as host compiler. +custom-builds: default ; Requires default config with GCC as host compiler. custom-builds: -wasm custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. @@ -101,7 +101,7 @@ custom-build-config: # Complements the multi configuration (see odb-tests for background). # -custom-multi-builds: latest ; Requires latest config with GCC as host compiler. +custom-multi-builds: default ; Requires default config with GCC as host compiler. custom-multi-builds: -wasm custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-build-bot: -- see below. @@ -209,7 +209,7 @@ qt6-default-build-config: # {boost,qt5,qt6}-default configurations (see odb-{tests,examples} for # background). # -boost-custom-builds: latest ; Requires latest config with GCC as host compiler. +boost-custom-builds: default ; Requires default config with GCC as host compiler. boost-custom-builds: -wasm boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. @@ -235,7 +235,7 @@ boost-custom-build-config: }+ odb-examples \ -qt5-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt5-custom-builds: default ; Requires default config with GCC as host compiler. qt5-custom-builds: -wasm qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. @@ -261,7 +261,7 @@ qt5-custom-build-config: }+ odb-examples \ -qt6-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt6-custom-builds: default ; Requires default config with GCC as host compiler. qt6-custom-builds: -wasm qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. @@ -305,24 +305,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -341,24 +323,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -377,24 +341,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -413,24 +359,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -448,21 +376,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/libodb-mysql/odb/mysql/query.cxx b/libodb-mysql/odb/mysql/query.cxx index a420495..107dcc7 100644 --- a/libodb-mysql/odb/mysql/query.cxx +++ b/libodb-mysql/odb/mysql/query.cxx @@ -194,7 +194,7 @@ namespace odb void query_base:: optimize () { - // Remove a single TRUE literal or one that is followe by one of + // Remove a single TRUE literal or one that is followed by one of // the other clauses. This avoids useless WHERE clauses like // // WHERE TRUE GROUP BY foo diff --git a/libodb-mysql/odb/mysql/version.hxx.in b/libodb-mysql/odb/mysql/version.hxx.in index 0526554..4bbff2c 100644 --- a/libodb-mysql/odb/mysql/version.hxx.in +++ b/libodb-mysql/odb/mysql/version.hxx.in @@ -76,6 +76,6 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_MYSQL_VERSION 2049976 +#define LIBODB_MYSQL_VERSION 2049978 #endif // LIBODB_MYSQL_VERSION diff --git a/libodb-oracle/manifest b/libodb-oracle/manifest index 3192a63..6f53b99 100644 --- a/libodb-oracle/manifest +++ b/libodb-oracle/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-oracle -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: Oracle ODB runtime library license: other: ODB NCUEL ; Non-Commercial Use and Evaluation License. @@ -18,11 +18,11 @@ requires: oci ; Oracle Call Interface library. # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: libodb == $ -depends: * cli ^1.2.0- ? ($config.libodb_oracle.develop) +depends: * cli ^1.2.0 ? ($config.libodb_oracle.develop) tests: odb-tests == $ \ ? (!$defined(config.odb_tests.database)) config.odb_tests.database=oracle @@ -42,7 +42,7 @@ builds: none ; Requires proprietary software. # Instead of the default configuration (see odb-{tests,examples} for # background). # -custom-builds: latest ; Requires proprietary software. +custom-builds: default ; Requires proprietary software. custom-builds: &( +linux &gcc ) ; Only test on Linux with main compiler. custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. @@ -67,7 +67,7 @@ custom-build-config: # Instead of the multi configuration (see odb-tests for background). # -custom-multi-builds: latest ; Requires proprietary software. +custom-multi-builds: default ; Requires proprietary software. custom-multi-builds: &( +linux &gcc ) ; Only test on Linux with main compiler. custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-build-bot: -- see below. @@ -88,7 +88,7 @@ custom-multi-build-config: # {boost,qt5,qt6}-default configurations (see odb-{tests,examples} for # background). # -boost-custom-builds: latest ; Requires proprietary software. +boost-custom-builds: default ; Requires proprietary software. boost-custom-builds: &( +linux &gcc ) ; Only test on Linux with main compiler. boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. @@ -116,7 +116,7 @@ boost-custom-build-config: }+ odb-examples \ -qt5-custom-builds: latest ; Requires proprietary software. +qt5-custom-builds: default ; Requires proprietary software. qt5-custom-builds: &( +linux &gcc ) ; Only test on Linux with main compiler. qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. @@ -144,7 +144,7 @@ qt5-custom-build-config: }+ odb-examples \ -qt6-custom-builds: latest ; Requires proprietary software. +qt6-custom-builds: default ; Requires proprietary software. qt6-custom-builds: &( +linux &gcc ) ; Only test on Linux with main compiler. qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. @@ -190,24 +190,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -226,24 +208,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -262,24 +226,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -298,24 +244,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -333,21 +261,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/libodb-oracle/odb/oracle/query.cxx b/libodb-oracle/odb/oracle/query.cxx index 890e1db..397955e 100644 --- a/libodb-oracle/odb/oracle/query.cxx +++ b/libodb-oracle/odb/oracle/query.cxx @@ -195,7 +195,7 @@ namespace odb void query_base:: optimize () { - // Remove a single TRUE literal or one that is followe by one of + // Remove a single TRUE literal or one that is followed by one of // the other clauses. This avoids useless WHERE clauses like // // WHERE TRUE GROUP BY foo diff --git a/libodb-oracle/odb/oracle/version.hxx.in b/libodb-oracle/odb/oracle/version.hxx.in index c13ce47..13497cf 100644 --- a/libodb-oracle/odb/oracle/version.hxx.in +++ b/libodb-oracle/odb/oracle/version.hxx.in @@ -56,6 +56,6 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_ORACLE_VERSION 2049976 +#define LIBODB_ORACLE_VERSION 2049978 #endif // LIBODB_ORACLE_VERSION diff --git a/libodb-pgsql/manifest b/libodb-pgsql/manifest index 1a9a865..041f0f8 100644 --- a/libodb-pgsql/manifest +++ b/libodb-pgsql/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-pgsql -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: PostgreSQL ODB runtime library license: GPL-2.0-only @@ -17,12 +17,12 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: libpq >= 7.4.0 depends: libodb == $ -depends: * cli ^1.2.0- ? ($config.libodb_pgsql.develop) +depends: * cli ^1.2.0 ? ($config.libodb_pgsql.develop) tests: odb-tests == $ \ ? (!$defined(config.odb_tests.database)) config.odb_tests.database=pgsql @@ -77,7 +77,7 @@ multi-build-config: # Complements the default configuration (see odb-{tests,examples} for # background). # -custom-builds: latest ; Requires latest config with GCC as host compiler. +custom-builds: default ; Requires default config with GCC as host compiler. custom-builds: -wasm custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. @@ -100,7 +100,7 @@ custom-build-config: # Complements the multi configuration (see odb-tests for background). # -custom-multi-builds: latest ; Requires latest config with GCC as host compiler. +custom-multi-builds: default ; Requires default config with GCC as host compiler. custom-multi-builds: -wasm custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-build-bot: -- see below. @@ -208,7 +208,7 @@ qt6-default-build-config: # {boost,qt5,qt6}-default configurations (see odb-{tests,examples} for # background). # -boost-custom-builds: latest ; Requires latest config with GCC as host compiler. +boost-custom-builds: default ; Requires default config with GCC as host compiler. boost-custom-builds: -wasm boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. @@ -234,7 +234,7 @@ boost-custom-build-config: }+ odb-examples \ -qt5-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt5-custom-builds: default ; Requires default config with GCC as host compiler. qt5-custom-builds: -wasm qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. @@ -260,7 +260,7 @@ qt5-custom-build-config: }+ odb-examples \ -qt6-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt6-custom-builds: default ; Requires default config with GCC as host compiler. qt6-custom-builds: -wasm qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. @@ -304,24 +304,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -340,24 +322,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -376,24 +340,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -412,24 +358,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -447,21 +375,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/libodb-pgsql/odb/pgsql/buildfile b/libodb-pgsql/odb/pgsql/buildfile index 57d38f0..cb87c58 100644 --- a/libodb-pgsql/odb/pgsql/buildfile +++ b/libodb-pgsql/odb/pgsql/buildfile @@ -40,6 +40,11 @@ lib{odb-pgsql}: liba{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_STATIC libs{odb-pgsql}: cxx.export.poptions += -DLIBODB_PGSQL_SHARED +# Required for pipelining support on Windows. +# +if ($cxx.target.class == 'windows') + cxx.libs += ($cxx.target.system == 'mingw32' ? -lws2_32 : ws2_32.lib) + # For pre-releases use the complete version to make sure they cannot be used # in place of another pre-release or the final version. See the version module # for details on the version.* variable values. diff --git a/libodb-pgsql/odb/pgsql/query.cxx b/libodb-pgsql/odb/pgsql/query.cxx index b096c97..9de310b 100644 --- a/libodb-pgsql/odb/pgsql/query.cxx +++ b/libodb-pgsql/odb/pgsql/query.cxx @@ -287,7 +287,7 @@ namespace odb void query_base:: optimize () { - // Remove a single TRUE literal or one that is followe by one of + // Remove a single TRUE literal or one that is followed by one of // the other clauses. This avoids useless WHERE clauses like // // WHERE TRUE GROUP BY foo diff --git a/libodb-pgsql/odb/pgsql/statement.cxx b/libodb-pgsql/odb/pgsql/statement.cxx index 03d58cd..08f59c0 100644 --- a/libodb-pgsql/odb/pgsql/statement.cxx +++ b/libodb-pgsql/odb/pgsql/statement.cxx @@ -9,6 +9,8 @@ # ifndef _WIN32 # include <errno.h> # include <sys/select.h> +# else +# include <winsock2.h> # endif #endif @@ -568,7 +570,7 @@ namespace odb return r; } -#if defined(LIBPQ_HAS_PIPELINING) && !defined(_WIN32) +#if defined(LIBPQ_HAS_PIPELINING) // Note that this function always marks the connection as failed. // @@ -650,10 +652,16 @@ namespace odb FD_ZERO (&rds); FD_SET (sock, &rds); +#ifndef _WIN32 if (select (sock + 1, &rds, write ? &wds : 0, 0, 0) != -1) break; if (errno != EINTR) +#else + if (select (sock + 1, &rds, write ? &wds : 0, 0, 0) != SOCKET_ERROR) + break; + else +#endif { if (throw_) translate_connection_error (conn); @@ -1241,7 +1249,7 @@ namespace odb return true; } -#if defined(LIBPQ_HAS_PIPELINING) && !defined(_WIN32) +#if defined(LIBPQ_HAS_PIPELINING) struct insert_data { @@ -1380,7 +1388,7 @@ namespace odb return affected_row_count (h); } -#if defined(LIBPQ_HAS_PIPELINING) && !defined(_WIN32) +#if defined(LIBPQ_HAS_PIPELINING) static bool process_update_result (size_t i, PGresult* r, bool gr, void* data) @@ -1506,7 +1514,7 @@ namespace odb return affected_row_count (h); } -#if defined(LIBPQ_HAS_PIPELINING) && !defined(_WIN32) +#if defined(LIBPQ_HAS_PIPELINING) static bool process_delete_result (size_t i, PGresult* r, bool gr, void* data) diff --git a/libodb-pgsql/odb/pgsql/version.hxx.in b/libodb-pgsql/odb/pgsql/version.hxx.in index db8b152..9116959 100644 --- a/libodb-pgsql/odb/pgsql/version.hxx.in +++ b/libodb-pgsql/odb/pgsql/version.hxx.in @@ -56,6 +56,6 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_PGSQL_VERSION 2049976 +#define LIBODB_PGSQL_VERSION 2049978 #endif // LIBODB_PGSQL_VERSION diff --git a/libodb-qt/manifest b/libodb-qt/manifest index b848077..6da476e 100644 --- a/libodb-qt/manifest +++ b/libodb-qt/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-qt -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: Qt ODB profile library license: GPL-2.0-only @@ -18,7 +18,7 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: libodb == $ diff --git a/libodb-qt/odb/qt/version.hxx.in b/libodb-qt/odb/qt/version.hxx.in index b95bec3..0ca1be2 100644 --- a/libodb-qt/odb/qt/version.hxx.in +++ b/libodb-qt/odb/qt/version.hxx.in @@ -61,14 +61,14 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // // NOTE: also hardcoded in *.options. // -#define ODB_QT_VERSION 2047600 -#define ODB_QT_VERSION_STR "2.5.0-b.26" +#define ODB_QT_VERSION 2047800 +#define ODB_QT_VERSION_STR "2.5.0-b.28" // libodb-qt version: odb interface version plus the bugfix version. Note // that LIBODB_QT_VERSION is always greater or equal to ODB_QT_VERSION // since if the Qt interface virsion is incremented then the bugfix version // must be incremented as well. // -#define LIBODB_QT_VERSION 2049976 +#define LIBODB_QT_VERSION 2049978 #endif // LIBODB_QT_VERSION diff --git a/libodb-qt/odb/qt/version.options b/libodb-qt/odb/qt/version.options index 0fef537..018f956 100644 --- a/libodb-qt/odb/qt/version.options +++ b/libodb-qt/odb/qt/version.options @@ -11,6 +11,6 @@ # --hxx-prologue '#include <odb/qt/version.hxx>' ---hxx-prologue '#if ODB_QT_VERSION != 2047600 // 2.5.0-b.26' +--hxx-prologue '#if ODB_QT_VERSION != 2047800 // 2.5.0-b.28' --hxx-prologue '# error ODB and C++ compilers see different libodb-qt interface versions' --hxx-prologue '#endif' diff --git a/libodb-sqlite/manifest b/libodb-sqlite/manifest index f47879e..296178a 100644 --- a/libodb-sqlite/manifest +++ b/libodb-sqlite/manifest @@ -1,6 +1,6 @@ : 1 name: libodb-sqlite -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: SQLite ODB runtime library license: GPL-2.0-only @@ -17,12 +17,12 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: libsqlite3 ^3.6.18 depends: libodb == $ -depends: * cli ^1.2.0- ? ($config.libodb_sqlite.develop) +depends: * cli ^1.2.0 ? ($config.libodb_sqlite.develop) tests: odb-tests == $ \ ? (!$defined(config.odb_tests.database)) config.odb_tests.database=sqlite @@ -45,13 +45,13 @@ multi-build-config: { config.odb_tests.multi_database=true }+ odb-tests # Complements the default configuration (see odb-{tests,examples} for # background). # -custom-builds: latest ; Requires latest config with GCC as host compiler. +custom-builds: default ; Requires default config with GCC as host compiler. custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. # Complements the multi configuration (see odb-tests for background). # -custom-multi-builds: latest ; Requires latest config with GCC as host compiler. +custom-multi-builds: default ; Requires default config with GCC as host compiler. custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-build-bot: -- see below. custom-multi-build-config: { config.odb_tests.multi_database=true }+ odb-tests @@ -100,7 +100,7 @@ qt6-default-build-config: # {boost,qt5,qt6}-default configurations (see odb-{tests,examples} for # background). # -boost-custom-builds: latest ; Requires latest config with GCC as host compiler. +boost-custom-builds: default ; Requires default config with GCC as host compiler. boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. #boost-custom-build-bot: -- see below. @@ -110,7 +110,7 @@ boost-custom-build-config: { config.odb_examples.boost=true }+ odb-examples \ -qt5-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt5-custom-builds: default ; Requires default config with GCC as host compiler. qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. #qt5-custom-build-bot: -- see below. @@ -120,7 +120,7 @@ qt5-custom-build-config: { config.odb_examples.qt=5 }+ odb-examples \ -qt6-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt6-custom-builds: default ; Requires default config with GCC as host compiler. qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. #qt6-custom-build-bot: -- see below. @@ -148,24 +148,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -184,24 +166,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -220,24 +184,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -256,24 +202,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -291,21 +219,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/libodb-sqlite/odb/sqlite/query.cxx b/libodb-sqlite/odb/sqlite/query.cxx index 98eb1cd..34d6d65 100644 --- a/libodb-sqlite/odb/sqlite/query.cxx +++ b/libodb-sqlite/odb/sqlite/query.cxx @@ -226,7 +226,7 @@ namespace odb void query_base:: optimize () { - // Remove a single TRUE literal or one that is followe by one of + // Remove a single TRUE literal or one that is followed by one of // the other clauses. This avoids useless WHERE clauses like // // WHERE TRUE GROUP BY foo diff --git a/libodb-sqlite/odb/sqlite/version.hxx.in b/libodb-sqlite/odb/sqlite/version.hxx.in index c100d57..84a6242 100644 --- a/libodb-sqlite/odb/sqlite/version.hxx.in +++ b/libodb-sqlite/odb/sqlite/version.hxx.in @@ -56,6 +56,6 @@ $libodb.check(LIBODB_VERSION_FULL, LIBODB_SNAPSHOT)$ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_SQLITE_VERSION 2049976 +#define LIBODB_SQLITE_VERSION 2049978 #endif // LIBODB_SQLITE_VERSION diff --git a/libodb/manifest b/libodb/manifest index 6052338..add9a8c 100644 --- a/libodb/manifest +++ b/libodb/manifest @@ -1,6 +1,6 @@ : 1 name: libodb -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb summary: Common ODB runtime library license: GPL-2.0-only @@ -17,8 +17,8 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 tests: odb-tests == $ ? ($config.odb_tests.libodb_test) examples: odb-examples == $ ? ($config.odb_examples.libodb_example) @@ -70,7 +70,7 @@ multi-build-config: # Complements the default configuration (see odb-{tests,examples} for # background). # -custom-builds: latest ; Requires latest config with GCC as host compiler. +custom-builds: default ; Requires default config with GCC as host compiler. custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. custom-build-config: @@ -88,7 +88,7 @@ custom-build-config: # Complements the multi configuration (see odb-tests for background). # -custom-multi-builds: latest ; Requires latest config with GCC as host compiler. +custom-multi-builds: default ; Requires default config with GCC as host compiler. custom-multi-builds: -wasm ; Not supported by libodb-{mysql,pgsql}. custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. custom-multi-build-auxiliary-mysql: *-mysql_* @@ -114,7 +114,7 @@ custom-multi-build-config: # Complements the multi configuration (see libodb-oracle for background). # -custom-multi-oracle-builds: latest ; Requires proprietary software. +custom-multi-oracle-builds: default ; Requires proprietary software. custom-multi-oracle-builds: -wasm ; Not supported by libodb-{mysql,pgsql,oracle}. custom-multi-oracle-builds: &( +linux &gcc ) ; Only test on Linux with main compiler. custom-multi-oracle-builds: -static ; Implementation uses plugins and requires -fPIC. @@ -148,7 +148,7 @@ custom-multi-oracle-build-config: # Complements the multi configuration (see libodb-mssql for background). # -custom-multi-mssql-builds: latest ; Requires proprietary software. +custom-multi-mssql-builds: default ; Requires proprietary software. custom-multi-mssql-builds: -wasm ; Not supported by libodb-{mysql,pgsql,mssql}. custom-multi-mssql-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. custom-multi-mssql-builds: -static ; Implementation uses plugins and requires -fPIC. @@ -199,24 +199,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -235,24 +217,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-oracle-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -271,24 +235,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-oracle-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-mssql-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -306,21 +252,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -custom-multi-mssql-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/libodb/odb/vector.ixx b/libodb/odb/vector.ixx index 230b187..8b7bd77 100644 --- a/libodb/odb/vector.ixx +++ b/libodb/odb/vector.ixx @@ -233,8 +233,10 @@ namespace odb inline void vector<T, A LIBODB_VECTOR_ARG_USE>:: insert (iterator p, I f, I l) { - size_type i, n; - if (_tracking ()) + const bool t (_tracking ()); + + size_type i (0), n (0); // Suppress GCC -Wmaybe-uninitialized. + if (t) { i = static_cast<size_type> (p.base () - v_.begin ()); n = v_.size (); @@ -242,7 +244,7 @@ namespace odb v_.insert (p.base (), f, l); - if (_tracking ()) + if (t) impl_.insert (i, v_.size () - n); } diff --git a/libodb/odb/version.hxx.in b/libodb/odb/version.hxx.in index 178c8cc..64cef6c 100644 --- a/libodb/odb/version.hxx.in +++ b/libodb/odb/version.hxx.in @@ -55,11 +55,11 @@ // ODB interface version: minor, major, and alpha/beta versions. // -#define ODB_VERSION 20476 -#define ODB_VERSION_STR "2.5-b.26" +#define ODB_VERSION 20478 +#define ODB_VERSION_STR "2.5-b.28" // libodb version: interface version plus the bugfix version. // -#define LIBODB_VERSION 2049976 +#define LIBODB_VERSION 2049978 #endif // LIBODB_VERSION diff --git a/odb-examples/manifest b/odb-examples/manifest index 6e3d70a..4c51e1d 100644 --- a/odb-examples/manifest +++ b/odb-examples/manifest @@ -1,6 +1,6 @@ : 1 name: odb-examples -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb type: examples language: c++ @@ -14,8 +14,8 @@ email: odb-users@codesynthesis.com ; Mailing list # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: * odb == $ @@ -64,7 +64,7 @@ builds: -static ; Implementation uses plugins and requires -fPIC. # And they allow CI'ing odb-examples by itself (thus we specify the bot keys # both in libodb* and here). # -custom-builds: latest ; Requires latest config with GCC as host compiler. +custom-builds: default ; Requires default config with GCC as host compiler. custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. @@ -75,30 +75,30 @@ custom-multi-mssql-builds: none ; Multiple databases cannot be configured. # @@ TMP # -#boost-custom-builds: latest ; Requires proprietary software. +#boost-custom-builds: default ; Requires proprietary software. #boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. ##boost-custom-build-bot: -- see below. -boost-custom-builds: latest ; Requires latest config with GCC as host compiler. +boost-custom-builds: default ; Requires default config with GCC as host compiler. boost-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. # @@ TMP # -#qt5-custom-builds: latest ; Requires proprietary software. +#qt5-custom-builds: default ; Requires proprietary software. #qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. ##qt5-custom-build-bot: -- see below. -qt5-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt5-custom-builds: default ; Requires default config with GCC as host compiler. qt5-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. # @@ TMP # -#qt6-custom-builds: latest ; Requires proprietary software. +#qt6-custom-builds: default ; Requires proprietary software. #qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. ##qt6-custom-build-bot: -- see below. -qt6-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt6-custom-builds: default ; Requires default config with GCC as host compiler. qt6-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. @@ -121,24 +121,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -157,24 +139,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -193,24 +157,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -228,21 +174,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/odb-tests/build/root.build b/odb-tests/build/root.build index 5eb8920..1d22b4c 100644 --- a/odb-tests/build/root.build +++ b/odb-tests/build/root.build @@ -172,8 +172,7 @@ config [string] config.odb_tests.pgsql.port # Note: config.odb_tests.pgsql.bulk_default is reflected from manifest. # config [bool] config.odb_tests.pgsql.bulk_default ?= false -config [bool] config.odb_tests.pgsql.bulk ?= ($cxx.target.class != 'windows' && \ - $config.odb_tests.pgsql.bulk_default) +config [bool] config.odb_tests.pgsql.bulk ?= $config.odb_tests.pgsql.bulk_default pgsql_bulk = $config.odb_tests.pgsql.bulk # Oracle diff --git a/odb-tests/manifest b/odb-tests/manifest index 8924fb7..22a74a7 100644 --- a/odb-tests/manifest +++ b/odb-tests/manifest @@ -1,6 +1,6 @@ : 1 name: odb-tests -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z project: odb type: tests language: c++ @@ -14,8 +14,8 @@ email: odb-users@codesynthesis.com ; Mailing list # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 depends: * odb == $ @@ -39,8 +39,8 @@ depends: libQt5Core ? ($qt && $qt_ver == 5) depends: libQt6Core ? ($qt && $qt_ver == 6) # Reflect whether libodb-pgsql is likely to support bulk operations. This is -# normally the case on POSIX platforms if libodb-pgsql is linked against libpq -# of the version 14 or above. +# normally the case if libodb-pgsql is linked against libpq of the version 14 +# or above. # # Note, though, that this approach doesn't work well for libodb-pgsql # configured as a system package, since the version of libpq it is linked to @@ -79,48 +79,48 @@ builds: -static ; Implementation uses plugins and requires -fPIC. # And they allow CI'ing odb-tests by itself (thus we specify the bot keys both # in libodb* and here). # -custom-builds: latest ; Requires latest config with GCC as host compiler. +custom-builds: default ; Requires default config with GCC as host compiler. custom-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-build-bot: -- see below. -custom-multi-builds: latest ; Requires latest config with GCC as host compiler. +custom-multi-builds: default ; Requires default config with GCC as host compiler. custom-multi-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-build-bot: -- see below. -custom-multi-oracle-builds: latest ; Requires proprietary software. +custom-multi-oracle-builds: default ; Requires proprietary software. custom-multi-oracle-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-oracle-build-bot: -- see below. -custom-multi-mssql-builds: latest ; Requires proprietary software. +custom-multi-mssql-builds: default ; Requires proprietary software. custom-multi-mssql-builds: -static ; Implementation uses plugins and requires -fPIC. #custom-multi-mssql-build-bot: -- see below. # @@ TMP # -#boost-custom-builds: latest ; Requires proprietary software. +#boost-custom-builds: default ; Requires proprietary software. #boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. ##boost-custom-build-bot: -- see below. -boost-custom-builds: latest ; Requires latest config with GCC as host compiler. +boost-custom-builds: default ; Requires default config with GCC as host compiler. boost-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. boost-custom-builds: -static ; Implementation uses plugins and requires -fPIC. boost-custom-builds: -( +macos &gcc ) ; Not supported by libboost-*. # @@ TMP # -#qt5-custom-builds: latest ; Requires proprietary software. +#qt5-custom-builds: default ; Requires proprietary software. #qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. ##qt5-custom-build-bot: -- see below. -qt5-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt5-custom-builds: default ; Requires default config with GCC as host compiler. qt5-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. qt5-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt5-custom-builds: -( +macos &gcc ) ; Not supported by libQt5Core. # @@ TMP # -#qt6-custom-builds: latest ; Requires proprietary software. +#qt6-custom-builds: default ; Requires proprietary software. #qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. ##qt6-custom-build-bot: -- see below. -qt6-custom-builds: latest ; Requires latest config with GCC as host compiler. +qt6-custom-builds: default ; Requires default config with GCC as host compiler. qt6-custom-builds: &( +( +windows &msvc ) +( +linux &gcc ) ) ; Only test on Windows and Linux with main compiler. qt6-custom-builds: -static ; Implementation uses plugins and requires -fPIC. qt6-custom-builds: -( +macos &gcc ) ; Not supported by libQt6Core. @@ -143,24 +143,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -179,24 +161,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-oracle-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -215,24 +179,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-oracle-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - custom-multi-mssql-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -251,24 +197,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -custom-multi-mssql-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - boost-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -287,24 +215,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -boost-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt5-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -323,24 +233,6 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv -----END PUBLIC KEY----- \ -qt5-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ - qt6-custom-build-bot: \ -----BEGIN PUBLIC KEY----- @@ -358,21 +250,3 @@ f5m1W/CcDr53PKWg/ayY9nWMUQaIwH4b69kLM+VTpYSbzu5UQJkmNBNq2EOHgoTv 9MLA+cE/nNJ/rMI//MZ1+kcCAwEAAQ== -----END PUBLIC KEY----- \ - -qt6-custom-build-bot: -\ ------BEGIN PUBLIC KEY----- -MIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAuLYZ68rotGDAtWViFHOe -XEsmZB8BGI+af1ixh9JOy9BE4ohGTfPr1YsjGDzh+PhOVLAtyykOoT/qG7cuGB0T -gBInoRrgVB2/ZKTMwxeDGb/TA3uykaXxcw7/liTsizHAY+phCNTbke8iER5Y78js -9GlnTPmNhwFqEj2fwCz+2o08eyZvZ9Vj1fH/bFDCmDmU33JR3crtJlC8wPiF70Ho -FJzHFdaFQl3MxvEV92HjOsyqozMi6tAVVefN1vapVQeNtjkB0Di18p0/EMugEuGU -OxktjDHQWNaV8Ao6cCDk6OkJnM3ZNL1no3cV4cuF+/xI8UZzwfPoBnwg/s183Qzu -pHHKOSHmuO0oVE/XohJhepSw3tb+wf5BwejRhYHikIjqCxJdm9H0QTiqXT82y24K -yg3gkRMOgqnVxERKKP4ZknLSMQCEKiND/t2zdLJ/lxH9eHZdPHKk3OZZG292j+Bh -fknxcTKNk1Dmf32Irs5hVrjsoU8eAutbItovzXdBaj//rn/ry/kUlCa1Ov6iLIDJ -gyxmsDlgKNR/uE9ogmDn0ishJIoCmxeqenRfJkttr9pEsDsUFuB425QGqiSxa1jh -PCNca3iRtO44wADXaQMTGpvLzBfdfVc8LoFpn+kynN0V1MvxAX4mHRXxw8ERXd3U -dpHDhOthPLolJQrYKb/YyW8CAwEAAQ== ------END PUBLIC KEY----- -\ diff --git a/odb-tests/pgsql/bulk/buildfile b/odb-tests/pgsql/bulk/buildfile index 1885fdd..af0bc7f 100644 --- a/odb-tests/pgsql/bulk/buildfile +++ b/odb-tests/pgsql/bulk/buildfile @@ -34,6 +34,9 @@ odb_options = --table-prefix pgsql_bulk_ \ cxx.poptions =+ "-I$out_base" "-I$src_base" +if ($cxx.target.class == 'windows') + cxx.libs += ($cxx.target.system == 'mingw32' ? -lws2_32 : ws2_32.lib) + # Testscript's run-time prerequisites. # exe{driver}: ../../alias{pgsql-client}: include = adhoc diff --git a/odb-tests/pgsql/bulk/driver.cxx b/odb-tests/pgsql/bulk/driver.cxx index 6b30073..61e7d56 100644 --- a/odb-tests/pgsql/bulk/driver.cxx +++ b/odb-tests/pgsql/bulk/driver.cxx @@ -10,12 +10,17 @@ #include <stdio.h> #include <string.h> #include <stddef.h> -#include <sys/select.h> + +#ifndef _WIN32 +# include <sys/select.h> +# include <arpa/inet.h> +#else +# include <winsock2.h> +#endif // Note: hack (also, some platforms, like Mac OS, provide it). // -#include <arpa/inet.h> -#ifndef htonll +#if !defined(_MSC_VER) && !defined(htonll) # define htonll(x) ((((long long)htonl(x)) << 32) + htonl((x) >> 32)) #endif @@ -51,7 +56,7 @@ init (const struct data* d) lengths[1] = sizeof (d->idata); values[2] = (char*)d->sdata; - lengths[2] = strlen (d->sdata); + lengths[2] = (int)strlen (d->sdata); } static void @@ -85,6 +90,7 @@ execute (PGconn* conn, const struct data* ds, size_t n) FD_ZERO (&rds); FD_SET (sock, &rds); +#ifndef _WIN32 if (select (sock + 1, &rds, wdone ? NULL : &wds, NULL, NULL) == -1) { if (errno == EINTR) @@ -92,6 +98,10 @@ execute (PGconn* conn, const struct data* ds, size_t n) assert (false); } +#else + if (select (sock + 1, &rds, wdone ? NULL : &wds, NULL, NULL) == SOCKET_ERROR) + assert (false); +#endif // Try to minimize the chance of blocking the server by first processing // the result and then sending more queries. diff --git a/odb/manifest b/odb/manifest index 2ef8b08..15d4df2 100644 --- a/odb/manifest +++ b/odb/manifest @@ -1,6 +1,6 @@ : 1 name: odb -version: 2.5.0-b.26.z +version: 2.5.0-b.28.z summary: ODB compiler license: GPL-3.0-only topics: C++, ORM, source code generation, object persistence, \ @@ -12,7 +12,7 @@ doc-url: https://www.codesynthesis.com/products/odb/doc/manual.xhtml src-url: https://git.codesynthesis.com/cgit/odb/odb/ email: odb-users@codesynthesis.com build-warning-email: odb-builds@codesynthesis.com -builds: all +builds: all relocatable builds: -( +windows -gcc ) ; Requires MinGW GCC. builds: &gcc ; Requires GCC with plugin support enabled. builds: &gcc-5+ ; Requires GCC 5 or later. @@ -22,13 +22,13 @@ requires: c++11 # @@ TMP Bump the toolchain version to 0.17.0 after it is released. # -depends: * build2 >= 0.16.0- -depends: * bpkg >= 0.16.0- +depends: * build2 >= 0.17.0 +depends: * bpkg >= 0.17.0 -depends: libstudxml ^1.1.0- -depends: libcutl ^1.11.0- +#depends: libstudxml ^1.1.0- +#depends: libcutl ^1.11.0 -#depends: libstudxml == 1.1.0-b.10 -#depends: libcutl == 1.11.0-b.9 +depends: libstudxml == 1.1.0-b.10 +depends: libcutl ~1.11.0 -depends: * cli ^1.2.0- ? ($config.odb.develop) +depends: * cli ^1.2.0 ? ($config.odb.develop) diff --git a/odb/odb/buildfile b/odb/odb/buildfile index 96eb95f..21b98ed 100644 --- a/odb/odb/buildfile +++ b/odb/odb/buildfile @@ -30,6 +30,8 @@ if ($cxx.target.class != 'windows') # # NOTE: see ODB_GCC_PLUGIN_DIR when adding this support. # +# NOTE: also think about relocatable installation. +# plugin{*}: install = bin/ import libs = libcutl%lib{cutl} @@ -43,11 +45,19 @@ import libs += libstudxml%lib{studxml} # We, however, don't want to install via the driver since the same driver # build could be used with multiple plugin builds (e.g., for different GCC # versions, which is something distribution packagers sometimes want to do). -# @@ For this we will have to wait for operation-specific values support. # exe{odb}: cxx{odb} exe{odb}: libus{odb}: bin.whole = false -exe{odb}: plugin{odb}: include = adhoc +exe{odb}: plugin{odb}: +{ + include = adhoc + + # @@ This work but triggers "incompatible libs{cutl} build". Feels like to + # solve this we will also need to say update_for_install=false which + # we currently cant. + # + #install = false +} # Target metadata, see also --build2-metadata in odb.cxx. # diff --git a/odb/odb/odb.cxx b/odb/odb/odb.cxx index 9899262..41063d5 100644 --- a/odb/odb/odb.cxx +++ b/odb/odb/odb.cxx @@ -185,6 +185,9 @@ main (int argc, char* argv[]) // Also modify LD_LIBRARY_PATH to include the lib path. // + // @@ Hm, I wonder why we are doing this? (One some platforms, like + // Fedora, the directory could be called something else, like lib64). + // #ifndef _WIN32 { #ifdef __APPLE__ @@ -546,12 +549,12 @@ main (int argc, char* argv[]) // // To allow executing the ODB compiler in-place we add the odb.exe.dlls/ // directory to PATH. It is a bit of hack but then DLL assemblies for - // DLLs is whole new level of insanity that we are unlikely to ever + // DLLs is a whole new level of insanity that we are unlikely to ever // touch. // // And it turns out we have the same problem in the installed case: if // the installation directory is not in PATH, then GCC won't find the - // DLLs the plugin needs. So we handle both here. + // DLLs the plugin needs. So we handle both cases here. // { path d (plugin.directory ()); @@ -1616,8 +1619,8 @@ plugin_path (path const& drv, char const plugin_ext[] = ".dll"; // While GCC 8 switched to using .dylib as the plugin extension, there is a -// bug in the extension stripping code. So for now we use the .so extension -// everywhere (see also buildfile if changing this). +// bug (86358) in the extension stripping code. So for now we use the .so +// extension everywhere (see also buildfile if changing this). // //#elif defined(__APPLE__) // char const plugin_ext[] = ".dylib"; @@ -1638,7 +1641,7 @@ plugin_path (path const& drv, if (dp.empty ()) { - cerr << drv << ": error: unable to resolve ODB driver path" << endl; + cerr << drv << ": error: unable to resolve ODB compiler driver path" << endl; return path (); } diff --git a/odb/odb/relational/processor.cxx b/odb/odb/relational/processor.cxx index 0f60359..7abd6d9 100644 --- a/odb/odb/relational/processor.cxx +++ b/odb/odb/relational/processor.cxx @@ -1181,11 +1181,11 @@ namespace relational string q (upcase (vq.literal)); //@@ We need to recognize database-specific list of prefixes. For - // example, PG has WITH. Alternatively (or in addition) we could - // do the same comment trick (e.g., /*SELECT*/ to treat it as a - // SELECT-like queiry). + // now any unrecognized prefix can be worked around with the + // /*SELECT*/ comment prefix. // - if (q.compare (0, 7, "SELECT ") == 0) + if (q.compare (0, 7, "SELECT ") == 0 || + q.compare (0, 5, "WITH ") == 0) vq.kind = view_query::complete_select; else if (q.compare (0, 5, "EXEC ") == 0 || q.compare (0, 5, "CALL ") == 0 || @@ -1200,21 +1200,30 @@ namespace relational vq.literal = string (vq.literal, q[8] == ' ' ? 9 : 8); vq.kind = view_query::complete_execute; } + // + // Hint that what follows is a SELECT-like query. + // + else if (q.compare (0, 10, "/*SELECT*/") == 0) + { + vq.literal = string (vq.literal, q[10] == ' ' ? 11 : 10); + vq.kind = view_query::complete_select; + } else vq.kind = view_query::condition; } else if (!vq.expr.empty ()) { - // If the first token in the expression is a string and - // it starts with "SELECT " or is equal to "SELECT" or - // one of the stored procedure call keywords, then we - // have a complete query. + // If the first token in the expression is a string and it starts + // with "SELECT " or is equal to "SELECT" (or equivalent) or one + // of the stored procedure call keywords, then we have a complete + // query. // if (vq.expr.front ().type == CPP_STRING) { string q (upcase (vq.expr.front ().literal)); - if (q.compare (0, 7, "SELECT ") == 0 || q == "SELECT") + if (q.compare (0, 7, "SELECT ") == 0 || q == "SELECT" || + q.compare (0, 5, "WITH ") == 0 || q == "WITH") vq.kind = view_query::complete_select; else if (q.compare (0, 5, "EXEC ") == 0 || q == "EXEC" || q.compare (0, 5, "CALL ") == 0 || q == "CALL" || @@ -1226,6 +1235,12 @@ namespace relational string (vq.expr.front ().literal, q[8] == ' ' ? 9 : 8); vq.kind = view_query::complete_execute; } + else if (q.compare (0, 10, "/*SELECT*/") == 0) + { + vq.expr.front ().literal = + string (vq.expr.front ().literal, q[10] == ' ' ? 11 : 10); + vq.kind = view_query::complete_select; + } else vq.kind = view_query::condition; } diff --git a/odb/odb/version.hxx.in b/odb/odb/version.hxx.in index 2bf2ae7..b58f60e 100644 --- a/odb/odb/version.hxx.in +++ b/odb/odb/version.hxx.in @@ -45,10 +45,10 @@ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define ODB_COMPILER_VERSION_OLD 2049976 +#define ODB_COMPILER_VERSION_OLD 2049978 // ODB interface version: minor, major, and alpha/beta versions. // -#define ODB_VERSION 20476 +#define ODB_VERSION 20478 #endif // ODB_COMPILER_VERSION |