Sync 30072020 (#347)

Sync 30072020

Author: sfc-gh-mkeller

cursor.py

@@ -70,6 +70,13 @@
 LOG_MAX_QUERY_LENGTH = 80
 
 
+def exit_handler(*_):
+    """Handler for signal. When called, it will raise SystemExit with exit code FORCE_EXIT."""
+    print("\nForce exit")
+    logger.info("Force exit")
+    sys.exit(1)
+
+
 class SnowflakeCursor(object):
     """Implementation of Cursor object that is returned from Connection.cursor() method.
 
@@ -334,9 +341,9 @@ def _execute_helper(
 
         original_sigint = signal.getsignal(signal.SIGINT)
 
-        def abort_exit(*_):
+        def interrupt_handler(*_):
             try:
-                signal.signal(signal.SIGINT, signal.SIG_IGN)
+                signal.signal(signal.SIGINT, exit_handler)
             except (ValueError, TypeError):
                 # ignore failures
                 pass
@@ -356,7 +363,8 @@ def abort_exit(*_):
             raise KeyboardInterrupt
 
         try:
-            signal.signal(signal.SIGINT, abort_exit)
+            if not original_sigint == exit_handler:
+                signal.signal(signal.SIGINT, interrupt_handler)
         except ValueError:
             logger.debug(
                 'Failed to set SIGINT handler. '
@@ -665,9 +673,8 @@ def check_can_use_pandas(self):
         global pyarrow
 
         if pyarrow is None:
-            msg = (
-                "pyarrow package is missing. Install using pip if the platform is supported."
-            )
+            msg = ("Optional dependency: 'pyarrow' is not installed, please see the following link for install "
+                   "instructions: https://docs.snowflake.com/en/user-guide/python-connector-pandas.html#installation")
             errno = ER_NO_PYARROW
 
             Error.errorhandler_wrapper(

test/pandas/test_arrow_pandas.py

@@ -6,6 +6,9 @@
 
 import pytest
 import time
+
+from pandas import DataFrame
+
 from snowflake.connector.options import pandas as pd, installed_pandas
 import random
 from datetime import datetime
@@ -674,3 +677,34 @@ def test_arrow_fetch_result_scan(conn_cnx):
         assert tuple(res) == ('1', '2', '3')
         result_scan_res = cur.execute("select * from table(result_scan('{}'));".format(cur.sfqid)).fetch_pandas_all()
         assert tuple(result_scan_res) == ('1', '2', '3')
+
+
+@pytest.mark.parametrize('query_format', ('JSON', 'ARROW'))
+@pytest.mark.parametrize('resultscan_format', ('JSON', 'ARROW'))
+def test_query_resultscan_combos(conn_cnx, query_format, resultscan_format):
+    with conn_cnx() as cnx:
+        sfqid = None
+        results = None
+        scanned_results = None
+        with cnx.cursor() as query_cur:
+            query_cur.execute("alter session set python_connector_query_result_format='{}'".format(query_format))
+            query_cur.execute("select seq8(), randstr(1000,random()) from table(generator(rowcount=>100))")
+            sfqid = query_cur.sfqid
+            assert query_cur._query_result_format.upper() == query_format
+            if query_format == 'JSON':
+                results = query_cur.fetchall()
+            else:
+                results = query_cur.fetch_pandas_all()
+        with cnx.cursor() as resultscan_cur:
+            resultscan_cur.execute("alter session set python_connector_query_result_format='{}'".format(resultscan_format))
+            resultscan_cur.execute("select * from table(result_scan('{}'))".format(sfqid))
+            if resultscan_format == 'JSON':
+                scanned_results = resultscan_cur.fetchall()
+            else:
+                scanned_results = resultscan_cur.fetch_pandas_all()
+            assert resultscan_cur._query_result_format.upper() == resultscan_format
+        if isinstance(results, DataFrame):
+            results = [tuple(e) for e in results.values.tolist()]
+        if isinstance(scanned_results, DataFrame):
+            scanned_results = [tuple(e) for e in scanned_results.values.tolist()]
+        assert results == scanned_results