Merge pull request #2527 from moj-analytical-services/explicit-tf-col…

…umns-select Explicit tf columns select
moj-analytical-services · Nov 27, 2024 · 1fa511b · 1fa511b
2 parents 2aa78da + d4a7daa
commit 1fa511b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/scripts/postgres_docker/teardown.sh b/scripts/postgres_docker/teardown.sh
@@ -2,4 +2,4 @@
 # run from root
 
 # remove -v (removing volume) if you want to keep data
-docker-compose -f scripts/postgres/docker-compose.yaml down -v
+docker-compose -f scripts/postgres_docker/docker-compose.yaml down -v
diff --git a/splink/internals/term_frequencies.py b/splink/internals/term_frequencies.py
@@ -58,7 +58,13 @@ def _join_tf_to_df_concat_sql(linker: Linker) -> str:
         tbl = colname_to_tf_tablename(col)
         select_cols.append(f"{tbl}.{col.tf_name}")
 
-    select_cols.insert(0, "__splink__df_concat.*")
+    column_names_in_df_concat = linker._concat_table_column_names
+
+    aliased_concat_column_names = [
+        f"__splink__df_concat.{col} AS {col}" for col in column_names_in_df_concat
+    ]
+
+    select_cols = aliased_concat_column_names + select_cols
     select_cols_str = ", ".join(select_cols)
 
     templ = "left join {tbl} on __splink__df_concat.{col} = {tbl}.{col}"
@@ -72,7 +78,7 @@ def _join_tf_to_df_concat_sql(linker: Linker) -> str:
     left_joins_str = " ".join(left_joins)
 
     sql = f"""
-    select {select_cols_str }
+    select {select_cols_str}
     from __splink__df_concat
     {left_joins_str}
     """