Skip to content

Fix Insert into column name with space #31

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
merged 7 commits into from
Jan 7, 2021
Merged

Fix Insert into column name with space #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
76aedbe
Fix Insert into column name with space
pakapor Feb 27, 2020
afb5fb8
change escaping method
pakapor Jan 6, 2021
e213ffb
Add unit test for speces and special chars in names
pakapor Jan 6, 2021
93f7706
Merge branch 'master' into bugfix-insertSpaceColumn
pakapor Jan 6, 2021
d008751
Clean up ColEscapeNameTest ut
pakapor Jan 6, 2021
f812600
Validating that names of the columns received from clickhouse
Enmk Jan 6, 2021
46396a6
Merge pull request #1 from Enmk/bugfix-insertSpaceColumn
pakapor Jan 7, 2021
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
21 changes: 20 additions & 1 deletion clickhouse/client.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,25 @@ void Client::Impl::ExecuteQuery(Query query) {
}
}

std::string NameToQueryString(const std::string &input)
{
std::string output;
output.reserve(input.size() + 2);
output += '`';

for (const auto & c : input) {
if (c == '`') {
//escape ` with ``
output.append("``");
} else {
output.push_back(c);
}
}

output += '`';
return output;
}

void Client::Impl::Insert(const std::string& table_name, const Block& block) {
if (options_.ping_before_query) {
RetryGuard([this]() { Ping(); });
Expand All @@ -211,7 +230,7 @@ void Client::Impl::Insert(const std::string& table_name, const Block& block) {

// Enumerate all fields
for (unsigned int i = 0; i < block.GetColumnCount(); i++) {
fields.push_back(block.GetColumnName(i));
fields.push_back(NameToQueryString(block.GetColumnName(i)));
}

std::stringstream fields_section;
Expand Down
48 changes: 48 additions & 0 deletions ut/client_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,54 @@ TEST_P(ClientCase, Decimal) {
});
}

// Test special chars in names
TEST_P(ClientCase, ColEscapeNameTest) {
client_->Execute(R"sql(DROP TABLE IF EXISTS test_clickhouse_cpp."col_escape_""name_test";)sql");

client_->Execute(R"sql(CREATE TABLE IF NOT EXISTS test_clickhouse_cpp."col_escape_""name_test" ("test space" UInt64, "test "" quote" UInt64, "test ""`'[]&_\ all" UInt64) ENGINE = Memory)sql");

auto col1 = std::make_shared<ColumnUInt64>();
col1->Append(1);
col1->Append(2);
auto col2 = std::make_shared<ColumnUInt64>();
col2->Append(4);
col2->Append(8);
auto col3 = std::make_shared<ColumnUInt64>();
col3->Append(16);
col3->Append(32);

static const std::string column_names[] = {
"test space",
R"sql(test " quote)sql",
R"sql(test "`'[]&_\ all)sql"
};
static const auto columns_count = sizeof(column_names)/sizeof(column_names[0]);

Block block;
block.AppendColumn(column_names[0], col1);
block.AppendColumn(column_names[1], col2);
block.AppendColumn(column_names[2], col3);

client_->Insert(R"sql(test_clickhouse_cpp."col_escape_""name_test")sql", block);
client_->Select(R"sql(SELECT * FROM test_clickhouse_cpp."col_escape_""name_test")sql", [] (const Block& sblock)
{
int row = sblock.GetRowCount();
if (row <= 0) {return;}
ASSERT_EQ(columns_count, sblock.GetColumnCount());
for (size_t i = 0; i < columns_count; ++i) {
EXPECT_EQ(column_names[i], sblock.GetColumnName(i));
}

EXPECT_EQ(row, 2);
EXPECT_EQ(sblock[0]->As<ColumnUInt64>()->At(0), 1u);
EXPECT_EQ(sblock[0]->As<ColumnUInt64>()->At(1), 2u);
EXPECT_EQ(sblock[1]->As<ColumnUInt64>()->At(0), 4u);
EXPECT_EQ(sblock[1]->As<ColumnUInt64>()->At(1), 8u);
EXPECT_EQ(sblock[2]->As<ColumnUInt64>()->At(0), 16u);
EXPECT_EQ(sblock[2]->As<ColumnUInt64>()->At(1), 32u);
});
}

// Test roundtrip of DateTime64 values
TEST_P(ClientCase, DateTime64) {
const auto & server_info = client_->GetServerInfo();
Expand Down