changed visit_type to type

diff --git a/bin/import_ward_data b/bin/import_ward_data
index 57d450fc976cd504d0f6f6f808a5e139a7545d87..3f08fc065f2326f2e2ced703980e55e141224d52 100755 (executable)
--- a/bin/import_ward_data
+++ b/bin/import_ward_data
@@ -615,7 +615,7 @@ sub update_tc_visit_table
                                if ($importing_status ne '')
                                {
                                        # add visit if it doesn't exist in tc_visit
-                                       $sth = $dbh->prepare("insert into tc_visit values (NULL, '$family_id', '$comp_id', '', '', '$visit_date', '', '$importing_status', 'hometeaching')");
+                                       $sth = $dbh->prepare("insert into tc_visit values (NULL, '$family_id', '$comp_id', '', '', '$visit_date', '', '$importing_status', 'H')");
                                        $sth->execute or die "-E- DB error: $DBI::errstr\n";
                                }
                        }

diff --git a/bin/upgrade_1_1_0_to_1_1_1 b/bin/upgrade_1_1_0_to_1_1_1
index 904133d92afd622feaabd529268be7abff6a338d..9bb7ff609f2fd0e0f7ff3acb4d7cbe904b45b385 100755 (executable)
--- a/bin/upgrade_1_1_0_to_1_1_1
+++ b/bin/upgrade_1_1_0_to_1_1_1
@@ -26,6 +26,16 @@ $sth->execute or die "-E- DB error: $DBI::errstr\n";
 $sth = $dbh->prepare("ALTER TABLE `tc_interview` DROP `interview_type` ");
 $sth->execute or die "-E- DB error: $DBI::errstr\n";
 
+# Change visit_type field in tc_visit table to type, change enum to use 'H','P'
+$sth = $dbh->prepare("ALTER TABLE `tc_visit` ADD `type` ENUM( 'H', 'P' ) NOT NULL AFTER `visit_type`");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+$sth = $dbh->prepare("UPDATE tc_visit SET type='H' WHERE visit_type='hometeaching'");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+$sth = $dbh->prepare("UPDATE tc_visit SET type='P' WHERE visit_type='presidency'");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+$sth = $dbh->prepare("ALTER TABLE `tc_visit` DROP `visit_type` ");
+$sth->execute or die "-E- DB error: $DBI::errstr\n";
+
 print "-> Done!\n";
 
 ###################################################

diff --git a/sql/schema.dot b/sql/schema.dot
index ec23ab7b4f1b56ede97e1dbd45740ba4a258d68d..9f5e512c5d88480735e25145171d2bde1327b149 100644 (file)
--- a/sql/schema.dot
+++ b/sql/schema.dot
@@ -55,7 +55,7 @@ digraph schema {
     shape = "record"
   ];
   visit   [
-    label = "visit||<v> visit|<f> family|<c> companionship|<c1> companion1|<c2> companion2|<t> date|<n> notes|<v> visited|<vt> visit_type"
+    label = "visit||<v> visit|<f> family|<c> companionship|<c1> companion1|<c2> companion2|<t> date|<n> notes|<v> visited|<vt> type"
     shape = "record"
   ];
   willingness   [

diff --git a/sql/tc.sql b/sql/tc.sql
index d66b728d642eb8681becdb3372734873faf64659..f5520dbaeee32d909b912eedfff10087a4e6e741 100644 (file)
--- a/sql/tc.sql
+++ b/sql/tc.sql
@@ -182,7 +182,7 @@ CREATE TABLE /*!42501 IF NOT EXISTS*/ `tc_visit` (
   `date` date default NULL,
   `notes` text,
   `visited` enum('y','n','') default NULL,
-  `visit_type` enum('presidency','hometeaching') not null default 'hometeaching',
+  `type` enum('P','H') not null default 'H',
   PRIMARY KEY  (`visit`)
 ) ENGINE=MyISAM AUTO_INCREMENT=9513 DEFAULT CHARSET=latin1;