From c5096a10a88457257f85a1679fe1bc3621952f50 Mon Sep 17 00:00:00 2001
From: "Jens H. Nielsen" <Jens.Nielsen@microsoft.com>
Date: Fri, 16 Jun 2023 11:37:06 +0200
Subject: [PATCH] Restore table handling

---
 qcodes/dataset/data_set_in_memory.py    | 2 +-
 qcodes/dataset/database_extract_runs.py | 2 +-
 qcodes/dataset/dataset_helpers.py       | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/qcodes/dataset/data_set_in_memory.py b/qcodes/dataset/data_set_in_memory.py
index 4fb70737ded..358dcc88192 100644
--- a/qcodes/dataset/data_set_in_memory.py
+++ b/qcodes/dataset/data_set_in_memory.py
@@ -153,7 +153,7 @@ def write_metadata_to_db(self, path_to_db: str | Path | None = None) -> None:
                     sample_name=self.sample_name,
                     load_last_duplicate=True,
                 )
-                run_id = _add_run_to_runs_table(
+                _, run_id = _add_run_to_runs_table(
                     self, aconn, exp.exp_id, create_run_table=False
                 )
             self._run_id = run_id
diff --git a/qcodes/dataset/database_extract_runs.py b/qcodes/dataset/database_extract_runs.py
index 844c254b4e2..49405d83f14 100644
--- a/qcodes/dataset/database_extract_runs.py
+++ b/qcodes/dataset/database_extract_runs.py
@@ -146,7 +146,7 @@ def _extract_single_dataset_into_db(dataset: DataSet,
     if run_id is not None:
         return
 
-    target_table_name = _add_run_to_runs_table(dataset, target_conn, target_exp_id)
+    target_table_name, _ = _add_run_to_runs_table(dataset, target_conn, target_exp_id)
     assert target_table_name is not None
     _populate_results_table(
         source_conn, target_conn, dataset.table_name, target_table_name
diff --git a/qcodes/dataset/dataset_helpers.py b/qcodes/dataset/dataset_helpers.py
index e82165adb75..caae2063554 100644
--- a/qcodes/dataset/dataset_helpers.py
+++ b/qcodes/dataset/dataset_helpers.py
@@ -15,13 +15,13 @@ def _add_run_to_runs_table(
     target_conn: ConnectionPlus,
     target_exp_id: int,
     create_run_table: bool = True,
-) -> int:
+) -> tuple[str | None, int]:
     metadata = dataset.metadata
     snapshot_raw = dataset._snapshot_raw
     captured_run_id = dataset.captured_run_id
     captured_counter = dataset.captured_counter
     parent_dataset_links = links_to_str(dataset.parent_dataset_links)
-    _, target_run_id, _ = create_run(
+    _, target_run_id, target_table_name = create_run(
         target_conn,
         target_exp_id,
         name=dataset.name,
@@ -41,4 +41,4 @@ def _add_run_to_runs_table(
         dataset.run_timestamp_raw,
         dataset.completed_timestamp_raw,
     )
-    return target_run_id
+    return target_table_name, target_run_id