FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-21 20:06:18 +00:00
Code Issues Releases Wiki Activity

93_DbLog.pm: some bugfixes to run SQLITE

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@8631 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
tobiasfaust 2015-05-25 05:03:35 +00:00
parent 14cc02e7aa
commit 6952a19565
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fhem/FHEM/93_DbLog.pm
View File

@ -877,6 +877,9 @@ DbLog_Get($@)
$sqlspec{get_timestamp} = "TO_CHAR(TIMESTAMP, 'YYYY-MM-DD HH24:MI:SS')";
$sqlspec{from_timestamp} = "TO_TIMESTAMP('$from', 'YYYY-MM-DD HH24:MI:SS')";
$sqlspec{to_timestamp} = "TO_TIMESTAMP('$to', 'YYYY-MM-DD HH24:MI:SS')";
$sqlspec{order_by_hour} = "TO_CHAR(TIMESTAMP, 'YYYY-MM-DD HH24')";
$sqlspec{max_value} = "MAX(VALUE)";
$sqlspec{day_before} = "DATE_SUB($sqlspec{from_timestamp},INTERVAL 1 DAY)";
} elsif ($hash->{DBMODEL} eq "MYSQL") {
$sqlspec{get_timestamp} = "DATE_FORMAT(TIMESTAMP, '%Y-%m-%d %H:%i:%s')";
$sqlspec{from_timestamp} = "STR_TO_DATE('$from', '%Y-%m-%d %H:%i:%s')";
@ -888,10 +891,16 @@ DbLog_Get($@)
$sqlspec{get_timestamp} = "TIMESTAMP";
$sqlspec{from_timestamp} = "'$from'";
$sqlspec{to_timestamp} = "'$to'";
$sqlspec{order_by_hour} = "strftime('%Y-%m-%d %H', TIMESTAMP)";
$sqlspec{max_value} = "MAX(VALUE)";
$sqlspec{day_before} = "date($sqlspec{from_timestamp},'-1 day')";
} else {
$sqlspec{get_timestamp} = "TIMESTAMP";
$sqlspec{from_timestamp} = "'$from'";
$sqlspec{to_timestamp} = "'$to'";
$sqlspec{order_by_hour} = "strftime('%Y-%m-%d %H', TIMESTAMP)";
$sqlspec{max_value} = "MAX(VALUE)";
$sqlspec{day_before} = "date($sqlspec{from_timestamp},'-1 day')";
}
if($outf =~ m/(all|array)/) {
@ -1150,7 +1159,7 @@ DbLog_Get($@)
}
# Wenn Attr SuppressUndef gesetzt ist, dann ausfiltern aller undef-Werte
$writeout = 0 if (($sql_value == undef) && AttrVal($hash->{NAME}, "suppressUndef", 0));
$writeout = 0 if (!defined($sql_value) && AttrVal($hash->{NAME}, "suppressUndef", 0));
###################### Ausgabe ###########################
if($writeout) {