Index: db.scm
==================================================================
--- db.scm
+++ db.scm
@@ -77,13 +77,16 @@
                                comment TEXT DEFAULT '',
                                CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));")
 	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);")
 	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT,
                                   CONSTRAINT metadat_constraint UNIQUE (var));")
-	  (db:set-var db "MEGATEST_VERSION" megatest-version)
 	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);")
-	  (patch-db db)))
+	  (patch-db db)
+	  (patch-db db) ;; yes, need to do it twice BUG FIXME
+	  ;; Must do this *after* running patch db
+	  (db:set-var db "MEGATEST_VERSION" megatest-version)
+	  ))
     db))
 
 ;;======================================================================
 ;; TODO:
 ;;   put deltas into an assoc list with version numbers
@@ -337,10 +340,11 @@
   (sqlite3:execute db "DELETE FROM test_steps WHERE test_id in (SELECT id FROM tests WHERE run_id=? AND testname=? AND item_path=?);" 
 		   run-id test-name (item-list->path itemdat)))
 ;; 
 (define (db:delete-test-records db test-id)
   (sqlite3:execute db "DELETE FROM test_steps WHERE test_id=?;" test-id)
+  (sqlite3:execute db "DELETE FROM test_data  WHERE test_id=?;" test-id)
   (sqlite3:execute db "DELETE FROM tests WHERE id=?;" test-id))
 
 ;; set tests with state currstate and status currstatus to newstate and newstatus
 ;; use currstate = #f and or currstatus = #f to apply to any state or status respectively
 ;; WARNING: SQL injection risk
@@ -474,19 +478,20 @@
      csvlist)))
 
 (define (db:load-test-data db run-id test-name itemdat)
   (let* ((item-path (item-list->path itemdat))
 	 (testdat (db:get-test-info db run-id test-name item-path))
-	 (test-id (db:test-get-id testdat)))
+	 (test-id (if testdat (db:test-get-id testdat) #f)))
     (debug:print 1 "Enter records to insert in the test_data table, four fields, comma separated per line")
     (debug:print 4 "itemdat: " itemdat ", test-name: " test-name ", test-id: " test-id)
-    (let loop ((lin (read-line)))
-      (if (not (eof-object? lin))
-	  (begin
-	    (debug:print 4 lin)
-	    (db:csv->testdata db test-id lin)
-	    (loop (read-line)))))))    
+    (if test-id
+	(let loop ((lin (read-line)))
+	  (if (not (eof-object? lin))
+	      (begin
+		(debug:print 4 lin)
+		(db:csv->testdata db test-id lin)
+		(loop (read-line)))))))    )
 
 ;;======================================================================
 ;; S T E P S 
 ;;======================================================================
 ;; Run steps

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -904,9 +904,16 @@
 	 (sqlite3:execute 
 	  db 
 	  (conc "INSERT OR REPLACE INTO test_steps (test_id,stepname,state,status,event_time,comment) "
 		"SELECT " (db:test-get-id new-testdat) ",stepname,state,status,event_time,comment FROM test_steps WHERE test_id=?;")
 	  (db:test-get-id testdat))
+	 ;; Now duplicate the test data
+	 (debug:print 4 "Copying records in test_data from test_id=" (db:test-get-id testdat) " to " (db:test-get-id new-testdat))
+	 (sqlite3:execute 
+	  db 
+	  (conc "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,comment) "
+		"SELECT " (db:test-get-id new-testdat) ",category,variable,value,comment FROM test_data WHERE test_id=?;")
+	  (db:test-get-id testdat))
 	 ))
      prev-tests)))