Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: escape column names in PRIMARY KEY statement in SQL query #2351

Merged
merged 5 commits into from
Jun 30, 2023
Merged

fix: escape column names in PRIMARY KEY statement in SQL query #2351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
49c1982
escape column names in PRIMARY KEY statement in SQL query
mc51 Jun 16, 2023
89df59d
Merge branch 'main' into fix_redshift_pk_with_hyphen
kukushking Jun 16, 2023
1c8517c
add test for writing to redshift with hyphenated primary key
mc51 Jun 30, 2023
0a7d286
Merge branch 'fix_redshift_pk_with_hyphen' of github.com:mc51/aws-sdk…
mc51 Jun 30, 2023
1ead3a9
Merge branch 'main' into fix_redshift_pk_with_hyphen
jaidisido Jun 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion awswrangler/redshift/_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,9 @@ def _create_table( # pylint: disable=too-many-locals,too-many-arguments,too-man
primary_keys=primary_keys,
)
cols_str: str = "".join([f'"{k}" {v},\n' for k, v in redshift_types.items()])[:-2]
primary_keys_str: str = f",\nPRIMARY KEY ({', '.join(primary_keys)})" if primary_keys else ""
primary_keys_str: str = (
",\nPRIMARY KEY ({})".format(", ".join('"' + pk + '"' for pk in primary_keys)) if primary_keys else ""
)
distkey_str: str = f"\nDISTKEY({distkey})" if distkey and diststyle == "KEY" else ""
sortkey_str: str = f"\n{sortstyle} SORTKEY({','.join(sortkey)})" if sortkey else ""
sql = (
Expand Down
16 changes: 16 additions & 0 deletions tests/unit/test_redshift.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
from awswrangler import _utils

from .._utils import (
assert_pandas_equals,
dt,
ensure_data_types,
ensure_data_types_category,
Expand Down Expand Up @@ -63,6 +64,21 @@ def test_to_sql_simple(redshift_table: str, redshift_con: redshift_connector.Con
wr.redshift.to_sql(df, redshift_con, redshift_table, "public", "overwrite", overwrite_method, True)


def test_to_sql_with_hyphenated_primary_key(
redshift_table: str,
redshift_con: redshift_connector.Connection,
) -> None:
schema = "public"
df = pd.DataFrame({"id-col": [1, 2, 3], "other-col": ["foo", "boo", "bar"]})
df["id-col"] = df["id-col"].astype("Int64")
df["other-col"] = df["other-col"].astype("string")
wr.redshift.to_sql(
df=df, con=redshift_con, table=redshift_table, schema=schema, mode="overwrite", primary_keys=["id-col"]
)
df_out = wr.redshift.read_sql_table(table=redshift_table, con=redshift_con, schema=schema)
assert_pandas_equals(df, df_out)


def test_empty_table(redshift_table: str, redshift_con: redshift_connector.Connection) -> None:
with redshift_con.cursor() as cursor:
cursor.execute(f"CREATE TABLE public.{redshift_table}(c0 integer not null, c1 integer, primary key(c0));")
Expand Down
Loading