Enforce limitations on dimensions in query system.

I plan to remove these limitations on a future ticket, but for now it's
better to fail early rather than produce some confusing error message
or (more likely and worse) unexpected query later.

python/lsst/daf/butler/registry/queries/_builder.py

@@ -260,6 +260,13 @@ def joinTable(self, table: sqlalchemy.sql.FromClause, dimensions: NamedValueSet[
         datasets : `DatasetQueryColumns`, optional
             Columns that identify a dataset that is part of the query results.
         """
+        unexpectedDimensions = NamedValueSet(dimensions - self.summary.requested.dimensions)
+        unexpectedDimensions.discard(self.summary.universe.commonSkyPix)
+        if unexpectedDimensions:
+            raise NotImplementedError(
+                f"QueryBuilder does not yet support joining in dimensions {unexpectedDimensions} that "
+                f"were not provided originally to the QuerySummary object passed at construction."
+            )
         joinOn = self.startJoin(table, dimensions, dimensions.names)
         self.finishJoin(table, joinOn)
         if datasets is not None:

python/lsst/daf/butler/registry/queries/_query.py

@@ -698,6 +698,12 @@ def makeBuilder(self, summary: Optional[QuerySummary] = None) -> QueryBuilder:
         from ._builder import QueryBuilder
         if summary is None:
             summary = QuerySummary(self.graph, whereRegion=self.whereRegion)
+        if not summary.requested.issubset(self.graph):
+            raise NotImplementedError(
+                f"Query.makeBuilder does not yet support augmenting dimensions "
+                f"({summary.requested.dimensions}) beyond those originally included in the query "
+                f"({self.graph.dimensions})."
+            )
         builder = QueryBuilder(summary, managers=self.managers)
         builder.joinTable(self.sql.alias(), dimensions=self.graph.dimensions,
                           datasets=self.getDatasetColumns())
@@ -810,6 +816,12 @@ def makeBuilder(self, summary: Optional[QuerySummary] = None) -> QueryBuilder:
         from ._builder import QueryBuilder
         if summary is None:
             summary = QuerySummary(self.graph, whereRegion=self.whereRegion)
+        if not summary.requested.issubset(self.graph):
+            raise NotImplementedError(
+                f"Query.makeBuilder does not yet support augmenting dimensions "
+                f"({summary.requested.dimensions}) beyond those originally included in the query "
+                f"({self.graph.dimensions})."
+            )
         builder = QueryBuilder(summary, managers=self.managers)
         builder.joinTable(self._table, dimensions=self.graph.dimensions, datasets=self.getDatasetColumns())
         return builder
@@ -877,4 +889,10 @@ def makeBuilder(self, summary: Optional[QuerySummary] = None) -> QueryBuilder:
         from ._builder import QueryBuilder
         if summary is None:
             summary = QuerySummary(self.graph)
+        if not summary.requested.issubset(self.graph):
+            raise NotImplementedError(
+                f"Query.makeBuilder does not yet support augmenting dimensions "
+                f"({summary.requested.dimensions}) beyond those originally included in the query "
+                f"({self.graph.dimensions})."
+            )
         return QueryBuilder(summary, managers=self.managers)