From 1de593ac84f013e8bc1672f4069c7eb02ab61786 Mon Sep 17 00:00:00 2001 From: DS_Starter Date: Thu, 22 Feb 2018 08:43:10 +0000 Subject: [PATCH] database create scripts changed in contrib/dblog (forum:#84419) git-svn-id: https://svn.fhem.de/fhem/trunk@16242 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/contrib/dblog/db_create_mysql.sql | 2 +- fhem/contrib/dblog/db_create_postgresql.sql | 2 +- fhem/contrib/dblog/db_create_sqlite.sql | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fhem/contrib/dblog/db_create_mysql.sql b/fhem/contrib/dblog/db_create_mysql.sql index 3dd46c80a..aa1f7017c 100644 --- a/fhem/contrib/dblog/db_create_mysql.sql +++ b/fhem/contrib/dblog/db_create_mysql.sql @@ -1,6 +1,6 @@ CREATE DATABASE `fhem` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; CREATE USER 'fhemuser'@'%' IDENTIFIED BY 'fhempassword'; -CREATE TABLE `fhem`.`history` (TIMESTAMP TIMESTAMP, DEVICE varchar(64), TYPE varchar(64), EVENT varchar(512), READING varchar(64), VALUE varchar(128), UNIT varchar(32)); +CREATE TABLE `fhem`.`history` (TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, DEVICE varchar(64), TYPE varchar(64), EVENT varchar(512), READING varchar(64), VALUE varchar(128), UNIT varchar(32)); CREATE TABLE `fhem`.`current` (TIMESTAMP TIMESTAMP, DEVICE varchar(64), TYPE varchar(64), EVENT varchar(512), READING varchar(64), VALUE varchar(128), UNIT varchar(32)); GRANT SELECT, INSERT, DELETE, UPDATE ON `fhem`.* TO 'fhemuser'@'%'; CREATE INDEX Search_Idx ON `fhem`.`history` (DEVICE, READING, TIMESTAMP); diff --git a/fhem/contrib/dblog/db_create_postgresql.sql b/fhem/contrib/dblog/db_create_postgresql.sql index bcea476b7..abc348621 100644 --- a/fhem/contrib/dblog/db_create_postgresql.sql +++ b/fhem/contrib/dblog/db_create_postgresql.sql @@ -53,7 +53,7 @@ ALTER TABLE fhem.current OWNER TO fhem; -- CREATE TABLE history ( - "timestamp" timestamp without time zone, + "timestamp" timestamp without time zone default CURRENT_TIMESTAMP, device character varying(64), type character varying(64), event character varying(512), diff --git a/fhem/contrib/dblog/db_create_sqlite.sql b/fhem/contrib/dblog/db_create_sqlite.sql index cf7050119..b071b1bde 100644 --- a/fhem/contrib/dblog/db_create_sqlite.sql +++ b/fhem/contrib/dblog/db_create_sqlite.sql @@ -1,3 +1,3 @@ +CREATE TABLE history (TIMESTAMP TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, DEVICE varchar(64), TYPE varchar(64), EVENT varchar(512), READING varchar(64), VALUE varchar(128), UNIT varchar(32)); CREATE TABLE current (TIMESTAMP TIMESTAMP, DEVICE varchar(64), TYPE varchar(64), EVENT varchar(512), READING varchar(64), VALUE varchar(128), UNIT varchar(32)); -CREATE TABLE history (TIMESTAMP TIMESTAMP, DEVICE varchar(64), TYPE varchar(64), EVENT varchar(512), READING varchar(64), VALUE varchar(128), UNIT varchar(32)); CREATE INDEX Search_Idx ON `history` (DEVICE, READING, TIMESTAMP);