Skip to content

Commit 9427762

Browse files
sfc-gh-stakedaankit-bhatnagar167
authored andcommitted
SNOW-83042: Switched on raise_put_get_error on Python connector by default
1 parent a3f8b03 commit 9427762

File tree

6 files changed

+17
-12
lines changed

6 files changed

+17
-12
lines changed

cursor.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ def execute(self, command, params=None, timeout=None,
456456
_no_results=False,
457457
_use_ijson=False,
458458
_is_put_get=None,
459-
_raise_put_get_error=False,
459+
_raise_put_get_error=True,
460460
_force_put_overwrite=False):
461461
u"""
462462
Executes a command/query
@@ -497,11 +497,7 @@ def execute(self, command, params=None, timeout=None,
497497
processed_params = self._connection._process_params_qmarks(
498498
params, self)
499499
# Skip reporting Key, Value and Type errors
500-
except KeyError:
501-
raise
502-
except ValueError:
503-
raise
504-
except TypeError:
500+
except (KeyError, ValueError, TypeError):
505501
raise
506502
except Exception:
507503
self.connection.incident.report_incident()

file_transfer_agent.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def __init__(self, cursor, command, ret,
185185
get_azure_callback=None,
186186
get_callback_output_stream=sys.stdout,
187187
show_progress_bar=True,
188-
raise_put_get_error=False,
188+
raise_put_get_error=True,
189189
force_put_overwrite=True):
190190
self._cursor = cursor
191191
self._command = command

test/test_put_get_medium.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -451,7 +451,7 @@ def run(cnx, sql):
451451
sql = sql.format(
452452
files=files.replace('\\', '\\\\'),
453453
name=db_parameters['name'])
454-
return cnx.cursor().execute(sql).fetchall()
454+
return cnx.cursor().execute(sql, _raise_put_get_error=False).fetchall()
455455

456456
with conn_cnx(
457457
user=db_parameters['s3_user'],

test/test_put_get_user_stage.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -239,8 +239,8 @@ def test_put_get_duplicated_data_user_stage(is_public_test, tmpdir, test_files,
239239
c = cnx.cursor()
240240
try:
241241
for rec in c.execute(
242-
"put file://{file} @{stage_name}".format(
243-
file=files, stage_name=stage_name)):
242+
"put file://{file} @{stage_name}".format(file=files, stage_name=stage_name),
243+
_raise_put_get_error=False):
244244
logger.info('rec=%s', rec)
245245
if rec[6] == 'UPLOADED':
246246
success_cnt += 1

test/test_put_get_with_azure_token.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def run(cnx, sql):
167167
sql = sql.format(
168168
files=files,
169169
name=db_parameters['name'])
170-
return cnx.cursor().execute(sql).fetchall()
170+
return cnx.cursor().execute(sql, _raise_put_get_error=False).fetchall()
171171

172172
with conn_cnx(
173173
user=db_parameters['azure_user'],

test/test_unit_put_get.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
@pytest.mark.skipif(IS_WINDOWS, reason='permission model is different')
2020
def test_put_error(tmpdir):
2121
"""
22-
Test for raise_put_get_error flag in SnowflakeFileTransferAgent
22+
Test for raise_put_get_error flag (now turned on by default) in SnowflakeFileTransferAgent
2323
"""
2424
tmp_dir = str(tmpdir.mkdir('putfiledir'))
2525
file1 = path.join(tmp_dir, 'file1')
@@ -68,4 +68,13 @@ def test_put_error(tmpdir):
6868
with pytest.raises(Exception):
6969
sf_file_transfer_agent.result()
7070

71+
# unspecified, should fail because flag is on by default now
72+
sf_file_transfer_agent = SnowflakeFileTransferAgent(
73+
cursor,
74+
query,
75+
ret)
76+
sf_file_transfer_agent.execute()
77+
with pytest.raises(Exception):
78+
sf_file_transfer_agent.result()
79+
7180
chmod(file1, 0o700)

0 commit comments

Comments
 (0)