FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-29 05:24:10 +00:00
Code Issues Releases Wiki Activity

93_DbRep: contrib 8.52.10

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@27741 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2023-07-10 09:31:44 +00:00
parent 38a1b6b496
commit c43644610b
1 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10963,7 +10963,8 @@ sub DbRep_createCommonSql {
################### ###################
if (($rsf && $rsn)) { if (($rsf && $rsn)) {
# $sql .= "TIMESTAMP >= '$rsf' AND TIMESTAMP ".($tnfull ? "<=" : "<")." '$rsn' "; # $sql .= "TIMESTAMP >= '$rsf' AND TIMESTAMP ".($tnfull ? "<=" : "<")." '$rsn' ";
$sql .= "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." "; # $sql .= "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." ";
$sql .= _DbRep_timeSelspec ($rsf, $rsn, $tnfull);
} }
else { else {
if ($dbmodel eq "POSTGRESQL") { if ($dbmodel eq "POSTGRESQL") {
@ -11109,7 +11110,8 @@ sub DbRep_createSelectSql {
# Timestamp Filter # Timestamp Filter
################### ###################
if (($rsf && $rsn)) { if (($rsf && $rsn)) {
$sql .= "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." "; # $sql .= "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." ";
$sql .= _DbRep_timeSelspec ($rsf, $rsn, $tnfull);
} }
else { else {
if ($dbmodel eq "POSTGRESQL") { if ($dbmodel eq "POSTGRESQL") {
@ -11257,7 +11259,9 @@ sub DbRep_createDeleteSql {
################### ###################
if ($rsf && $rsn) { if ($rsf && $rsn) {
#$sql .= "TIMESTAMP >= '$rsf' AND TIMESTAMP ".($tnfull ? "<=" : "<")." '$rsn' $addon;"; #$sql .= "TIMESTAMP >= '$rsf' AND TIMESTAMP ".($tnfull ? "<=" : "<")." '$rsn' $addon;";
$sql .= "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." $addon;"; #$sql .= "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." $addon;";
$sql .= _DbRep_timeSelspec ($rsf, $rsn, $tnfull);
$sql .= "$addon;";
} }
else { else {
if ($dbmodel eq "POSTGRESQL") { if ($dbmodel eq "POSTGRESQL") {
@ -11271,6 +11275,20 @@ sub DbRep_createDeleteSql {
return $sql; return $sql;
} }
###################################################################################
# erzeugt die Zeitabgrenzung für SQL-Statements
# ? im Statement ist bei Verwendung von Platzhaltern relevant
###################################################################################
sub _DbRep_timeSelspec {
my $rsf = shift;
my $rsn = shift;
my $tnfull = shift;
my $tlspec = "TIMESTAMP >= ".($rsf eq '?' ? $rsf : qq{'}.$rsf.qq{'})." AND TIMESTAMP ".($tnfull ? "<=" : "<")." ".($rsn eq '?' ? $rsn : qq{'}.$rsn.qq{'})." ";
return $tlspec;
}
#################################################################################################### ####################################################################################################
# Ableiten von Device, Reading-Spezifikationen # Ableiten von Device, Reading-Spezifikationen
#################################################################################################### ####################################################################################################