Skip to content

Added cql_result::column_name() method #7

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 1 commit into from
Jan 13, 2014
Merged

Added cql_result::column_name() method #7

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
6 changes: 6 additions & 0 deletions include/cql/cql_result.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ class cql_result_t {
virtual bool
exists(const std::string& column) const = 0;

virtual bool
column_name(int i,
std::string& output_keyspace,
std::string& output_table,
std::string& output_column) const = 0;

virtual bool
column_class(int i,
std::string& output) const = 0;
Expand Down
6 changes: 6 additions & 0 deletions include/cql/internal/cql_message_result_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,12 @@ public cql_message_t,
bool
exists(const std::string& column) const;

bool
column_name(int i,
std::string& output_keyspace,
std::string& output_table,
std::string& output_column) const;

bool
column_class(int i,
std::string& output) const;
Expand Down
7 changes: 7 additions & 0 deletions include/cql/internal/cql_result_metadata.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,12 @@ class cql_result_metadata_t :
const std::string& table,
const std::string& column) const;

bool
column_name(int i,
std::string& output_keyspace,
std::string& output_table,
std::string& output_column) const;

bool
column_class(int i,
std::string& output) const;
Expand Down Expand Up @@ -178,6 +184,7 @@ class cql_result_metadata_t :
private:

struct option_t {
column_name_t name;
cql::cql_column_type_enum primary_type;
cql::cql_column_type_enum collection_primary_type;
cql::cql_column_type_enum collection_secondary_type;
Expand Down
16 changes: 15 additions & 1 deletion src/cql/internal/cql_message_result_impl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,18 @@ cql::cql_message_result_impl_t::exists(const std::string& column) const {
return _metadata.exists(column);
}

bool
cql::cql_message_result_impl_t::column_name(int i,
std::string& output_keyspace,
std::string& output_table,
std::string& output_column) const
{
return _metadata.column_name(i,
output_keyspace,
output_table,
output_column);
}

bool
cql::cql_message_result_impl_t::column_class(int i,
std::string& output) const {
Expand Down Expand Up @@ -364,7 +376,9 @@ cql::cql_message_result_impl_t::get_double(const std::string& column,
bool
cql::cql_message_result_impl_t::get_bigint(int i,
cql::cql_bigint_t& output) const {
if (is_valid(i, cql::CQL_COLUMN_TYPE_BIGINT)) {
if (is_valid(i, cql::CQL_COLUMN_TYPE_BIGINT)
|| is_valid(i, cql::CQL_COLUMN_TYPE_TIMESTAMP)
|| is_valid(i, cql::CQL_COLUMN_TYPE_COUNTER)) {
cql::decode_bigint(_row[i] + sizeof(cql_int_t), output);
return true;
}
Expand Down
20 changes: 18 additions & 2 deletions src/cql/internal/cql_result_metadata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ cql::cql_result_metadata_t::read(cql::cql_byte_t* input) {
input = cql::decode_option(input, option.collection_secondary_type, option.collection_secondary_class);
}

column_name_t name(keyspace_name, table_name, column_name);
_column_name_idx.insert(column_name_idx_t::value_type(name, i));
option.name = column_name_t(keyspace_name, table_name, column_name);
_column_name_idx.insert(column_name_idx_t::value_type(option.name, i));
_columns.push_back(option);
}
return input;
Expand Down Expand Up @@ -156,6 +156,22 @@ cql::cql_result_metadata_t::global_table(const std::string& table) {
_global_table_name = table;
}

bool
cql::cql_result_metadata_t::column_name(int i,
std::string& output_keyspace,
std::string& output_table,
std::string& output_column) const
{
if (i > _column_count || i < 0) {
return false;
}

output_keyspace = _columns[i].name.get<0>();
output_table = _columns[i].name.get<1>();
output_column = _columns[i].name.get<2>();
return true;
}

bool
cql::cql_result_metadata_t::column_class(int i,
std::string& output) const {
Expand Down