Fix error message for append function, usage of deleteElement function with Associative Array collection types and update copyright year to 2025

Author: sharadraju

LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2015, 2024 Oracle and/or its affiliates.
+Copyright (c) 2015, 2025 Oracle and/or its affiliates.
 
 This software is dual-licensed to you under the Universal Permissive License
 (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License

NOTICE.txt

@@ -1 +1 @@
-Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+Copyright (c) 2015, 2025, Oracle and/or its affiliates.

README.md

@@ -50,7 +50,7 @@ vulnerability disclosure process.
 
 ## License
 
-Copyright (c) 2015, 2024, Oracle and/or its affiliates.
+Copyright (c) 2015, 2025, Oracle and/or its affiliates.
 
 This software is dual-licensed to you under the Universal Permissive License
 (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License

doc/api.md

@@ -1,6 +1,6 @@
 # node-oracledb Documentation for the Oracle Database Node.js Add-on
 
-*Copyright (c) 2015, 2024, Oracle and/or its affiliates.*
+*Copyright (c) 2015, 2025, Oracle and/or its affiliates.*
 
 This software is dual-licensed to you under the Universal Permissive License
 (UPL) 1.0 as shown at https://oss.oracle.com/licenses/upl and Apache License

doc/src/release_notes.rst

@@ -8,6 +8,18 @@ node-oracledb Release Notes
 For deprecated and desupported features, see
 :ref:`Deprecations and desupported features <deprecations>`.
 
+node-oracledb `v6.8.0 <https://github.com/oracle/node-oracledb/compare/v6.7.1...v6.8.0>`__ (TBD)
+---------------------------------------------------------------------------------------------------------
+
+Thin Mode Changes
++++++++++++++++++
+
+#)  Fixed error message in ``NJS-131`` to provide the correct range of the
+    database object collection types.
+
+#)  Fixed bug with :meth:`dbObject.deleteElement()` which did not update the
+    keys of associative arrays when an element was deleted.
+
 node-oracledb `v6.7.1 <https://github.com/oracle/node-oracledb/compare/v6.7.0...v6.7.1>`__ (23 Dec 2024)
 ---------------------------------------------------------------------------------------------------------
 

lib/errors.js

@@ -1,4 +1,4 @@
-// Copyright (c) 2022, 2024, Oracle and/or its affiliates.
+// Copyright (c) 2022, 2025, Oracle and/or its affiliates.
 
 //-----------------------------------------------------------------------------
 //
@@ -416,7 +416,7 @@ messages.set(ERR_INVALID_OBJECT_TYPE_NAME,              // NJS-129
 messages.set(ERR_TDS_TYPE_NOT_SUPPORTED,                // NJS-130
   'Oracle TDS data type %d is not supported');
 messages.set(ERR_INVALID_COLL_INDEX_SET,                // NJS-131
-  'given index %d must be in the range of %d to %d');
+  'given index [%d] must be in the range of [%d] to [%d]');
 messages.set(ERR_INVALID_COLL_INDEX_GET,                // NJS-132
   'element at index %d does not exist');
 messages.set(ERR_DELETE_ELEMENTS_OF_VARRAY,             // NJS-133

lib/thin/dbObject.js

@@ -429,7 +429,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
       if (objType.maxNumElements > 0 &&
           this.unpackedArray.length >= objType.maxNumElements) {
         errors.throwErr(errors.ERR_INVALID_COLL_INDEX_SET,
-          this.unpackedArray.length, 0, objType.maxNumElements);
+          this.unpackedArray.length, 0, objType.maxNumElements - 1);
       }
       this.unpackedArray.push(value);
     } else {
@@ -459,7 +459,7 @@ class ThinDbObjectImpl extends DbObjectImpl {
       }
       this.unpackedArray.splice(index, 1);
     } else {
-      this._unpackedAssocKeys = undefined;
+      this.unpackedAssocKeys = undefined;
       this.unpackedAssocArray.delete(index);
     }
   }

test/dbObject20.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2019, 2024, Oracle and/or its affiliates. */
+/* Copyright (c) 2019, 2025, Oracle and/or its affiliates. */
 
 /******************************************************************************
  *
@@ -1243,6 +1243,8 @@ describe('290. dbObject20.js', () => {
       assert.strictEqual(res.hasElement(12), false);
       assert.deepStrictEqual(res.getKeys(), Object.keys(inDataobj).map(Number));
       assert.deepStrictEqual(res.getValues(), Object.values(inDataobj).map(Number));
+      res.deleteElement(2);
+      assert.strictEqual(res.hasElement(2), false);
     });
   });