Handle alias name in SELECTs which are part of a super class

Author: cjbj

CHANGELOG.md

@@ -4,6 +4,10 @@
 
 **This release is under development and information may be incomplete**
 
+- Fixed numeric suffix feature (for duplicate SELECT column names when using
+  `oracledb.OUT_FORMAT_OBJECT` mode) when the column name is also a JavaScript
+  property or method name.
+
 - Added missing support for binding as `oracledb.DB_TYPE_BINARY_INTEGER`.
 
 ## node-oracledb v5.3.0 (22 Oct 2021)

src/njsResultSet.c

@@ -522,7 +522,7 @@ bool njsResultSet_makeUniqueColumnNames(napi_env env, njsBaton *baton,
         NJS_CHECK_NAPI(env, napi_create_string_utf8(env, queryVars[col].name,
                 queryVars[col].nameLength, &queryVars[col].jsName))
 
-        NJS_CHECK_NAPI(env, napi_has_property(env, tempObj,
+        NJS_CHECK_NAPI(env, napi_has_own_property(env, tempObj,
                 queryVars[col].jsName, &exists))
         if (!exists) {
             NJS_CHECK_NAPI(env, napi_create_uint32(env, col, &colObj))

test/dataTypeRowid.js

@@ -1,4 +1,4 @@
-/* Copyright (c) 2015, 2021, Oracle and/or its affiliates. All rights reserved. */
+/* Copyright (c) 2015, 2022, Oracle and/or its affiliates. All rights reserved. */
 
 /******************************************************************************
  *

test/dupColNames1.js

@@ -608,6 +608,30 @@ describe('246. dupColNames1.js', function() {
       assert.equal(result.rows[0].DEPARTMENT_ID_499, 101);
       assert.equal(result.rows[0].DEPARTMENT_ID_1000, 101);
     });
+
+
+    it('246.1.19 Negative not-case sensitive prop name', async function() {
+      // alias name is within quotes and so does not match any string
+      // comparison
+      const sql =
+        `SELECT
+            A.EMPLOYEE_ID, A.DEPARTMENT_ID,
+            B.department_id, B.department_id AS "toString"
+         FROM nodb_dupEmployee A, nodb_dupDepartment B
+         WHERE A.department_id = B.department_id
+         ORDER BY A.EMPLOYEE_ID`;
+
+      const result = await connection.execute(sql);
+      assert.equal(result.metaData[0].name, "EMPLOYEE_ID");
+      assert.equal(result.metaData[1].name, "DEPARTMENT_ID");
+      assert.equal(result.metaData[2].name, "DEPARTMENT_ID_1");
+      assert.equal(result.metaData[3].name, "toString");
+      assert.equal(result.rows[0].EMPLOYEE_ID, 1001);
+      assert.equal(result.rows[0].DEPARTMENT_ID, 101);
+      assert.equal(result.rows[0].DEPARTMENT_ID_1, 101);
+      assert.equal(result.rows[0].toString, 101);
+    });
+
   });
 
   describe('246.2 Duplicate column names, query with ResultSet', function() {

test/list.txt

@@ -4945,6 +4945,9 @@ oracledb.OUT_FORMAT_OBJECT and resultSet =  true
         246.1.15 Duplicate column with non-conflicting alias name using REF cursor
         246.1.16 Duplicate column with case sensitive alias name using REF cursor
         246.1.17 Duplicate column with case sensitive alias name from dual
+        246.1.18 1000 duplicate columns
+        246.1.19 Negative not-case sensitive prop name
+
     246.2 Duplicate Column Names, query with ResultSet
         246.2.1 Two duplicate columns
         246.2.2 Three duplicate columns