Skip to content

fix issue where merge fails because source and target have different columns #264

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

Merged
tomjemmett merged 4 commits into from
Jun 17, 2026
Merged

fix issue where merge fails because source and target have different columns #264

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d76d09
fix issue where merge fails because source and target have different …
tomjemmett Jun 17, 2026
6ce4a57
simplifies to just overwrite the entire table
tomjemmett Jun 17, 2026
39e4246
remove unused import
tomjemmett Jun 17, 2026
b4c7079
changes code line order to match outpatient/aae script
tomjemmett Jun 17, 2026
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
26 changes: 5 additions & 21 deletions src/nhp/data/raw_data/inpatients.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
"""Generate inpatients data"""

from delta.tables import DeltaTable
from pyspark.sql import DataFrame, SparkSession
from pyspark.sql import functions as F
from pyspark.sql.types import * # noqa: F403
Expand Down Expand Up @@ -195,29 +194,14 @@ def get_inpatients_data(spark: SparkSession) -> DataFrame:

def generate_inpatients_data(spark: SparkSession) -> None:
"""Generate Inpatients Data"""

# allow schema evolution for the Delta table
spark.conf.set("spark.databricks.delta.schema.autoMerge.enabled", "true")

hes_apc_processed = get_inpatients_data(spark)

target = (
DeltaTable.createIfNotExists(spark)
.tableName(table_names.raw_data_apc)
.addColumns(hes_apc_processed.schema)
.execute()
)

spark.conf.set("spark.sql.sources.partitionOverwriteMode", "dynamic")
(
target.alias("t")
.merge(hes_apc_processed.alias("s"), "t.epikey = s.epikey")
.withSchemaEvolution()
.whenMatchedUpdateAll(
condition=" or ".join(f"t.{i} != s.{i}" for i in hes_apc_processed.columns)
)
.whenNotMatchedInsertAll()
.whenNotMatchedBySourceDelete()
.execute()
hes_apc_processed.write.partitionBy("fyear", "provider")
.mode("overwrite")
.option("mergeSchema", "true")
.saveAsTable(table_names.raw_data_apc)
)


Expand Down