X-Git-Url: http://git.pippins.net/embedvideo/.git/static/git-logo.png?a=blobdiff_plain;f=bin%2Fupgrade_4_0_to_5_0;h=c27fa3ac4f2b1dd473001258455e89c8fd575ec2;hb=bf339f318906f8965f5b81e9e4c5eb431f57219a;hp=731c51226fb64377f711f1549ed25f49540c4d55;hpb=e72d7ba6537f5e438dedd252ae8cd0b0f0ec08d8;p=eq%2F.git

diff --git a/bin/upgrade_4_0_to_5_0 b/bin/upgrade_4_0_to_5_0
index 731c512..c27fa3a 100755
--- a/bin/upgrade_4_0_to_5_0
+++ b/bin/upgrade_4_0_to_5_0
@@ -15,8 +15,8 @@ $dbh=DBI->connect("dbi:mysql:dbname=$dbname:host=$dbhost:port=$dbport",$dbuser,$
     PrintError=>0}) or print "Connect Failure:".$DBI::errstr."\n" and exit 2;
 ###################################################
 
-# Rename eq_aaronic table to tc_aaronic
-$sth = $dbh->prepare("RENAME TABLE `eq_aaronic` TO `tc_aaronic`");
+# Remove eq_aaronic table
+$sth = $dbh->prepare("DROP TABLE IF EXISTS `eq_aaronic`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Rename eq_activity table to tc_activity
@@ -47,14 +47,18 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n";
 $sth = $dbh->prepare("RENAME TABLE `eq_calling` TO `tc_calling`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
-# Rename eq_child table to tc_child
-$sth = $dbh->prepare("RENAME TABLE `eq_child` TO `tc_child`");
+# Remove eq_child table
+$sth = $dbh->prepare("DROP TABLE IF EXISTS `eq_child`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Rename eq_companionship table to tc_companionship
 $sth = $dbh->prepare("RENAME TABLE `eq_companionship` TO `tc_companionship`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
+# Remove aaronic field from tc_companionship
+$sth = $dbh->prepare("ALTER TABLE `tc_companionship` DROP `aaronic`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
 # Change elder field in tc_companionship table to indiv
 $sth = $dbh->prepare("ALTER TABLE `tc_companionship` CHANGE `elder` `indiv` INT(16)");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
@@ -67,12 +71,24 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n";
 $sth = $dbh->prepare("RENAME TABLE `eq_elder` TO `tc_indiv`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
-# Add a new 'propective' field to the tc_indiv table
-$sth = $dbh->prepare("ALTER TABLE `tc_indiv` ADD `prospective` enum('y','n') NULL AFTER `priesthood`");
+# Change elder field in tc_indiv table to indiv
+$sth = $dbh->prepare("ALTER TABLE `tc_indiv` CHANGE `elder` `indiv` INT(16) NOT NULL AUTO_INCREMENT");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'address' column to the tc_indiv table
+$sth = $dbh->prepare("ALTER TABLE `tc_indiv` ADD `address` VARCHAR( 255 ) NULL DEFAULT NULL AFTER `name`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
-# Change elder field in tc_indiv table to indiv
-$sth = $dbh->prepare("ALTER TABLE `tc_indiv` CHANGE `elder` `indiv` INT(16)");
+# Add a new 'family' column to the tc_indiv table
+$sth = $dbh->prepare("ALTER TABLE `tc_indiv` ADD `family` INT(16) UNSIGNED NULL DEFAULT NULL AFTER `email`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'hh_position' column to the tc_indiv table
+$sth = $dbh->prepare("ALTER TABLE `tc_indiv` ADD `hh_position` ENUM( 'Head of Household', 'Spouse', 'Other' ) NOT NULL DEFAULT 'Other' AFTER `family`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
+# Add a new 'steward' column to the tc_indiv table
+$sth = $dbh->prepare("ALTER TABLE `tc_indiv` ADD `steward` ENUM( 'High Priest', 'Elder', '' ) NULL DEFAULT NULL AFTER `priesthood`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Rename eq_family table to tc_family
@@ -83,8 +99,8 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n";
 $sth = $dbh->prepare("ALTER TABLE `tc_family` CHANGE `elder_id` `indiv_id` INT(16)");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
-# Rename eq_parent table to tc_parent
-$sth = $dbh->prepare("RENAME TABLE `eq_parent` TO `tc_parent`");
+# Remove eq_parent table
+$sth = $dbh->prepare("DROP TABLE IF EXISTS `eq_parent`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Rename eq_participation table to tc_participation
@@ -103,8 +119,12 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n";
 $sth = $dbh->prepare("ALTER TABLE `tc_interview` CHANGE `elder` `indiv` INT(16)");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
+# Remove aaronic field from tc_interview
+$sth = $dbh->prepare("ALTER TABLE `tc_interview` DROP `aaronic`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
 # Change ppi field in tc_interview table to interview
-$sth = $dbh->prepare("ALTER TABLE `tc_interview` CHANGE `ppi` `interview` INT(16)");
+$sth = $dbh->prepare("ALTER TABLE `tc_interview` CHANGE `ppi` `interview` INT(16) NOT NULL AUTO_INCREMENT");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Add a new 'interview_type' column to the tc_interview table