fix(athena): escape single quotes in iceberg DDL splices#3372
Merged
Conversation
`_create_iceberg_table` interpolates `columns_comments` values and `additional_table_properties` keys/values into a generated CREATE TABLE DDL with no escaping. A value containing a single quote can close the surrounding string literal and append additional clauses (LOCATION, TBLPROPERTIES, etc.). Add `_escape_athena_string_literal` that doubles single quotes per the Athena/Trino string-literal escape rule, and apply it at both splice sites. Both keys and values in `additional_table_properties` are escaped for symmetry — the cost is one function call. Add a unit test in `test_moto.py` that exercises both splice sites with a representative payload and asserts the structure of the generated DDL is preserved.
EthanBunce
approved these changes
Jun 17, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Feature or Bugfix
Detail
columns_commentsvalues andadditional_table_propertieskeys/values when interpolated into the generatedCREATE TABLEDDL in_create_iceberg_table. Caller-supplied content stays inside the surrounding string literal and cannot append clauses (LOCATION, TBLPROPERTIES, ...).tests/unit/test_moto.pyexercising both splice sites.By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.