Skip to content

feat(c/driver/postgresql): remove trailing whitespace from queries #5002

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
lidavidm merged 1 commit into from
Nov 9, 2026
Merged

feat(c/driver/postgresql): remove trailing whitespace from queries #5002

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
22 changes: 22 additions & 0 deletions c/driver/postgresql/postgresql_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2428,6 +2428,28 @@ TEST_F(PostgresStatementTest, BindUpsertWithSlicedListParameter) {
ASSERT_THAT(AdbcStatementRelease(&statement, &error), IsOkStatus(&error));
}

// Regression test for https://github.com/apache/arrow-adbc/issues/4999.
TEST_F(PostgresStatementTest, SqlQueryTrailingWhitespace) {
ASSERT_THAT(AdbcStatementNew(&connection, &statement, &error), IsOkStatus(&error));
ASSERT_THAT(AdbcStatementSetSqlQuery(&statement, "SELECT 1; \t\r\n", &error),
IsOkStatus(&error));

adbc_validation::StreamReader reader;
ASSERT_THAT(
AdbcStatementExecuteQuery(&statement, &reader.stream.value, nullptr, &error),
IsOkStatus(&error));
ASSERT_NO_FATAL_FAILURE(reader.GetSchema());
ASSERT_EQ(reader.schema->n_children, 1);
ASSERT_EQ(reader.fields[0].type, NANOARROW_TYPE_INT32);
ASSERT_NO_FATAL_FAILURE(reader.Next());
ASSERT_NE(reader.array->release, nullptr);
ASSERT_EQ(reader.array->length, 1);
ASSERT_NO_FATAL_FAILURE(
adbc_validation::CompareArray<int32_t>(reader.array_view->children[0], {1}));
ASSERT_NO_FATAL_FAILURE(reader.Next());
ASSERT_EQ(reader.array->release, nullptr);
}

TEST_F(PostgresStatementTest, SqlExecuteCopyZeroRowOutputError) {
ASSERT_THAT(quirks()->DropTable(&connection, "adbc_test", &error), IsOkStatus(&error));
ASSERT_THAT(AdbcStatementNew(&connection, &statement, &error), IsOkStatus(&error));
Expand Down
6 changes: 4 additions & 2 deletions c/driver/postgresql/result_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,8 +111,10 @@ Status PqResultHelper::Execute(const std::vector<std::string>& params,
}

Status PqResultHelper::ExecuteCopy() {
// Remove trailing semicolon(s) from the query before feeding it into COPY
while (!query_.empty() && query_.back() == ';') {
// Remove trailing semicolons and whitespace before feeding the query into COPY
while (!query_.empty() &&
(query_.back() == ';' || query_.back() == ' ' || query_.back() == '\t' ||
query_.back() == '\r' || query_.back() == '\n')) {
query_.pop_back();
}

Expand Down
Loading