@@ -711,13 +711,23 @@
       ;; exn
       ;; (begin
       ;;   (debug:print 0 "ERROR: Failed to create tables. Look at your [fields] section, should be: fieldname TEXT DEFAULT 'yourdefault'")
       ;;   (exit))
 	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys (id INTEGER PRIMARY KEY, fieldname TEXT, fieldtype TEXT, CONSTRAINT keyconstraint UNIQUE (fieldname));")
-	(for-each (lambda (key)
-		    (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT"))
-		  keys)
+	(for-each
+	 (lambda (key)
+	   (let* ((fieldname #f)
+		  (fieldtype #f))
+	     (sqlite3:for-each-row
+	      (lambda (fn ft)
+		(set! fieldname fn)
+		(set! fieldtype ft))
+	      db
+	      "SELECT fieldname,fieldtype FROM keys WHERE fieldname=?" key)
+	     (if (not fieldname)
+		 (sqlite3:execute db "INSERT INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT"))))
+	 keys)
 	(sqlite3:execute db (conc 
 			     "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n			 " 
 			     fieldstr (if havekeys "," "") "
 			 runname    TEXT DEFAULT 'norun',
                          contour    TEXT DEFAULT '',
@@ -808,11 +818,21 @@
 	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT,
                                   CONSTRAINT metadat_constraint UNIQUE (var));")
 	(sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);")
 	;; Must do this *after* running patch db !! No more. 
 	;; cannot use db:set-var since it will deadlock, hardwire the code here
-	(sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature))
+	(let* ((prev-version #f)
+	       (curr-version (common:version-signature)))
+	  (sqlite3:for-each-row
+	   (lambda (ver)
+	     (set! prev-version ver))
+	   db
+	   "SELECT val FROM metadat WHERE var='MEGATEST_VERSION';")
+	  (if prev-version
+	      (if (not (equal? prev-version curr-version))
+		  (sqlite3:execute db "UPDATE metadat SET val=? WHERE var=?;" curr-version "MEGATEST_VERSION"))
+	      (sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" curr-version) ))
 	(debug:print-info 11 *default-log-port* "db:initialize END") ;; ))))
 
 	;;======================================================================
 	;; R U N   S P E C I F I C   D B 
 	;;======================================================================