pub_soft/libcifpp
3
0
Fork 0
mirror of https://github.com/PDB-REDO/libcifpp.git synced 2026-06-04 13:54:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

some initial work

Browse Source
This commit is contained in:
Maarten L. Hekkelman
2025-11-19 16:36:44 +01:00
parent 42e66afd92
commit 4a7f48eed8
4 changed files with 1245 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@@ -257,6 +257,7 @@ set(project_sources
${CMAKE_CURRENT_SOURCE_DIR}/src/point.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/symmetry.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/model.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/cql/transaction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pdb/cif2pdb.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pdb/pdb2cif.cpp
${CMAKE_CURRENT_SOURCE_DIR}/src/pdb/pdb_record.hpp
@@ -293,6 +294,7 @@ set(project_headers
include/cif++/row.hpp
include/cif++/symmetry.hpp
include/cif++/text.hpp
include/cif++/cql/transaction.hpp
include/cif++/utilities.hpp
include/cif++/validate.hpp
)

96
include/cif++/cql/transaction.hpp
View File

@@ -29,6 +29,10 @@
#include "cif++/datablock.hpp"
#include "cif++/item.hpp"
#include "cif++/row.hpp"
#include "cif++/validate.hpp"
#include <stdexcept>
#include <vector>
// --------------------------------------------------------------------
@@ -41,15 +45,24 @@ class transaction;
// --------------------------------------------------------------------
class field
class field : private cif::item_handle
{
public:
std::string_view name() const &;
// DDL_PrimitiveType type() const;
constexpr size_t num() const noexcept;
std::string_view text() const &
{
return cif::item_handle::text();
}
/** Return the contents of this item as type @tparam T */
template <typename T = std::string>
auto as() const -> T
{
return m_item.as<T>();
return cif::item_handle::as<T>();
}
/** Return the contents of this item as type @tparam T or, if not
@@ -58,11 +71,16 @@ class field
template <typename T>
auto value_or(const T &dv) const
{
return m_item.value_or(dv);
}
return cif::item_handle::value_or(dv);
}
private:
cif::item_handle m_item;
protected:
friend class row;
field(cif::item_handle ih)
: cif::item_handle(ih)
{
}
};
// --------------------------------------------------------------------
@@ -70,36 +88,86 @@ class field
class row
{
public:
row() = default;
row(row const &rhs) = default;
row(row &&rhs) = default;
row &operator=(row const &rhs) noexcept = default;
row &operator=(row &&rhs) noexcept = default;
field operator[](size_t ix) const;
protected:
friend class result;
row(row_handle rh, std::vector<int> cols) noexcept
: m_row(rh)
, m_cols(cols)
{
}
row_handle m_row;
std::vector<int> m_cols;
};
// --------------------------------------------------------------------
class result
class const_row_iterator : public row
{
public:
row &one_row();
using row::operator[];
};
class result
{
public:
result();
result(result const &rhs) noexcept = default;
result(result &&rhs) noexcept = default;
result &operator=(result const &rhs) noexcept = default;
result &operator=(result &&rhs) noexcept = default;
row one_row() const;
field one_field() const;
size_t size() const;
size_t columns() const;
private:
friend class transaction;
friend class transaction;
friend class SelectStatement;
result();
result(std::string query,
std::vector<row_handle> rows, std::vector<int> columns);
result expect_columns(size_t cols) const
{
if (auto actual = columns(); cols != actual)
throw std::runtime_error("Unexpected number of columns");
return *this;
}
std::shared_ptr<struct result_impl> m_impl;
};
// --------------------------------------------------------------------
class transaction
{
public:
transaction(const datablock &db);
transaction(const datablock &db)
: m_db(const_cast<datablock &>(db))
{
}
result exec(std::string_view query);
result exec(std::string_view query);
private:
datablock &m_db;
};
}
} // namespace cif::cql

1144
src/cql/transaction.cpp Normal file
View File

File diff suppressed because it is too large Load Diff

25
test/cql-test.cpp
View File

@@ -58,12 +58,12 @@ TEST_CASE("cql-1")
cif::cql::transaction tx(db);
CHECK(tx.exec("SELECT COUNT(*) FROM entry").one_field() == 1);
CHECK(tx.exec("SELECT COUNT(*) FROM entry WHERE id = '1CBS'").one_field() == 1);
CHECK(tx.exec("SELECT COUNT(*) FROM entry WHERE id = 'XXXX'").one_field() == 0);
// CHECK(tx.exec("SELECT COUNT(*) FROM entry").one_field().as<int>() == 1);
// CHECK(tx.exec("SELECT COUNT(*) FROM entry WHERE id = '1CBS'").one_field().as<int>() == 1);
// CHECK(tx.exec("SELECT COUNT(*) FROM entry WHERE id = 'XXXX'").one_field().as<int>() == 0);
CHECK(tx.exec("SELECT COUNT(*) FROM citation").one_field() == 4);
CHECK(tx.exec("SELECT COUNT(page_last) FROM citation").one_field() == 1);
// CHECK(tx.exec("SELECT COUNT(*) FROM citation").one_field().as<int>() == 4);
// CHECK(tx.exec("SELECT COUNT(page_last) FROM citation").one_field().as<int>() == 1);
const char *kPrimaryAuthors[] = {
"Kleywegt, G.J.",
@@ -75,15 +75,24 @@ TEST_CASE("cql-1")
"Jones, T.A."
};
auto r = tx.exec("SELECT name FROM citation_author WHERE citation_id = 'primary'");
auto r = tx.exec("SELECT name FROM citation_author WHERE citation_id = 'primary';");
CHECK(r.size() == 7);
for (size_t ix = 0; auto row : r)
{
REQUIRE(ix < (sizeof(kPrimaryAuthors) / sizeof(char*)));
CHECK(row["name"].as<std::string>() == kPrimaryAuthors[ix++]);
CHECK(row["ordinal"].as<int>() == ix);
CHECK(row[0].as<std::string>() == kPrimaryAuthors[ix++]);
// CHECK(row["ordinal"].as<int>() == ix);
}
// for (size_t ix = 0; auto row : r)
// {
// REQUIRE(ix < (sizeof(kPrimaryAuthors) / sizeof(char*)));
// // CHECK(row["name"].as<std::string>() == kPrimaryAuthors[ix++]);
// // CHECK(row["ordinal"].as<int>() == ix);
// }
// for (size_t ix = 0; const auto &[name, ordinal] : tx.stream<std::string, int>("SELECT name FROM citation_author WHERE citation_id = 'primary'"))
// {
// REQUIRE(ix < (sizeof(kPrimaryAuthors) / sizeof(char*)));