Skip to content

chore: upgrading driver version to 3.2.1.3001 for integration tests #1545

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sachinpro wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore: upgrading driver version to 3.2.1.3001 for integration tests #1545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/dependencies/driver-manager-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
2 changes: 1 addition & 1 deletion ci/gha/builds/lib/odbc-driver-install.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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."
}
Expand Down
16 changes: 3 additions & 13 deletions google/cloud/odbc/integration_tests/odbc_driver_tests/data_translation_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,21 +268,11 @@ std::vector<NumericBasicTestStruct> 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},

Expand Down Expand Up @@ -484,7 +474,7 @@ void TestTranslationsFromArithmetic(std::shared_ptr<ODBCHandles> conn,

void TestTranslationsFromNumeric(
std::shared_ptr<ODBCHandles> conn, std::string query,
std::vector<NumericBasicTestStruct> const kFromNumericTestData) {
std::vector<NumericBasicTestStruct> const numeric_test_data) {
SQLRETURN status;
SQLCHAR data[kBufferLength];
SQLLEN strlen_or_ind;
Expand All @@ -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;
Expand Down Expand Up @@ -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<ODBCHandles> conn,
Expand Down
Loading