Snow 55371 (#29)

* SNOW-55371: Re-enable testCancel.js
snowflakedb · Mar 20, 2019 · 6be8049 · 6be8049
1 parent 95fa5b3
commit 6be8049
Show file tree

Hide file tree

Showing 65 changed files with 137 additions and 65 deletions.
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -187,7 +187,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright (c) 2013-2018 Snowflake Computing, Inc.
+   Copyright (c) 2013-2019 Snowflake Computing, Inc.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/index.js b/index.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 module.exports = require('./lib/snowflake');
diff --git a/lib/agent/https_ocsp_agent.js b/lib/agent/https_ocsp_agent.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util       = require('../util');

diff --git a/lib/agent/ocsp_response_cache.js b/lib/agent/ocsp_response_cache.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var SimpleCache = require('simple-lru-cache');

diff --git a/lib/agent/socket_util.js b/lib/agent/socket_util.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var check             = require('./check');

diff --git a/lib/browser.js b/lib/browser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var core = require('./core');

diff --git a/lib/connection/connection.js b/lib/connection/connection.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 const uuidv4 = require('uuid/v4');
 

diff --git a/lib/connection/connection_config.js b/lib/connection/connection_config.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util        = require('../util');

diff --git a/lib/connection/connection_context.js b/lib/connection/connection_context.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util      = require('../util');

diff --git a/lib/connection/result/chunk.js b/lib/connection/result/chunk.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var EventEmitter = require('events').EventEmitter;

diff --git a/lib/connection/result/chunk_cache.js b/lib/connection/result/chunk_cache.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var DoublyLinkedList = require('./doubly_linked_list');

diff --git a/lib/connection/result/column.js b/lib/connection/result/column.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util        = require('../../util');

diff --git a/lib/connection/result/data_types.js b/lib/connection/result/data_types.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util   = require('../../util');

diff --git a/lib/connection/result/doubly_linked_list.js b/lib/connection/result/doubly_linked_list.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 function DoublyLinkedList()

diff --git a/lib/connection/result/result.js b/lib/connection/result/result.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var EventEmitter  = require('events').EventEmitter;

diff --git a/lib/connection/result/result_stream.js b/lib/connection/result/result_stream.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var EventEmitter = require('events').EventEmitter;

diff --git a/lib/connection/result/row_stream.js b/lib/connection/result/row_stream.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Readable     = require('stream').Readable;

diff --git a/lib/connection/result/sf_timestamp.js b/lib/connection/result/sf_timestamp.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Moment = require('moment-timezone');

diff --git a/lib/connection/result/statement_type.js b/lib/connection/result/statement_type.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 exports.isDml = function(statementTypeId)

diff --git a/lib/connection/statement.js b/lib/connection/statement.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 const uuidv4 = require('uuid/v4');

diff --git a/lib/constants/error_messages.js b/lib/constants/error_messages.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 // 400001

diff --git a/lib/core.js b/lib/core.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util              = require('./util');

diff --git a/lib/errors.js b/lib/errors.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util          = require('./util');

diff --git a/lib/global_config.js b/lib/global_config.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util   = require('./util');

diff --git a/lib/http/base.js b/lib/http/base.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 const uuidv4 = require('uuid/v4');
 

diff --git a/lib/http/browser.js b/lib/http/browser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util    = require('../util');

diff --git a/lib/http/node.js b/lib/http/node.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Url             = require('url');

diff --git a/lib/logger.js b/lib/logger.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var BrowserLogger = require('./logger/browser');

diff --git a/lib/logger/browser.js b/lib/logger/browser.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util = require('../util');

diff --git a/lib/logger/core.js b/lib/logger/core.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var moment = require('moment');

diff --git a/lib/logger/node.js b/lib/logger/node.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var winston = require('winston');

diff --git a/lib/parameters.js b/lib/parameters.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var Util   = require('./util');

diff --git a/lib/services/large_result_set.js b/lib/services/large_result_set.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var EventEmitter = require('events').EventEmitter;

diff --git a/lib/services/sf.js b/lib/services/sf.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 /*

diff --git a/lib/snowflake.js b/lib/snowflake.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 var core       = require('./core');

diff --git a/lib/util.js b/lib/util.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  *
  */
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "snowflake-sdk",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Node.js driver for Snowflake",
   "dependencies": {
     "agent-base": "^2.1.1",

diff --git a/test/integration/connectionOptions.js b/test/integration/connectionOptions.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var snowflakeTestProtocol = process.env.SNOWFLAKE_TEST_PROTOCOL;
 var snowflakeTestHost = process.env.SNOWFLAKE_TEST_HOST;

diff --git a/test/integration/sharedStatements.js b/test/integration/sharedStatements.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 
 const setTimezoneToPST = "alter session set TIMEZONE='America/Los_Angeles'";

diff --git a/test/integration/testBind.js b/test/integration/testBind.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var async = require('async');
 var assert = require('assert');

diff --git a/test/integration/testCancel.js b/test/integration/testCancel.js
@@ -0,0 +1,72 @@
+var async = require('async');
+var testUtil = require('./testUtil');
+
+describe('Test Cancel Query', function ()
+{
+  var connection;
+  var longQuery = 'select count(*) from table(generator(timeLimit => 3600))';
+
+  before(function (done)
+  {
+    connection = testUtil.createConnection();
+    async.series(
+      [
+        function (callback)
+        {
+          testUtil.connect(connection, callback);
+        }
+      ],
+      done
+    );
+  });
+
+  after(function (done)
+  {
+    async.series(
+      [
+        function (callback)
+        {
+          testUtil.destroyConnection(connection, callback);
+        }
+      ],
+      done
+    );
+  });
+
+
+  it('testCancelQuerySimple', function (done)
+  {
+    var statement = connection.execute({
+      sqlText: longQuery
+    });
+
+    setTimeout(function ()
+    {
+      statement.cancel(function (err)
+      {
+        testUtil.checkError(err);
+        done();
+      });
+    }, 10000);
+  });
+});
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/test/integration/testConcurrent.js b/test/integration/testConcurrent.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var async = require('async');
 var assert = require('assert');

diff --git a/test/integration/testConnection.js b/test/integration/testConnection.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var snowflake  = require('./../../lib/snowflake');
 var async = require('async');

diff --git a/test/integration/testConnectionNegative.js b/test/integration/testConnectionNegative.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var snowflake  = require('./../../lib/snowflake');
 var assert = require('assert');

diff --git a/test/integration/testDataType.js b/test/integration/testDataType.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var async = require('async');
 var testUtil = require('./testUtil');

diff --git a/test/integration/testExecute.js b/test/integration/testExecute.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var async = require('async');
 var testUtil = require('./testUtil');

diff --git a/test/integration/testLargeResultSet.js b/test/integration/testLargeResultSet.js
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Snowflake Computing Inc. All rights reserved.
+ * Copyright (c) 2015-2019 Snowflake Computing Inc. All rights reserved.
  */
 var assert = require('assert');
 var async = require('async');