summaryrefslogtreecommitdiff
path: root/libsqlitepp
diff options
context:
space:
mode:
authorDan Goodliffe <dan@randomdan.homeip.net>2021-09-21 17:59:41 +0100
committerDan Goodliffe <dan@randomdan.homeip.net>2021-09-21 17:59:41 +0100
commitf036fb38fb75c1298f6729ffc2f7d411b5478854 (patch)
tree12a6345905cceb9f50e189cdf7d2993edd0f14de /libsqlitepp
parentPass cppcheck and clang-tidy (diff)
downloadlibdbpp-sqlite-f036fb38fb75c1298f6729ffc2f7d411b5478854.tar.bz2
libdbpp-sqlite-f036fb38fb75c1298f6729ffc2f7d411b5478854.tar.xz
libdbpp-sqlite-f036fb38fb75c1298f6729ffc2f7d411b5478854.zip
First commit passing IWYU
Diffstat (limited to 'libsqlitepp')
-rw-r--r--libsqlitepp/sqlite-command.cpp11
-rw-r--r--libsqlitepp/sqlite-command.h9
-rw-r--r--libsqlitepp/sqlite-connection.cpp3
-rw-r--r--libsqlitepp/sqlite-connection.h3
-rw-r--r--libsqlitepp/sqlite-error.cpp2
-rw-r--r--libsqlitepp/sqlite-error.h4
-rw-r--r--libsqlitepp/sqlite-mock.cpp5
-rw-r--r--libsqlitepp/sqlite-mock.h3
-rw-r--r--libsqlitepp/sqlite-modifycommand.cpp5
-rw-r--r--libsqlitepp/sqlite-modifycommand.h1
-rw-r--r--libsqlitepp/sqlite-selectcommand.cpp10
-rw-r--r--libsqlitepp/sqlite-selectcommand.h2
-rw-r--r--libsqlitepp/unittests/testsqlite.cpp7
13 files changed, 53 insertions, 12 deletions
diff --git a/libsqlitepp/sqlite-command.cpp b/libsqlitepp/sqlite-command.cpp
index 694c5d2..662e053 100644
--- a/libsqlitepp/sqlite-command.cpp
+++ b/libsqlitepp/sqlite-command.cpp
@@ -1,7 +1,14 @@
#include "sqlite-command.h"
+#include "command.h"
#include "sqlite-connection.h"
-#include <cstdlib>
-#include <cstring>
+#include "sqlite-error.h"
+
+namespace Glib {
+ class ustring;
+}
+namespace boost::posix_time {
+ class time_duration;
+}
SQLite::Command::Command(const Connection * conn, const std::string & sql) : DB::Command(sql), c(conn), stmt(nullptr)
{
diff --git a/libsqlitepp/sqlite-command.h b/libsqlitepp/sqlite-command.h
index 1bf93c4..cf36ec3 100644
--- a/libsqlitepp/sqlite-command.h
+++ b/libsqlitepp/sqlite-command.h
@@ -1,8 +1,17 @@
#ifndef SQLITE_COMMAND_H
#define SQLITE_COMMAND_H
+#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <boost/date_time/posix_time/ptime.hpp>
#include <command.h>
+#include <glibmm/ustring.h>
#include <sqlite3.h>
+#include <string>
+#include <string_view>
+
+namespace boost::posix_time {
+ class time_duration;
+}
namespace SQLite {
class Connection;
diff --git a/libsqlitepp/sqlite-connection.cpp b/libsqlitepp/sqlite-connection.cpp
index e1a6de7..346c6db 100644
--- a/libsqlitepp/sqlite-connection.cpp
+++ b/libsqlitepp/sqlite-connection.cpp
@@ -1,7 +1,10 @@
#include "sqlite-connection.h"
+#include "connection.h"
#include "sqlite-error.h"
#include "sqlite-modifycommand.h"
#include "sqlite-selectcommand.h"
+#include <factory.h>
+#include <memory>
NAMEDFACTORY("sqlite", SQLite::Connection, DB::ConnectionFactory)
diff --git a/libsqlitepp/sqlite-connection.h b/libsqlitepp/sqlite-connection.h
index 1be1514..efb18dd 100644
--- a/libsqlitepp/sqlite-connection.h
+++ b/libsqlitepp/sqlite-connection.h
@@ -1,9 +1,12 @@
#ifndef SQLITE_CONNECTION_H
#define SQLITE_CONNECTION_H
+#include "command_fwd.h"
#include "sqlite-error.h"
#include <connection.h>
+#include <cstdint>
#include <sqlite3.h>
+#include <string>
namespace SQLite {
class ConnectionError : public virtual Error, public virtual DB::ConnectionError {
diff --git a/libsqlitepp/sqlite-error.cpp b/libsqlitepp/sqlite-error.cpp
index 0e4d084..71dda04 100644
--- a/libsqlitepp/sqlite-error.cpp
+++ b/libsqlitepp/sqlite-error.cpp
@@ -1,5 +1,5 @@
#include "sqlite-error.h"
-#include <cstring>
+#include <error.h>
SQLite::Error::Error(sqlite3 * db) : msg(sqlite3_errmsg(db)) { }
diff --git a/libsqlitepp/sqlite-error.h b/libsqlitepp/sqlite-error.h
index 9735966..4b9fb59 100644
--- a/libsqlitepp/sqlite-error.h
+++ b/libsqlitepp/sqlite-error.h
@@ -1,10 +1,10 @@
#ifndef SQLITE_ERROR_H
#define SQLITE_ERROR_H
-#include <error.h>
+#include <error.h> // IWYU pragma: keep
#include <exception.h>
#include <sqlite3.h>
-#include <visibility.h>
+#include <string>
namespace SQLite {
class Error : public AdHoc::Exception<DB::Error> {
diff --git a/libsqlitepp/sqlite-mock.cpp b/libsqlitepp/sqlite-mock.cpp
index 11f4f90..9c37012 100644
--- a/libsqlitepp/sqlite-mock.cpp
+++ b/libsqlitepp/sqlite-mock.cpp
@@ -1,6 +1,9 @@
#include "sqlite-mock.h"
+#include "mockDatabase.h"
#include "sqlite-connection.h"
-#include <boost/lexical_cast.hpp>
+#include <factory.h>
+#include <memory>
+#include <unistd.h>
NAMEDFACTORY("sqlite", SQLite::Mock, DB::MockDatabaseFactory)
diff --git a/libsqlitepp/sqlite-mock.h b/libsqlitepp/sqlite-mock.h
index fd8a8e9..7f21788 100644
--- a/libsqlitepp/sqlite-mock.h
+++ b/libsqlitepp/sqlite-mock.h
@@ -1,9 +1,12 @@
#ifndef MOCKSQLITEDATASOURCE_H
#define MOCKSQLITEDATASOURCE_H
+#include "connection_fwd.h"
#include <c++11Helpers.h>
#include <filesystem>
#include <mockDatabase.h>
+#include <string>
+#include <vector>
#include <visibility.h>
namespace SQLite {
diff --git a/libsqlitepp/sqlite-modifycommand.cpp b/libsqlitepp/sqlite-modifycommand.cpp
index d69516d..ee7a665 100644
--- a/libsqlitepp/sqlite-modifycommand.cpp
+++ b/libsqlitepp/sqlite-modifycommand.cpp
@@ -1,7 +1,10 @@
#include "sqlite-modifycommand.h"
+#include "command.h"
+#include "modifycommand.h"
+#include "sqlite-command.h"
#include "sqlite-connection.h"
#include "sqlite-error.h"
-#include <cstdlib>
+#include <sqlite3.h>
SQLite::ModifyCommand::ModifyCommand(const Connection * conn, const std::string & sql) :
DB::Command(sql), DB::ModifyCommand(sql), SQLite::Command(conn, sql)
diff --git a/libsqlitepp/sqlite-modifycommand.h b/libsqlitepp/sqlite-modifycommand.h
index d9f58c6..0583da1 100644
--- a/libsqlitepp/sqlite-modifycommand.h
+++ b/libsqlitepp/sqlite-modifycommand.h
@@ -3,6 +3,7 @@
#include "sqlite-command.h"
#include <modifycommand.h>
+#include <string>
namespace SQLite {
class Connection;
diff --git a/libsqlitepp/sqlite-selectcommand.cpp b/libsqlitepp/sqlite-selectcommand.cpp
index e360dcd..dcb1944 100644
--- a/libsqlitepp/sqlite-selectcommand.cpp
+++ b/libsqlitepp/sqlite-selectcommand.cpp
@@ -1,9 +1,15 @@
#include "sqlite-selectcommand.h"
+#include "column.h"
+#include "command.h"
+#include "error.h"
+#include "selectcommand.h"
+#include "sqlite-command.h"
#include "sqlite-connection.h"
#include "sqlite-error.h"
-#include <boost/multi_index/ordered_index.hpp>
-#include <boost/multi_index_container.hpp>
#include <cstring>
+#include <glibmm/ustring.h>
+#include <memory>
+#include <sqlite3.h>
namespace SQLite {
class Column : public DB::Column {
diff --git a/libsqlitepp/sqlite-selectcommand.h b/libsqlitepp/sqlite-selectcommand.h
index 30e0118..679e528 100644
--- a/libsqlitepp/sqlite-selectcommand.h
+++ b/libsqlitepp/sqlite-selectcommand.h
@@ -3,10 +3,10 @@
#include "sqlite-command.h"
#include <selectcommand.h>
+#include <string>
namespace SQLite {
class Connection;
- class ColumnBase;
class SelectCommand : public DB::SelectCommand, public Command {
public:
SelectCommand(const Connection *, const std::string & sql);
diff --git a/libsqlitepp/unittests/testsqlite.cpp b/libsqlitepp/unittests/testsqlite.cpp
index 5a14bfb..7d7041f 100644
--- a/libsqlitepp/unittests/testsqlite.cpp
+++ b/libsqlitepp/unittests/testsqlite.cpp
@@ -1,12 +1,15 @@
#define BOOST_TEST_MODULE TestSQLite
#include <boost/test/unit_test.hpp>
-#include <boost/date_time/posix_time/posix_time.hpp>
-#include <column.h>
+#include "mockDatabase.h"
+#include <connection.h>
#include <definedDirs.h>
+#include <filesystem>
+#include <memory>
#include <modifycommand.h>
#include <selectcommand.h>
#include <sqlite-mock.h>
+#include <string_view>
#include <testCore.h>
class StandardMockDatabase : public DB::PluginMock<SQLite::Mock> {