Merge pull request #944 from drdrew42/primary-key-pgfile-keyword

Ensure all OPL tables have primary keys
openwebwork · Aug 16, 2022 · 8a99b0f · 8a99b0f
2 parents b659dc7 + acc7935
commit 8a99b0f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/.github/workflows/bin/generate-OPL-tables.pl b/.github/workflows/bin/generate-OPL-tables.pl
@@ -145,7 +145,7 @@ sub dbug {
 		$tables{pgfile_keyword}, '
 	pgfile_id int(15) DEFAULT 0 NOT NULL,
 	keyword_id int(15) DEFAULT 0 NOT NULL,
-	KEY pgfile_keyword (keyword_id, pgfile_id),
+	PRIMARY KEY pgfile_keyword (keyword_id, pgfile_id),
 	KEY pgfile (pgfile_id)'
 	],
 	[
@@ -537,7 +537,7 @@ sub pgfiles {
 				);
 				if (not $DBsubject_id) {
 					print "\nInvalid subject '$tags->{DBsubject}' in $name\n";
-					next;
+					return;
 				}
 
 				# DBchapter table
@@ -549,7 +549,7 @@ sub pgfiles {
 				);
 				if (not $DBchapter_id) {
 					print "\nInvalid chapter '$tags->{DBchapter}' in $name\n";
-					next;
+					return;
 				}
 
 				# DBsection table
@@ -561,7 +561,7 @@ sub pgfiles {
 				);
 				if (!$aDBsection_id) {
 					print "\nInvalid section '$tags->{DBsection}' in $name\n";
-					next;
+					return;
 				}
 			} else {
 				# Tags are not valid, error printed by validation part.