From a32b39cfb4dac6b4d3eff3ef95f9ba0cc7f07ddf Mon Sep 17 00:00:00 2001
From: Shanika Kuruppu <skuruppu@google.com>
Date: Wed, 14 Feb 2024 13:50:59 +1100
Subject: [PATCH] fixes to address feedback

---
 src/codec.ts           |  2 +-
 system-test/spanner.ts | 17 ++++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/src/codec.ts b/src/codec.ts
index 663a76873..bf00491b3 100644
--- a/src/codec.ts
+++ b/src/codec.ts
@@ -257,7 +257,7 @@ export class PGOid extends WrappedNumber {
   value: string;
   constructor(value: string) {
     super();
-    this.value = value.toString();
+    this.value = value;
   }
   valueOf(): number {
     const num = Number(this.value);
diff --git a/system-test/spanner.ts b/system-test/spanner.ts
index e0d6dd2e4..011cba1f5 100644
--- a/system-test/spanner.ts
+++ b/system-test/spanner.ts
@@ -828,7 +828,7 @@ describe('Spanner', () => {
     });
 
     describe('oids', () => {
-      it('POSTGRESQL should read pgOid values', function (done) {
+      it('POSTGRESQL should read non-null pgOid values', function (done) {
         if (IS_EMULATOR_ENABLED) {
           this.skip();
         }
@@ -842,6 +842,21 @@ describe('Spanner', () => {
           done();
         });
       });
+
+      it('POSTGRESQL should read null pgOid values', function (done) {
+        if (IS_EMULATOR_ENABLED) {
+          this.skip();
+        }
+        PG_DATABASE.run('SELECT null::oid', (err, rows) => {
+          assert.ifError(err);
+          let queriedValue = rows[0][0].value;
+          if (rows[0][0].value) {
+            queriedValue = rows[0][0].value.value;
+          }
+          assert.strictEqual(queriedValue, null);
+          done();
+        });
+      });
     });
 
     describe('float64s', () => {