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: add primary keys when upserting in Postgres #2819

Merged
merged 4 commits into from
May 15, 2024
Merged

fix: add primary keys when upserting in Postgres #2819

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a615402
fix: add primary keys when upserting in Postgres
May 13, 2024
6586804
fix: add unique keys at table creation in Postgres to fix both upsert…
May 15, 2024
0c91ee9
fix: remove unnecessary table creation statements from test_postgresq…
May 15, 2024
9a4cace
Merge branch 'main' into fix/upsert-postgres-table-creation
LeonLuttenberger May 15, 2024
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: 4 additions & 0 deletions awswrangler/postgresql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@ def _create_table(
index: bool,
dtype: dict[str, str] | None,
varchar_lengths: dict[str, int] | None,
unique_keys: list[str] | None = None,
) -> None:
if mode == "overwrite":
if overwrite_method in ["drop", "cascade"]:
Expand All @@ -101,6 +102,8 @@ def _create_table(
converter_func=_data_types.pyarrow2postgresql,
)
cols_str: str = "".join([f"{_identifier(k)} {v},\n" for k, v in postgresql_types.items()])[:-2]
if unique_keys:
cols_str += f",\nUNIQUE ({', '.join([_identifier(k) for k in unique_keys])})"
sql = f"CREATE TABLE IF NOT EXISTS {_identifier(schema)}.{_identifier(table)} (\n{cols_str})"
_logger.debug("Create table query:\n%s", sql)
cursor.execute(sql)
Expand Down Expand Up @@ -619,6 +622,7 @@ def to_sql(
index=index,
dtype=dtype,
varchar_lengths=varchar_lengths,
unique_keys=upsert_conflict_columns or insert_conflict_columns,
)
if index:
df.reset_index(level=df.index.names, inplace=True)
Expand Down
42 changes: 0 additions & 42 deletions tests/unit/test_postgresql.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,16 +285,6 @@ def test_dfs_are_equal_for_different_chunksizes(postgresql_table, postgresql_con


def test_upsert(postgresql_table, postgresql_con):
create_table_sql = (
f"CREATE TABLE public.{postgresql_table} "
"(c0 varchar NULL PRIMARY KEY,"
"c1 int NULL DEFAULT 42,"
"c2 int NOT NULL);"
)
with postgresql_con.cursor() as cursor:
cursor.execute(create_table_sql)
postgresql_con.commit()

df = pd.DataFrame({"c0": ["foo", "bar"], "c2": [1, 2]})

with pytest.raises(wr.exceptions.InvalidArgumentValue):
Expand Down Expand Up @@ -369,17 +359,6 @@ def test_upsert(postgresql_table, postgresql_con):


def test_upsert_multiple_conflict_columns(postgresql_table, postgresql_con):
create_table_sql = (
f"CREATE TABLE public.{postgresql_table} "
"(c0 varchar NULL PRIMARY KEY,"
"c1 int NOT NULL,"
"c2 int NOT NULL,"
"UNIQUE (c1, c2));"
)
with postgresql_con.cursor() as cursor:
cursor.execute(create_table_sql)
postgresql_con.commit()

df = pd.DataFrame({"c0": ["foo", "bar"], "c1": [1, 2], "c2": [3, 4]})
upsert_conflict_columns = ["c1", "c2"]

Expand Down Expand Up @@ -437,16 +416,6 @@ def test_upsert_multiple_conflict_columns(postgresql_table, postgresql_con):


def test_insert_ignore_duplicate_columns(postgresql_table, postgresql_con):
create_table_sql = (
f"CREATE TABLE public.{postgresql_table} "
"(c0 varchar NULL PRIMARY KEY,"
"c1 int NULL DEFAULT 42,"
"c2 int NOT NULL);"
)
with postgresql_con.cursor() as cursor:
cursor.execute(create_table_sql)
postgresql_con.commit()

df = pd.DataFrame({"c0": ["foo", "bar"], "c2": [1, 2]})

wr.postgresql.to_sql(
Expand Down Expand Up @@ -501,17 +470,6 @@ def test_insert_ignore_duplicate_columns(postgresql_table, postgresql_con):


def test_insert_ignore_duplicate_multiple_columns(postgresql_table, postgresql_con):
create_table_sql = (
f"CREATE TABLE public.{postgresql_table} "
"(c0 varchar NULL PRIMARY KEY,"
"c1 int NOT NULL,"
"c2 int NOT NULL,"
"UNIQUE (c1, c2));"
)
with postgresql_con.cursor() as cursor:
cursor.execute(create_table_sql)
postgresql_con.commit()

df = pd.DataFrame({"c0": ["foo", "bar"], "c1": [1, 2], "c2": [3, 4]})
insert_conflict_columns = ["c1", "c2"]

Expand Down
Loading