Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pyiceberg/catalog/bigquery_metastore.py
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ def create_namespace(self, namespace: str | Identifier, properties: Properties =
dataset.external_catalog_dataset_options = self._create_external_catalog_dataset_options(properties, dataset_ref)
self.client.create_dataset(dataset)
except Conflict as e:
raise NamespaceAlreadyExistsError("Namespace {database_name} already exists") from e
raise NamespaceAlreadyExistsError(f"Namespace {database_name} already exists") from e

@override
def load_table(self, identifier: str | Identifier) -> Table:
Expand Down
17 changes: 15 additions & 2 deletions tests/catalog/test_bigquery_metastore.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@
from unittest.mock import MagicMock

import pytest
from google.api_core.exceptions import NotFound
from google.api_core.exceptions import Conflict, NotFound
from google.cloud.bigquery import Dataset, DatasetReference, Table, TableReference
from google.cloud.bigquery.external_config import ExternalCatalogDatasetOptions, ExternalCatalogTableOptions
from pytest_mock import MockFixture

from pyiceberg.catalog.bigquery_metastore import ICEBERG_TABLE_TYPE_VALUE, TABLE_TYPE_PROP, BigQueryMetastoreCatalog
from pyiceberg.exceptions import NoSuchNamespaceError, NoSuchTableError
from pyiceberg.exceptions import NamespaceAlreadyExistsError, NoSuchNamespaceError, NoSuchTableError
from pyiceberg.schema import Schema


Expand Down Expand Up @@ -124,6 +124,19 @@ def test_drop_namespace(mocker: MockFixture, gcp_dataset_name: str) -> None:
assert args[0].dataset_id == gcp_dataset_name


def test_create_namespace_already_exists(mocker: MockFixture, gcp_dataset_name: str) -> None:
client_mock = MagicMock()
client_mock.create_dataset.side_effect = Conflict("Already Exists")
mocker.patch("pyiceberg.catalog.bigquery_metastore.Client", return_value=client_mock)
mocker.patch.dict(os.environ, values={"PYICEBERG_LEGACY_CURRENT_SNAPSHOT_ID": "True"})
catalog = BigQueryMetastoreCatalog(
"test_catalog", **{"gcp.bigquery.project-id": "my-project", "warehouse": "gs://test-bucket/warehouse"}
)

with pytest.raises(NamespaceAlreadyExistsError, match=f"^Namespace {gcp_dataset_name} already exists$"):
catalog.create_namespace(gcp_dataset_name)


def test_list_tables(mocker: MockFixture, gcp_dataset_name: str) -> None:
client_mock = MagicMock()

Expand Down
Loading