From 778df0d3419ccf3c9fc4bf9ea696aced2a11ae99 Mon Sep 17 00:00:00 2001
From: phassoa <phassoa@itech-cotedivoire.org>
Date: Tue, 6 Dec 2016 23:44:28 +0000
Subject: [PATCH 1/4] prefix add

---
 liquibase/OE6.2/Base.xml                 | 21 +++++++++++++++++++++
 liquibase/OE6.2/Site_Information_Add.xml | 19 +++++++++++++++++++
 2 files changed, 40 insertions(+)
 create mode 100644 liquibase/OE6.2/Base.xml
 create mode 100644 liquibase/OE6.2/Site_Information_Add.xml

diff --git a/liquibase/OE6.2/Base.xml b/liquibase/OE6.2/Base.xml
new file mode 100644
index 00000000..347f0a0e
--- /dev/null
+++ b/liquibase/OE6.2/Base.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ The contents of this file are subject to the Mozilla Public License
+  ~ Version 1.1 (the "License"); you may not use this file except in
+  ~ compliance with the License. You may obtain a copy of the License at
+  ~ http://www.mozilla.org/MPL/
+  ~
+  ~ Software distributed under the License is distributed on an "AS IS"
+  ~ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+  ~ License for the specific language governing rights and limitations under
+  ~ the License.
+  ~
+  ~ The Original Code is OpenELIS code.
+  ~
+  ~ Copyright (C) ITECH, University of Washington, Seattle WA.  All Rights Reserved.
+  -->
+
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+  <include file="OE6.2/Site_Information_Add.xml" />
+
+  </databaseChangeLog> 
\ No newline at end of file
diff --git a/liquibase/OE6.2/Site_Information_Add.xml b/liquibase/OE6.2/Site_Information_Add.xml
new file mode 100644
index 00000000..f36c91b2
--- /dev/null
+++ b/liquibase/OE6.2/Site_Information_Add.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
+  <changeSet author="CI OpenELIS developers group" id="1" context="ci_regional,ci_general,CDIRetroCI,CDIRetroCI_CT">
+    <preConditions onFail="MARK_RAN">
+      <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'Accession number prefix';
+    		</sqlCheck>
+    </preConditions>
+    <comment>Insert in clinlims prefix update</comment>
+    <sql>
+	INSERT INTO clinlims.site_information(
+            id, name, lastupdated, description, value, encrypted, domain_id, 
+            value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
+            description_key, name_key)
+    VALUES (nextval('clinlims.site_information_seq'),'Accession number prefix',now(),'Prefix for SITEYEARNUM format.  Can not be changed if there are samples','(select value from clinlims.site_information where name = 'siteNumber')',default,1,'text',default,0,default,default,default,'siteInfo.Accession.number.prefix',default);
+	
+ 
+ </sql>
+  </changeSet>
+</databaseChangeLog>
\ No newline at end of file

From b28b3d6a604928bc9bf84f56fe25c224c005d637 Mon Sep 17 00:00:00 2001
From: phassoa <phassoa@itech-cotedivoire.org>
Date: Wed, 7 Dec 2016 00:21:11 +0000
Subject: [PATCH 2/4] ras

---
 liquibase/OE6.1.x/ci_regional/Site_information.xml  | 13 ++++++-------
 liquibase/OE6.2/Base.xml                            |  2 +-
 .../OE6.2/{ => regional}/Site_Information_Add.xml   |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
 rename liquibase/OE6.2/{ => regional}/Site_Information_Add.xml (83%)

diff --git a/liquibase/OE6.1.x/ci_regional/Site_information.xml b/liquibase/OE6.1.x/ci_regional/Site_information.xml
index 2aed03e0..9636b57e 100644
--- a/liquibase/OE6.1.x/ci_regional/Site_information.xml
+++ b/liquibase/OE6.1.x/ci_regional/Site_information.xml
@@ -10,13 +10,7 @@
             id, name, description)
     VALUES (nextval('clinlims.site_information_domain_seq'),'MenuStatementConfig','Manage menu Item');
 
