migrate development tip to version 3.2.0-dev

DiscoverAndChange · Aug 25, 2009 · 4571a6a · 4571a6a
1 parent 0e1cbcf
commit 4571a6a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/interface/globals.php b/interface/globals.php
@@ -319,9 +319,9 @@
 //Version tags
 
 $v_major = '3';
-$v_minor = '0';
-$v_patch = '1';
-$tag = '.4'; // minor revision number, should be empty for production releases
+$v_minor = '2';
+$v_patch = '0';
+$tag = '-dev'; // minor revision number, should be empty for production releases
 
 // This name appears on the login page and in the title bar of most windows.
 // It's nice to customize this to be the name of your clinic.

diff --git a/sql/3_0_1-to-3_1_0_upgrade.sql b/sql/3_0_1-to-3_1_0_upgrade.sql
@@ -202,12 +202,6 @@ CREATE TABLE `users_facility` (
 ) ENGINE=InnoDB COMMENT='joins users or patient_data to facility table';
 #EndIf
 
-#IfMissingColumn users calendar
-ALTER TABLE `users` 
- ADD `calendar` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 = appears in calendar';
-UPDATE users SET calendar = 1 WHERE authorized = 1 AND ( info IS NULL OR info NOT LIKE '%Nocalendar%' );
-#EndIf
-
 #IfTable form_reviewofs
 ALTER TABLE form_reviewofs CHANGE fever fever varchar(5);
 ALTER TABLE form_reviewofs CHANGE chills chills varchar(5);
@@ -318,19 +312,6 @@ ALTER TABLE form_reviewofs CHANGE cushing_syndrom cushing_syndrom varchar(5);
 ALTER TABLE form_reviewofs CHANGE addison_syndrom addison_syndrom varchar(5);
 #EndIf
 
-#IfNotRow2D list_options list_id lists option_id lbfnames
-INSERT INTO list_options VALUES ('lists','lbfnames','Layout-Based Visit Forms',9,0,0);
-#EndIf
-
-#IfNotTable lbf_data
-CREATE TABLE `lbf_data` (
- `form_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'references forms.form_id',
- `field_id` varchar(31) NOT NULL COMMENT 'references layout_options.field_id',
- `field_value` varchar(255) NOT NULL,
- PRIMARY KEY (`form_id`,`field_id`)
-) ENGINE=MyISAM COMMENT='contains all data from layout-based forms';
-#EndIf
-
 #IfTable gacl_phpgacl
 ALTER TABLE gacl_phpgacl MODIFY value varchar(150) NOT NULL;
 #EndIf

diff --git a/sql/3_1_0-to-3_2_0_upgrade.sql b/sql/3_1_0-to-3_2_0_upgrade.sql
@@ -0,0 +1,19 @@
+#IfMissingColumn users calendar
+ALTER TABLE `users` 
+ ADD `calendar` TINYINT(1) NOT NULL DEFAULT 0 COMMENT '1 = appears in calendar';
+UPDATE users SET calendar = 1 WHERE authorized = 1 AND ( info IS NULL OR info NOT LIKE '%Nocalendar%' );
+#EndIf
+
+#IfNotRow2D list_options list_id lists option_id lbfnames
+INSERT INTO list_options VALUES ('lists','lbfnames','Layout-Based Visit Forms',9,0,0);
+#EndIf
+
+#IfNotTable lbf_data
+CREATE TABLE `lbf_data` (
+ `form_id` int(11) NOT NULL AUTO_INCREMENT COMMENT 'references forms.form_id',
+ `field_id` varchar(31) NOT NULL COMMENT 'references layout_options.field_id',
+ `field_value` varchar(255) NOT NULL,
+ PRIMARY KEY (`form_id`,`field_id`)
+) ENGINE=MyISAM COMMENT='contains all data from layout-based forms';
+#EndIf
+