Loading CMakeLists.txt +2 −0 Original line number Diff line number Diff line Loading @@ -9,6 +9,7 @@ find_package(libcryptplus REQUIRED) find_package(htmlpp REQUIRED) find_package(httppp REQUIRED) find_package(PostgreSQL REQUIRED) find_package(SQLite3 REQUIRED) find_package(OpenLDAP) find_package(OpenSSL REQUIRED) find_package(Hiredis REQUIRED) Loading @@ -18,6 +19,7 @@ include_directories( ${NETPLUS_INCLUDE_DIRS} ${CRYPTPLUS_INCLUDE_DIRS} ${PostgreSQL_INCLUDE_DIRS} ${SQLite3_INCLUDE_DIRS} ${OPENLDAP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src ${SECUREID_INCLUDE_DIRS} Loading src/CMakeLists.txt +1 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ add_library(blogidev STATIC theme.cpp editor.cpp database/pgsql.cpp database/sqlite.cpp ) target_link_libraries(blogidev Loading src/database.cpp +5 −0 Original line number Diff line number Diff line Loading @@ -85,6 +85,11 @@ bool blogi::SQL::empty(){ return _SQL.empty(); } size_t blogi::SQL::length(){ return _SQL.length(); } blogi::DBResult::DBResult(){ firstRow=nullptr; Loading src/database.h +1 −0 Original line number Diff line number Diff line Loading @@ -46,6 +46,7 @@ namespace blogi { const char *c_str(); void clear(); bool empty(); size_t length(); private: std::string _SQL; friend class Database; Loading src/database/sqlite.cpp 0 → 100644 +108 −0 Original line number Diff line number Diff line /******************************************************************************* * Copyright (c) 2023, 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 <httppp/exception.h> #include <sqlite3.h> #include "../database.h" namespace blogi { class SQLite : public Database{ public: SQLite(const char *constr) : Database (constr) { int status=sqlite3_open(constr,&_dbconn); if (status){ libhttppp::HTTPException exp; exp[libhttppp::HTTPException::Critical] << sqlite3_errmsg(_dbconn); sqlite3_close(_dbconn); throw exp; } } ~SQLite(){ sqlite3_close(_dbconn); } int exec(SQL *sql,DBResult &res){ const char *zErrMsg = 0; sqlite3_stmt *prep; int pstate=sqlite3_prepare(_dbconn,sql->c_str(),sql->length(),&prep,&zErrMsg); if(pstate) { libhttppp::HTTPException exp; exp[libhttppp::HTTPException::Critical] << zErrMsg; throw exp; } if(sqlite3_step(prep)){ libhttppp::HTTPException exp; exp[libhttppp::HTTPException::Critical] << sqlite3_errmsg(_dbconn); throw exp; } if(res.firstRow){ delete res.firstRow; } res.firstRow=nullptr; DBResult::Data *lastdat; res.columns=sqlite3_data_count(prep); int rcount=sqlite3_column_count(prep); for(int i = 0; i < rcount; ++i ){ for(int ii=0; ii < res.columns; ++ii){ if(!res.firstRow){ res.firstRow = new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep)); lastdat=res.firstRow; }else{ lastdat->nextData=new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep)); lastdat=lastdat->nextData; } } prep=sqlite3_next_stmt(_dbconn,prep); } sqlite3_finalize(prep); return rcount; }; const char *getDriverName(){ return "sqlite"; }; private: sqlite3 *_dbconn; }; } Loading
CMakeLists.txt +2 −0 Original line number Diff line number Diff line Loading @@ -9,6 +9,7 @@ find_package(libcryptplus REQUIRED) find_package(htmlpp REQUIRED) find_package(httppp REQUIRED) find_package(PostgreSQL REQUIRED) find_package(SQLite3 REQUIRED) find_package(OpenLDAP) find_package(OpenSSL REQUIRED) find_package(Hiredis REQUIRED) Loading @@ -18,6 +19,7 @@ include_directories( ${NETPLUS_INCLUDE_DIRS} ${CRYPTPLUS_INCLUDE_DIRS} ${PostgreSQL_INCLUDE_DIRS} ${SQLite3_INCLUDE_DIRS} ${OPENLDAP_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/src ${SECUREID_INCLUDE_DIRS} Loading
src/CMakeLists.txt +1 −0 Original line number Diff line number Diff line Loading @@ -7,6 +7,7 @@ add_library(blogidev STATIC theme.cpp editor.cpp database/pgsql.cpp database/sqlite.cpp ) target_link_libraries(blogidev Loading
src/database.cpp +5 −0 Original line number Diff line number Diff line Loading @@ -85,6 +85,11 @@ bool blogi::SQL::empty(){ return _SQL.empty(); } size_t blogi::SQL::length(){ return _SQL.length(); } blogi::DBResult::DBResult(){ firstRow=nullptr; Loading
src/database.h +1 −0 Original line number Diff line number Diff line Loading @@ -46,6 +46,7 @@ namespace blogi { const char *c_str(); void clear(); bool empty(); size_t length(); private: std::string _SQL; friend class Database; Loading
src/database/sqlite.cpp 0 → 100644 +108 −0 Original line number Diff line number Diff line /******************************************************************************* * Copyright (c) 2023, 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 <httppp/exception.h> #include <sqlite3.h> #include "../database.h" namespace blogi { class SQLite : public Database{ public: SQLite(const char *constr) : Database (constr) { int status=sqlite3_open(constr,&_dbconn); if (status){ libhttppp::HTTPException exp; exp[libhttppp::HTTPException::Critical] << sqlite3_errmsg(_dbconn); sqlite3_close(_dbconn); throw exp; } } ~SQLite(){ sqlite3_close(_dbconn); } int exec(SQL *sql,DBResult &res){ const char *zErrMsg = 0; sqlite3_stmt *prep; int pstate=sqlite3_prepare(_dbconn,sql->c_str(),sql->length(),&prep,&zErrMsg); if(pstate) { libhttppp::HTTPException exp; exp[libhttppp::HTTPException::Critical] << zErrMsg; throw exp; } if(sqlite3_step(prep)){ libhttppp::HTTPException exp; exp[libhttppp::HTTPException::Critical] << sqlite3_errmsg(_dbconn); throw exp; } if(res.firstRow){ delete res.firstRow; } res.firstRow=nullptr; DBResult::Data *lastdat; res.columns=sqlite3_data_count(prep); int rcount=sqlite3_column_count(prep); for(int i = 0; i < rcount; ++i ){ for(int ii=0; ii < res.columns; ++ii){ if(!res.firstRow){ res.firstRow = new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep)); lastdat=res.firstRow; }else{ lastdat->nextData=new DBResult::Data(i,ii,(const char*)sqlite3_column_text(prep,ii),sqlite3_column_bytes(prep)); lastdat=lastdat->nextData; } } prep=sqlite3_next_stmt(_dbconn,prep); } sqlite3_finalize(prep); return rcount; }; const char *getDriverName(){ return "sqlite"; }; private: sqlite3 *_dbconn; }; }