sascha
/
query
1
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: sascha:1dbe4e6096ad945b84086c49051314f10d96b298
Branches Tags
sascha:main
sascha:feature/matador-ng
..
compare: sascha:44adc81ce147bea47ada56bb070267ea898cb51f
Branches Tags
sascha:feature/matador-ng
sascha:main

No commits in common. "1dbe4e6096ad945b84086c49051314f10d96b298" and "44adc81ce147bea47ada56bb070267ea898cb51f" have entirely different histories.
1dbe4e6096 ... 44adc81ce1

4 changed files with 3 additions and 14 deletions
Show Stats Expand all files Collapse all files

1
include/matador/sql/column.hpp
View File

@ -50,7 +50,6 @@ public:
[[nodiscard]] const std::string& ref_table() const;
[[nodiscard]] const std::string& ref_column() const;
void type(data_type_t type);
void alias(const std::string &as);
template< typename Type >

5
src/sql/column.cpp
View File

@ -68,11 +68,6 @@ const std::string &column::ref_column() const
return ref_column_;
}
void column::type(data_type_t type)
{
type_ = type;
}
void column::alias(const std::string &as)
{
alias_ = as;

7
src/sql/session.cpp
View File

@ -50,14 +50,9 @@ query_result<record> session::fetch(const query &q) const
if (it == prototypes_.end()) {
it = prototypes_.emplace(q.table_name, c->describe(q.table_name)).first;
}
// adjust columns from given query
for (auto &col : q.prototype) {
if (const auto rit = it->second.find(col.name()); col.type() == data_type_t::type_unknown && rit != it->second.end()) {
const_cast<column&>(col).type(rit->type());
}
}
auto res = c->call_fetch(q.sql);
return query_result<record>{std::move(res), q.prototype};
// return query_result<record>{std::move(res), [it]() { return new record(it->second); }};
}
//query_result<record> session::fetch(const std::string &sql) const

4
test/SessionTest.cpp
View File

@ -72,13 +72,13 @@ TEST_CASE("Execute select statement with where clause", "[session]") {
for (const auto& i : result_record) {
REQUIRE(i.size() == 3);
REQUIRE(i.at(0).name() == "id");
REQUIRE(i.at(0).type() == data_type_t::type_unsigned_long);
REQUIRE(i.at(0).type() == data_type_t::type_long_long);
REQUIRE(i.at(0).as<long long>() == george.id);
REQUIRE(i.at(1).name() == "name");
REQUIRE(i.at(1).type() == data_type_t::type_varchar);
REQUIRE(i.at(1).as<std::string>() == george.name);
REQUIRE(i.at(2).name() == "age");
REQUIRE(i.at(2).type() == matador::sql::data_type_t::type_unsigned_int);
REQUIRE(i.at(2).type() == matador::sql::data_type_t::type_long_long);
REQUIRE(i.at(2).as<long long>() == george.age);
}