Commit 9f07820c authored by jan.koester's avatar jan.koester
Browse files

changed link behavior

parent 3955819a
Loading
Loading
Loading
Loading
+2 −8
Original line number Diff line number Diff line
@@ -11,25 +11,19 @@ if(NOT ${CMAKE_CXX_COMPILER} MATCHES "MSVC")
set(CMAKE_CXX_FLAGS "-fPIC -Wall")
endif()

find_package(PostgreSQL REQUIRED)
find_package(SQLite3 REQUIRED)

include_directories(
    ${CMAKE_SOURCE_DIR}/include
    ${PostgreSQL_INCLUDE_DIRS}
    ${SQLite3_INCLUDE_DIRS}
)

add_subdirectory(backends)

add_library(dbpp STATIC
    src/database.cpp
    $<TARGET_OBJECTS:backend>
)

target_link_libraries(dbpp ${SQLite3_LIBRARIES} ${PostgreSQL_LIBRARIES})
target_link_libraries(dbpp PRIVATE backend)

install(TARGETS dbpp DESTINATION lib EXPORT dbppTargets)
install(TARGETS dbpp backend DESTINATION lib EXPORT dbppTargets)

install(
  FILES include/database.h
+30 −2
Original line number Diff line number Diff line
add_library(backend OBJECT
    backend.cpp pgsql.cpp sqlite.cpp
find_package(PostgreSQL)
if(${PostgreSQL_FOUND})
    include_directories(
        ${PostgreSQL_INCLUDE_DIRS}
    )

    list(APPEND libs ${PostgreSQL_LIBRARIES})

    list(APPEND srcs pgsql.cpp)

endif()

find_package(SQLite3)
if(${SQLite3_FOUND})
    include_directories(
        ${SQLite3_INCLUDE_DIRS}
    )

    list(APPEND libs ${SQLite3_LIBRARIES})

    list(APPEND srcs sqlite.cpp)

endif()


add_library(backend STATIC
    backend.cpp
    ${srcs}
)

target_link_libraries(backend ${libs})
+112 −0
Original line number Diff line number Diff line
/*******************************************************************************
 * Copyright (c) 2024, Jan Koester jan.koester@gmx.net
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions are met:
 * Redistributions of source code must retain the above copyright
 *      notice, this list of conditions and the following disclaimer.
 * Redistributions in binary form must reproduce the above copyright
 *      notice, this list of conditions and the following disclaimer in the
 *      documentation and/or other materials provided with the distribution.
 * Neither the name of the <organization> nor the
 *      names of its contributors may be used to endorse or promote products
 *      derived from this software without specific prior written permission.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
 * DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 *******************************************************************************/

#include <mutex>

#include <libpq-fe.h>

#include <database.h>

namespace dbpp {

    std::mutex g_lock_mutex;

    class DuckDB : public DatabaseApi{
    public:
        DuckDB(const char *constr) {
            _dbconn = PQconnectdb(constr);
            if (PQstatus(_dbconn) != CONNECTION_OK){
                PQfinish(_dbconn);
                throw PQerrorMessage(_dbconn);
            }
        }

        ~DuckDB(){
            PQfinish(_dbconn);
        }

        int exec(const SQL &sql,DBResult &res) override{
            PGresult *pres = PQexec(_dbconn,sql.c_str());
            int pstate=PQresultStatus(pres);

            if(pstate==PGRES_FATAL_ERROR || pstate==PGRES_BAD_RESPONSE) {
                 PQclear(pres);
                 throw PQerrorMessage(_dbconn);
            }

            res.clear();

            DBResult::Data *lastdat=nullptr;

            int rcount=PQntuples(pres);

            for(int i = 0; i < rcount; ++i ){
                for(int ii=0; ii < PQnfields(pres); ++ii){
                    if(!res.firstRow){
                       res.firstRow = new DBResult::Data(i,ii,PQgetvalue(pres,i,ii),PQgetlength(pres,i,ii));
                       lastdat=res.firstRow;
                    }else{
                       lastdat->nextData=new DBResult::Data(i,ii,PQgetvalue(pres,i,ii),PQgetlength(pres,i,ii));
                       lastdat=lastdat->nextData;
                    }
                }
            }

            PQclear(pres);

            return rcount;
        };

        const char *getDriverName() override{
            return "duckdb";
        };

        const SQL &autoincrement(SQL &sql) override{
            return (sql << "GENERATED BY DEFAULT AS IDENTITY");
        }

        const SQL &getUUIDType(SQL &sql) override {
            return (sql << "UUID");
        }

        bool isConnected() override{
            const std::lock_guard<std::mutex> lock(g_lock_mutex);
            if(PQstatus(_dbconn)==CONNECTION_OK)
                return true;
            return false;
        }

        void reset() override{
            const std::lock_guard<std::mutex> lock(g_lock_mutex);
            PQreset(_dbconn);
        }

    private:
        duckdb_database db;
        duckdb_connection con;
    };
}
+1 −1

File changed.

Contains only whitespace changes.