From d2f3a00d3c857209d4b4527cde5696b022bb8d0f Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Mon, 2 Sep 2019 22:08:04 +0000
Subject: [PATCH] 93_DbRep: contrib 8.26.0

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@20095 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 contrib/DS_Starter/93_DbRep.pm | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/contrib/DS_Starter/93_DbRep.pm b/contrib/DS_Starter/93_DbRep.pm
index c1ae66dd7..b488125f7 100644
--- a/contrib/DS_Starter/93_DbRep.pm
+++ b/contrib/DS_Starter/93_DbRep.pm
@@ -2843,7 +2843,7 @@ sub count_DoParse($) {
  if ($@) {
      $err = encode_base64($@,"");
      Log3 ($name, 2, "DbRep $name - $@");
-     return "$name|''|$device|$reading|''|$err|$table";
+     return "$name|''|$device|''|$err|$table";
  }
      
  # only for this block because of warnings if details of readings are not set
@@ -2898,7 +2898,7 @@ sub count_DoParse($) {
          $err = encode_base64($@,"");
          Log3 ($name, 2, "DbRep $name - $@");
          $dbh->disconnect;
-         return "$name|''|$device|$reading|''|$err|$table";
+         return "$name|''|$device|''|$err|$table";
      }
      
      if($ced) {
@@ -9169,16 +9169,15 @@ sub DbRep_createDeleteSql($$$$$$$) {
  # add valueFilter
  $sql .= $vf if(defined $vf);
  # Timestamp Filter
- if (($tf && $tn)) {
-     $sql .= "TIMESTAMP >= $tf AND TIMESTAMP ".($tnfull?"<=":"<")." $tn ";
+ if ($tf && $tn) {
+     $sql .= "TIMESTAMP >= '$tf' AND TIMESTAMP ".($tnfull?"<=":"<")." '$tn' $addon;";
  } else {
      if ($dbmodel eq "POSTGRESQL") {
-	     $sql .= "true ";
+	     $sql .= "true;";
 	 } else {
-	     $sql .= "1 ";
+	      $sql .= "1;";
 	 }
  }
- $sql .= "$addon;";
 
 return $sql;
 }