Merge branch 'issue/1214/import-error'

Fixes #1214
jpschewe · Dec 14, 2024 · 7504cf8 · 7504cf8
2 parents ea1c9ba + 272ed12
commit 7504cf8
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 9 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,3 +1,4 @@
+* #1214 fix error merging databases when deleting teams
 * More consistent handling of websocket errors
 * Synchronize sending of messages to web sockets
 * Clear redirect URL on logout

diff --git a/src/main/java/fll/db/GenerateDB.java b/src/main/java/fll/db/GenerateDB.java
@@ -884,7 +884,7 @@ public static String generateGoalColumnDefinition(final AbstractGoal goalElement
       if (createConstraints) {
         sql.append(" ,CONSTRAINT schedule_fk1 FOREIGN KEY(tournament) REFERENCES Tournaments(tournament_id)");
         sql.append(" ,CONSTRAINT schedule_fk2 FOREIGN KEY(team_number) REFERENCES Teams(TeamNumber)");
-        sql.append(" ,CONSTRAINT schedule_fk3 FOREIGN KEY(tournament, team_number) REFERENCES TournamentTeams(tournament, TeamNumber)");
+        sql.append(" ,CONSTRAINT schedule_fk3 FOREIGN KEY(tournament, team_number) REFERENCES TournamentTeams(tournament, TeamNumber) ON DELETE CASCADE");
       }
       sql.append(")");
       stmt.executeUpdate(sql.toString());
@@ -899,7 +899,7 @@ public static String generateGoalColumnDefinition(final AbstractGoal goalElement
       perfRoundsSql.append(" ,practice BOOLEAN NOT NULL");
       perfRoundsSql.append(" ,CONSTRAINT sched_perf_rounds_pk PRIMARY KEY (tournament, team_number, perf_time)");
       if (createConstraints) {
-        perfRoundsSql.append(" ,CONSTRAINT sched_perf_rounds_fk1 FOREIGN KEY(tournament, team_number) REFERENCES schedule(tournament, team_number)");
+        perfRoundsSql.append(" ,CONSTRAINT sched_perf_rounds_fk1 FOREIGN KEY(tournament, team_number) REFERENCES schedule(tournament, team_number) ON DELETE CASCADE");
       }
       perfRoundsSql.append(")");
       stmt.executeUpdate(perfRoundsSql.toString());
@@ -912,7 +912,7 @@ public static String generateGoalColumnDefinition(final AbstractGoal goalElement
       subjectiveSql.append(" ,subj_time TIME NOT NULL");
       subjectiveSql.append(" ,CONSTRAINT sched_subjective_pk PRIMARY KEY (tournament, team_number, name)");
       if (createConstraints) {
-        subjectiveSql.append(" ,CONSTRAINT sched_subjective_fk1 FOREIGN KEY(tournament, team_number) REFERENCES schedule(tournament, team_number)");
+        subjectiveSql.append(" ,CONSTRAINT sched_subjective_fk1 FOREIGN KEY(tournament, team_number) REFERENCES schedule(tournament, team_number) ON DELETE CASCADE");
       }
       subjectiveSql.append(")");
       stmt.executeUpdate(subjectiveSql.toString());

diff --git a/src/main/web/developer/importdb/awardsScript/resolveAwardsScriptDifferences.jsp b/src/main/web/developer/importdb/awardsScript/resolveAwardsScriptDifferences.jsp
@@ -31,9 +31,13 @@ ResolveAwardsScriptDifferences.populateContext(pageContext);
             <p>${difference.description}</p>
             <c:forEach items="${awardsScriptDifferenceActionValues}"
                 var="differenceAction">
-                <input type='radio' name='difference_${loopStatus.index}'
+                <input type='radio'
+                    name='difference_${loopStatus.index}'
+                    id='difference_${loopStatus.index}_${differenceAction.name}'
                     value='${differenceAction.name}' required />
-                ${differenceAction.description}
+                <label
+                    for='difference_${loopStatus.index}_${differenceAction.name}'>
+                    ${differenceAction.description}</label>
                 <br />
             </c:forEach>
             <hr />

diff --git a/src/main/web/developer/importdb/resolveTeamInfoDifferences.jsp b/src/main/web/developer/importdb/resolveTeamInfoDifferences.jsp
@@ -25,12 +25,15 @@
                 ${difference.teamNumber} differs
                 <br />
                 <input type='radio' name='${loopStatus.index}'
-                    value='source' checked />
-                Use source value of '${difference.sourceValue}'
+                    id='${loopStatus.index}_source' value='source'
+                    checked />
+                <label for='${loopStatus.index}_source'> Use
+                    source value of '${difference.sourceValue}'</label>
                 <br />
                 <input type='radio' name='${loopStatus.index}'
-                    value='dest' />
-                Use dest value of '${difference.destValue}'
+                    id='${loopStatus.index}_dest' value='dest' />
+                <label for='${loopStatus.index}_dest'> Use dest
+                    value of '${difference.destValue}'</label>
                 <br />
             </p>
         </c:forEach>