Fix database schema (#254)

fixes #252

Author: nilmerg

doc/80-Upgrading.md

@@ -21,7 +21,7 @@ You may use the following command to apply the database schema upgrade file:
 **MySQL:**
 
 ```
-# mysql -u root -p reporting /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/1.0.3.sql
+# mysql -u root -p reporting < /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/1.0.3.sql
 ```
 
 **PostgreSQL:**
@@ -42,7 +42,7 @@ Icinga Reporting version 1.0.0 requires a schema update for the database.
 You may use the following command to apply the database schema upgrade file:
 
 ```
-# mysql -u root -p reporting /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/1.0.0.sql
+# mysql -u root -p reporting < /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/1.0.0.sql
 ```
 
 ## Upgrading to Version 0.10.0
@@ -54,7 +54,7 @@ Please find the upgrade script in **schema/mysql-upgrades**.
 You may use the following command to apply the database schema upgrade file:
 
 ```
-# mysql -u root -p reporting /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/0.10.0.sql
+# mysql -u root -p reporting < /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/0.10.0.sql
 ```
 
 ## Upgrading to Version 0.9.1
@@ -68,5 +68,5 @@ Please find the upgrade script in **schema/mysql-migrations**.
 You may use the following command to apply the database schema upgrade file:
 
 ```
-# mysql -u root -p reporting /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/0.9.1.sql
+# mysql -u root -p reporting < /usr/share/icingaweb2/modules/reporting/schema/mysql-upgrades/0.9.1.sql
 ```

schema/mysql.schema.sql

@@ -94,7 +94,7 @@ CREATE TABLE reporting_schema (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin ROW_FORMAT=DYNAMIC;
 
 INSERT INTO reporting_schema (version, timestamp, success)
-  VALUES ('1.0.0', UNIX_TIMESTAMP() * 1000, 'y');
+  VALUES ('1.0.3', UNIX_TIMESTAMP() * 1000, 'y');
 
 -- CREATE TABLE share (
 --   id int(10) unsigned NOT NULL AUTO_INCREMENT,

schema/pgsql-upgrades/1.0.3.sql

@@ -1,4 +1,7 @@
-UPDATE timeframe SET end = 'now' WHERE name = 'Current Week';
+UPDATE timeframe SET "end" = 'now' WHERE name = 'Current Week';
 
 INSERT INTO reporting_schema (version, timestamp, success, reason)
-  VALUES ('1.0.3', unix_timestamp() * 1000, 'y', NULL);
+  VALUES ('1.0.3', unix_timestamp() * 1000, 'y', NULL)
+  ON CONFLICT ON CONSTRAINT idx_reporting_schema_version DO UPDATE SET success   = EXCLUDED.success,
+                                                                       reason    = EXCLUDED.reason,
+                                                                       timestamp = EXCLUDED.timestamp;

schema/pgsql.schema.sql

@@ -92,4 +92,4 @@ CREATE TABLE reporting_schema (
 );
 
 INSERT INTO reporting_schema (version, timestamp, success)
-  VALUES ('1.0.0', UNIX_TIMESTAMP() * 1000, 'y');
+  VALUES ('1.0.3', UNIX_TIMESTAMP() * 1000, 'y');