FIX 222 - Pass client application on connect

lib/authentication/authentication.js

@@ -27,6 +27,7 @@ exports.authenticationTypes = authenticationTypes;
  * @param {String} clientName
  * @param {String} clientVersion
  * @param {Object} clientEnv
+ * @param {String} clientApplication
  *
  * @returns {JSON}
  */
@@ -36,7 +37,8 @@ exports.formAuthJSON = function formAuthJSON(
   username,
   clientName,
   clientVersion,
-  clientEnv
+  clientEnv,
+  clientApplication,
 )
 {
   var body =
@@ -52,7 +54,8 @@ exports.formAuthJSON = function formAuthJSON(
       {
         OS: clientEnv.OS,
         OS_VERSION: clientEnv.OS_VERSION,
-        OCSP_MODE: clientEnv.OCSP_MODE
+        OCSP_MODE: clientEnv.OCSP_MODE,
+        APPLICATION: clientApplication,
       }
     }
   };

lib/connection/connection.js

@@ -209,7 +209,8 @@ function Connection(context)
         connectionConfig.username,
         connectionConfig.getClientName(),
         connectionConfig.getClientVersion(),
-        connectionConfig.getClientEnvironment());
+        connectionConfig.getClientEnvironment(),
+        connectionConfig.getClientApplication());
 
       // Update JSON body with the authentication values
       auth.updateBody(body);
@@ -271,7 +272,8 @@ function Connection(context)
             connectionConfig.username,
             connectionConfig.getClientName(),
             connectionConfig.getClientVersion(),
-            connectionConfig.getClientEnvironment());
+            connectionConfig.getClientEnvironment(),
+            connectionConfig.getClientApplication());
 
           // Update JSON body with the authentication values
           auth.updateBody(body);

lib/connection/statement.js

@@ -397,6 +397,13 @@ function createContextPreExec(
       ErrorCodes.ERR_CONN_EXEC_STMT_INVALID_INTERNAL);
   }
 
+  // if a describeOnly option is specified, make sure it's boolean
+  if (Util.exists(statementOptions.describeOnly))
+  {
+    Errors.checkArgumentValid(Util.isBoolean(statementOptions.describeOnly),
+      ErrorCodes.ERR_CONN_EXEC_STMT_INVALID_OPTIONS);
+  }
+
   // create a statement context
   var statementContext = createStatementContext();
 
@@ -423,6 +430,12 @@ function createContextPreExec(
     statementContext.internal = statementOptions.internal;
   }
 
+  // if the describeOnly flag is specified, add it to the statement context
+  if(Util.exists(statementOptions.describeOnly))
+  {
+    statementContext.describeOnly = statementOptions.describeOnly;
+  }
+
   // validate non-user-specified arguments
   Errors.assertInternal(Util.isObject(services));
   Errors.assertInternal(Util.isObject(connectionConfig));
@@ -1242,6 +1255,12 @@ function sendRequestPreExec(statementContext, onResultAvailable)
     json.isInternal = statementContext.internal;
   }
 
+  // include statement parameters if a value was specified
+  if (Util.exists(statementContext.describeOnly))
+  {
+    json.describeOnly = statementContext.describeOnly;
+  }
+
   // use the snowflake service to issue the request
   sendSfRequest(statementContext,
     {

lib/core.js

@@ -171,7 +171,7 @@ function Core(options)
         {
           // check that the specified value is a valid tag
           Errors.checkArgumentValid(LoggerCore.isValidLogTag(logTag),
-            ErrorCodes.ERR_GLOGAL_CONFIGURE_INVALID_LOG_LEVEL);
+            ErrorCodes.ERR_GLOBAL_CONFIGURE_INVALID_LOG_LEVEL);
 
           Logger.getInstance().configure(
             {

lib/services/large_result_set.js

@@ -26,7 +26,7 @@ function LargeResultSetService(connectionConfig, httpClient)
     // Note: 403's are retried because of a bug in S3/Blob
     return Util.isRetryableHttpError(
       response, true // retry HTTP 403
-    ) || err && (err.code === "ECONNRESET" || err.code === 'ETIMEDOUT');
+    ) || err && (err.code === "ECONNRESET" || err.code === 'ETIMEDOUT' || err.name === 'ResponseTimeoutError' || err.name === 'ConnectionTimeoutError');
   }
 
   /**

lib/services/sf.js

@@ -1085,23 +1085,16 @@ StateConnecting.prototype.continue = function ()
       CLIENT_APP_VERSION: this.connectionConfig.getClientVersion(),
     };
 
-  // if we have some information about the client environment, add it as well
-  var clientEnvironment = this.connectionConfig.getClientEnvironment();
-  if (Util.isObject(clientEnvironment))
-  {
-    clientInfo.CLIENT_ENVIRONMENT = clientEnvironment;
-  }
-
+  // If we have some information about the client environment, add it as well
+  var clientEnvironment = this.connectionConfig.getClientEnvironment() || {};
   var clientApplication = this.connectionConfig.getClientApplication();
-  if (Util.isString(clientApplication))
-  {
+  if (Util.isString(clientApplication)) {
     clientEnvironment["APPLICATION"] = clientApplication;
   }
-
-  var sessionParameters =
-    {
-      SESSION_PARAMETERS: {}
-    };
+  if (Object.keys(clientEnvironment).length > 0) {
+    clientInfo.CLIENT_ENVIRONMENT = clientEnvironment;
+  }
+  var sessionParameters = { SESSION_PARAMETERS: {} };
 
   if (Util.exists(this.connectionConfig.getClientSessionKeepAlive()))
   {