Merge branch 'main' into feat-new-load-options

Author: chalmerlowe

google/cloud/bigquery/dataset.py

@@ -17,6 +17,7 @@
 from __future__ import absolute_import
 
 import copy
+import json
 
 import typing
 from typing import Optional, List, Dict, Any, Union
@@ -506,7 +507,20 @@ def entity_id(self) -> Optional[Union[Dict[str, Any], str]]:
     def __eq__(self, other):
         if not isinstance(other, AccessEntry):
             return NotImplemented
-        return self._key() == other._key()
+        return (
+            self.role == other.role
+            and self.entity_type == other.entity_type
+            and self._normalize_entity_id(self.entity_id)
+            == self._normalize_entity_id(other.entity_id)
+            and self.condition == other.condition
+        )
+
+    @staticmethod
+    def _normalize_entity_id(value):
+        """Ensure consistent equality for dicts like 'view'."""
+        if isinstance(value, dict):
+            return json.dumps(value, sort_keys=True)
+        return value
 
     def __ne__(self, other):
         return not self == other
@@ -557,7 +571,6 @@ def from_api_repr(cls, resource: dict) -> "AccessEntry":
             google.cloud.bigquery.dataset.AccessEntry:
                 Access entry parsed from ``resource``.
         """
-
         access_entry = cls()
         access_entry._properties = resource.copy()
         return access_entry

samples/geography/requirements.txt

@@ -4,13 +4,13 @@ cffi==1.17.1
 charset-normalizer==3.4.2
 click===8.1.8; python_version == '3.9'
 click==8.2.1; python_version >= '3.10'
-click-plugins==1.1.1
+click-plugins==1.1.1.2
 cligj==0.7.2
 db-dtypes==1.4.3
 Fiona==1.10.1
 geojson==3.2.0
 geopandas===1.0.1; python_version <= '3.9'
-geopandas==1.1.0; python_version >= '3.10'
+geopandas==1.1.1; python_version >= '3.10'
 google-api-core==2.25.1
 google-auth==2.40.3
 google-cloud-bigquery==3.34.0
@@ -19,7 +19,7 @@ google-cloud-core==2.4.3
 google-crc32c==1.7.1
 google-resumable-media==2.7.2
 googleapis-common-protos==1.70.0
-grpcio==1.73.0
+grpcio==1.73.1
 idna==3.10
 munch==4.0.0
 mypy-extensions==1.1.0

tests/unit/test_dataset.py

@@ -1767,3 +1767,70 @@ def test__hash__with_minimal_inputs(self):
             description=None,
         )
         assert hash(cond1) is not None
+
+    def test_access_entry_view_equality(self):
+        from google.cloud import bigquery
+
+        entry1 = bigquery.dataset.AccessEntry(
+            entity_type="view",
+            entity_id={
+                "projectId": "my_project",
+                "datasetId": "my_dataset",
+                "tableId": "my_table",
+            },
+        )
+        entry2 = bigquery.dataset.AccessEntry.from_api_repr(
+            {
+                "view": {
+                    "projectId": "my_project",
+                    "datasetId": "my_dataset",
+                    "tableId": "my_table",
+                }
+            }
+        )
+
+        entry3 = bigquery.dataset.AccessEntry(
+            entity_type="routine",
+            entity_id={
+                "projectId": "my_project",
+                "datasetId": "my_dataset",
+                "routineId": "my_routine",
+            },
+        )
+
+        entry4 = bigquery.dataset.AccessEntry.from_api_repr(
+            {
+                "routine": {
+                    "projectId": "my_project",
+                    "datasetId": "my_dataset",
+                    "routineId": "my_routine",
+                }
+            }
+        )
+
+        entry5 = bigquery.dataset.AccessEntry(
+            entity_type="dataset",
+            entity_id={
+                "dataset": {
+                    "projectId": "my_project",
+                    "datasetId": "my_dataset",
+                },
+                "target_types": "VIEWS",
+            },
+        )
+
+        entry6 = bigquery.dataset.AccessEntry.from_api_repr(
+            {
+                "dataset": {
+                    "dataset": {
+                        "projectId": "my_project",
+                        "datasetId": "my_dataset",
+                    },
+                    "target_types": "VIEWS",
+                }
+            }
+        )
+
+        assert entry1 == entry2
+        assert entry3 == entry4
+        assert entry5 == entry6