This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/main by this push:
new 457619283f GH-48055: [C++][FlightRPC] Allow spaces while parsing Table
Type in ODBC (#48056)
457619283f is described below
commit 457619283f660d0887a19b97988e2348111ecd3f
Author: Alina (Xi) Li <[email protected]>
AuthorDate: Sun Nov 9 15:52:34 2025 -0800
GH-48055: [C++][FlightRPC] Allow spaces while parsing Table Type in ODBC
(#48056)
### Rationale for this change
Allow spaces while parsing Table Type in ODBC. For example, driver should
be able to interpret `" TABLE , VIEW "` as "TABLE" and "VIEW".
### What changes are included in this PR?
- Allow spaces while parsing Table Type in ODBC & Add 3 tests
### Are these changes tested?
Tested locally on Windows MSVC.
### Are there any user-facing changes?
N/A
* GitHub Issue: #48055
Lead-authored-by: Alina (Xi) Li <[email protected]>
Co-authored-by: justing-bq <[email protected]>
Co-authored-by: justing-bq <[email protected]>
Signed-off-by: David Li <[email protected]>
---
.../odbc_impl/flight_sql_statement_get_tables.cc | 47 ++++++++++------------
.../sql/odbc/odbc_impl/parse_table_types_test.cc | 13 ++++++
2 files changed, 35 insertions(+), 25 deletions(-)
diff --git
a/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_statement_get_tables.cc
b/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_statement_get_tables.cc
index 2a6bb8970b..1af2ab42bf 100644
--- a/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_statement_get_tables.cc
+++ b/cpp/src/arrow/flight/sql/odbc/odbc_impl/flight_sql_statement_get_tables.cc
@@ -23,11 +23,21 @@
#include "arrow/flight/sql/odbc/odbc_impl/record_batch_transformer.h"
#include "arrow/flight/sql/odbc/odbc_impl/util.h"
#include "arrow/flight/types.h"
+#include "arrow/util/string.h"
namespace arrow::flight::sql::odbc {
using arrow::Result;
+static void AddTableType(std::string& table_type, std::vector<std::string>&
table_types) {
+ std::string trimmed_type = arrow::internal::TrimString(table_type);
+
+ // Only put the string if the trimmed result is non-empty
+ if (!trimmed_type.empty()) {
+ table_types.emplace_back(std::move(trimmed_type));
+ }
+}
+
void ParseTableTypes(const std::string& table_type,
std::vector<std::string>& table_types) {
bool encountered = false; // for checking if there is a single quote
@@ -36,36 +46,23 @@ void ParseTableTypes(const std::string& table_type,
for (char temp : table_type) { // while still in the string
switch (temp) { // switch depending on the character
case '\'': // if the character is a single quote
- if (encountered) {
- encountered = false; // if we already found a single quote, reset
encountered
- } else {
- encountered =
- true; // if we haven't found a single quote, set encountered to
true
- }
+ // track when we've encountered a single opening quote
+ // and are still looking for the closing quote
+ encountered = !encountered;
break;
- case ',': // if it is a comma
- if (!encountered) { // if we have not found a single
quote
- table_types.push_back(curr_parse); // put our current string into
our vector
- curr_parse = ""; // reset the current string
+ case ',': // if it is a comma
+ if (!encountered) { // if we have not found a
single quote
+ AddTableType(curr_parse, table_types); // put current string into
vector
+ curr_parse = ""; // reset the current string
break;
}
- default: // if it is a normal character
- if (encountered && isspace(temp)) {
- curr_parse.push_back(temp); // if we have found a single quote put
the
- // whitespace, we don't care
- } else if (temp == '\'' || temp == ' ') {
- break; // if the current character is a single quote, trash it and
go to
- // the next character.
- } else {
- curr_parse.push_back(temp); // if all of the above failed, put the
- // character into the current string
- }
- break; // go to the next character
+ [[fallthrough]];
+ default: // if it is a normal character
+ curr_parse.push_back(temp); // put the character into the current
string
+ break; // go to the next character
}
}
- table_types.emplace_back(
- curr_parse); // if we have found a single quote put the whitespace,
- // we don't care
+ AddTableType(curr_parse, table_types);
}
std::shared_ptr<ResultSet> GetTablesForSQLAllCatalogs(
diff --git a/cpp/src/arrow/flight/sql/odbc/odbc_impl/parse_table_types_test.cc
b/cpp/src/arrow/flight/sql/odbc/odbc_impl/parse_table_types_test.cc
index 544430539b..cf1e5930a8 100644
--- a/cpp/src/arrow/flight/sql/odbc/odbc_impl/parse_table_types_test.cc
+++ b/cpp/src/arrow/flight/sql/odbc/odbc_impl/parse_table_types_test.cc
@@ -49,4 +49,17 @@ TEST(TableTypeParser,
ParsingWithSingleQuotesWithoutLeadingWhiteSpace) {
TEST(TableTypeParser, ParsingWithCommaInsideSingleQuotes) {
AssertParseTest("'TABLE, TEST', 'VIEW, TEMPORARY'", {"TABLE, TEST", "VIEW,
TEMPORARY"});
}
+
+TEST(TableTypeParser, ParsingWithManyLeadingAndTrailingWhiteSpaces) {
+ AssertParseTest(" TABLE , VIEW ", {"TABLE", "VIEW"});
+}
+
+TEST(TableTypeParser, ParsingWithOnlyWhiteSpaceBetweenCommas) {
+ AssertParseTest("TABLE, ,VIEW", {"TABLE", "VIEW"});
+}
+
+TEST(TableTypeParser, ParsingWithWhiteSpaceInsideValue) {
+ AssertParseTest("BASE TABLE", {"BASE TABLE"});
+}
+
} // namespace arrow::flight::sql::odbc