-INSERT INTO clinlims.site_information(
-            id, name, lastupdated, description, value, encrypted, domain_id, 
-            value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
-            description_key, name_key)
-    VALUES (nextval('clinlims.site_information_seq'),'siteNumber',now(),'site Id Number','lnsp',default,1,'text',default,0,default,default,default,'siteInfo.siteNumber',default);
-	
-	
+
 INSERT INTO clinlims.site_information(
             id, name, lastupdated, description, value, encrypted, domain_id, 
             value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
@@ -31,6 +25,11 @@ UPDATE clinlims.site_information
    SET value = 'CI'
  WHERE name='stringContext';
  
+UPDATE clinlims.site_information
+   SET value = 'lnsp'
+ WHERE name='siteNumber'; 
+ 
+ 
    UPDATE clinlims.site_information
    SET value = 'CDI'
  WHERE name='passwordRequirements';
diff --git a/liquibase/OE6.2/Base.xml b/liquibase/OE6.2/Base.xml
index 347f0a0e..a6081b0a 100644
--- a/liquibase/OE6.2/Base.xml
+++ b/liquibase/OE6.2/Base.xml
@@ -16,6 +16,6 @@
   -->
 
 <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
-  <include file="OE6.2/Site_Information_Add.xml" />
+  <include file="OE6.2/regional/Site_Information_Add.xml" />
 
   </databaseChangeLog> 
\ No newline at end of file
diff --git a/liquibase/OE6.2/Site_Information_Add.xml b/liquibase/OE6.2/regional/Site_Information_Add.xml
similarity index 83%
rename from liquibase/OE6.2/Site_Information_Add.xml
rename to liquibase/OE6.2/regional/Site_Information_Add.xml
index f36c91b2..98b85721 100644
--- a/liquibase/OE6.2/Site_Information_Add.xml
+++ b/liquibase/OE6.2/regional/Site_Information_Add.xml
@@ -11,7 +11,7 @@
             id, name, lastupdated, description, value, encrypted, domain_id, 
             value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
             description_key, name_key)
-    VALUES (nextval('clinlims.site_information_seq'),'Accession number prefix',now(),'Prefix for SITEYEARNUM format.  Can not be changed if there are samples','(select value from clinlims.site_information where name = 'siteNumber')',default,1,'text',default,0,default,default,default,'siteInfo.Accession.number.prefix',default);
+    VALUES (nextval('clinlims.site_information_seq'),'Accession number prefix',now(),'Prefix for SITEYEARNUM format.  Can not be changed if there are samples',(select value from clinlims.site_information where name = 'siteNumber'),default,1,'text',default,0,default,default,default,'siteInfo.Accession.number.prefix',default);
 	
  
  </sql>

From 6b5e956451d994eadd57d57551d268f9edcbbbff Mon Sep 17 00:00:00 2001
From: phassoa <phassoa@itech-cotedivoire.org>
Date: Wed, 7 Dec 2016 15:20:17 +0000
Subject: [PATCH 3/4] ras

---
 .../OE6.1.x/ci_regional/Site_information.xml  | 40 +++++++++++++++++--
 1 file changed, 36 insertions(+), 4 deletions(-)

diff --git a/liquibase/OE6.1.x/ci_regional/Site_information.xml b/liquibase/OE6.1.x/ci_regional/Site_information.xml
index 9636b57e..319da59f 100644
--- a/liquibase/OE6.1.x/ci_regional/Site_information.xml
+++ b/liquibase/OE6.1.x/ci_regional/Site_information.xml
@@ -25,10 +25,6 @@ UPDATE clinlims.site_information
    SET value = 'CI'
  WHERE name='stringContext';
  
-UPDATE clinlims.site_information
-   SET value = 'lnsp'
- WHERE name='siteNumber'; 
- 
  
    UPDATE clinlims.site_information
    SET value = 'CDI'
@@ -36,4 +32,40 @@ UPDATE clinlims.site_information
  
  </sql>
   </changeSet>
