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

93_DbRep: contrib 8.52.10

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27735 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2023-07-09 19:40:41 +00:00
parent 0885d29ba3
commit db1e1e8447
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
fhem/contrib/DS_Starter/93_DbRep.pm
View File

@ -4097,11 +4097,11 @@ sub DbRep_maxval {
my $aval = AttrVal($name, "aggregation", ""); my $aval = AttrVal($name, "aggregation", "");
my @rsf; my @rsf;
if($aval eq "hour") { if ($aval eq "hour") {
@rsf = split(/[ :]/,$runtime_string_first); @rsf = split(/[ :]/,$runtime_string_first);
@array = ($runtime_string." "."0"." ".$rsf[0]."_".$rsf[1]."!_ESC_!".$runtime_string_first."|".$runtime_string_next); @array = ($runtime_string." "."0"." ".$rsf[0]."_".$rsf[1]."!_ESC_!".$runtime_string_first."|".$runtime_string_next);
} }
elsif($aval eq "minute") { elsif ($aval eq "minute") {
@rsf = split(/[ :]/,$runtime_string_first); @rsf = split(/[ :]/,$runtime_string_first);
@array = ($runtime_string." "."0"." ".$rsf[0]."_".$rsf[1]."-".$rsf[2]."!_ESC_!".$runtime_string_first."|".$runtime_string_next); @array = ($runtime_string." "."0"." ".$rsf[0]."_".$rsf[1]."-".$rsf[2]."!_ESC_!".$runtime_string_first."|".$runtime_string_next);
} }
@ -11007,7 +11007,7 @@ sub DbRep_createSelectSql {
} }
} }
if ($dbmodel eq 'POSTGRESQL') { # eingeügt mit V 8.52.10 if ($dbmodel eq 'POSTGRESQL') { # eingefügt mit V 8.52.10
if ($rsn =~ /\d{4}-\d{2}-\d{2}\s\d{2}$/xs) { if ($rsn =~ /\d{4}-\d{2}-\d{2}\s\d{2}$/xs) {
$rsn .= ':00:00'; $rsn .= ':00:00';
} }
@ -11156,6 +11156,16 @@ sub DbRep_createDeleteSql {
} }
} }
if ($dbmodel eq 'POSTGRESQL') { # eingefügt mit V 8.52.10
if ($rsn =~ /\d{4}-\d{2}-\d{2}\s\d{2}$/xs) {
$rsn .= ':00:00';
}
if ($rsf =~ /\d{4}-\d{2}-\d{2}\s\d{2}$/xs) {
$rsf .= ':00:00';
}
}
$sql = "delete FROM $table where "; $sql = "delete FROM $table where ";
# included devices # included devices
@ -11241,7 +11251,7 @@ sub DbRep_createDeleteSql {
# Timestamp Filter # Timestamp Filter
################### ###################
if ($rsf && $rsn) { if ($rsf && $rsn) {
$sql .= "TIMESTAMP >= '$rsf' AND TIMESTAMP ".($tnfull?"<=":"<")." '$rsn' $addon;"; $sql .= "TIMESTAMP >= '$rsf' AND TIMESTAMP ".($tnfull ? "<=" : "<")." '$rsn' $addon;";
} else { } else {
if ($dbmodel eq "POSTGRESQL") { if ($dbmodel eq "POSTGRESQL") {
$sql .= "true;"; $sql .= "true;";