Commit 5a1bfcea authored by jan.koester's avatar jan.koester
Browse files

test

parent fd8f2245
Loading
Loading
Loading
Loading
+2 −8
Changes for src/blogi.cpp: 2 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -260,10 +260,7 @@ blogi::Blogi::Blogi(std::vector<netplus::socket*> serversocket,bool debug) : Htt
                   << "variable character varying(64) NOT NULL,"
                   << "value character varying(64) NOT NULL);";

         if(dcfg.dbDriver == "pgsql" || dcfg.dbDriver == "postgresql")
               optsql << "ALTER TABLE options ALTER COLUMN value TYPE text;";
         else if(dcfg.dbDriver == "mariadb" || dcfg.dbDriver == "mysql")
             optsql << "ALTER TABLE options MODIFY COLUMN value text NOT NULL;";
            dbpp::modifyColumn(optsql, *initdb, "options", "value", "text", "NOT NULL");

        try {
            initdb->exec(optsql, optres);
@@ -389,10 +386,7 @@ bool blogi::Blogi::reloadConfig() {
                       << "profile character varying(32) NOT NULL,"
                       << "variable character varying(64) NOT NULL,"
                       << "value character varying(64) NOT NULL);";
            if (dcfg.dbDriver == "pgsql" || dcfg.dbDriver == "postgresql")
                optsql << "ALTER TABLE options ALTER COLUMN value TYPE text;";
            else if (dcfg.dbDriver == "mariadb" || dcfg.dbDriver == "mysql")
                optsql << "ALTER TABLE options MODIFY COLUMN value text NOT NULL;";
            dbpp::modifyColumn(optsql, *initdb, "options", "value", "text", "NOT NULL");
            try { initdb->exec(optsql, optres); } catch (std::runtime_error &e) {
                std::cerr << "[blogi] Reload: DB init failed for '" << dcfg.names[0] << "': " << e.what() << std::endl;
            }