Merge pull request #1133 from lsst/tickets/DM-48094

DM-48094: Fix dataset fields not working in Butler.query_datasets

doc/changes/DM-48094.bugfix.md

@@ -0,0 +1 @@
+Fix a bug where dataset fields like `ingest_date` were raising `InvalidQueryError: Unrecognized identifier` when used in `Butler.query_datasets` `where` clause.

python/lsst/daf/butler/_butler.py

@@ -1869,8 +1869,8 @@ def query_datasets(
             warn_limit = True
         with self.query() as query:
             result = (
-                query.where(data_id, where, bind=bind, **kwargs)
-                .datasets(dataset_type, collections=collections, find_first=find_first)
+                query.datasets(dataset_type, collections=collections, find_first=find_first)
+                .where(data_id, where, bind=bind, **kwargs)
                 .order_by(*ensure_iterable(order_by))
                 .limit(query_limit)
             )

python/lsst/daf/butler/tests/butler_queries.py

@@ -1921,6 +1921,13 @@ def test_dataset_queries(self) -> None:
             self.assertEqual(rows[0]["visit"], 1)
             self.assertEqual(rows[0]["dt.collection"], "run1")
 
+        # Test that dataset fields like ingest_date can be used in the 'where'
+        # clause.
+        result = butler.query_datasets("dt", "run1", where="ingest_date > T'2000-01-01'")
+        self.assertEqual(len(result), 1)
+        result = butler.query_datasets("dt", "run1", where="ingest_date < T'2000-01-01'", explain=False)
+        self.assertEqual(len(result), 0)
+
     def test_multiple_instrument_queries(self) -> None:
         """Test that multiple-instrument queries are not rejected as having
         governor dimension ambiguities.