From 16a9271a87c4cabd512608b808e7ae320b4cecd9 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc kop@karlpinc.com" Date: Wed, 17 Jan 2024 09:16:25 +0000 Subject: [PATCH] Revert all code that changes the FOLLOW_MAP_TIME DDL statement on db load The data still contains duplicate keys. This reverts commit ea49f4a06ac3ef8c2aec1e8fbc0c08703bca36d7. This reverts commit 3e206bacf3a14ed9a242e766c1b1e590104890dc. --- conversion/mung_dump.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/conversion/mung_dump.sh b/conversion/mung_dump.sh index e8b69fd..76cbe31 100755 --- a/conversion/mung_dump.sh +++ b/conversion/mung_dump.sh @@ -42,6 +42,15 @@ bunzip2 -c "${DATA_FILE}" \ / VARCHAR\(255\)/ { print gensub(/ VARCHAR\(255\)/, " TEXT", 1); \ printed = 1; } + # Frob the CREATE TABLE for FOLLOW_MAP_TIME. + # Get rid of the comma on the line before the PRIMARY KEY declaration + / "FMT_update" TIMESTAMP,/ { print gensub(/,/, "", 1); \ + printed = 1; } + # Get rid of the PRIMARY KEY declaration, because the "key" is not + # unique. + / PRIMARY KEY \("FMT_FOL_date", "FMT_FOL_B_focal_AnimID", "FMT_time"\)/\ + { printed = 1; } + # Everything else is printed {if (printed) { printed = 0 ; } -- 2.34.1