Merge pull request #1016 from sisamiwe/dbaddon_dev

db_addon: Bugfix

Author: Morg42

db_addon/__init__.py

@@ -59,7 +59,7 @@ class DatabaseAddOn(SmartPlugin):
     Main class of the Plugin. Does all plugin specific stuff and provides the update functions for the items
     """
 
-    PLUGIN_VERSION = '1.2.10'
+    PLUGIN_VERSION = '1.2.11'
 
     def __init__(self, sh):
         """
@@ -469,6 +469,12 @@ def get_query_parameters_from_db_addon_params() -> Union[dict, None]:
             # add additional params
             if additional_params:
                 new_db_addon_params.update(additional_params)
+                    
+            ### NEW 1.2.11 ###
+            if 'start' in new_db_addon_params and 'end' not in new_db_addon_params:
+                new_db_addon_params['end'] = new_db_addon_params['start']
+                if self.debug_log.prepare:
+                    self.logger.debug(f"'end' parameter has been added")
 
             return new_db_addon_params
 
@@ -1685,12 +1691,14 @@ def _handle_zaehlerstand(self, query_params: dict) -> Union[float, int, None]:
         Die Vorgehensweise ist:
             - Abfrage des letzten Eintrages vor dem Beginn des Zeitraums
         """
-
+        # change db query function
+        query_params.update({'func': 'next'})
+        
+        # log final query_params
         if self.debug_log.prepare:
             self.logger.debug(f"called with {query_params=}")
 
         # get last value of timeframe
-        query_params.update({'func': 'next'})
         last_value = self._query_item(**query_params)[0][1]
 
         if self.debug_log.prepare:

db_addon/plugin.yaml

@@ -11,7 +11,7 @@ plugin:
 #    keywords: iot xyz
 #    documentation: https://github.com/smarthomeNG/smarthome/wiki/CLI-Plugin        # url of documentation (wiki) page
     support: https://knx-user-forum.de/forum/supportforen/smarthome-py/1848494-support-thread-databaseaddon-plugin
-    version: 1.2.10                 # Plugin version (must match the version specified in __init__.py)
+    version: 1.2.11                 # Plugin version (must match the version specified in __init__.py)
     sh_minversion: 1.9.3.5          # minimum shNG version to use this plugin
 #    sh_maxversion:                 # maximum shNG version to use this plugin (leave empty if latest)
     py_minversion: '3.9'              # minimum Python version to use for this plugin