summaryrefslogtreecommitdiff
path: root/libdbpp/unittests
diff options
context:
space:
mode:
Diffstat (limited to 'libdbpp/unittests')
-rw-r--r--libdbpp/unittests/Jamfile.jam14
m---------libdbpp/unittests/libdbpp-postgresql0
-rw-r--r--libdbpp/unittests/mockdb.cpp2
-rw-r--r--libdbpp/unittests/mockdb.h2
-rw-r--r--libdbpp/unittests/testParse.cpp4
5 files changed, 18 insertions, 4 deletions
diff --git a/libdbpp/unittests/Jamfile.jam b/libdbpp/unittests/Jamfile.jam
index b1413ba..d80f623 100644
--- a/libdbpp/unittests/Jamfile.jam
+++ b/libdbpp/unittests/Jamfile.jam
@@ -125,3 +125,17 @@ run
testMock
;
+run
+ libdbpp-postgresql/libpqpp/unittests/testpq.cpp
+ : :
+ libdbpp-postgresql/libpqpp/unittests/pqschema.sql
+ :
+ <define>ROOT=\"$(me)/libdbpp-postgresql/libpqpp/unittests\"
+ <define>BOOST_TEST_DYN_LINK
+ <library>dbpp-local-postgresql
+ <library>..//dbpptestcore
+ <library>..//adhocutil
+ <library>boost_utf
+ <library>..//stdc++fs
+ <library>boost_system
+ ;
diff --git a/libdbpp/unittests/libdbpp-postgresql b/libdbpp/unittests/libdbpp-postgresql
-Subproject a4c6328efab2e614a46b4a1c78fb0c5678c3fd7
+Subproject b7544cf990e782cec92a69555ab9dacd3f2d596
diff --git a/libdbpp/unittests/mockdb.cpp b/libdbpp/unittests/mockdb.cpp
index d831b57..ea85294 100644
--- a/libdbpp/unittests/mockdb.cpp
+++ b/libdbpp/unittests/mockdb.cpp
@@ -58,7 +58,7 @@ MockDb::modify(const std::string &, const DB::CommandOptionsCPtr &)
return nullptr;
}
-MockMock::MockMock(const std::string &, const std::string &, const std::vector<boost::filesystem::path> & ss) :
+MockMock::MockMock(const std::string &, const std::string &, const std::vector<std::filesystem::path> & ss) :
DB::MockDatabase()
{
CreateNewDatabase();
diff --git a/libdbpp/unittests/mockdb.h b/libdbpp/unittests/mockdb.h
index 41d63e1..379d076 100644
--- a/libdbpp/unittests/mockdb.h
+++ b/libdbpp/unittests/mockdb.h
@@ -24,7 +24,7 @@ class MockDb : public DB::Connection {
class MockMock : public DB::MockDatabase {
public:
- MockMock(const std::string &, const std::string &, const std::vector<boost::filesystem::path> &);
+ MockMock(const std::string &, const std::string &, const std::vector<std::filesystem::path> &);
DB::ConnectionPtr openConnection() const override;
void CreateNewDatabase() const override;
void DropDatabase() const override;
diff --git a/libdbpp/unittests/testParse.cpp b/libdbpp/unittests/testParse.cpp
index b5f3d65..491e8e6 100644
--- a/libdbpp/unittests/testParse.cpp
+++ b/libdbpp/unittests/testParse.cpp
@@ -14,7 +14,7 @@ BOOST_TEST_SPECIALIZED_COLLECTION_COMPARE(SQLs);
class RecordingParser : std::fstream, public DB::SqlParse {
public:
- RecordingParser(const boost::filesystem::path & p) :
+ RecordingParser(const std::filesystem::path & p) :
std::fstream(p.string()),
DB::SqlParse(*this, p.parent_path())
{
@@ -35,7 +35,7 @@ class RecordingParser : std::fstream, public DB::SqlParse {
};
template<typename E = DB::SqlParseException>
-void assertFail(const boost::filesystem::path & p)
+void assertFail(const std::filesystem::path & p)
{
BOOST_TEST_CONTEXT(p) {
BOOST_REQUIRE_THROW({