+  
+  
+  
+  <changeSet author="CI OpenELIS developers group" id="2" context="ci_regional,ci_general">
+    <preConditions onFail="MARK_RAN">
+      <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'siteNumber';
+    		</sqlCheck>
+    </preConditions>
+    <comment>Insert in clinlims new site information</comment>
+    <sql>INSERT INTO clinlims.site_information(
+            id, name, lastupdated, description, value, encrypted, domain_id, 
+            value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
+            description_key, name_key)
+    VALUES (nextval('clinlims.site_information_seq'),'siteNumber',now(),'site Id Number','lnsp',default,1,'text',default,0,default,default,default,'siteInfo.siteNumber',default);
+	
+ </sql>
+  </changeSet>  
+  
+    
+   <changeSet author="CI OpenELIS developers group" id="3" context="ci_regional,ci_general">
+    <preConditions onFail="MARK_RAN">
+      <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'Accession number prefix';
+    		</sqlCheck>
+    </preConditions>
+    <comment>Insert in clinlims new site information</comment>
+    <sql>INSERT INTO clinlims.site_information(
+            id, name, lastupdated, description, value, encrypted, domain_id, 
+            value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
+            description_key, name_key)
+    VALUES (nextval('clinlims.site_information_seq'),'Accession number prefix',now(),'Prefix for SITEYEARNUM format.  Can not be changed if there are samples',(select value from clinlims.site_information where name = 'siteNumber'),default,1,'text',default,0,default,default,default,'siteInfo.Accession.number.prefix',default);
+	
+ </sql>
+  </changeSet>
+  
+  
+
 </databaseChangeLog>
\ No newline at end of file

From 75d92fccc0eae02820d91b39b79319cede4ddcd8 Mon Sep 17 00:00:00 2001
From: phassoa <phassoa@itech-cotedivoire.org>
Date: Wed, 7 Dec 2016 15:24:44 +0000
Subject: [PATCH 4/4] ras

---
 liquibase/OE6.2/Base.xml                      | 21 -------------------
 .../OE6.2/regional/Site_Information_Add.xml   | 19 -----------------
 2 files changed, 40 deletions(-)
 delete mode 100644 liquibase/OE6.2/Base.xml
 delete mode 100644 liquibase/OE6.2/regional/Site_Information_Add.xml

diff --git a/liquibase/OE6.2/Base.xml b/liquibase/OE6.2/Base.xml
deleted file mode 100644
index a6081b0a..00000000
--- a/liquibase/OE6.2/Base.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ The contents of this file are subject to the Mozilla Public License
-  ~ Version 1.1 (the "License"); you may not use this file except in
-  ~ compliance with the License. You may obtain a copy of the License at
-  ~ http://www.mozilla.org/MPL/
-  ~
-  ~ Software distributed under the License is distributed on an "AS IS"
-  ~ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-  ~ License for the specific language governing rights and limitations under
-  ~ the License.
-  ~
-  ~ The Original Code is OpenELIS code.
-  ~
-  ~ Copyright (C) ITECH, University of Washington, Seattle WA.  All Rights Reserved.
-  -->
-
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
-  <include file="OE6.2/regional/Site_Information_Add.xml" />
-
-  </databaseChangeLog> 
\ No newline at end of file
diff --git a/liquibase/OE6.2/regional/Site_Information_Add.xml b/liquibase/OE6.2/regional/Site_Information_Add.xml
deleted file mode 100644
index 98b85721..00000000
--- a/liquibase/OE6.2/regional/Site_Information_Add.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog/1.9" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog/1.9 http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-1.9.xsd">
-  <changeSet author="CI OpenELIS developers group" id="1" context="ci_regional,ci_general,CDIRetroCI,CDIRetroCI_CT">
-    <preConditions onFail="MARK_RAN">
-      <sqlCheck expectedResult="0">select count(*) from clinlims.site_information where name = 'Accession number prefix';
-    		</sqlCheck>
-    </preConditions>
-    <comment>Insert in clinlims prefix update</comment>
-    <sql>
-	INSERT INTO clinlims.site_information(
-            id, name, lastupdated, description, value, encrypted, domain_id, 
-            value_type, instruction_key, "group", schedule_id, tag, dictionary_category_id, 
-            description_key, name_key)
-    VALUES (nextval('clinlims.site_information_seq'),'Accession number prefix',now(),'Prefix for SITEYEARNUM format.  Can not be changed if there are samples',(select value from clinlims.site_information where name = 'siteNumber'),default,1,'text',default,0,default,default,default,'siteInfo.Accession.number.prefix',default);
-	
- 
- </sql>
-  </changeSet>
-</databaseChangeLog>
\ No newline at end of file