From 01538166eda83838ad537ecbd425756e708ae0c4 Mon Sep 17 00:00:00 2001 From: emeric Date: Mon, 5 Feb 2024 11:21:15 +0100 Subject: [PATCH] Fixed bad MediaLibrary::getCount() --- src/libs/database/impl/MediaLibrary.cpp | 2 +- src/libs/database/include/database/MediaLibrary.hpp | 4 +++- src/libs/database/test/Common.cpp | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/libs/database/impl/MediaLibrary.cpp b/src/libs/database/impl/MediaLibrary.cpp index 2538caad..3732bb26 100644 --- a/src/libs/database/impl/MediaLibrary.cpp +++ b/src/libs/database/impl/MediaLibrary.cpp @@ -43,7 +43,7 @@ namespace Database { session.checkReadTransaction(); - return session.getDboSession().query("SELECT COUNT(*) FROM cluster"); + return session.getDboSession().query("SELECT COUNT(*) FROM media_library"); } MediaLibrary::pointer MediaLibrary::find(Session& session, MediaLibraryId id) diff --git a/src/libs/database/include/database/MediaLibrary.hpp b/src/libs/database/include/database/MediaLibrary.hpp index ca3582ec..790a5719 100644 --- a/src/libs/database/include/database/MediaLibrary.hpp +++ b/src/libs/database/include/database/MediaLibrary.hpp @@ -17,6 +17,8 @@ * along with LMS. If not, see . */ +#pragma once + #include #include #include @@ -38,7 +40,7 @@ namespace Database MediaLibrary() = default; // find - std::size_t getCount(Session& session); + static std::size_t getCount(Session& session); static pointer find(Session& session, MediaLibraryId id); static pointer find(Session& session, std::string_view name); static pointer find(Session& session, const std::filesystem::path& path); diff --git a/src/libs/database/test/Common.cpp b/src/libs/database/test/Common.cpp index 80fcc170..2015cacb 100644 --- a/src/libs/database/test/Common.cpp +++ b/src/libs/database/test/Common.cpp @@ -23,6 +23,7 @@ #include "database/Cluster.hpp" #include "database/Db.hpp" #include "database/Listen.hpp" +#include "database/MediaLibrary.hpp" #include "database/Release.hpp" #include "database/Session.hpp" #include "database/StarredArtist.hpp" @@ -77,6 +78,7 @@ void DatabaseFixture::testDatabaseEmpty() EXPECT_EQ(Cluster::getCount(session), 0); EXPECT_EQ(ClusterType::getCount(session), 0); EXPECT_EQ(Listen::getCount(session), 0); + EXPECT_EQ(MediaLibrary::getCount(session), 0); EXPECT_EQ(Release::getCount(session), 0); EXPECT_EQ(StarredArtist::getCount(session), 0); EXPECT_EQ(StarredRelease::getCount(session), 0);