Fix how values are converted to native numbers in result summary

Author: ali-ince

src/v1/internal/bolt-protocol-v3.js

@@ -21,13 +21,13 @@ import RequestMessage from './request-message'
 
 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/v1/result-summary.js

@@ -167,8 +167,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))
       : []
@@ -201,11 +201,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]
     })
   }
 
@@ -322,9 +320,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)
     }
   }
 }
@@ -347,6 +345,10 @@ class ServerInfo {
   }
 }
 
+function intValue (value) {
+  return isInt(value) ? value.toInt() : value
+}
+
 const statementType = {
   READ_ONLY: 'r',
   READ_WRITE: 'rw',

test/v1/summary.test.js

@@ -21,21 +21,71 @@ import neo4j from '../../src/v1'
 import sharedNeo4j from '../internal/shared-neo4j'
 
 describe('result summary', () => {
-  let driver, session
+  describe('default driver', () => {
+    let driver, session
 
-  beforeEach(done => {
-    driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
-    session = driver.session()
+    beforeEach(done => {
+      driver = neo4j.driver('bolt://localhost', sharedNeo4j.authToken)
+      session = driver.session()
 
-    session.run('MATCH (n) DETACH DELETE n').then(done)
+      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(() => {
-    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
 
@@ -63,9 +113,9 @@ describe('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
       expect(summary.plan).toBeDefined()
@@ -78,9 +128,9 @@ describe('result summary', () => {
       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
       expect(summary.plan).toBeDefined()
@@ -96,10 +146,10 @@ describe('result summary', () => {
 
       done()
     })
-  })
+  }
 
-  it('should get notifications from summary', done => {
-    session.run('EXPLAIN MATCH (n), (m) RETURN n, m').then(result => {
+  function verifyNotifications (session, statement, done) {
+    session.run(statement).then(result => {
       let summary = result.summary
       expect(summary.notifications).toBeDefined()
       expect(summary.notifications.length).toBe(1)
@@ -113,7 +163,7 @@ describe('result summary', () => {
 
       done()
     })
-  })
+  }
 
   function verifyProfileAndPlanAreEqual (profile, plan) {
     expect(profile.arguments).toBe(plan.arguments)