BlockStorage/repertory
1
0
Fork 0
Code Issues 7 Pull Requests Releases 6 Wiki Activity

fixes

Browse Source
This commit is contained in:
Scott E. Graves 2024-10-02 11:38:45 -05:00
parent 3e6ed45562
commit 42a81b1c8e
2 changed files with 56 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
repertory/librepertory/src/file_manager/file_manager.cpp
View File

@ -613,7 +613,7 @@ void file_manager::remove_upload(const std::string &api_path, bool no_lock) {
.equals(api_path) .equals(api_path)
.go(); .go();
if (not result.ok()) { if (not result.ok()) {
utils::error::raise_api_path_error(function_name, to_api_path, utils::error::raise_api_path_error(function_name, api_path,
"failed to remove from upload table"); "failed to remove from upload table");
} }
@ -623,8 +623,7 @@ void file_manager::remove_upload(const std::string &api_path, bool no_lock) {
.go(); .go();
if (not result.ok()) { if (not result.ok()) {
utils::error::raise_api_path_error( utils::error::raise_api_path_error(
function_name, to_api_path, function_name, api_path, "failed to remove from upload_active table");
"failed to remove from upload_active table");
} }
if (upload_lookup_.find(api_path) != upload_lookup_.end()) { if (upload_lookup_.find(api_path) != upload_lookup_.end()) {
@ -970,6 +969,10 @@ void file_manager::store_resume(const i_open_file &file) {
void file_manager::swap_renamed_items(std::string from_api_path, void file_manager::swap_renamed_items(std::string from_api_path,
std::string to_api_path, bool directory) { std::string to_api_path, bool directory) {
static constexpr const std::string_view function_name{
static_cast<const char *>(__FUNCTION__),
};
auto file_iter = open_file_lookup_.find(from_api_path); auto file_iter = open_file_lookup_.find(from_api_path);
if (file_iter != open_file_lookup_.end()) { if (file_iter != open_file_lookup_.end()) {
auto ptr = std::move(open_file_lookup_[from_api_path]); auto ptr = std::move(open_file_lookup_[from_api_path]);

69
repertory/repertory_test/src/database_test.cpp
View File

@ -143,23 +143,54 @@ TEST_F(database_test, db_update_query) {
query_str.c_str()); query_str.c_str());
} }
// auto res = query.go(); TEST_F(database_test, insert_select_delete) {
// {
// EXPECT_TRUE(res.ok()); auto query = db::db_insert{*db3.get(), "table"}
// EXPECT_TRUE(res.has_row()); .column_value("column1", "test0")
// std::size_t row_count{}; .column_value("column2", "test1");
// while (res.has_row()) { auto res = query.go();
// std::optional<db::db_select::row> row; EXPECT_TRUE(res.ok());
// EXPECT_TRUE(res.get_row(row)); }
// EXPECT_TRUE(row.has_value());
// if (row.has_value()) { {
// for (const auto &column : row.value().get_columns()) { auto query = db::db_select{*db3.get(), "table"};
// std::cout << column.get_index() << ':'; EXPECT_TRUE(res.ok());
// std::cout << column.get_name() << ':'; EXPECT_TRUE(res.has_row());
// std::cout << column.get_value<std::string>() << std::endl;
// } std::size_t row_count{};
// } while (res.has_row()) {
// ++row_count; std::optional<db::db_select::row> row;
// } EXPECT_TRUE(res.get_row(row));
// EXPECT_EQ(std::size_t(1U), row_count); EXPECT_TRUE(row.has_value());
if (row.has_value()) {
for (auto &&column : row.value().get_columns()) {
std::cout << column.get_index() << ':';
std::cout << column.get_name() << ':';
std::cout << column.get_value<std::string>() << std::endl;
}
}
++row_count;
}
EXPECT_EQ(std::size_t(1U), row_count);
}
{
auto query = db::db_delete{*db3.get(), "table"};
auto res = query.go();
EXPECT_TRUE(res.ok());
}
{
auto query = db::db_select{*db3.get(), "table"};
EXPECT_TRUE(res.ok());
std::size_t row_count{};
while (res.has_row()) {
++row_count;
}
EXPECT_EQ(std::size_t(0U), row_count);
}
}
} // namespace repertory } // namespace repertory