OpenMRS

Timestamp:

08/06/08 17:17:55 (5 months ago)

Author:

mseaton

Message:

synchronization_bidirectional_branch: merge from [4734] to [5181].

Files:

• openmrs/branches/data_synchronization_bidirectional/metadata/model/update-to-latest-db.mysqldiff.sql (modified) (2 diffs)

openmrs/branches/data_synchronization_bidirectional/metadata/model/update-to-latest-db.mysqldiff.sql

@@ -994 +994 @@
-        
-        set FOREIGN_KEY_CHECKS = 0;
-
-
+
+
+
-        update role_privilege set privilege = 'Delete Patient Programs' where privilege = 'Manage Patient Programs';
-        
@@ -1015 +1016 @@
-call diff_procedure('1.3.0.12');
-
+#----------------------------------------
+# OpenMRS Datamodel version 1.3.0.13
+# Ben Wolfe               July 3, 2008
+# Changing person.dead and person_attribute_type.searchable to tinyint
+#----------------------------------------
+
+DROP PROCEDURE IF EXISTS diff_procedure;
+
+delimiter //
+
+CREATE PROCEDURE diff_procedure (IN new_db_version VARCHAR(10))
+ BEGIN
+    IF (SELECT REPLACE(property_value, '.', '0') < REPLACE(new_db_version, '.', '0') FROM global_property WHERE property = 'database_version') THEN
+    SELECT CONCAT('Updating to ', new_db_version) AS 'Datamodel Update:' FROM dual;
+        
+        ALTER TABLE person CHANGE COLUMN dead dead tinyint(1) NOT NULL DEFAULT '0';
+        ALTER TABLE person_attribute_type CHANGE COLUMN searchable searchable tinyint(1) NOT NULL DEFAULT '0';
+
+    UPDATE `global_property` SET property_value=new_db_version WHERE property = 'database_version';
+    
+    END IF;
+ END;
+//
+
+delimiter ;
+call diff_procedure('1.3.0.13');
+
+#----------------------------------------
+# OpenMRS Datamodel version 1.3.0.14
+# Ben Wolfe               July 24th, 2008
+# Giving 1.3 modified privileges to roles
+#----------------------------------------
+
+#-- temporary procedure to check and add a privilege to the Authenticated role
+DROP PROCEDURE IF EXISTS insert_authenticated_privilege;
+delimiter //
+CREATE PROCEDURE insert_authenticated_privilege (IN priv VARCHAR(50))
+ BEGIN
+        IF NOT EXISTS (SELECT * FROM role_privilege where role = 'Authenticated' and privilege = priv) THEN
+                insert into role_privilege (role, privilege) values ('Authenticated', priv);
+        END IF;
+ END;
+//
+delimiter ;
+
+DROP PROCEDURE IF EXISTS diff_procedure;
+
+delimiter //
+
+CREATE PROCEDURE diff_procedure (IN new_db_version VARCHAR(10))
+ BEGIN
+    IF (SELECT REPLACE(property_value, '.', '0') < REPLACE(new_db_version, '.', '0') FROM global_property WHERE property = 'database_version') THEN
+    SELECT CONCAT('Updating to ', new_db_version) AS 'Datamodel Update:' FROM dual;
+        
+        set FOREIGN_KEY_CHECKS = 0;
+        
+    insert into role_privilege (role, privilege) select distinct role, 'View Patient Programs' from role_privilege rp where privilege = 'Manage Patient Programs' and not exists (select * from role_privilege where role = rp.role and privilege = 'View Patient Programs');
+        insert into role_privilege (role, privilege) select distinct role, 'Edit Patient Programs' from role_privilege rp where privilege = 'Manage Patient Programs' and not exists (select * from role_privilege where role = rp.role and privilege = 'Edit Patient Programs');
+        insert into role_privilege (role, privilege) select distinct role, 'Delete Patient Programs' from role_privilege rp where privilege = 'Manage Patient Programs' and not exists (select * from role_privilege where role = rp.role and privilege = 'Delete Patient Programs');
+        delete from role_privilege where privilege = 'Manage Patient Programs';
+        
+        #-- the 1.3.0.12 update didn't do this change correctly
+        update role_privilege set privilege = 'Manage Concepts' where privilege = 'Edit Concepts';
+        update role_privilege set privilege = 'Manage Forms' where privilege = 'Edit Forms';
+        
+        #-- The concept proposal privilege changed slightly
+        insert into role_privilege (role, privilege) select distinct role, 'Add Concept Proposals' from role_privilege rp where privilege = 'Add Concept Proposal' and not exists (select * from role_privilege where role = rp.role and privilege = 'Add Concept Proposals');
+        insert into role_privilege (role, privilege) select distinct role, 'Edit Concept Proposals' from role_privilege rp where privilege = 'Edit Concept Proposal' and not exists (select * from role_privilege where role = rp.role and privilege = 'Edit Concept Proposals');
+        
+        #-- These objects/methods now require an explicit privilege.  Previously they only required authentication
+        call insert_authenticated_privilege('View Encounter Types');
+        call insert_authenticated_privilege('View Locations');
+        call insert_authenticated_privilege('View Mime Types');
+        call insert_authenticated_privilege('View Identifier Types');
+        call insert_authenticated_privilege('View Concept Classes');
+        call insert_authenticated_privilege('View Concept Datatypes');
+        call insert_authenticated_privilege('View Privileges');
+        call insert_authenticated_privilege('View Roles');
+        call insert_authenticated_privilege('View Field Types');
+        call insert_authenticated_privilege('View Order Types');
+        call insert_authenticated_privilege('View Relationship Types');
+        call insert_authenticated_privilege('View Global Properties');
+        call insert_authenticated_privilege('View Person Attribute Types');
+        call insert_authenticated_privilege('View Relationships');
+        call insert_authenticated_privilege('View Tribes');
+        
+        #-- If a role can View Patients...add the new View Patient Identifiers privilege to that role
+        insert into role_privilege (role, privilege) select distinct role, 'View Patient Identifiers' from role_privilege rp where privilege = 'View Patients' and not exists (select * from role_privilege where role = rp.role and privilege = 'View Patient Identifiers');   
+        
+        #-- Convert Manage Encounter Types
+        insert into role_privilege (role, privilege) select distinct role, 'Add Encounter Types' from role_privilege rp where privilege = 'Manage Encounter Types' and not exists (select * from role_privilege where role = rp.role and privilege = 'Add Encounter Types');
+        insert into role_privilege (role, privilege) select distinct role, 'Edit Encounter Types' from role_privilege rp where privilege = 'Manage Encounter Types' and not exists (select * from role_privilege where role = rp.role and privilege = 'Edit Encounter Types');
+        insert into role_privilege (role, privilege) select distinct role, 'Delete Encounter Types' from role_privilege rp where privilege = 'Manage Encounter Types' and not exists (select * from role_privilege where role = rp.role and privilege = 'Delete Encounter Types');
+        delete from role_privilege where privilege = 'Manage Encounter Types';
+        
+        #-- Convert Manage Relationships privilege
+        insert into role_privilege (role, privilege) select distinct role, 'Add Relationships' from role_privilege rp where privilege = 'Manage Relationships' and not exists (select * from role_privilege where role = rp.role and privilege = 'Add Relationships');
+        insert into role_privilege (role, privilege) select distinct role, 'Edit Relationships' from role_privilege rp where privilege = 'Manage Relationships' and not exists (select * from role_privilege where role = rp.role and privilege = 'Edit Relationships');
+        insert into role_privilege (role, privilege) select distinct role, 'Delete Relationships' from role_privilege rp where privilege = 'Manage Relationships' and not exists (select * from role_privilege where role = rp.role and privilege = 'Delete Relationships');
+        delete from role_privilege where privilege = 'Manage Relationships';
+        
+        set FOREIGN_KEY_CHECKS = 1;
+
+    UPDATE `global_property` SET property_value=new_db_version WHERE property = 'database_version';
+    
+    END IF;
+ END;
+//
+
+delimiter ;
+call diff_procedure('1.3.0.14');
+
+DROP PROCEDURE IF EXISTS insert_authenticated_privilege;
+
+#----------------------------------------
+# OpenMRS Datamodel version 1.3.0.15
+# Ben Wolfe               Aug 1st, 2008
+# Fixing 1.3.0.14 modified authenticated role
+#----------------------------------------
+DROP PROCEDURE IF EXISTS diff_procedure;
+
+delimiter //
+
+CREATE PROCEDURE diff_procedure (IN new_db_version VARCHAR(10))
+ BEGIN
+    IF (SELECT REPLACE(property_value, '.', '0') < REPLACE(new_db_version, '.', '0') FROM global_property WHERE property = 'database_version') THEN
+    SELECT CONCAT('Updating to ', new_db_version) AS 'Datamodel Update:' FROM dual;
+        
+        # Fix the incorrect privilege name from the privious update
+        update role_privilege set privilege = 'View Relationship Types' where privilege = 'View RelationshipTypes';
+
+    UPDATE `global_property` SET property_value=new_db_version WHERE property = 'database_version';
+    
+    END IF;
+ END;
+//
+
+delimiter ;
+call diff_procedure('1.3.0.15');
+
+#----------------------------------------
+# OpenMRS Datamodel version 1.4.0.01
+# Mike Seaton          July 28, 2008
+# Adding accession_number to orders
+#----------------------------------------
+
+DROP PROCEDURE IF EXISTS diff_procedure;
+
+delimiter //
+
+CREATE PROCEDURE diff_procedure (IN new_db_version VARCHAR(10))
+ BEGIN
+    IF (SELECT REPLACE(property_value, '.', '0') < REPLACE(new_db_version, '.', '0') FROM global_property WHERE property = 'database_version') THEN
+    SELECT CONCAT('Updating to ', new_db_version) AS 'Datamodel Update:' FROM dual;
+        
+        ALTER TABLE `orders` ADD COLUMN `accession_number` varchar(255) default NULL;
+
+    UPDATE `global_property` SET property_value=new_db_version WHERE property = 'database_version';
+    
+    END IF;
+ END;
+//
+
+delimiter ;
+call diff_procedure('1.4.0.01');
-
-#-----------------------------------