Fixed connector

Author: technige

neo4j/__init__.py

@@ -40,6 +40,7 @@
     "SessionError",
     "SessionExpired",
     "TransactionError",
+    "unit_of_work",
     "basic_auth",
     "custom_auth",
     "kerberos_auth",
@@ -574,7 +575,7 @@ def begin_transaction(self, bookmark=None):
         self._open_transaction()
         return self._transaction
 
-    def _open_transaction(self, access_mode=None):
+    def _open_transaction(self, access_mode=None, metadata=None):
         self._transaction = Transaction(self, on_close=self._close_transaction)
         self._connect(access_mode)
         self._connection.begin(self._bookmarks_in)
@@ -619,6 +620,9 @@ def _run_transaction(self, access_mode, unit_of_work, *args, **kwargs):
 
         if not callable(unit_of_work):
             raise TypeError("Unit of work is not callable")
+
+        metadata = getattr(unit_of_work, "metadata", None)
+        print(metadata)    # TODO
         retry_delay = retry_delay_generator(INITIAL_RETRY_DELAY,
                                             RETRY_DELAY_MULTIPLIER,
                                             RETRY_DELAY_JITTER_FACTOR)
@@ -1341,6 +1345,21 @@ def __init__(self, transaction, *args, **kwargs):
         self.transaction = transaction
 
 
+def unit_of_work(**metadata):
+    """ Decorator for transaction functions.
+    """
+
+    def wrapper(f):
+
+        def wrapped(*args, **kwargs):
+            return f(*args, **kwargs)
+
+        wrapped.metadata = metadata
+        return wrapped
+
+    return wrapper
+
+
 def basic_auth(user, password, realm=None):
     """ Generate a basic auth token for a given user and password.
 

requirements.txt

@@ -1,2 +1,2 @@
-neobolt==1.7.0b2
+neobolt==1.7.0rc2
 neotime

setup.py

@@ -30,7 +30,7 @@
 from neo4j.meta import package, version
 
 install_requires = [
-    "neobolt==1.7.0b2",
+    "neobolt==1.7.0rc2",
     "neotime",
 ]
 classifiers = [

test/integration/test_session.py

@@ -24,8 +24,8 @@
 
 from neo4j import \
     READ_ACCESS, WRITE_ACCESS, \
-    CypherError, SessionError, TransactionError
-from neo4j.v1.types.graph import Node, Relationship, Path
+    CypherError, SessionError, TransactionError, unit_of_work
+from neo4j.types.graph import Node, Relationship, Path
 from neo4j.exceptions import CypherSyntaxError
 
 from test.integration.tools import DirectIntegrationTestCase
@@ -471,6 +471,7 @@ def test_large_values(self):
             session.run("RETURN '{}'".format("A" * 2 ** 20))
             session.close()
 
+
 class TransactionCommittedTestCase(DirectIntegrationTestCase):
 
     def setUp(self):
@@ -483,3 +484,62 @@ def setUp(self):
     def test_errors_on_run(self):
         with self.assertRaises(TransactionError):
             self.transaction.run("RETURN 1")
+
+
+class TransactionFunctionTestCase(DirectIntegrationTestCase):
+
+    def test_simple_read(self):
+
+        def work(tx):
+            return tx.run("RETURN 1").single().value()
+
+        with self.driver.session() as session:
+            value = session.read_transaction(work)
+            self.assertEqual(value, 1)
+
+    def test_read_with_arg(self):
+
+        def work(tx, x):
+            return tx.run("RETURN $x", x=x).single().value()
+
+        with self.driver.session() as session:
+            value = session.read_transaction(work, x=1)
+            self.assertEqual(value, 1)
+
+    def test_read_with_arg_and_metadata(self):
+
+        @unit_of_work(timeout=25, metadata={"foo": "bar"})
+        def work(tx, x):
+            return tx.run("RETURN $x", x=x).single().value()
+
+        with self.driver.session() as session:
+            value = session.read_transaction(work, x=1)
+            self.assertEqual(value, 1)
+
+    def test_simple_write(self):
+
+        def work(tx):
+            return tx.run("CREATE (a {x: 1}) RETURN a.x").single().value()
+
+        with self.driver.session() as session:
+            value = session.write_transaction(work)
+            self.assertEqual(value, 1)
+
+    def test_write_with_arg(self):
+
+        def work(tx, x):
+            return tx.run("CREATE (a {x: $x}) RETURN a.x", x=x).single().value()
+
+        with self.driver.session() as session:
+            value = session.write_transaction(work, x=1)
+            self.assertEqual(value, 1)
+
+    def test_write_with_arg_and_metadata(self):
+
+        @unit_of_work(timeout=25, metadata={"foo": "bar"})
+        def work(tx, x):
+            return tx.run("CREATE (a {x: $x}) RETURN a.x", x=x).single().value()
+
+        with self.driver.session() as session:
+            value = session.write_transaction(work, x=1)
+            self.assertEqual(value, 1)

test/integration/tools.py

@@ -30,6 +30,7 @@
 except ImportError:
     from urllib import urlretrieve
 
+from boltkit.config import update as update_config
 from boltkit.controller import _install, WindowsController, UnixController
 
 from neo4j import GraphDatabase
@@ -156,10 +157,11 @@ def _unpack(cls, package):
     def _start_server(cls, home):
         controller_class = WindowsController if platform.system() == "Windows" else UnixController
         cls.controller = controller_class(home, 1)
+        update_config(cls.controller.home, {"dbms.connectors.default_listen_address": "::"})
         if NEO4J_USER is None:
             cls.controller.create_user(cls.user, cls.password)
             cls.controller.set_user_role(cls.user, "admin")
-        cls.controller.start()
+        cls.controller.start(timeout=90)
 
     @classmethod
     def _stop_server(cls):

test/requirements.txt

@@ -1,4 +1,4 @@
-boltkit>=1.0.34
+boltkit>=1.0.39
 coverage
 mock
 pytest