Merge branch 'master' into work/gh_6413_restore_swept

Author: hvlad

.github/actions/create-release/action.yml

@@ -1,6 +1,3 @@
-# TODO: Replace asfernandes/action-gh-release@master by softprops/action-gh-release@v1
-# once https://github.com/softprops/action-gh-release/pull/343 is merged.
-
 name: Create release
 description: Create release
 
@@ -44,7 +41,7 @@ runs:
 
     - name: Release
       id: release_try1
-      uses: asfernandes/action-gh-release@master
+      uses: softprops/action-gh-release@master
       if: steps.release-info.outputs.artifacts-tag
       continue-on-error: true
       with:
@@ -65,7 +62,7 @@ runs:
         files: ${{ inputs.uploadFiles }}
 
     - name: Release (retry)
-      uses: asfernandes/action-gh-release@master
+      uses: softprops/action-gh-release@master
       if: |
         steps.release-info.outputs.artifacts-tag &&
         steps.release_try1.outcome == 'failure'

.github/workflows/main.yml

@@ -156,14 +156,13 @@ jobs:
     if: github.ref_type != 'tag'
     runs-on: ${{ matrix.os }}
     env:
-      VS_VERSION: ${{ (matrix.os == 'windows-2019' && '2019' || (matrix.os == 'windows-2022' && '2022' || '')) }}
+      VS_VERSION: 2022
 
     strategy:
       fail-fast: false
       matrix:
         os:
-          - windows-2022
-          - windows-2019
+          - windows-2025
         platform: [x64, x86]
 
     steps:
@@ -186,7 +185,7 @@ jobs:
         shell: cmd
         env:
           PLATFORM: ${{ matrix.platform }}
-          VS_SCRIPT: ${{ matrix.os == 'windows-2022' && 'C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat' || 'C:\Program Files (x86)\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat' }}
+          VS_SCRIPT: C:\Program Files\Microsoft Visual Studio\%VS_VERSION%\Enterprise\Common7\Tools\VsDevCmd.bat
         run: |
           set SEVENZIP=C:\Program Files\7-Zip
           set INNO6_SETUP_PATH=C:\Program Files (x86)\Inno Setup 6
@@ -362,8 +361,6 @@ jobs:
   build-macos:
     name: build-macos-${{ matrix.arch }}
     runs-on: ${{ (matrix.arch == 'arm64' && 'macos-14') || 'macos-13' }}
-    env:
-      VCPKG_BINARY_SOURCES: "clear;x-gha,readwrite"
 
     strategy:
       fail-fast: false
@@ -384,14 +381,16 @@ jobs:
 
       - name: Prepare - Install tools
         run: |
-          brew install automake autoconf-archive libtool ninja
+          brew install --quiet automake autoconf-archive libtool ninja
 
-      - name: Export GitHub Actions cache environment variables
-        uses: actions/github-script@v7
+      - name: Restore vcpkg cache
+        uses: actions/cache/restore@v4
+        id: restore-vcpkg-cache
         with:
-          script: |
-            core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
-            core.exportVariable('ACTIONS_RUNTIME_TOKEN', process.env.ACTIONS_RUNTIME_TOKEN || '');
+          path: ~/.cache/vcpkg/archives
+          key: vcpkg-cache-${{ runner.os }}-${{ matrix.arch }}-${{ hashFiles('vcpkg-custom/**', 'vcpkg.json', 'vcpkg-configuration.json') }}
+          restore-keys: |
+            vcpkg-cache-${{ runner.os }}-${{ matrix.arch }}-
 
       - name: Build
         run: |
