Fix DateTime with ZoneId for years between 00-99 (#992)

bigmontz · web-flow · commit f67e4f4094a1 · 2022-09-09T18:36:15.000+02:00
The error was happening because Date.UTC factory doesn't treats dates between 00-99 as 1900-1999.

Removing the usage of this factory makes the code slightly faster while resolves the issue.
diff --git a/packages/bolt-connection/src/bolt/bolt-protocol-v5x0.utc.transformer.js b/packages/bolt-connection/src/bolt/bolt-protocol-v5x0.utc.transformer.js
@@ -172,22 +172,17 @@ function getTimeInZoneId (timeZoneId, epochSecond, nano) {
     era: 'narrow'
   })
 
-  const l = epochSecondAndNanoToLocalDateTime(epochSecond, nano)
-  const utc = Date.UTC(
-    int(l.year).toNumber(),
-    int(l.month).toNumber() - 1,
-    int(l.day).toNumber(),
-    int(l.hour).toNumber(),
-    int(l.minute).toNumber(),
-    int(l.second).toNumber()
-  )
+  const utc = int(epochSecond)
+    .multiply(1000)
+    .add(int(nano).div(1_000_000))
+    .toNumber()
 
   const formattedUtcParts = formatter.formatToParts(utc)
 
   const localDateTime = formattedUtcParts.reduce((obj, currentValue) => {
     if (currentValue.type === 'era') {
       obj.adjustEra =
-        currentValue.value.toLocaleUpperCase() === 'B'
+        currentValue.value.toUpperCase() === 'B'
           ? year => year.subtract(1).negate() // 1BC equals to year 0 in astronomical year numbering
           : identity
     } else if (currentValue.type !== 'literal') {
diff --git a/packages/bolt-connection/test/bolt/bolt-protocol-v4x3.test.js b/packages/bolt-connection/test/bolt/bolt-protocol-v4x3.test.js
@@ -813,6 +813,10 @@ describe('#unit BoltProtocolV4x3', () => {
         [
           'DateWithWithZoneId / Min Date',
           new DateTime(-99_999, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')
+        ],
+        [
+          'DateWithWithZoneId / Ambiguous date between 00 and 99',
+          new DateTime(50, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')
         ]
       ])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {
         const packable = protocol.packable(object)
diff --git a/packages/bolt-connection/test/bolt/bolt-protocol-v4x4.test.js b/packages/bolt-connection/test/bolt/bolt-protocol-v4x4.test.js
@@ -846,6 +846,10 @@ describe('#unit BoltProtocolV4x4', () => {
         [
           'DateWithWithZoneId / Min Date',
           new DateTime(-99_999, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')
+        ],
+        [
+          'DateWithWithZoneId / Ambiguous date between 00 and 99',
+          new DateTime(50, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')
         ]
       ])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {
         const packable = protocol.packable(object)
diff --git a/packages/bolt-connection/test/bolt/bolt-protocol-v5x0.test.js b/packages/bolt-connection/test/bolt/bolt-protocol-v5x0.test.js
@@ -539,6 +539,10 @@ describe('#unit BoltProtocolV5x0', () => {
       [
         'DateWithWithZoneId / Min Date',
         new DateTime(-99_999, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')
+      ],
+      [
+        'DateWithWithZoneId / Ambiguous date between 00 and 99',
+        new DateTime(50, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')
       ]
     ])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {
       const buffer = alloc(256)
diff --git a/packages/neo4j-driver/test/examples.test.js b/packages/neo4j-driver/test/examples.test.js
@@ -708,7 +708,7 @@ describe('#integration examples', () => {
   it('service unavailable example', done => {
     const console = consoleOverride
     const consoleLoggedMsg = consoleOverridePromise
-    const uri = `bolt://${sharedNeo4j.hostname}:7688` // wrong port
+    const uri = `bolt://${sharedNeo4j.hostname}:7686` // wrong port
     const password = 'wrongPassword'
 
     // tag::service-unavailable[]
diff --git a/packages/neo4j-driver/test/internal/transaction-executor.test.js b/packages/neo4j-driver/test/internal/transaction-executor.test.js
@@ -35,8 +35,7 @@ const LOCKS_TERMINATED_ERROR =
   'Neo.TransientError.Transaction.LockClientStopped'
 const OOM_ERROR = 'Neo.DatabaseError.General.OutOfMemoryError'
 
-// Not exactly integration tests but annoyingly slow for being a unit tests.
-describe('#integration TransactionExecutor', () => {
+describe('#unit TransactionExecutor', () => {
   it('should retry until database error happens', async () => {
     await testNoRetryOnUnknownError(
       [
diff --git a/packages/neo4j-driver/test/temporal-types.test.js b/packages/neo4j-driver/test/temporal-types.test.js
@@ -1439,7 +1439,24 @@ describe('#integration temporal-types', () => {
       expect(records.length).toEqual(1)
 
       const value = records[0].get(0)
-      expect(value).toEqual(expectedValue)
+
+      if (
+        expectedValue.timeZoneId != null &&
+        value.timeZoneOffsetSeconds != null &&
+        neo4j.isDateTime(value) &&
+        neo4j.isDateTime(expectedValue)) {
+        expect(value).toEqual(jasmine.objectContaining({
+          year: expectedValue.year,
+          month: expectedValue.month,
+          day: expectedValue.day,
+          hour: expectedValue.hour,
+          second: expectedValue.second,
+          nanosecond: expectedValue.nanosecond,
+          timeZoneId: expectedValue.timeZoneId
+        }))
+      } else {
+        expect(value).toEqual(expectedValue)
+      }
     } finally {
       await session.close()
     }
@@ -1457,10 +1474,23 @@ describe('#integration temporal-types', () => {
     const receivedValue = records[0].get(0)
     // Amend test to ignore timeZoneOffsetInSeconds returned by the
     // new servers in ZonedDateTime with the utc fix
-    if (value.timeZoneId != null && receivedValue.timeZoneOffsetSeconds != null) {
-      receivedValue.timeZoneOffsetInSeconds = undefined
+    if (
+      value.timeZoneId != null &&
+        receivedValue.timeZoneOffsetSeconds != null &&
+        neo4j.isDateTime(value) &&
+        neo4j.isDateTime(receivedValue)) {
+      expect(receivedValue).toEqual(jasmine.objectContaining({
+        year: value.year,
+        month: value.month,
+        day: value.day,
+        hour: value.hour,
+        second: value.second,
+        nanosecond: value.nanosecond,
+        timeZoneId: value.timeZoneId
+      }))
+    } else {
+      expect(receivedValue).toEqual(value)
     }
-    expect(receivedValue).toEqual(value)
   }
 
   async function testDurationToString (values) {

Original file line number	Diff line number	Diff line change
`@@ -813,6 +813,10 @@ describe('#unit BoltProtocolV4x3', () => {`
`813`	`813`	`[`
`814`	`814`	`'DateWithWithZoneId / Min Date',`
`815`	`815`	`new DateTime(-99_999, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')`
	`816`	`+ ],`
	`817`	`+ [`
	`818`	`+ 'DateWithWithZoneId / Ambiguous date between 00 and 99',`
	`819`	`+ new DateTime(50, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')`
`816`	`820`	`]`
`817`	`821`	`])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {`
`818`	`822`	`const packable = protocol.packable(object)`
Original file line number	Diff line number	Diff line change
`@@ -846,6 +846,10 @@ describe('#unit BoltProtocolV4x4', () => {`
`846`	`846`	`[`
`847`	`847`	`'DateWithWithZoneId / Min Date',`
`848`	`848`	`new DateTime(-99_999, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')`
	`849`	`+ ],`
	`850`	`+ [`
	`851`	`+ 'DateWithWithZoneId / Ambiguous date between 00 and 99',`
	`852`	`+ new DateTime(50, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')`
`849`	`853`	`]`
`850`	`854`	`])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {`
`851`	`855`	`const packable = protocol.packable(object)`
Original file line number	Diff line number	Diff line change
`@@ -539,6 +539,10 @@ describe('#unit BoltProtocolV5x0', () => {`
`539`	`539`	`[`
`540`	`540`	`'DateWithWithZoneId / Min Date',`
`541`	`541`	`new DateTime(-99_999, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')`
	`542`	`+ ],`
	`543`	`+ [`
	`544`	`+ 'DateWithWithZoneId / Ambiguous date between 00 and 99',`
	`545`	`+ new DateTime(50, 12, 31, 23, 59, 59, 999_999_999, undefined, 'Pacific/Samoa')`
`542`	`546`	`]`
`543`	`547`	`])('should pack and unpack DateTimeWithZoneId and without offset (%s)', (_, object) => {`
`544`	`548`	`const buffer = alloc(256)`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,7 @@ const LOCKS_TERMINATED_ERROR =`
`35`	`35`	`'Neo.TransientError.Transaction.LockClientStopped'`
`36`	`36`	`const OOM_ERROR = 'Neo.DatabaseError.General.OutOfMemoryError'`
`37`	`37`
`38`		`-// Not exactly integration tests but annoyingly slow for being a unit tests.`
`39`		`-describe('#integration TransactionExecutor', () => {`
	`38`	`+describe('#unit TransactionExecutor', () => {`
`40`	`39`	`it('should retry until database error happens', async () => {`
`41`	`40`	`await testNoRetryOnUnknownError(`
`42`	`41`	`[`