From f7cf93bb9abc589e6104f841d170d331f7339828 Mon Sep 17 00:00:00 2001 From: Eelke Klein Date: Sat, 26 Aug 2017 14:50:36 +0200 Subject: [PATCH] Moved lowlevel postgresql wrappers to seperate folder and static lib. --- CMakeLists.txt | 14 +++++++++----- {pglab => pgsql}/Pgsql_Connection.cpp | 0 {pglab => pgsql}/Pgsql_Connection.h | 0 {pglab => pgsql}/Pgsql_Params.cpp | 0 {pglab => pgsql}/Pgsql_Params.h | 0 {pglab => pgsql}/Pgsql_Result.cpp | 0 {pglab => pgsql}/Pgsql_Result.h | 0 {pglab => pgsql}/Pgsql_Row.cpp | 0 {pglab => pgsql}/Pgsql_Row.h | 0 {pglab => pgsql}/Pgsql_Value.cpp | 0 {pglab => pgsql}/Pgsql_Value.h | 0 {pglab => pgsql}/Pgsql_declare.h | 0 12 files changed, 9 insertions(+), 5 deletions(-) rename {pglab => pgsql}/Pgsql_Connection.cpp (100%) rename {pglab => pgsql}/Pgsql_Connection.h (100%) rename {pglab => pgsql}/Pgsql_Params.cpp (100%) rename {pglab => pgsql}/Pgsql_Params.h (100%) rename {pglab => pgsql}/Pgsql_Result.cpp (100%) rename {pglab => pgsql}/Pgsql_Result.h (100%) rename {pglab => pgsql}/Pgsql_Row.cpp (100%) rename {pglab => pgsql}/Pgsql_Row.h (100%) rename {pglab => pgsql}/Pgsql_Value.cpp (100%) rename {pglab => pgsql}/Pgsql_Value.h (100%) rename {pglab => pgsql}/Pgsql_declare.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 044da69..ec76119 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -66,6 +66,13 @@ add_library(core STATIC core/PasswordManager.cpp core/SqlLexer.cpp) +add_library(pgsql STATIC + pgsql/Pgsql_Connection.cpp + pgsql/Pgsql_Params.cpp + pgsql/Pgsql_Result.cpp + pgsql/Pgsql_Row.cpp + pgsql/Pgsql_Value.cpp) + add_executable(pglab pglab/ASyncDBConnection.cpp pglab/ASyncWindow.cpp @@ -94,11 +101,6 @@ add_executable(pglab pglab/PgDatabaseContainer.cpp pglab/PgDatabase.cpp pglab/PgNamespace.cpp - pglab/Pgsql_Connection.cpp - pglab/Pgsql_Params.cpp - pglab/Pgsql_Result.cpp - pglab/Pgsql_Row.cpp - pglab/Pgsql_Value.cpp pglab/PgTypeContainer.cpp pglab/PgType.cpp pglab/ProcessStdioWidget.cpp @@ -120,10 +122,12 @@ add_executable(pglab target_include_directories(pglab PUBLIC ./core + ./pgsql ) target_link_libraries( pglab core + pgsql ${Boost_LIBRARIES} Qt5::Widgets ${Pq_LIBRARIES} diff --git a/pglab/Pgsql_Connection.cpp b/pgsql/Pgsql_Connection.cpp similarity index 100% rename from pglab/Pgsql_Connection.cpp rename to pgsql/Pgsql_Connection.cpp diff --git a/pglab/Pgsql_Connection.h b/pgsql/Pgsql_Connection.h similarity index 100% rename from pglab/Pgsql_Connection.h rename to pgsql/Pgsql_Connection.h diff --git a/pglab/Pgsql_Params.cpp b/pgsql/Pgsql_Params.cpp similarity index 100% rename from pglab/Pgsql_Params.cpp rename to pgsql/Pgsql_Params.cpp diff --git a/pglab/Pgsql_Params.h b/pgsql/Pgsql_Params.h similarity index 100% rename from pglab/Pgsql_Params.h rename to pgsql/Pgsql_Params.h diff --git a/pglab/Pgsql_Result.cpp b/pgsql/Pgsql_Result.cpp similarity index 100% rename from pglab/Pgsql_Result.cpp rename to pgsql/Pgsql_Result.cpp diff --git a/pglab/Pgsql_Result.h b/pgsql/Pgsql_Result.h similarity index 100% rename from pglab/Pgsql_Result.h rename to pgsql/Pgsql_Result.h diff --git a/pglab/Pgsql_Row.cpp b/pgsql/Pgsql_Row.cpp similarity index 100% rename from pglab/Pgsql_Row.cpp rename to pgsql/Pgsql_Row.cpp diff --git a/pglab/Pgsql_Row.h b/pgsql/Pgsql_Row.h similarity index 100% rename from pglab/Pgsql_Row.h rename to pgsql/Pgsql_Row.h diff --git a/pglab/Pgsql_Value.cpp b/pgsql/Pgsql_Value.cpp similarity index 100% rename from pglab/Pgsql_Value.cpp rename to pgsql/Pgsql_Value.cpp diff --git a/pglab/Pgsql_Value.h b/pgsql/Pgsql_Value.h similarity index 100% rename from pglab/Pgsql_Value.h rename to pgsql/Pgsql_Value.h diff --git a/pglab/Pgsql_declare.h b/pgsql/Pgsql_declare.h similarity index 100% rename from pglab/Pgsql_declare.h rename to pgsql/Pgsql_declare.h