Skip to content

Implement SQLDescribeCol #80

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 13 commits into from
Aug 8, 2025
Merged

Implement SQLDescribeCol #80

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c8704e9
Implement SQLDescribeCol
rscales Jul 31, 2025
a51bdba
Add initial set of tests for SQLDescribeCol
rscales Aug 6, 2025
b173748
Format test cases
rscales Aug 6, 2025
900498d
Update based on comments from draft review
rscales Aug 6, 2025
bfa9edb
Update code comments based on draft review
rscales Aug 6, 2025
f4e37bd
Add tests to get metadata for SQLColumns and SQLTables using SQLDescr…
rscales Aug 7, 2025
52308e0
Add ODBC2 tests for SQLColumns and SQLTables using SQLDescribeCol
rscales Aug 7, 2025
acdd8a2
Empty commit to force running workflows
rscales Aug 7, 2025
98a67b3
Empty commit to force running workflows after rebase
rscales Aug 7, 2025
0d74b78
Fix incorrect column type comparison value and remove unnecessary tes…
rscales Aug 7, 2025
67e39c7
Remove TODO comment as functionality implemented
rscales Aug 7, 2025
c1df189
Fix formatting issues with columns test file
rscales Aug 7, 2025
714fef9
Fix garbled test case name
rscales Aug 7, 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/tests/columns_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2372,7 +2372,7 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColValidateInput) {
this->disconnect();
}

TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColQueryAllDataTypesMetadataMock) {
TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColQueryAllDataTypesMetadata) {
// Mock server has a limitation where only SQL_WVARCHAR column type values are returned
// from SELECT AS queries
this->connect();
Expand Down Expand Up @@ -2452,7 +2452,7 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColQueryAllDataTypesMetadataMock) {
this->disconnect();
}

TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColQueryAllDataTypesMetadataRemote) {
TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColQueryAllDataTypesMetadata) {
this->connect();

SQLWCHAR columnName[1024];
Expand Down Expand Up @@ -2536,7 +2536,8 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColQueryAllDataTypesMetadataRemot
this->disconnect();
}

TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataRemote) {
TEST_F(FlightSQLODBCRemoteTestBase,
SQLDescribeColODBCTestTableMetadatafSQLDescribeColQueryAllDataTypesMetadata) {
// Test assumes there is a table $scratch.ODBCTest in remote server
this->connect();

Expand Down Expand Up @@ -2600,7 +2601,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataRemote) {
this->disconnect();
}

TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataRemoteODBC2) {
TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataODBC2) {
// Test assumes there is a table $scratch.ODBCTest in remote server
this->connect(SQL_OV_ODBC2);

Expand All @@ -2621,9 +2622,9 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataRemoteODB
(SQLWCHAR*)L"double_max", (SQLWCHAR*)L"bit_true",
(SQLWCHAR*)L"date_max", (SQLWCHAR*)L"time_max",
(SQLWCHAR*)L"timestamp_max"};
SQLSMALLINT columnDataTypes[] = {SQL_INTEGER, SQL_BIGINT, SQL_DECIMAL,
SQL_FLOAT, SQL_DOUBLE, SQL_BIT,
SQL_DATETIME, SQL_TIME, SQL_TIMESTAMP};
SQLSMALLINT columnDataTypes[] = {SQL_INTEGER, SQL_BIGINT, SQL_DECIMAL,
SQL_FLOAT, SQL_DOUBLE, SQL_BIT,
SQL_DATE, SQL_TIME, SQL_TIMESTAMP};
SQLULEN columnSizes[] = {4, 8, 19, 8, 8, 1, 10, 12, 23};
SQLULEN columnDecimalDigits[] = {0, 0, 0, 0, 0, 0, 10, 12, 23};

Expand Down Expand Up @@ -2664,7 +2665,7 @@ TEST_F(FlightSQLODBCRemoteTestBase, SQLDescribeColODBCTestTableMetadataRemoteODB
this->disconnect();
}

TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColAllTypesTableMetadataMock) {
TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColAllTypesTableMetadata) {
this->connect();
this->CreateTableAllDataType();

Expand Down Expand Up @@ -2722,7 +2723,7 @@ TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColAllTypesTableMetadataMock) {
this->disconnect();
}

TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColUnicodeTableMetadataMock) {
TEST_F(FlightSQLODBCMockTestBase, SQLDescribeColUnicodeTableMetadata) {
this->connect();
this->CreateUnicodeTable();

Expand Down
3 changes: 0 additions & 3 deletions cpp/src/arrow/flight/sql/odbc/tests/tables_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@

namespace arrow::flight::sql::odbc {

// TODO: Add tests with SQLDescribeCol to check metadata of SQLColumns for ODBC 2 and
// ODBC 3.

// Helper Functions

std::wstring GetStringColumnW(SQLHSTMT stmt, int colId) {
Expand Down
Loading