@@ -419,6 +418,14 @@ jobs:
           mkdir gen/artifacts
           mv gen/Release/*.pkg gen/artifacts
 
+      - name: Save vcpkg cache
+        uses: actions/cache/save@v4
+        # Saves if the key changed (hashes on vcpkg/**, vcpkg.json, vcpkg-configuration.json)
+        if: steps.restore-vcpkg-cache.outputs.cache-hit != 'true'
+        with:
+          path: ~/.cache/vcpkg/archives
+          key: ${{ steps.restore-vcpkg-cache.outputs.cache-primary-key }}
+
       - name: Upload installer
         uses: actions/upload-artifact@v4
         with:

builds/install/arch-specific/hpux/super/postInstall.sh.in

@@ -137,7 +137,7 @@ writeNewPassword() {
     if [ $NewPasswd = "masterkey" ]
       then
         echo "# for install on `hostname` at time `date`" >> $DBAPasswordFile
-        echo "# You should change this password at the earliest oportunity" >> $DBAPasswordFile
+        echo "# You should change this password at the earliest opportunity" >> $DBAPasswordFile
       else 
         echo "# generated on `hostname` at time `date`" >> $DBAPasswordFile
     fi

builds/install/misc/firebird.conf

@@ -700,7 +700,7 @@
 # active connections. If you do not like its default 2-hour keepalive timeout,
 # then adjust your server OS settings appropriately. On UNIX-like OS's,
 # modify contents of /proc/sys/net/ipv4/tcp_keepalive_*. On Windows,
-# follow instrutions of this article:
+# follow instructions of this article:
 # https://learn.microsoft.com/en-us/troubleshoot/windows-client/networking/tcpip-and-nbt-configuration-parameters
 #
 # Per-connection configurable.

builds/install/misc/replication.conf

@@ -11,15 +11,25 @@ database
 	#
 	# plugin =
 
+	# Pattern (regular expression) that defines what schemas must be included into
+	# replication. By default, tables from all schemas are replicated.
+	#
+	# include_schema_filter =
+
+	# Pattern (regular expression) that defines what schemas must be excluded from
+	# replication. By default, tables from all schemas are replicated.
+	#
+	# exclude_schema_filter =
+
 	# Pattern (regular expression) that defines what tables must be included into
 	# replication. By default, all tables are replicated.
 	#
-	# include_filter = 
+	# include_filter =
 
 	# Pattern (regular expression) that defines what tables must be excluded from
 	# replication. By default, all tables are replicated.
 	#
-	# exclude_filter = 
+	# exclude_filter =
 
 	# Boolean parameters describing how replication errors must be handled.
 	#
@@ -42,20 +52,20 @@ database
 
 	# Directory to store replication journal files.
 	#
-	# journal_directory = 
+	# journal_directory =
 
 	# Prefix for replication journal file names. It will be automatically suffixed
 	# with an ordinal sequential number. If not specified, database filename
 	# (without path) is used as a prefix.
 	#
-	# journal_file_prefix =  
+	# journal_file_prefix =
 
 	# Maximum allowed size for a single replication segment.
 	#
 	# journal_segment_size = 16777216 # 16MB
 
 	# Maximum allowed number of full replication segments. Once this limit is reached,
-	# the replication process is temporarily delayed to allow the archiving to catch up. 
+	# the replication process is temporarily delayed to allow the archiving to catch up.
  	# If any of the full segments is not archived during one minute,
  	# the replication fails with an error.
  	#
@@ -76,7 +86,7 @@ database
 	# Directory to store archived replication segments.
 	# It also defines the $(archpathname) substitution macro (see below).
 	#
-	# journal_archive_directory = 
+	# journal_archive_directory =
 
 	# Program (complete command line with arguments) that is executed when some
 	# replication segment gets full and needs archiving.
@@ -97,7 +107,7 @@ database
 	# or
 	# Windows: "copy $(pathname) $(archivepathname)"
 	#
-	# journal_archive_command = 
+	# journal_archive_command =
 
 	# Timeout, in seconds, to wait until incomplete segment is scheduled for archiving.
 	# It allows to minimize the replication gap if the database is modified rarely.
@@ -121,7 +131,7 @@ database
 	#
 	# Multiple entries are allowed (for different synchronous replicas).
 	#
-	# sync_replica = 
+	# sync_replica =
 	#
 	# It's also possible to configure replicas as separate sub-sections, e.g.:
 	#
@@ -175,13 +185,13 @@ database
 
 	# Directory to search for the journal files to be replicated.
 	#
-	# journal_source_directory = 
+	# journal_source_directory =
 
 	# Filter to limit replication to the particular source database (based on its GUID).
 	# Expected format: "{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}"
 	# Note that double quotes are mandatory, as well as curly braces.
 	#
-	# source_guid = 
+	# source_guid =
 
 	# If enabled, replication.log contains the detailed log of operations performed
 	# by the replication server. Otherwise (by default), only errors and warnings are logged.
@@ -202,6 +212,14 @@ database
 	# then reconnects back and tries to re-apply the latest segments from the point of failure.
 	#
 	# apply_error_timeout = 60
+
+	# Schema search path for compatibility with Firebird versions below 6.0
+	#
+	# Firebird master databases below v6 has no schemas, so use this search path in the replica to
+	# locate the objects.
+	# Used only with asynchronous replication.
+	#
+	# schema_search_path =
 }
 
 #

builds/make.new/config/install-sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2023-11-23.18; # UTC
+scriptversion=2024-06-19.01; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -170,7 +170,7 @@ while test $# -ne 0; do
 
     -T) is_target_a_directory=never;;
 
-    --version) echo "$0 $scriptversion"; exit $?;;
+    --version) echo "$0 (GNU Automake) $scriptversion"; exit $?;;
 
     --) shift
         break;;
@@ -345,15 +345,15 @@ do
 	' 0
 
 	# Because "mkdir -p" follows existing symlinks and we likely work
-	# directly in world-writeable /tmp, make sure that the '$tmpdir'
+	# directly in world-writable /tmp, make sure that the '$tmpdir'
 	# directory is successfully created first before we actually test
 	# 'mkdir -p'.
 	if (umask $mkdir_umask &&
 	    $mkdirprog $mkdir_mode "$tmpdir" &&
 	    exec $mkdirprog $mkdir_mode -p -- "$tmpdir/a/b") >/dev/null 2>&1
 	then
 	  if test -z "$dir_arg" || {
-	       # Check for POSIX incompatibilities with -m.
+	       # Check for POSIX incompatibility with -m.
 	       # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
 	       # other-writable bit of parent directory when it shouldn't.
 	       # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.

builds/win32/msvc15/FirebirdCommon.props

@@ -8,7 +8,7 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalOptions>/EHsc- %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/EHsc- /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
       <OmitFramePointers>true</OmitFramePointers>
       <AdditionalIncludeDirectories>../../../src/include;../../../src/include/gen;../../../extern/libtomcrypt/src/headers;../../../extern/libtommath;../../../extern/icu/include;../../../extern/zlib;../../../extern/re2;../../../extern/boost;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <ExceptionHandling>

builds/win32/msvc15/common.vcxproj

@@ -153,7 +153,7 @@
     <ClInclude Include="..\..\..\src\common\classes\NoThrowTimeStamp.h" />
     <ClInclude Include="..\..\..\src\common\classes\objects_array.h" />
     <ClInclude Include="..\..\..\src\common\classes\ParsedList.h" />
-    <ClInclude Include="..\..\..\src\common\classes\QualifiedName.h" />
+    <ClInclude Include="..\..\..\src\common\classes\QualifiedMetaString.h" />
     <ClInclude Include="..\..\..\src\common\classes\RefCounted.h" />
     <ClInclude Include="..\..\..\src\common\classes\RefMutex.h" />
     <ClInclude Include="..\..\..\src\common\classes\rwlock.h" />

builds/win32/msvc15/common.vcxproj.filters

@@ -449,9 +449,6 @@
     <ClInclude Include="..\..\..\src\common\classes\objects_array.h">
       <Filter>headers</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\..\src\common\classes\QualifiedName.h">
-      <Filter>headers</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\..\src\common\classes\RefCounted.h">
       <Filter>headers</Filter>
     </ClInclude>
@@ -611,6 +608,9 @@
     <ClInclude Include="..\..\..\src\common\classes\ParsedList.h">
       <Filter>headers</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\..\src\common\classes\QualifiedMetaString.h">
+      <Filter>headers</Filter>
+    </ClInclude>
     <ClInclude Include="..\..\..\src\common\Int128.h">
       <Filter>headers</Filter>
     </ClInclude>

builds/win32/msvc15/common_test.vcxproj

@@ -255,14 +255,16 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\src\common\classes\tests\ClumpletTest.cpp" />
-    <ClCompile Include="..\..\..\src\common\classes\tests\VectorTest.cpp" />
     <ClCompile Include="..\..\..\src\common\tests\CommonTest.cpp" />
     <ClCompile Include="..\..\..\src\common\tests\CvtTest.cpp" />
     <ClCompile Include="..\..\..\src\common\tests\StringTest.cpp" />
     <ClCompile Include="..\..\..\src\common\classes\tests\AlignerTest.cpp" />
     <ClCompile Include="..\..\..\src\common\classes\tests\ArrayTest.cpp" />
+    <ClCompile Include="..\..\..\src\common\classes\tests\ClumpletTest.cpp" />
     <ClCompile Include="..\..\..\src\common\classes\tests\DoublyLinkedListTest.cpp" />
+    <ClCompile Include="..\..\..\src\common\classes\tests\MetaStringTest.cpp" />
+    <ClCompile Include="..\..\..\src\common\classes\tests\QualifiedMetaStringTest.cpp" />
+    <ClCompile Include="..\..\..\src\common\classes\tests\VectorTest.cpp" />
     <ClCompile Include="..\..\..\src\yvalve\gds.cpp" />
   </ItemGroup>
   <ItemGroup>