Fix the database on Postgres

Author: jacnils

libs/limhamn

@@ -73,7 +73,7 @@ void ff::setup_database(database& database) {
     // id: the post id
     // identifier: the post identifier
     // json: the json of the post (including content, author, etc.)
-    if (!database.exec("CREATE TABLE IF NOT EXISTS posts (" + primary + ", identifier INTEGER NOT NULL, json TEXT NOT NULL);")) {
+    if (!database.exec("CREATE TABLE IF NOT EXISTS posts (" + primary + ", identifier TEXT NOT NULL, json TEXT NOT NULL);")) {
         throw std::runtime_error{"Error creating the posts table."};
     }
 

src/database.cpp

@@ -216,6 +216,10 @@ void ff::start_server() {
                 settings.psql_password,
                 settings.psql_database,
                 settings.psql_port);
+
+#ifdef FF_DEBUG
+        	ff::logger.write_to_log(limhamn::logger::type::notice, "PostgreSQL database opened with host: " + settings.psql_host + ", username: " + settings.psql_username + ", password: " + settings.psql_password + ", database: " + settings.psql_database + "\n");
+#endif
 #endif
         } else {
 #ifdef FF_ENABLE_SQLITE
@@ -453,6 +457,10 @@ void ff::start_server() {
             ff::fatal = true;
         }
 
+    	if (std::string(e.what()).find("Error creating the ") != std::string::npos) {
+            ff::fatal = true;
+        }
+
         if (ff::fatal) {
             ff::logger.write_to_log(limhamn::logger::type::error, "The last error was too severe to recover, and the server will now halt.\n");
             std::exit(EXIT_FAILURE);

src/ff.cpp

@@ -253,7 +253,7 @@ limhamn::http::server::response ff::try_upload_post(const limhamn::http::server:
 
 		ff::logger.write_to_log(limhamn::logger::type::notice, "Inserting post with ID: " + post_id + " into the database.\n");
 
-		db.exec("INSERT INTO posts (identifier, json) VALUES (?, ?)", post_id, db_json.dump());
+		db.exec("INSERT INTO posts (identifier, json) VALUES (?, ?);", post_id, db_json.dump());
 
 		ff::logger.write_to_log(limhamn::logger::type::notice, "Post with ID: " + post_id + " inserted into the database.\n");