X-Git-Url: http://git.pippins.net/embedvideo/.git/static/gitweb.js?a=blobdiff_plain;f=bin%2Fupgrade_4_0_to_5_0;h=c27fa3ac4f2b1dd473001258455e89c8fd575ec2;hb=bf339f318906f8965f5b81e9e4c5eb431f57219a;hp=4c88c2a584602ba4476758f15476a3efc303f617;hpb=1c42e4dcbd4ebc672c7be3059a6e36ef1c9b0b74;p=eq%2F.git

diff --git a/bin/upgrade_4_0_to_5_0 b/bin/upgrade_4_0_to_5_0
index 4c88c2a..c27fa3a 100755
--- a/bin/upgrade_4_0_to_5_0
+++ b/bin/upgrade_4_0_to_5_0
@@ -16,7 +16,7 @@ $dbh=DBI->connect("dbi:mysql:dbname=$dbname:host=$dbhost:port=$dbport",$dbuser,$
 ###################################################
 
 # Remove eq_aaronic table
-$sth = $dbh->prepare("DROP TABLE `eq_aaronic` IF EXISTS");
+$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
@@ -48,7 +48,7 @@ $sth = $dbh->prepare("RENAME TABLE `eq_calling` TO `tc_calling`");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Remove eq_child table
-$sth = $dbh->prepare("DROP TABLE `eq_child` IF EXISTS");
+$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
@@ -56,7 +56,7 @@ $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 = $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
@@ -72,15 +72,11 @@ $sth = $dbh->prepare("RENAME TABLE `eq_elder` TO `tc_indiv`");
 $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)");
-$sth->execute or die "-E- DB error: $DBI::errstr\n";
-
-# Add a new 'birthday' column to the tc_indiv table
-$sth = $dbh->prepare("ALTER TABLE `tc_indiv` ADD `birthday` DATE NULL DEFAULT NULL AFTER `name` ");
+$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 `birthday`");
+$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";
 
 # Add a new 'family' column to the tc_indiv table
@@ -104,7 +100,7 @@ $sth = $dbh->prepare("ALTER TABLE `tc_family` CHANGE `elder_id` `indiv_id` INT(1
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
 # Remove eq_parent table
-$sth = $dbh->prepare("DROP TABLE `eq_parent` IF EXISTS");
+$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
@@ -124,11 +120,11 @@ $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 = $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