From 2f30cd6d731fb120bfc818b3d528be41f374cd10 Mon Sep 17 00:00:00 2001
From: Mark Crane <markjcrane@gmail.com>
Date: Sat, 20 Sep 2014 02:56:25 +0000
Subject: [PATCH] Fix the primary keys for settings, and meetings tables

---
 app/meetings/app_config.php | 4 +++-
 app/settings/app_config.php | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/app/meetings/app_config.php b/app/meetings/app_config.php
index 641ba8b9a4..d44c49472d 100644
--- a/app/meetings/app_config.php
+++ b/app/meetings/app_config.php
@@ -65,12 +65,14 @@
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
 		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "meeting_uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
-		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign";
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "primary";
 		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "moderator_pin";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "numeric";
diff --git a/app/settings/app_config.php b/app/settings/app_config.php
index a07ed094b6..55c01e9e83 100644
--- a/app/settings/app_config.php
+++ b/app/settings/app_config.php
@@ -69,6 +69,12 @@
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
 		$apps[$x]['db'][$y]['fields'][$z]['deprecated'] = "true";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = 'setting_uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
+		$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
+		$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "numbering_plan";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";