Update DB schema tooling to be table order agnostic

Author: cpeel

SETUP/db_schema.sql

@@ -1,3 +1,5 @@
+# Disable foreign key checks to until all tables are created
+SET FOREIGN_KEY_CHECKS=0;
 
 #
 # Table structure for table `access_log`
@@ -774,6 +776,23 @@ CREATE TABLE `user_teams` (
 );
 # --------------------------------------------------------
 
+#
+# Table structure for table `user_teams_membership`
+#
+# Creation:
+# Last update:
+#
+
+CREATE TABLE `user_teams_membership` (
+  `u_id` int(11) unsigned NOT NULL,
+  `t_id` int(11) unsigned NOT NULL,
+  PRIMARY KEY (`u_id`,`t_id`),
+  KEY (`t_id`),
+  FOREIGN KEY (`u_id`) REFERENCES `users` (`u_id`),
+  FOREIGN KEY (`t_id`) REFERENCES `user_teams` (`id`)
+);
+# --------------------------------------------------------
+
 #
 # Table structure for table `users`
 #
@@ -813,23 +832,6 @@ CREATE TABLE `users` (
 );
 # --------------------------------------------------------
 
-#
-# Table structure for table `user_teams_membership`
-#
-# Creation:
-# Last update:
-#
-
-CREATE TABLE `user_teams_membership` (
-  `u_id` int(11) unsigned NOT NULL,
-  `t_id` int(11) unsigned NOT NULL,
-  PRIMARY KEY (`u_id`,`t_id`),
-  KEY (`t_id`),
-  FOREIGN KEY (`u_id`) REFERENCES `users` (`u_id`),
-  FOREIGN KEY (`t_id`) REFERENCES `user_teams` (`id`)
-);
-# --------------------------------------------------------
-
 #
 # Table structure for table `usersettings`
 #
@@ -868,3 +870,6 @@ CREATE TABLE `wordcheck_events` (
 );
 # --------------------------------------------------------
 
+# Re-enable foreign key checks
+SET FOREIGN_KEY_CHECKS=1;
+

SETUP/dump_db_schema.template

@@ -96,6 +96,12 @@ get_table_names()
 tables=`get_table_names`
 
 if true; then
+    # The order tables are dumped is not consistent and it's possible to have
+    # tables with foreign keys before the foreign key tables are created.
+    # To make sure the dump is loadable, we have to temporarily disable
+    # foreign key checks for this session.
+    echo "SET FOREIGN_KEY_CHECKS=0;"
+
     mysqldump --user=$db_user --password="$db_password" \
         --no-data --quote-names --add-drop-table=FALSE --force \
         $db_name $tables |
@@ -119,5 +125,7 @@ if true; then
     # Skip MySQL command sequences as they may be version-specific
     # (and generate a lot of noise in the diffs).
     grep -v '/*!'
+
+    # Re-enable foreign key checks
+    echo "SET FOREIGN_KEY_CHECKS=1;"
 fi
-# vim: sw=4 ts=4 expandtab ai

SETUP/install_db.php

@@ -18,6 +18,7 @@
 
 DPDatabase::query("CREATE DATABASE IF NOT EXISTS $db_name");
 DPDatabase::query("USE $db_name");
+DPDatabase::query("SET FOREIGN_KEY_CHECKS=0");
 
 // Declare all variables
 $db_schema = "db_schema.sql";
@@ -50,4 +51,6 @@
     DPDatabase::query($lines);
 }
 
+DPDatabase::query("SET FOREIGN_KEY_CHECKS=1");
+
 echo "Tables have been created.\n";