Revert "Fixes for observed production errors (#741)"

This reverts commit f6d6d6d.

Author: dmannarino

app/crud/geostore.py

@@ -4,9 +4,9 @@
 
 from asyncpg.exceptions import UniqueViolationError
 from fastapi.logger import logger
-from sqlalchemy import Column, MetaData, Table, func
+from sqlalchemy import Column, Table, func
 from sqlalchemy.sql import Select, label
-from sqlalchemy.sql.elements import Label, TextClause, quoted_name
+from sqlalchemy.sql.elements import Label, TextClause
 
 from app.application import db
 from app.errors import (
@@ -61,8 +61,8 @@ async def get_gfw_geostore_from_any_dataset(geostore_id: UUID) -> Geostore:
 async def get_geostore_by_version(
     dataset: str, version: str, geostore_id: UUID
 ) -> Geostore:
-    src_table = Table(version, MetaData(), schema=dataset, quote=True)
-    src_table.schema = quoted_name(dataset, quote=True)
+    src_table: Table = db.table(version)
+    src_table.schema = dataset
 
     where_clause: TextClause = db.text("gfw_geostore_id=:geostore_id")
     bind_vals = {"geostore_id": f"{geostore_id}"}

app/routes/datasets/queries.py

@@ -724,10 +724,10 @@ def _get_date_conf_derived_layers(
     """Get derived layers that decode our date_conf layers for alert
     systems."""
     # TODO should these somehow be in the metadata or creation options instead of hardcoded?
-    # 16435 is number of days from 1970-01-01 to 2015-01-01, and can be used to convert
+    # 16435 is number of days from 1970-01-01 and 2015-01-01, and can be used to convet
     # our encoding of days since 2015 to a number that can be used generally for datetimes
     decode_expression = "(A + 16435).astype('datetime64[D]').astype(str)"
-    encode_expression = "(A.astype('datetime64[D]') - 16435).astype(uint16)"
+    encode_expression = "(datetime64(A) - 16435).astype(uint16)"
     conf_encoding = RasterTable(
         default_meaning="not_detected",
         rows=[

tests_v2/fixtures/otf_payload/otf_payload.py

@@ -14,7 +14,7 @@
         "no_data": 0,
         "raster_table": None,
         "decode_expression": "(A + 16435).astype('datetime64[D]').astype(str)",
-        "encode_expression": "(A.astype('datetime64[D]') - 16435).astype(uint16)",
+        "encode_expression": "(datetime64(A) - 16435).astype(uint16)",
         "source_layer": "my_first_dataset__date_conf",
         "calc": "A % 10000",
     },

tests_v2/unit/app/crud/test_geostore.py

@@ -1,70 +1,10 @@
-import uuid
 from unittest.mock import patch
 
 import pytest
 
-from app.crud.geostore import (
-    get_gadm_geostore,
-    get_gadm_geostore_id,
-    get_geostore_by_version,
-)
+from app.crud.geostore import get_gadm_geostore, get_gadm_geostore_id
 from app.errors import RecordNotFoundError
 
-GEOSTORE_ID = uuid.UUID("12345678-1234-5678-1234-567812345678")
-
-
-@pytest.mark.asyncio
-async def test_get_geostore_by_version_quotes_dotted_version_string():
-    """Regression test: version strings containing dots (e.g. 'v1.11') must be
-    double-quoted in the generated SQL.
-    """
-    dataset = "umd_tree_cover_loss"
-    version = "v1.11"
-
-    with patch("app.crud.geostore.db.first") as mock_db_first:
-        mock_db_first.return_value = None
-        try:
-            await get_geostore_by_version(dataset, version, GEOSTORE_ID)
-        except RecordNotFoundError:
-            pass
-
-    assert mock_db_first.called, "db.first should have been called"
-
-    actual_sql = str(
-        mock_db_first.call_args.args[0].compile(compile_kwargs={"literal_binds": True})
-    )
-
-    # The schema and table must both be double-quoted so that PostgreSQL
-    # treats the dot in "v1.11" as part of the identifier, not a separator.
-    assert (
-        '"umd_tree_cover_loss"."v1.11"' in actual_sql
-    ), f"Expected schema and table to be double-quoted in SQL, but got:\n{actual_sql}"
-
-
-@pytest.mark.asyncio
-async def test_get_geostore_by_version_quotes_undotted_version_string():
-    """Ensure that version strings without dots also render correctly and are
-    quoted, as a sanity check that the fix doesn't break the common case."""
-    dataset = "umd_tree_cover_loss"
-    version = "v1"
-
-    with patch("app.crud.geostore.db.first") as mock_db_first:
-        mock_db_first.return_value = None
-        try:
-            await get_geostore_by_version(dataset, version, GEOSTORE_ID)
-        except RecordNotFoundError:
-            pass
-
-    assert mock_db_first.called
-
-    actual_sql = str(
-        mock_db_first.call_args.args[0].compile(compile_kwargs={"literal_binds": True})
-    )
-
-    assert (
-        '"umd_tree_cover_loss"."v1"' in actual_sql
-    ), f"Expected schema and table to be double-quoted in SQL, but got:\n{actual_sql}"
-
 
 @pytest.mark.asyncio
 async def test_get_gadm_geostore_generates_correct_sql_for_country_lookup():