Update Tests

Signed-off-by: Amber-Rigg <amber.l.rigg25@gmail.com>

src/sdk/python/rtdip_sdk/queries/weather/_weather_query_builder.py

@@ -98,9 +98,9 @@ def _build_parameters(
 def _raw_query_grid(parameters_dict: dict) -> str:
     raw_query_grid = (
         "SELECT * FROM "
-        "`{{table_name|lower }}`"
+        "{{table_name|lower }} "
         "WHERE {{ timestamp_column }} BETWEEN to_timestamp('{{ start_date }}') AND to_timestamp('{{ end_date }}') "
-        "AND {{ forecast_run_timestamp_column }}` BETWEEN to_timestamp('{{ forecast_run_timestamp_start_date }}') AND to_timestamp('{{ forecast_run_timestamp_end_date }}') "
+        "AND {{ forecast_run_timestamp_column }} BETWEEN to_timestamp('{{ forecast_run_start_date }}') AND to_timestamp('{{ forecast_run_end_date }}') "
         "AND {{ latitude_column }} > {{ min_lat}} "
         "AND {{ latitude_column }} < {{ max_lat}} "
         "AND {{ longitude_column }} > {{ min_lon}} "
@@ -123,11 +123,11 @@ def _raw_query_grid(parameters_dict: dict) -> str:
 def _raw_query_point(parameters_dict: dict) -> str:
     raw_query_point = (
         "SELECT * FROM "
-        "`{{table_name|lower }}`"
+        "{{table_name|lower }} "
         "WHERE {{ timestamp_column }} BETWEEN to_timestamp('{{ start_date }}') AND to_timestamp('{{ end_date }}') "
-        "AND {{ forecast_run_timestamp_column }}` BETWEEN to_timestamp('{{ forecast_run_timestamp_start_date }}') AND to_timestamp('{{ forecast_run_timestamp_end_date }}') "
-        "AND {{ latitude_column }} > {{lat}} "
-        "AND {{ longitude_column }} > {{lon}} "
+        "AND {{ forecast_run_timestamp_column }} BETWEEN to_timestamp('{{ forecast_run_start_date }}') AND to_timestamp('{{ forecast_run_end_date }}') "
+        "AND {{ latitude_column }} == {{lat}} "
+        "AND {{ longitude_column }} == {{lon}} "
         "{% if source is defined and source is not none %}"
         "AND SOURCE = '{{ source }}' "
         "{% endif %}"
@@ -146,15 +146,15 @@ def _raw_query_point(parameters_dict: dict) -> str:
 def _latest_query_grid(parameters_dict: dict) -> str:
     latest_query_grid = (
         "SELECT * FROM "
-        "`{{table_name|lower }}`"
+        "{{table_name|lower }} "
         "WHERE {{ latitude_column }} > {{ min_lat}} "
         "AND {{ latitude_column }} < {{ max_lat}} "
         "AND {{ longitude_column }} > {{ min_lon}} "
         "AND {{ longitude_column }} < {{ max_lon}} "
         "{% if source is defined and source is not none %}"
         "AND SOURCE = '{{ source }}' "
         "{% endif %}"
-        "ORDER BY `{{ tagname_column }}` "
+        "ORDER BY {{ tagname_column }} "
         "{% if limit is defined and limit is not none %}"
         "LIMIT {{ limit }} "
         "{% endif %}"
@@ -169,13 +169,13 @@ def _latest_query_grid(parameters_dict: dict) -> str:
 def _latest_query_point(parameters_dict: dict) -> str:
     latest_query_point = (
         "SELECT * FROM "
-        "`{{table_name|lower }}`"
-        "WHERE {{ latitude_column }} > {{lat}} "
-        "AND {{ longitude_column }} > {{lon}} "
+        "{{table_name|lower }} "
+        "WHERE {{ latitude_column }} == {{lat}} "
+        "AND {{ longitude_column }} == {{lon}} "
         "{% if source is defined and source is not none %}"
         "AND SOURCE = '{{ source }}' "
         "{% endif %}"
-        "ORDER BY `{{ tagname_column }}` "
+        "ORDER BY {{ tagname_column }} "
         "{% if limit is defined and limit is not none %}"
         "LIMIT {{ limit }} "
         "{% endif %}"

src/sdk/python/rtdip_sdk/queries/weather/weather_query_builder.py

@@ -59,7 +59,7 @@ def source(
             status_column (optional str): The status column name in the source indicating `Good` or `Bad`. If this is not available, specify `None`
             value_column (optional str): The value column name in the source which is normally a float or string value for the time series event
         """
-        self.data_source = "`.`".join(source.split("."))
+        self.data_source = source
         self.tagname_column = tagname_column
         self.timestamp_column = timestamp_column
         self.forecast_run_timestamp_column = forecast_run_timestamp_column

tests/sdk/python/rtdip_sdk/queries/weather/test_latest.py

@@ -37,13 +37,14 @@
 DATABRICKS_SQL_CONNECT = "databricks.sql.connect"
 DATABRICKS_SQL_CONNECT_CURSOR = "databricks.sql.connect.cursor"
 INTERPOLATION_METHOD = "test/test/test"
-MOCKED_QUERY_GRID = "SELECT * FROM `mocked-asset` WHERE Latitude > 0 AND Latitude < 0.1 AND Longitude > 0 AND Longitude < 0.1 ORDER BY TagName"
-MOCKED_QUERY_POINT = "SELECT * FROM `mocked-asset` WHERE Latitude == 0 AND Longitude == 0 ORDER BY TagName"
+MOCKED_QUERY_GRID = "SELECT * FROM mocked-asset WHERE Latitude > 0 AND Latitude < 0.1 AND Longitude > 0 AND Longitude < 0.1 ORDER BY TagName "
+MOCKED_QUERY_POINT = "SELECT * FROM mocked-asset WHERE Latitude == 0 AND Longitude == 0 ORDER BY TagName "
 MOCKED_QUERY_OFFSET_LIMIT = "LIMIT 10 OFFSET 10 "
 
 MOCKED_PARAMETER_DICT_GRID = {
     "table_name": "mocked-asset",
     "max_lat": 0.1,
+    "min_lat": 0,
     "min_lon": 0,
     "max_lon": 0.1,
 }

tests/sdk/python/rtdip_sdk/queries/weather/test_raw.py

@@ -37,15 +37,15 @@
 DATABRICKS_SQL_CONNECT = "databricks.sql.connect"
 DATABRICKS_SQL_CONNECT_CURSOR = "databricks.sql.connect.cursor"
 INTERPOLATION_METHOD = "test/test/test"
-MOCKED_QUERY_GRID = "SELECT * FROM `mocked-asset` WHERE EventTime BETWEEN to_timestamp('2020-01-01') AND to_timestamp('2020-01-02')AND Latitude > 1.1 AND Latitude < 1.1 AND Longitude > 1.1 AND Longitude < 1.1 ORDER BY `TagName` "
-MOCKED_QUERY_POINT = "SELECT * FROM `mocked-asset` WHERE EventTime BETWEEN to_timestamp('2020-01-01') AND to_timestamp('2020-01-02')AND Latitude == 1.1 AND Longitude == 1.1 ORDER BY TagName "
+MOCKED_QUERY_GRID = "SELECT * FROM mocked-asset WHERE EventTime BETWEEN to_timestamp('2020-01-01') AND to_timestamp('2020-01-02') AND EnqueuedTime BETWEEN to_timestamp('2020-01-01') AND to_timestamp('2020-01-02') AND Latitude > 0 AND Latitude < 1.1 AND Longitude > 0 AND Longitude < 1.1 ORDER BY TagName "
+MOCKED_QUERY_POINT = "SELECT * FROM mocked-asset WHERE EventTime BETWEEN to_timestamp('2020-01-01') AND to_timestamp('2020-01-02') AND EnqueuedTime BETWEEN to_timestamp('2020-01-01') AND to_timestamp('2020-01-02') AND Latitude == 1.1 AND Longitude == 1.1 ORDER BY TagName "
 MOCKED_QUERY_OFFSET_LIMIT = "LIMIT 10 OFFSET 10 "
 
 MOCKED_PARAMETER_DICT_GRID = {
     "table_name": "mocked-asset",
-    "min_lat": 1.1,
+    "min_lat": 0,
     "max_lat": 1.1,
-    "min_lon": 1.1,
+    "min_lon": 0,
     "max_lon": 1.1,
     "start_date": "2020-01-01",
     "end_date": "2020-01-02",