diff --git a/ci/dependencies/driver-manager-setup.sh b/ci/dependencies/driver-manager-setup.sh index dc7f4cddfa..46bc61c395 100644 --- a/ci/dependencies/driver-manager-setup.sh +++ b/ci/dependencies/driver-manager-setup.sh @@ -25,7 +25,7 @@ CPP_BIGQUERY_ODBC_DRIVER_MANAGER_SETUP_CURR_DIR="$(pwd)" export CPP_BIGQUERY_ODBC_DRIVER_MANAGER_SETUP_CURR_DIR export GCS_BUCKET=bq-dev-tools-testing-drivers -export DRIVER_VERSION=3.1.6.3037 +export DRIVER_VERSION=3.2.1.3001 # Check gcloud is installed. echo "Verifying google cloud SDK is installed using GCS Bucket: "${GCS_BUCKET} diff --git a/ci/gha/builds/lib/odbc-driver-install.ps1 b/ci/gha/builds/lib/odbc-driver-install.ps1 index df7c70103a..a4d0f5c1e5 100644 --- a/ci/gha/builds/lib/odbc-driver-install.ps1 +++ b/ci/gha/builds/lib/odbc-driver-install.ps1 @@ -25,7 +25,7 @@ if ($CI_CLOUDBUILD_BUILDS_LIB_ODBC_DRIVER_INSTALL_SH__ -ne $null -and ++$CI_CLOU } # Set Environment Variables -$env:ODBC_DRIVER_VERSION = "3.1.6.3037" +$env:ODBC_DRIVER_VERSION = "3.2.1.3001" if ([string]::IsNullOrEmpty($env:DRIVER_ARCH)) { throw "DRIVER_ARCH environment variable is not set or empty. Please provide a valid architecture." } diff --git a/google/cloud/odbc/integration_tests/odbc_driver_tests/data_translation_test.cc b/google/cloud/odbc/integration_tests/odbc_driver_tests/data_translation_test.cc index 4e0813cf8d..9f4b5f43ae 100644 --- a/google/cloud/odbc/integration_tests/odbc_driver_tests/data_translation_test.cc +++ b/google/cloud/odbc/integration_tests/odbc_driver_tests/data_translation_test.cc @@ -268,21 +268,11 @@ std::vector const kConversionFromBigNumericTestData{ {SQL_C_DOUBLE, "123123123123123123123.222", SQL_SUCCESS}, {SQL_C_DOUBLE, "9.9999999999999999999999999999999999999E+29", SQL_SUCCESS}, {SQL_C_DOUBLE, "9.9999999999999999999999999999999999999E+28", SQL_SUCCESS}, -#ifdef BQ_DRIVER_INTEGRATION_TESTS {SQL_C_SSHORT, "31", SQL_SUCCESS}, {SQL_C_SSHORT, "-31", SQL_SUCCESS}, {SQL_C_USHORT, "3", SQL_SUCCESS}, {SQL_C_SLONG, "-13", SQL_SUCCESS}, {SQL_C_ULONG, "81", SQL_SUCCESS}, -#else - // existing driver returns (40460) Fractional data truncated while - // performing conversion. - {SQL_C_SSHORT, "31", SQL_SUCCESS_WITH_INFO}, - {SQL_C_SSHORT, "-31", SQL_SUCCESS_WITH_INFO}, - {SQL_C_USHORT, "3", SQL_SUCCESS_WITH_INFO}, - {SQL_C_SLONG, "-13", SQL_SUCCESS_WITH_INFO}, - {SQL_C_ULONG, "81", SQL_SUCCESS_WITH_INFO}, -#endif {SQL_C_FLOAT, "156.1", SQL_SUCCESS}, {SQL_C_FLOAT, "-157.8", SQL_SUCCESS}, @@ -484,7 +474,7 @@ void TestTranslationsFromArithmetic(std::shared_ptr conn, void TestTranslationsFromNumeric( std::shared_ptr conn, std::string query, - std::vector const kFromNumericTestData) { + std::vector const numeric_test_data) { SQLRETURN status; SQLCHAR data[kBufferLength]; SQLLEN strlen_or_ind; @@ -496,7 +486,7 @@ void TestTranslationsFromNumeric( // Read all the rows using SQLFetch int row_count = 0; - for (NumericBasicTestStruct expected : kFromNumericTestData) { + for (NumericBasicTestStruct expected : numeric_test_data) { status = SQLFetch(conn->hstmt); if (status == SQL_NO_DATA) { break; @@ -680,7 +670,7 @@ void TestTranslationsFromNumeric( row_count++; } } - EXPECT_EQ(row_count, kFromNumericTestData.size()); + EXPECT_EQ(row_count, numeric_test_data.size()); } void TestTranslationsFromString(std::shared_ptr conn,