Merge branch '1.7' into 2.0

Author: ali-ince

package-lock.json

@@ -188,8 +188,8 @@ const logging = {
  *
  *       // Specify socket connection timeout in milliseconds. Numeric values are expected. Negative and zero values
  *       // result in no timeout being applied. Connection establishment will be then bound by the timeout configured
- *       // on the operating system level. Default value is 5000, which is 5 seconds.
- *       connectionTimeout: 5000, // 5 seconds
+ *       // on the operating system level. Default value is 30000, which is 30 seconds.
+ *       connectionTimeout: 30000, // 30 seconds
  *
  *       // Make this driver always return native JavaScript numbers for integer values, instead of the
  *       // dedicated {@link Integer} class. Values that do not fit in native number bit range will be represented as

src/index.js

@@ -29,13 +29,13 @@ const noOpObserver = new StreamObserver()
 
 export default class BoltProtocol extends BoltProtocolV2 {
   transformMetadata (metadata) {
-    if (metadata.t_first) {
+    if ('t_first' in metadata) {
       // Bolt V3 uses shorter key 't_first' to represent 'result_available_after'
       // adjust the key to be the same as in Bolt V1 so that ResultSummary can retrieve the value
       metadata.result_available_after = metadata.t_first
       delete metadata.t_first
     }
-    if (metadata.t_last) {
+    if ('t_last' in metadata) {
       // Bolt V3 uses shorter key 't_last' to represent 'result_consumed_after'
       // adjust the key to be the same as in Bolt V1 so that ResultSummary can retrieve the value
       metadata.result_consumed_after = metadata.t_last

src/internal/bolt-protocol-v3.js

@@ -20,7 +20,7 @@
 import { newError, SERVICE_UNAVAILABLE } from '../error'
 import { ENCRYPTION_OFF, ENCRYPTION_ON } from './util'
 
-const DEFAULT_CONNECTION_TIMEOUT_MILLIS = 5000 // 5 seconds by default
+const DEFAULT_CONNECTION_TIMEOUT_MILLIS = 30000 // 30 seconds by default
 
 const ALLOWED_VALUES_ENCRYPTED = [
   null,

src/internal/channel-config.js

@@ -174,8 +174,8 @@ class ProfiledPlan {
     this.operatorType = profile.operatorType
     this.identifiers = profile.identifiers
     this.arguments = profile.args
-    this.dbHits = profile.args.DbHits.toInt()
-    this.rows = profile.args.Rows.toInt()
+    this.dbHits = intValue(profile.args.DbHits)
+    this.rows = intValue(profile.args.Rows)
     this.children = profile.children
       ? profile.children.map(child => new ProfiledPlan(child))
       : []
@@ -208,11 +208,9 @@ class StatementStatistics {
     }
     Object.keys(statistics).forEach(index => {
       // To camelCase
-      this._stats[index.replace(/(-\w)/g, m => m[1].toUpperCase())] = isInt(
+      this._stats[index.replace(/(-\w)/g, m => m[1].toUpperCase())] = intValue(
         statistics[index]
       )
-        ? statistics[index].toInt()
-        : statistics[index]
     })
   }
 
@@ -329,9 +327,9 @@ class Notification {
       return {}
     }
     return {
-      offset: pos.offset.toInt(),
-      line: pos.line.toInt(),
-      column: pos.column.toInt()
+      offset: intValue(pos.offset),
+      line: intValue(pos.line),
+      column: intValue(pos.column)
     }
   }
 }
@@ -354,6 +352,10 @@ class ServerInfo {
   }
 }
 
+function intValue (value) {
+  return isInt(value) ? value.toInt() : value
+}
+
 const statementType = {
   READ_ONLY: 'r',
   READ_WRITE: 'rw',

src/result-summary.js

@@ -109,7 +109,7 @@ describe('#unit ChannelConfig', () => {
   it('should have connection timeout by default', () => {
     const config = new ChannelConfig(null, {}, '')
 
-    expect(config.connectionTimeout).toEqual(5000)
+    expect(config.connectionTimeout).toEqual(30000)
   })
 
   it('should respect configured connection timeout', () => {

test/internal/channel-config.test.js

@@ -1,5 +1,6 @@
 !: BOLT 3
 !: AUTO HELLO
+!: AUTO GOODBYE
 
 C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
    PULL_ALL

test/resources/boltstub/v3/acquire_endpoints_three_servers_set_1.script

@@ -1,6 +1,7 @@
 !: BOLT 3
 !: AUTO HELLO
 !: AUTO RESET
+!: AUTO GOODBYE
 
 C: RUN "CALL dbms.cluster.routing.getRoutingTable($context)" {"context": {}} {}
    PULL_ALL

test/resources/boltstub/v3/acquire_endpoints_three_servers_set_2.script

@@ -19,26 +19,75 @@
 
 import neo4j from '../src'
 import sharedNeo4j from './internal/shared-neo4j'
-import { ServerVersion, VERSION_4_0_0 } from '../src/internal/server-version'
 
 describe('#integration result summary', () => {
-  let driver, session, serverVersion
+  describe('default driver', () => {
+    let driver, session
 
-  beforeEach(async () => {
-    driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
-    session = driver.session()
+    beforeEach(done => {
+      driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
+      session = driver.session()
 
-    serverVersion = await sharedNeo4j.cleanupAndGetVersion(driver)
+      session.run('MATCH (n) DETACH DELETE n').then(done)
+    })
+
+    afterEach(() => {
+      driver.close()
+    })
+
+    it('should get result summary', done => {
+      verifySummary(session, done)
+    })
+
+    it('should get plan from summary', done => {
+      verifyPlan(session, done)
+    })
+
+    it('should get profile from summary', done => {
+      verifyProfile(session, done)
+    })
+
+    it('should get notifications from summary', done => {
+      verifyNotifications(session, 'EXPLAIN MATCH (n), (m) RETURN n, m', done)
+    })
   })
 
-  afterEach(async () => {
-    await driver.close()
+  describe('driver with lossless integers disabled', () => {
+    let driver, session
+
+    beforeEach(done => {
+      driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken, {
+        disableLosslessIntegers: true
+      })
+      session = driver.session()
+
+      session.run('MATCH (n) DETACH DELETE n').then(done)
+    })
+
+    afterEach(() => {
+      driver.close()
+    })
+
+    it('should get result summary', done => {
+      verifySummary(session, done)
+    })
+
+    it('should get plan from summary', done => {
+      verifyPlan(session, done)
+    })
+
+    it('should get profile from summary', done => {
+      verifyProfile(session, done)
+    })
+
+    it('should get notifications from summary', done => {
+      verifyNotifications(session, 'EXPLAIN MATCH (n), (m) RETURN n, m', done)
+    })
   })
 
-  it('should get result summary', done => {
-    // When & Then
+  function verifySummary (session, done) {
     session.run("CREATE (p:Person { Name: 'Test'})").then(result => {
-      let summary = result.summary
+      const summary = result.summary
 
       expect(summary.statement.text).toBe("CREATE (p:Person { Name: 'Test'})")
       expect(summary.statement.parameters).toEqual({})
@@ -50,7 +99,7 @@ describe('#integration result summary', () => {
       expect(summary.resultConsumedAfter).toBeDefined()
       expect(summary.resultAvailableAfter).toBeDefined()
 
-      let counters = summary.counters
+      const counters = summary.counters
       expect(counters.nodesCreated()).toBe(1)
       expect(counters.nodesDeleted()).toBe(0)
       expect(counters.relationshipsCreated()).toBe(0)
@@ -64,31 +113,31 @@ describe('#integration result summary', () => {
       expect(counters.constraintsRemoved()).toBe(0)
       done()
     })
-  })
+  }
 
-  it('should get plan from summary', done => {
+  function verifyPlan (session, done) {
     session.run('EXPLAIN MATCH (n) RETURN 1').then(result => {
-      let summary = result.summary
+      const summary = result.summary
       expect(summary.plan).toBeDefined()
       expect(summary.profile).toBe(false)
 
-      let plan = summary.plan
+      const plan = summary.plan
       expect(plan.arguments).toBeDefined()
       expect(plan.children).toBeDefined()
       expect(plan.identifiers).toBeDefined()
       expect(plan.operatorType).toBeDefined()
       done()
     })
-  })
+  }
 
-  it('should get profile from summary', done => {
+  function verifyProfile (session, done) {
     session.run('PROFILE RETURN 1').then(result => {
-      let summary = result.summary
+      const summary = result.summary
       expect(summary.plan).toBeDefined()
       expect(summary.profile).toBeDefined()
 
-      let profile = summary.profile
-      let plan = summary.plan
+      const profile = summary.profile
+      const plan = summary.plan
 
       verifyProfileAndPlanAreEqual(profile, plan)
 
@@ -97,18 +146,14 @@ describe('#integration result summary', () => {
 
       done()
     })
-  })
-
-  it('should get notifications from summary', done => {
-    if (serverVersion.compareTo(VERSION_4_0_0) >= 0) {
-      pending('seems to be flaky')
-    }
+  }
 
-    session.run('EXPLAIN MATCH (n), (m) RETURN n, m').then(result => {
-      let summary = result.summary
+  function verifyNotifications (session, statement, done) {
+    session.run(statement).then(result => {
+      const summary = result.summary
       expect(summary.notifications).toBeDefined()
       expect(summary.notifications.length).toBe(1)
-      let notification = summary.notifications[0]
+      const notification = summary.notifications[0]
 
       expect(notification.code).toBeDefined()
       expect(notification.title).toBeDefined()
@@ -118,7 +163,7 @@ describe('#integration result summary', () => {
 
       done()
     })
-  })
+  }
 
   function verifyProfileAndPlanAreEqual (profile, plan) {
     expect(profile.arguments).toBe(plan.arguments)