Skip to content

Add additional SQLDescribeCol test cases #85

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 5 commits into from
Aug 12, 2025
Merged

Add additional SQLDescribeCol test cases #85

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e1fcc58
Add additional SQLDescribeCol test cases
rscales Aug 8, 2025
6b6b974
Removed all TODO comments
rscales Aug 8, 2025
471d15a
Add missing column metadata requests to validate SQLColumns call usin…
rscales Aug 11, 2025
8275909
Add missing column metadata requests to validate SQLColumns call usin…
rscales Aug 11, 2025
3cf1e35
Fix formatting issue
rscales Aug 12, 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
44 changes: 32 additions & 12 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 @@ -2781,12 +2781,22 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLColumnsGetMetadataBySQLDescribeCol) {
SQLSMALLINT nullable = 0;
size_t columnIndex = 0;

SQLWCHAR* columnNames[] = {(SQLWCHAR*)L"TABLE_CAT", (SQLWCHAR*)L"TABLE_SCHEM",
(SQLWCHAR*)L"TABLE_NAME", (SQLWCHAR*)L"COLUMN_NAME",
(SQLWCHAR*)L"DATA_TYPE"};
SQLSMALLINT columnDataTypes[] = {SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR,
SQL_SMALLINT};
SQLULEN columnSizes[] = {1024, 1024, 1024, 1024, 2};
SQLWCHAR* columnNames[] = {
(SQLWCHAR*)L"TABLE_CAT", (SQLWCHAR*)L"TABLE_SCHEM",
(SQLWCHAR*)L"TABLE_NAME", (SQLWCHAR*)L"COLUMN_NAME",
(SQLWCHAR*)L"DATA_TYPE", (SQLWCHAR*)L"TYPE_NAME",
(SQLWCHAR*)L"COLUMN_SIZE", (SQLWCHAR*)L"BUFFER_LENGTH",
(SQLWCHAR*)L"DECIMAL_DIGITS", (SQLWCHAR*)L"NUM_PREC_RADIX",
(SQLWCHAR*)L"NULLABLE", (SQLWCHAR*)L"REMARKS",
(SQLWCHAR*)L"COLUMN_DEF", (SQLWCHAR*)L"SQL_DATA_TYPE",
(SQLWCHAR*)L"SQL_DATETIME_SUB", (SQLWCHAR*)L"CHAR_OCTET_LENGTH",
(SQLWCHAR*)L"ORDINAL_POSITION", (SQLWCHAR*)L"IS_NULLABLE"};
SQLSMALLINT columnDataTypes[] = {
SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_SMALLINT, SQL_WVARCHAR,
SQL_INTEGER, SQL_INTEGER, SQL_SMALLINT, SQL_SMALLINT, SQL_SMALLINT, SQL_WVARCHAR,
SQL_WVARCHAR, SQL_SMALLINT, SQL_SMALLINT, SQL_INTEGER, SQL_INTEGER, SQL_WVARCHAR};
SQLULEN columnSizes[] = {1024, 1024, 1024, 1024, 2, 1024, 4, 4, 2,
2, 2, 1024, 1024, 2, 2, 4, 4, 1024};

SQLRETURN ret = SQLColumns(this->stmt, nullptr, 0, nullptr, 0, nullptr, 0, nullptr, 0);

Expand Down Expand Up @@ -2833,12 +2843,22 @@ TYPED_TEST(FlightSQLODBCTestBase, SQLColumnsGetMetadataBySQLDescribeColODBC2) {
SQLSMALLINT nullable = 0;
size_t columnIndex = 0;

SQLWCHAR* columnNames[] = {(SQLWCHAR*)L"TABLE_QUALIFIER", (SQLWCHAR*)L"TABLE_OWNER",
(SQLWCHAR*)L"TABLE_NAME", (SQLWCHAR*)L"COLUMN_NAME",
(SQLWCHAR*)L"DATA_TYPE"};
SQLSMALLINT columnDataTypes[] = {SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR,
SQL_SMALLINT};
SQLULEN columnSizes[] = {1024, 1024, 1024, 1024, 2};
SQLWCHAR* columnNames[] = {
(SQLWCHAR*)L"TABLE_QUALIFIER", (SQLWCHAR*)L"TABLE_OWNER",
(SQLWCHAR*)L"TABLE_NAME", (SQLWCHAR*)L"COLUMN_NAME",
(SQLWCHAR*)L"DATA_TYPE", (SQLWCHAR*)L"TYPE_NAME",
(SQLWCHAR*)L"PRECISION", (SQLWCHAR*)L"LENGTH",
(SQLWCHAR*)L"SCALE", (SQLWCHAR*)L"RADIX",
(SQLWCHAR*)L"NULLABLE", (SQLWCHAR*)L"REMARKS",
(SQLWCHAR*)L"COLUMN_DEF", (SQLWCHAR*)L"SQL_DATA_TYPE",
(SQLWCHAR*)L"SQL_DATETIME_SUB", (SQLWCHAR*)L"CHAR_OCTET_LENGTH",
(SQLWCHAR*)L"ORDINAL_POSITION", (SQLWCHAR*)L"IS_NULLABLE"};
SQLSMALLINT columnDataTypes[] = {
SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_WVARCHAR, SQL_SMALLINT, SQL_WVARCHAR,
SQL_INTEGER, SQL_INTEGER, SQL_SMALLINT, SQL_SMALLINT, SQL_SMALLINT, SQL_WVARCHAR,
SQL_WVARCHAR, SQL_SMALLINT, SQL_SMALLINT, SQL_INTEGER, SQL_INTEGER, SQL_WVARCHAR};
SQLULEN columnSizes[] = {1024, 1024, 1024, 1024, 2, 1024, 4, 4, 2,
2, 2, 1024, 1024, 2, 2, 4, 4, 1024};

SQLRETURN ret = SQLColumns(this->stmt, nullptr, 0, nullptr, 0, nullptr, 0, nullptr, 0);

Expand Down
Loading