Replace better-eval with vm

lib/connection/result/column.js

@@ -9,9 +9,10 @@ var SfTimestamp = require('./sf_timestamp');
 var SqlTypes = require('./data_types').SqlTypes;
 var bigInt = require('big-integer');
 var { XMLParser, XMLValidator } = require("fast-xml-parser");
-var betterEval = require("better-eval");
+const vm = require('vm');
 
 var NULL_UPPERCASE = 'NULL';
+const VM_CONTEXT = vm.createContext(); // create a new context so VM does not have to make a new one for each conversion
 
 /**
  * Creates a new Column.
@@ -552,7 +553,8 @@ function convertRawVariant(rawColumnValue, column, context)
   {
     try
     {
-      ret = betterEval("(" + rawColumnValue + ")");
+      // run code on a different scope
+      ret = vm.runInContext("(" + rawColumnValue + ")", VM_CONTEXT);
     }
     catch (parseError)
     {

package.json

@@ -12,7 +12,6 @@
     "async": "^3.2.3",
     "aws-sdk": "^2.878.0",
     "axios": "^0.27.2",
-    "better-eval": "^1.3.0",
     "big-integer": "^1.6.43",
     "bignumber.js": "^2.4.0",
     "binascii": "0.0.2",

test/integration/testLargeResultSet.js

@@ -2,6 +2,7 @@
  * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 const assert = require('assert');
+const async = require('async');
 const testUtil = require('./testUtil');
 
 const sourceRowCount = 10000;
@@ -105,4 +106,147 @@ describe('Large result Set Tests', function ()
       }
     });
   });
+
+  describe('Large Result Set Tests For Variant Column Type', function ()
+  {
+    const createTempTable = 'create or replace table testVariantTemp(value string)';
+    const createTableWithVariant = 'create or replace table testVariantTable(colA variant)';
+    const dropTableWithVariant = 'drop table if exists testVariantTable';
+    const dropTempTable = 'drop table if exists testVariantTemp';
+
+    before(async () =>
+    {
+      await testUtil.executeCmdAsync(connection, createTableWithVariant);
+      await testUtil.executeCmdAsync(connection, createTempTable);
+    });
+
+    after(async () =>
+    {
+      await testUtil.executeCmdAsync(connection, dropTableWithVariant);
+      await testUtil.executeCmdAsync(connection, dropTempTable);
+    });
+
+    it('testSelectOnVariantColumnForLargeResultSets', function (done)
+    {
+      const insertTemp = 'insert into testVariantTemp values (?)';
+      const insertVariant = 'insert into testVariantTable select parse_json(value) from testVariantTemp';
+      const selectVariant = 'select * from testVariantTable';
+
+      const arrJSON = [];
+      for (let i = 0; i < sourceRowCount; i++)
+      {
+        const sampleJSON = {
+          "root":
+          {
+            "key":
+              [
+                {
+                  "key1": i,
+                  "key2": "value2",
+                  "key3": "value3",
+                  "key4": "value4",
+                  "key5":
+                  {
+                    "key":
+                      [
+                        { "key1": "value1", "key2": "value2" },
+                        { "key1": "value1", "key2": "value2" },
+                        { "key1": "value1", "key2": "value2" },
+                        { "key1": "value1", "key2": "value2" }
+                      ]
+                  },
+                  "key6":
+                    [
+                      { "key1": "value1", "key": "value" },
+                      { "key1": "value1", "key": "value" },
+                      { "key1": "value1", "key": "value" },
+                      { "key1": "value1", "key": "value" },
+                      { "key1": "value1", "key": "value" },
+                      { "key1": "value1", "key": "value" },
+                      { "key1": "value1", "key": "value" }
+                    ]
+                },
+              ]
+          }
+        };
+        arrJSON.push([JSON.stringify(sampleJSON)]);
+      }
+
+      async.series([
+        function (callback)
+        {
+          connection.execute({
+            sqlText: insertTemp,
+            binds: arrJSON,
+            complete: function (err, stmt)
+            {
+              if (err)
+              {
+                callback(err);
+              }
+              else
+              {
+                try
+                {
+                  assert.strictEqual(stmt.getNumUpdatedRows(), sourceRowCount);
+                  callback();
+                }
+                catch (err)
+                {
+                  callback(err);
+                }
+              }
+            }
+          });
+        },
+        function (callback)
+        {
+          connection.execute({
+            sqlText: insertVariant,
+            complete: (err) => callback(err)
+          })
+        },
+        function (callback)
+        {
+          connection.execute({
+            sqlText: selectVariant,
+            streamResult: true,
+            complete: function (err, stmt)
+            {
+              if (err)
+              {
+                callback(err);
+              }
+              else
+              {
+                var stream = stmt.streamRows();
+                var rowCount = 0;
+                stream.on('data', function ()
+                {
+                  rowCount++;
+                });
+                stream.on('error', function (err)
+                {
+                  callback(err);
+                });
+                stream.on('end', function ()
+                {
+                  try
+                  {
+                    assert.strictEqual(rowCount, sourceRowCount);
+                    callback();
+                  }
+                  catch (err)
+                  {
+                    callback(err);
+                  }
+                });
+              }
+            }
+          });
+        }],
+        done
+      );
+    });
+  });
 });