Restrict --order-by in query-datasets to single type

The backend for querying multiple dataset types will not support "order by", so restrict the CLI to match the implementation.

python/lsst/daf/butler/script/queryDatasets.py

@@ -40,6 +40,7 @@
 from .._exceptions import MissingDatasetTypeError
 from .._query_all_datasets import DatasetsPage, query_all_datasets
 from ..cli.utils import sortAstropyTable
+from ..utils import has_globs
 
 if TYPE_CHECKING:
     from lsst.daf.butler import DatasetRef
@@ -205,6 +206,9 @@ def __init__(
             )
             glob = ["*"]
 
+        if order_by and (len(glob) > 1 or has_globs(glob)):
+            raise NotImplementedError("--order-by is only supported for queries with a single dataset type.")
+
         # show_uri requires a datastore.
         without_datastore = not show_uri
         self.butler = butler or Butler.from_config(repo, without_datastore=without_datastore)

tests/test_cliCmdQueryDatasets.py

@@ -344,7 +344,11 @@ def test_limit_order(self):
 
         with self.assertLogs("lsst.daf.butler.script.queryDatasets", level="WARNING") as cm:
             tables = self._queryDatasets(
-                repo=testRepo.butler, limit=-1, order_by=("visit",), collections="*", glob="*"
+                repo=testRepo.butler,
+                limit=-1,
+                order_by=("visit",),
+                collections="*",
+                glob=("test_metric_comp",),
             )
 
         self.assertIn("increase this limit", cm.output[0])
@@ -361,13 +365,21 @@ def test_limit_order(self):
         # issued.
         with self.assertNoLogs("lsst.daf.butler.script.queryDatasets", level="WARNING"):
             tables = self._queryDatasets(
-                repo=testRepo.butler, limit=1, order_by=("visit",), collections="*", glob="*"
+                repo=testRepo.butler,
+                limit=1,
+                order_by=("visit",),
+                collections="*",
+                glob=("test_metric_comp",),
             )
         self.assertAstropyTablesEqual(tables, expectedTables, filterColumns=True)
 
         with self.assertLogs("lsst.daf.butler.script.queryDatasets", level="WARNING") as cm:
             tables = self._queryDatasets(
-                repo=testRepo.butler, limit=-1, order_by=("-visit",), collections="*", glob="*"
+                repo=testRepo.butler,
+                limit=-1,
+                order_by=("-visit",),
+                collections="*",
+                glob=("test_metric_comp",),
             )
         self.assertIn("increase this limit", cm.output[0])
 
@@ -379,6 +391,22 @@ def test_limit_order(self):
         ]
         self.assertAstropyTablesEqual(tables, expectedTables, filterColumns=True)
 
+        # --order-by is not supported by the query backend for multiple dataset
+        # types, so we can only provide it for queries with a single dataset
+        # type.
+        with self.assertRaisesRegex(NotImplementedError, "--order-by"):
+            self._queryDatasets(
+                repo=testRepo.butler, limit=1, order_by=("visit",), collections="*", glob=["*"]
+            )
+        with self.assertRaisesRegex(NotImplementedError, "--order-by"):
+            self._queryDatasets(
+                repo=testRepo.butler,
+                limit=1,
+                order_by=("visit",),
+                collections="*",
+                glob=["test_metric_comp", "raw"],
+            )
+
     def testFindFirstAndCollections(self):
         """Test the find-first option, and the collections option, since it
         is required for find-first.