Change to bindings

Author: sfc-gh-pbulawa

DESCRIPTION.md

@@ -9,7 +9,7 @@ Source code is also available at: https://github.com/snowflakedb/snowflake-conne
 # Release Notes
 - v3.16(TBD)
   - Added basic arrow support for Interval types.
-- Fix `write_pandas` special characters usage in the location name.
+  - Fix `write_pandas` special characters usage in the location name.
 
 - v3.15.0(Apr 29,2025)
   - Bumped up min boto and botocore version to 1.24.

src/snowflake/connector/pandas_tools.py

@@ -68,7 +68,6 @@ def build_location_helper(
 
 def _escape_part_location(part: str, should_quote: bool) -> str:
     if "'" in part:
-        part = part.replace("'", "\\'")
         should_quote = True
     if should_quote:
         if not part.startswith('"'):
@@ -87,12 +86,14 @@ def _do_create_temp_stage(
     overwrite: bool,
     use_scoped_temp_object: bool,
 ) -> None:
-    create_stage_sql = f"CREATE {get_temp_type_for_object(use_scoped_temp_object)} STAGE /* Python:snowflake.connector.pandas_tools.write_pandas() */ identifier('{stage_location}') FILE_FORMAT=(TYPE=PARQUET COMPRESSION={compression}{' BINARY_AS_TEXT=FALSE' if auto_create_table or overwrite else ''})"
-    logger.debug(f"creating stage with '{create_stage_sql}'.")
+    create_stage_sql = f"CREATE {get_temp_type_for_object(use_scoped_temp_object)} STAGE /* Python:snowflake.connector.pandas_tools.write_pandas() */ identifier(?) FILE_FORMAT=(TYPE=PARQUET COMPRESSION={compression}{' BINARY_AS_TEXT=FALSE' if auto_create_table or overwrite else ''})"
+    params = (stage_location,)
+    logger.debug(f"creating stage with '{create_stage_sql}'. params: %s", params)
     cursor.execute(
         create_stage_sql,
         _is_internal=True,
         _force_qmark_paramstyle=True,
+        params=params,
         num_statements=1,
     )
 
@@ -154,15 +155,17 @@ def _do_create_temp_file_format(
     use_scoped_temp_object: bool,
 ) -> None:
     file_format_sql = (
-        f"CREATE {get_temp_type_for_object(use_scoped_temp_object)} FILE FORMAT identifier('{file_format_location}') "
+        f"CREATE {get_temp_type_for_object(use_scoped_temp_object)} FILE FORMAT identifier(?) "
         f"/* Python:snowflake.connector.pandas_tools.write_pandas() */ "
         f"TYPE=PARQUET COMPRESSION={compression}{sql_use_logical_type}"
     )
-    logger.debug(f"creating file format with '{file_format_sql}'.")
+    params = (file_format_location,)
+    logger.debug(f"creating file format with '{file_format_sql}'. params: %s", params)
     cursor.execute(
         file_format_sql,
         _is_internal=True,
         _force_qmark_paramstyle=True,
+        params=params,
         num_statements=1,
     )
 
@@ -442,17 +445,18 @@ def write_pandas(
             # Upload parquet file
             upload_sql = (
                 "PUT /* Python:snowflake.connector.pandas_tools.write_pandas() */ "
-                "'file://{path}' '{stage_location}' PARALLEL={parallel}"
+                "'file://{path}' ? PARALLEL={parallel}"
             ).format(
                 path=chunk_path.replace("\\", "\\\\").replace("'", "\\'"),
-                stage_location="@" + stage_location,
                 parallel=parallel,
             )
-            logger.debug(f"uploading files with '{upload_sql}'")
+            params = ("@" + stage_location,)
+            logger.debug(f"uploading files with '{upload_sql}', params: %s", params)
             cursor.execute(
                 upload_sql,
                 _is_internal=True,
                 _force_qmark_paramstyle=True,
+                params=params,
                 num_statements=1,
             )
             # Remove chunk file
@@ -471,12 +475,15 @@ def write_pandas(
     columns = quote + f"{quote},{quote}".join(snowflake_column_names) + quote
 
     def drop_object(name: str, object_type: str) -> None:
-        drop_sql = f"DROP {object_type.upper()} IF EXISTS identifier('{name}') /* Python:snowflake.connector.pandas_tools.write_pandas() */"
-        logger.debug(f"dropping {object_type} with '{drop_sql}'.")
+        drop_sql = f"DROP {object_type.upper()} IF EXISTS identifier(?) /* Python:snowflake.connector.pandas_tools.write_pandas() */"
+        params = (name,)
+        logger.debug(f"dropping {object_type} with '{drop_sql}'. params: %s", params)
+
         cursor.execute(
             drop_sql,
             _is_internal=True,
             _force_qmark_paramstyle=True,
+            params=params,
             num_statements=1,
         )
 
@@ -525,15 +532,19 @@ def drop_object(name: str, object_type: str) -> None:
         )
 
         create_table_sql = (
-            f"CREATE {table_type.upper()} {iceberg}TABLE IF NOT EXISTS identifier('{target_table_location}') "
+            f"CREATE {table_type.upper()} {iceberg}TABLE IF NOT EXISTS identifier(?) "
             f"({create_table_columns}) {iceberg_config_statement}"
             f" /* Python:snowflake.connector.pandas_tools.write_pandas() */ "
         )
-        logger.debug(f"auto creating table with '{create_table_sql}'.")
+        params = (target_table_location,)
+        logger.debug(
+            f"auto creating table with '{create_table_sql}'. params: %s", params
+        )
         cursor.execute(
             create_table_sql,
             _is_internal=True,
             _force_qmark_paramstyle=True,
+            params=params,
             num_statements=1,
         )
         # need explicit casting when the underlying table schema is inferred
@@ -554,19 +565,22 @@ def drop_object(name: str, object_type: str) -> None:
 
     try:
         if overwrite and (not auto_create_table):
-            truncate_sql = f"TRUNCATE TABLE identifier('{target_table_location}') /* Python:snowflake.connector.pandas_tools.write_pandas() */"
-            logger.debug(f"truncating table with '{truncate_sql}'")
+            truncate_sql = "TRUNCATE TABLE identifier(?) /* Python:snowflake.connector.pandas_tools.write_pandas() */"
+            params = (target_table_location,)
+            logger.debug(f"truncating table with '{truncate_sql}'. params: %s", params)
             cursor.execute(
                 truncate_sql,
                 _is_internal=True,
                 _force_qmark_paramstyle=True,
+                params=params,
                 num_statements=1,
             )
 
+        copy_stage_location = "@" + stage_location.replace("'", "\\'")
         copy_into_sql = (
-            f"COPY INTO identifier('{target_table_location}') /* Python:snowflake.connector.pandas_tools.write_pandas() */ "
+            f"COPY INTO identifier(?) /* Python:snowflake.connector.pandas_tools.write_pandas() */ "
             f"({columns}) "
-            f"FROM (SELECT {parquet_columns} FROM '@{stage_location}') "
+            f"FROM (SELECT {parquet_columns} FROM '{copy_stage_location}') "
             f"FILE_FORMAT=("
             f"TYPE=PARQUET "
             f"COMPRESSION={compression_map[compression]}"
@@ -575,7 +589,10 @@ def drop_object(name: str, object_type: str) -> None:
             f") "
             f"PURGE=TRUE ON_ERROR=?"
         )
-        params = (on_error,)
+        params = (
+            target_table_location,
+            on_error,
+        )
         logger.debug(f"copying into with '{copy_into_sql}'. params: %s", params)
         copy_results = cursor.execute(
             copy_into_sql,
@@ -593,12 +610,14 @@ def drop_object(name: str, object_type: str) -> None:
                 quote_identifiers=quote_identifiers,
             )
             drop_object(original_table_location, "table")
-            rename_table_sql = f"ALTER TABLE identifier('{target_table_location}') RENAME TO identifier('{original_table_location}') /* Python:snowflake.connector.pandas_tools.write_pandas() */"
-            logger.debug(f"rename table with '{rename_table_sql}'.")
+            rename_table_sql = "ALTER TABLE identifier(?) RENAME TO identifier(?) /* Python:snowflake.connector.pandas_tools.write_pandas() */"
+            params = (target_table_location, original_table_location)
+            logger.debug(f"rename table with '{rename_table_sql}'. params: %s", params)
             cursor.execute(
                 rename_table_sql,
                 _is_internal=True,
                 _force_qmark_paramstyle=True,
+                params=params,
                 num_statements=1,
             )
     except ProgrammingError:

test/integ/pandas/test_pandas_tools.py

@@ -535,7 +535,7 @@ def test_table_location_building(
 
         def mocked_execute(*args, **kwargs):
             if len(args) >= 1 and args[0].startswith("COPY INTO"):
-                assert expected_location in args[0]
+                assert kwargs["params"][0] == expected_location
             cur = SnowflakeCursor(cnx)
             cur._result = iter([])
             return cur
@@ -566,8 +566,8 @@ def mocked_execute(*args, **kwargs):
         (None, "schema", False, "schema"),
         (None, None, True, ""),
         (None, None, False, ""),
-        ("data'base", "schema", True, '"data\\\'base"."schema"'),
-        ("data'base", "schema", False, '"data\\\'base".schema'),
+        ("data'base", "schema", True, '"data\'base"."schema"'),
+        ("data'base", "schema", False, '"data\'base".schema'),
     ],
 )
 def test_stage_location_building(
@@ -583,11 +583,9 @@ def test_stage_location_building(
     with conn_cnx() as cnx:
 
         def mocked_execute(*args, **kwargs):
-            if len(args) >= 1 and args[0].lower().startswith("create temp stage"):
-                location_identifier = re.search(
-                    r"identifier\(\'(.*?)\)", args[0]
-                ).group(1)
-                assert location_identifier.startswith(expected_db_schema)
+            if len(args) >= 1 and args[0].startswith("create temporary stage"):
+                db_schema = ".".join(args[0].split(" ")[-1].split(".")[:-1])
+                assert db_schema == expected_db_schema
             cur = SnowflakeCursor(cnx)
             cur._result = iter([])
             return cur