Remove session config ignore_bookmark_manager (#792)

It's a leftover from a previous design of the bookmark manager.

Author: robsdedude

neo4j/_async/driver.py

@@ -423,7 +423,6 @@ def session(
             fetch_size: int = ...,
             impersonated_user: t.Optional[str] = ...,
             bookmarks: t.Union[t.Iterable[str], Bookmarks, None] = ...,
-            ignore_bookmark_manager: bool = ...,
             default_access_mode: str = ...,
             bookmark_manager: t.Union[AsyncBookmarkManager,
                                       BookmarkManager, None] = ...,

neo4j/_async/work/session.py

@@ -100,8 +100,7 @@ def __init__(self, pool, session_config):
         assert isinstance(session_config, SessionConfig)
         super().__init__(pool, session_config)
         self._initialize_bookmarks(session_config.bookmarks)
-        if not session_config.ignore_bookmark_manager:
-            self._bookmark_manager = session_config.bookmark_manager
+        self._bookmark_manager = session_config.bookmark_manager
 
     async def __aenter__(self) -> AsyncSession:
         return self

neo4j/_conf.py

@@ -500,9 +500,6 @@ class SessionConfig(WorkspaceConfig):
     #: Default AccessMode
     default_access_mode = WRITE_ACCESS
 
-    #: Whether to ignore the bookmark manager configured at driver level
-    ignore_bookmark_manager = False
-
 
 class TransactionConfig(Config):
     """ Transaction configuration. This is internal for now.

neo4j/_sync/driver.py

@@ -422,7 +422,6 @@ def session(
             fetch_size: int = ...,
             impersonated_user: t.Optional[str] = ...,
             bookmarks: t.Union[t.Iterable[str], Bookmarks, None] = ...,
-            ignore_bookmark_manager: bool = ...,
             default_access_mode: str = ...,
             bookmark_manager: t.Union[BookmarkManager,
                                       BookmarkManager, None] = ...,

neo4j/_sync/work/session.py

@@ -100,8 +100,7 @@ def __init__(self, pool, session_config):
         assert isinstance(session_config, SessionConfig)
         super().__init__(pool, session_config)
         self._initialize_bookmarks(session_config.bookmarks)
-        if not session_config.ignore_bookmark_manager:
-            self._bookmark_manager = session_config.bookmark_manager
+        self._bookmark_manager = session_config.bookmark_manager
 
     def __enter__(self) -> Session:
         return self

testkitbackend/_async/requests.py

@@ -384,7 +384,6 @@ async def NewSession(backend, data):
     for (conf_name, data_name) in (
         ("fetch_size", "fetchSize"),
         ("impersonated_user", "impersonatedUser"),
-        ("ignore_bookmark_manager", "ignoreBookmarkManager"),
     ):
         if data_name in data:
             config[conf_name] = data[data_name]

testkitbackend/_sync/requests.py

@@ -384,7 +384,6 @@ def NewSession(backend, data):
     for (conf_name, data_name) in (
         ("fetch_size", "fetchSize"),
         ("impersonated_user", "impersonatedUser"),
-        ("ignore_bookmark_manager", "ignoreBookmarkManager"),
     ):
         if data_name in data:
             config[conf_name] = data[data_name]

tests/unit/async_/work/test_session.py

@@ -484,16 +484,3 @@ async def bmm_gat_all_bookmarks():
 
         assert last_bookmarks.raw_values == {"session", "bookmarks"}
     assert last_bookmarks.raw_values == {"session", "bookmarks"}
-
-
-@mark_async_test
-async def test_with_ignored_bookmark_manager(fake_pool, mocker):
-    bmm = mocker.Mock(spec=AsyncBookmarkManager)
-    session_config = SessionConfig()
-    session_config.bookmark_manager = bmm
-    session_config.ignore_bookmark_manager = True
-    async with AsyncSession(fake_pool, session_config) as session:
-        await session.run("RETURN 1")
-
-    bmm.assert_not_called()
-    assert not bmm.method_calls

tests/unit/common/test_conf.py

@@ -68,7 +68,6 @@
     "impersonated_user": None,
     "fetch_size": 100,
     "bookmark_manager": object(),
-    "ignore_bookmark_manager": False,
 }
 
 

tests/unit/sync/work/test_session.py

@@ -484,16 +484,3 @@ def bmm_gat_all_bookmarks():
 
         assert last_bookmarks.raw_values == {"session", "bookmarks"}
     assert last_bookmarks.raw_values == {"session", "bookmarks"}
-
-
-@mark_sync_test
-def test_with_ignored_bookmark_manager(fake_pool, mocker):
-    bmm = mocker.Mock(spec=BookmarkManager)
-    session_config = SessionConfig()
-    session_config.bookmark_manager = bmm
-    session_config.ignore_bookmark_manager = True
-    with Session(fake_pool, session_config) as session:
-        session.run("RETURN 1")
-
-    bmm.assert_not_called()
-    assert not bmm.method_calls