Skip to content

SQLGetInfo Workflow Fixes #56

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

Merged
rscales merged 4 commits into from
Jul 3, 2025
Merged

SQLGetInfo Workflow Fixes #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0877443
Change to use this->conn required by workflow compiler
rscales Jul 3, 2025
9825452
Empty commit to force running workflows
rscales Jul 3, 2025
0e8fd44
Format odbc connection file
rscales Jul 3, 2025
c0c34f5
Empty commit to force running workflows
rscales Jul 3, 2025
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
19 changes: 10 additions & 9 deletions cpp/src/arrow/flight/sql/odbc/odbcabstraction/odbc_impl/odbc_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@ SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT infoType, SQLPOINTER value,
return GetStringAttribute(isUnicode, m_dsn, true, value, bufferLength, outputLength,
GetDiagnostics());
case SQL_DRIVER_ODBC_VER:
return GetStringAttribute(isUnicode, "03.80", true, value, bufferLength, outputLength,
GetDiagnostics());
return GetStringAttribute(isUnicode, "03.80", true, value, bufferLength,
outputLength, GetDiagnostics());
case SQL_DYNAMIC_CURSOR_ATTRIBUTES1:
GetAttribute(static_cast<SQLUINTEGER>(0), value, bufferLength, outputLength);
return SQL_SUCCESS;
Expand Down Expand Up @@ -248,8 +248,8 @@ SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT infoType, SQLPOINTER value,
GetAttribute(static_cast<SQLUINTEGER>(0), value, bufferLength, outputLength);
return SQL_SUCCESS;
case SQL_TABLE_TERM:
return GetStringAttribute(isUnicode, "table", true, value, bufferLength, outputLength,
GetDiagnostics());
return GetStringAttribute(isUnicode, "table", true, value, bufferLength,
outputLength, GetDiagnostics());
// Deprecated ODBC 2.x fields required for backwards compatibility.
case SQL_ODBC_API_CONFORMANCE:
GetAttribute(static_cast<SQLUSMALLINT>(SQL_OAC_LEVEL1), value, bufferLength,
Expand Down Expand Up @@ -308,8 +308,8 @@ SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT infoType, SQLPOINTER value,
case SQL_XOPEN_CLI_YEAR: {
const auto& info = m_spiConnection->GetInfo(infoType);
const std::string& infoValue = boost::get<std::string>(info);
return GetStringAttribute(isUnicode, infoValue, true, value, bufferLength, outputLength,
GetDiagnostics());
return GetStringAttribute(isUnicode, infoValue, true, value, bufferLength,
outputLength, GetDiagnostics());
}

// Driver-level 32-bit integer properties.
Expand Down Expand Up @@ -444,11 +444,12 @@ SQLRETURN ODBCConnection::GetInfo(SQLUSMALLINT infoType, SQLPOINTER value,
throw DriverException("Optional feature not supported.", "HYC00");
}
const std::string& infoValue = boost::get<std::string>(*attr);
return GetStringAttribute(isUnicode, infoValue, true, value, bufferLength, outputLength,
GetDiagnostics());
return GetStringAttribute(isUnicode, infoValue, true, value, bufferLength,
outputLength, GetDiagnostics());
}
default:
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(infoType), "HY096");
throw DriverException("Unknown SQLGetInfo type: " + std::to_string(infoType),
"HY096");
}

return SQL_ERROR;
Expand Down
Loading
Loading