chore: rebase upstream changes from 8.3.0 (#179)

Author: karenc-bq

Diff for: .clang-format

@@ -1,24 +1,25 @@
-# Copyright (c) 2016, 2022, Oracle and/or its affiliates.
+# Copyright (c) 2016, 2024, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0,
 # as published by the Free Software Foundation.
 #
-# This program is also distributed with certain software (including
-# but not limited to OpenSSL) that is licensed under separate terms,
-# as designated in a particular file or component or in included license
-# documentation.  The authors of MySQL hereby grant you an additional
+# This program is designed to work with certain software (including
+# but not limited to OpenSSL) that is licensed under separate terms, as
+# designated in a particular file or component or in included license
+# documentation. The authors of MySQL hereby grant you an additional
 # permission to link the program and your derivative works with the
-# separately licensed software that they have included with MySQL.
+# separately licensed software that they have either included with
+# the program or referenced in the documentation.
 #
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License, version 2.0, for more details.
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
+# the GNU General Public License, version 2.0, for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 # We currently use clang-format version 10.
 #

Diff for: .github/workflows/dockerized.yml

@@ -1,28 +1,29 @@
 name: Community Integration Tests
 
 on:
+  workflow_dispatch:
   push:
     branches:
       - main
-  pull_request:
-    branches:
-      - '*'
-    paths-ignore:
-      - '**/*.md'
-      - '**/*.jpg'
-      - '**/README.txt'
-      - '**/LICENSE.txt'
-      - 'docs/**'
-      - 'ISSUE_TEMPLATE/**'
-      - '**/remove-old-artifacts.yml'
+#  pull_request:
+#    branches:
+#      - '*'
+#    paths-ignore:
+#      - '**/*.md'
+#      - '**/*.jpg'
+#      - '**/README.txt'
+#      - '**/LICENSE.txt'
+#      - 'docs/**'
+#      - 'ISSUE_TEMPLATE/**'
+#      - '**/remove-old-artifacts.yml'
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   community-tests:
     name: Dockerized Community Tests
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       CMAKE_GENERATOR: Unix Makefiles
 
@@ -33,14 +34,6 @@ jobs:
       - name: Install build dependencies
         run: sudo apt-get update && sudo apt-get install libcurl4 && sudo apt-get install libcurl4-openssl-dev
 
-      - name: Cache AWS SDK libraries
-        id: cache-dynamic-aws-sdk
-        uses: actions/cache@v4
-        with:
-          path: |
-            aws_sdk
-          key: ${{ runner.os }}-aws-sdk-dynamic-lib
-
       - name: Build and install AWS SDK C++
         working-directory: ./scripts
         if: steps.cache-dynamic-aws-sdk.outputs.cache-hit != 'true'

Diff for: .github/workflows/failover.yml

@@ -24,9 +24,9 @@ env:
 jobs:
   build-windows:
     name: Windows
-    runs-on: windows-2019
+    runs-on: windows-latest
     env:
-      CMAKE_GENERATOR: Visual Studio 16 2019
+      CMAKE_GENERATOR: Visual Studio 17 2022
       MYSQL_DIR: C:/mysql-${{ vars.MYSQL_VERSION }}-winx64
     steps:
       - name: Checkout source code
@@ -35,8 +35,8 @@ jobs:
       # Configure build environment/dependencies
       - name: Install MySQL client libs and include files
         run: |
-          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
-          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug-test.zip -o mysql-debug.zip
+          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64.zip -o mysql.zip
+          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug-test.zip -o mysql-debug.zip
           unzip -d C:/ mysql.zip
           mkdir C:/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug
           unzip -d C:/mysql-${{ vars.MYSQL_VERSION }}-winx64-debug mysql-debug.zip
@@ -120,94 +120,97 @@ jobs:
           name: windows-failover-results
           path: ${{ github.workspace }}/build/unit_testing/Testing/Temporary/LastTest.log
 
-  build-linux:
-    name: Linux
-    runs-on: ubuntu-20.04
-    env:
-      CMAKE_GENERATOR: Unix Makefiles
-      CXX: g++-7
-    steps:
-      - name: Checkout source code
-        uses: actions/checkout@v4
-
-      - name: Install gcc7
-        run: sudo apt install g++-7
-
-      # Configure build environment/dependencies
-      - name: Install MySQL client libs & other dependencies
-        run: sudo apt-get update && sudo apt-get install 
-                build-essential 
-                libgtk-3-dev 
-                libmysqlclient-dev 
-                unixodbc
-                unixodbc-dev
-                libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev # AWS SDK dependencies
-
-      - name: Cache AWS SDK libraries
-        id: cache-dynamic-aws-sdk
-        uses: actions/cache@v4
-        with:
-          path: |
-            aws_sdk
-          key: ${{ runner.os }}-aws-sdk-dynamic-lib
-
-      - name: Build and install AWS SDK C++
-        working-directory: ./scripts
-        if: steps.cache-dynamic-aws-sdk.outputs.cache-hit != 'true'
-        run: |
-          ./build_aws_sdk_unix.sh $LINUX_BUILD_TYPE
-
-      - name: Create build environment
-        shell: bash
-        run: cmake -E make_directory ${{ github.workspace }}/build
-
-      - name: Configure CMake
-        shell: bash
-        run: cmake -S . -B build
-                -G "$CMAKE_GENERATOR"
-                -DCMAKE_BUILD_TYPE=$LINUX_BUILD_TYPE
-                -DMYSQLCLIENT_STATIC_LINKING=true
-                -DWITH_UNIXODBC=1
-                -DENABLE_UNIT_TESTS=TRUE
-                -DENABLE_INTEGRATION_TESTS=FALSE
-
-      - name: copy AWS SDK libraries to driver library
-        run: |
-          cp ./aws_sdk/install/lib/*.so ./build/lib/
-
-      # Build driver
-      - name: Build driver
-        working-directory: ${{ github.workspace }}/build
-        shell: bash
-        run: make -j4
-
-
-      # Test driver
-      - name: Run failover tests on Linux
-        if: success()
-        working-directory: ${{ github.workspace }}/build/unit_testing
-        shell: bash
-        run: ctest --output-on-failure
-
-      # Upload artifacts
-      - name: Upload build artifacts - Binaries
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux-failover-binaries
-          path: ${{ github.workspace }}/build/bin/
-      - name: Upload build artifacts - Libraries
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux-failover-libraries
-          path: ${{ github.workspace }}/build/lib/
-      - name: Upload test artifacts
-        if: always()
-        uses: actions/upload-artifact@v4
-        with:
-          name: linux-failover-results
-          path: ${{ github.workspace }}/build/unit_testing/Testing/Temporary/LastTest.log
+#  build-linux:
+#    name: Linux
+#    runs-on: ubuntu-latest
+#    env:
+#      CMAKE_GENERATOR: Unix Makefiles
+#      CXX: g++-11
+#    steps:
+#      - name: Checkout source code
+#        uses: actions/checkout@v4
+#
+#      # Configure build environment/dependencies
+#      - name: Install build dependencies
+#        run: sudo apt-get update && sudo apt-get install
+#          g++-11
+#          build-essential
+#          libgtk-3-dev
+#          unixodbc
+#          unixodbc-dev
+#          libcurl4-openssl-dev libssl-dev uuid-dev zlib1g-dev # AWS SDK dependencies
+#
+#      - name: Install MySQL client libs and include files
+#        run: |
+#          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64.tar.xz -o mysql.tar.gz
+#          tar xf mysql.tar.gz
+#
+#      - name: Cache AWS SDK libraries
+#        id: cache-dynamic-aws-sdk
+#        uses: actions/cache@v4
+#        with:
+#          path: |
+#            aws_sdk
+#          key: ${{ runner.os }}-aws-sdk-dynamic-lib
+#
+#      - name: Build and install AWS SDK C++
+#        working-directory: ./scripts
+#        if: steps.cache-dynamic-aws-sdk.outputs.cache-hit != 'true'
+#        run: |
+#          ./build_aws_sdk_unix.sh $LINUX_BUILD_TYPE
+#
+#      - name: Create build environment
+#        shell: bash
+#        run: cmake -E make_directory ${{ github.workspace }}/build
+#
+#      - name: Configure CMake
+#        shell: bash
+#        run: cmake -S . -B build
+#          -G "$CMAKE_GENERATOR"
+#          -DCMAKE_BUILD_TYPE=$LINUX_BUILD_TYPE
+#          -DMYSQLCLIENT_STATIC_LINKING=true
+#          -DWITH_UNIXODBC=1
+#          -DCONNECTOR_PLATFORM=linux
+#          -DMYSQL_DIR=./mysql-${{ vars.MYSQL_VERSION }}-linux-glibc2.28-x86_64/
+#          -DENABLE_UNIT_TESTS=TRUE
+#          -DENABLE_INTEGRATION_TESTS=FALSE
+#
+#      - name: copy AWS SDK libraries to driver library
+#        run: |
+#          cp ./aws_sdk/install/lib/*.so ./build/lib/
+#
+#      # Build driver
+#      - name: Build driver
+#        working-directory: ${{ github.workspace }}/build
+#        shell: bash
+#        run: make -j4
+#
+#      # Test driver
+#      - name: Run failover tests on Linux
+#        if: success()
+#        working-directory: ${{ github.workspace }}/build/unit_testing
+#        shell: bash
+#        run: ctest --output-on-failure
+#
+#      # Upload artifacts
+#      - name: Upload build artifacts - Binaries
+#        if: always()
+#        uses: actions/upload-artifact@v4
+#        with:
+#          name: linux-failover-binaries
+#          path: ${{ github.workspace }}/build/bin/
+#      - name: Upload build artifacts - Libraries
+#        if: always()
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: linux-failover-libraries
+#          path: ${{ github.workspace }}/build/lib/
+#      - name: Upload test artifacts
+#        if: always()
+#        uses: actions/upload-artifact@v2
+#        with:
+#          name: linux-failover-results
+#          path: ${{ github.workspace }}/build/unit_testing/Testing/Temporary/LastTest.log
 
   build-mac:
     name: MacOS
@@ -239,15 +242,15 @@ jobs:
           brew install libiodbc mysql-client
           brew link --overwrite --force libiodbc
 
-          brew install openssl@1.1
-          rm -f /usr/local/lib/libssl.1.1.dylib
-          rm -f /usr/local/lib/libcrypto.1.1.dylib
-          ln -s /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib /usr/local/lib/
-          ln -s /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib /usr/local/lib/
+          brew install openssl@3
+          rm -f /usr/local/lib/libssl.3.dylib
+          rm -f /usr/local/lib/libcrypto.3.dylib
+          ln -s /usr/local/opt/openssl@3/lib/libssl.3.dylib /usr/local/lib/
+          ln -s /usr/local/opt/openssl@3/lib/libcrypto.3.dylib /usr/local/lib/
 
           source /Users/runner/.bash_profile
           
-          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.0/mysql-${{ vars.MYSQL_VERSION }}-macos13-x86_64.tar.gz -o mysql.tar.gz
+          curl -L https://dev.mysql.com/get/Downloads/MySQL-8.3/mysql-${{ vars.MYSQL_VERSION }}-macos14-x86_64.tar.gz -o mysql.tar.gz
           tar -xzvf mysql.tar.gz
 
       - name: Cache AWS SDK libraries
@@ -277,7 +280,7 @@ jobs:
                 -DODBC_INCLUDES=$ODBC_DM_INCLUDES
                 -DENABLE_UNIT_TESTS=TRUE
                 -DENABLE_INTEGRATION_TESTS=FALSE
-                -DMYSQL_DIR=./mysql-${{ vars.MYSQL_VERSION }}-macos13-x86_64
+                -DMYSQL_DIR=./mysql-${{ vars.MYSQL_VERSION }}-macos14-x86_64
 
       # Build driver
       - name: Build driver
@@ -286,10 +289,10 @@ jobs:
         run: |
           export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
           cmake --build .
-          ln -s /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/
-          ln -s /usr/local/opt/openssl@1.1/lib/libssl.1.1.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/bin/
-          ln -s /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/
-          ln -s /usr/local/opt/openssl@1.1/lib/libcrypto.1.1.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/bin/
+          ln -s /usr/local/opt/openssl@3/lib/libssl.3.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/
+          ln -s /usr/local/opt/openssl@3/lib/libssl.3.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/bin/
+          ln -s /usr/local/opt/openssl@3/lib/libcrypto.3.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/
+          ln -s /usr/local/opt/openssl@3/lib/libcrypto.3.dylib /Users/runner/work/aws-mysql-odbc/aws-mysql-odbc/build/unit_testing/bin/
 
       # Test driver
       - name: Run driver tests

Diff for: .github/workflows/integration.yml

@@ -2,12 +2,20 @@ name: Integration Tests
 
 on:
   workflow_dispatch:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - '*'
+#  push:
+#    branches:
+#      - main
+#  pull_request:
+#    branches:
+#      - '*'
+#    paths-ignore:
+#      - '**/*.md'
+#      - '**/*.jpg'
+#      - '**/README.txt'
+#      - '**/LICENSE.txt'
+#      - 'docs/**'
+#      - 'ISSUE_TEMPLATE/**'
+#      - '**/remove-old-artifacts.yml'
 
 env:
   BUILD_TYPE: Release
@@ -22,7 +30,7 @@ jobs:
       matrix:
         engine_version: ["latest", "lts"]
     name: Integration Tests 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     env:
       CMAKE_GENERATOR: Unix Makefiles