diff --git a/fhem/CHANGED b/fhem/CHANGED index 0859ddd77..23bc68a32 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,4 +1,6 @@ - SVN + - feature: added example Setup SQL and configuration for SQLite + - change: modified MySQL Setup SQL to use 512 characters in EVENT column - feature: added new Javascript Frontend based on ExtJS (by Johannes) - feature: new Modules 30_HUEDevice and 31_HUEBridge for phillips hue and smartlink devices (by justme1968) diff --git a/fhem/HISTORY b/fhem/HISTORY index 8864cdfdb..9483923af 100644 --- a/fhem/HISTORY +++ b/fhem/HISTORY @@ -522,3 +522,5 @@ - Tue Feb 19 2013 (Johannes) - added new Javascript Frontend based on ExtJS (by Johannes) + - added example Setup SQL and configuration for SQLite + - extended the MySQL Setup SQL to use 512 characters in EVENT column diff --git a/fhem/contrib/dblog/db_create_mysql.sql b/fhem/contrib/dblog/db_create_mysql.sql index b02a008cd..6e91063ed 100644 --- a/fhem/contrib/dblog/db_create_mysql.sql +++ b/fhem/contrib/dblog/db_create_mysql.sql @@ -1,7 +1,7 @@ CREATE DATABASE `fhem` DEFAULT CHARACTER SET utf8 COLLATE utf8_bin; CREATE USER 'fhemuser'@'%' IDENTIFIED BY 'fhempassword'; -CREATE TABLE `fhem`.`history` (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(64), READING varchar(32), VALUE varchar(32), UNIT varchar(32)); -CREATE TABLE `fhem`.`current` (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(64), READING varchar(32), VALUE varchar(32), UNIT varchar(32)); +CREATE TABLE `fhem`.`history` (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(512), READING varchar(32), VALUE varchar(32), UNIT varchar(32)); +CREATE TABLE `fhem`.`current` (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(512), READING varchar(32), VALUE varchar(32), UNIT varchar(32)); GRANT SELECT, INSERT, DELETE ON `fhem`.* TO 'fhemuser'@'%'; CREATE INDEX Search_Idx ON `fhem`.`history` (DEVICE, READING, TIMESTAMP); diff --git a/fhem/contrib/dblog/db_create_sqlite.sql b/fhem/contrib/dblog/db_create_sqlite.sql new file mode 100644 index 000000000..fdc0cb007 --- /dev/null +++ b/fhem/contrib/dblog/db_create_sqlite.sql @@ -0,0 +1,3 @@ +CREATE TABLE current (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(512), READING varchar(32), VALUE varchar(32), UNIT varchar(32)); +CREATE TABLE history (TIMESTAMP TIMESTAMP, DEVICE varchar(32), TYPE varchar(32), EVENT varchar(512), READING varchar(32), VALUE varchar(32), UNIT varchar(32)); +CREATE INDEX Search_Idx ON `history` (DEVICE, READING, TIMESTAMP); \ No newline at end of file