Commit 5a8b6eae authored by Simon Spannagel's avatar Simon Spannagel
Browse files

DatabaseWriter: adjust to differen PQXX versions and their connection interface 

(cherry picked from commit 7519f65e492e7c45416bec070c5e39393c051bef)
parent c7541501

src/modules/DatabaseWriter/DatabaseWriterModule.cpp

+7 −2
Original line number Diff line number Diff line
@@ -205,7 +205,8 @@ void DatabaseWriterModule::run(Event* event) { 
            auto detectorName = (message->getDetector() != nullptr ? message->getDetector()->getName() : "global");



            for(const auto& object : message->getObjectArray()) {

                std::string class_name = allpix::demangle(typeid(object.get()).name());

                auto& o = object.get();

                std::string class_name = allpix::demangle(typeid(o).name());



                // Writing objects to corresponding database tables

                if(class_name == "PixelHit") {
@@ -335,7 +336,11 @@ void DatabaseWriterModule::run(Event* event) { 


void DatabaseWriterModule::finalizeThread() {

// Disconnecting from database

#if PQXX_VERSION_MAJOR > 6

    conn_->close();

#else

    conn_->disconnect();

#endif

}



void DatabaseWriterModule::finalize() {