From 31090f09bd22e80d0518ea7bf9bd464777cbb5fc Mon Sep 17 00:00:00 2001
From: Wikum Weerakutti <wikum@linuxdeveloper.space>
Date: Wed, 23 Oct 2024 16:29:37 +0530
Subject: [PATCH] TRUNK-6276: Fix ValidateHibernateMappingsDatabaseIT test
 errors when running with MySQL

---
 .github/workflows/build.yaml                  | 133 ++++++++++--------
 .../java/org/openmrs/BaseOpenmrsMetadata.java |   2 +-
 .../java/org/openmrs/BaseOpenmrsObject.java   |   2 +-
 api/src/main/java/org/openmrs/Location.java   |   5 +-
 .../java/org/openmrs/MedicationDispense.java  |   4 +-
 api/src/main/java/org/openmrs/OrderType.java  |   3 -
 .../org/openmrs/ProgramAttributeType.java     |   5 +
 .../org/openmrs/ProviderAttributeType.java    |   2 +-
 .../org/openmrs/api/db/SerializedObject.java  |   9 +-
 .../openmrs/attribute/BaseAttributeType.java  |   4 +-
 .../java/org/openmrs/hl7/HL7QueueItem.java    |   3 +-
 .../api/db/hibernate/AllergyReaction.hbm.xml  |   4 +-
 .../api/db/hibernate/CareSetting.hbm.xml      |   5 +-
 .../db/hibernate/ClobDatatypeStorage.hbm.xml  |   5 +-
 .../openmrs/api/db/hibernate/Cohort.hbm.xml   |   9 +-
 .../api/db/hibernate/CohortMembership.hbm.xml |   5 +-
 .../openmrs/api/db/hibernate/Concept.hbm.xml  |   5 +-
 .../api/db/hibernate/ConceptAnswer.hbm.xml    |   7 +-
 .../api/db/hibernate/ConceptAttribute.hbm.xml |   6 +-
 .../db/hibernate/ConceptAttributeType.hbm.xml |   6 +-
 .../api/db/hibernate/ConceptClass.hbm.xml     |   5 +-
 .../api/db/hibernate/ConceptDatatype.hbm.xml  |   7 +-
 .../db/hibernate/ConceptDescription.hbm.xml   |   6 +-
 .../api/db/hibernate/ConceptMap.hbm.xml       |   6 +-
 .../api/db/hibernate/ConceptName.hbm.xml      |   4 +-
 .../api/db/hibernate/ConceptNameTag.hbm.xml   |   8 +-
 .../api/db/hibernate/ConceptProposal.hbm.xml  |   7 +-
 .../db/hibernate/ConceptReferenceTerm.hbm.xml |   6 +-
 .../hibernate/ConceptReferenceTermMap.hbm.xml |   6 +-
 .../api/db/hibernate/ConceptSet.hbm.xml       |   7 +-
 .../api/db/hibernate/ConceptSource.hbm.xml    |   9 +-
 .../hibernate/ConceptStateConversion.hbm.xml  |  11 +-
 .../api/db/hibernate/ConceptStopWord.hbm.xml  |   4 +-
 .../db/hibernate/DiagnosisAttribute.hbm.xml   |   4 +-
 .../hibernate/DiagnosisAttributeType.hbm.xml  |   4 +-
 .../org/openmrs/api/db/hibernate/Drug.hbm.xml |   5 +-
 .../api/db/hibernate/DrugReferenceMap.hbm.xml |   6 +-
 .../db/hibernate/EncounterProvider.hbm.xml    |   7 +-
 .../api/db/hibernate/EncounterRole.hbm.xml    |   5 +-
 .../api/db/hibernate/EncounterType.hbm.xml    |   7 +-
 .../openmrs/api/db/hibernate/Field.hbm.xml    |  13 +-
 .../api/db/hibernate/FieldType.hbm.xml        |   8 +-
 .../org/openmrs/api/db/hibernate/Form.hbm.xml |   9 +-
 .../api/db/hibernate/FormField.hbm.xml        |   9 +-
 .../api/db/hibernate/FormResource.hbm.xml     |   4 +-
 .../api/db/hibernate/GlobalProperty.hbm.xml   |   9 +-
 .../db/hibernate/LocationAttribute.hbm.xml    |   6 +-
 .../api/db/hibernate/LocationTag.hbm.xml      |   4 +-
 .../api/db/hibernate/LoginCredential.hbm.xml  |   8 +-
 .../org/openmrs/api/db/hibernate/Obs.hbm.xml  |   7 +-
 .../openmrs/api/db/hibernate/Order.hbm.xml    |   7 +-
 .../api/db/hibernate/OrderAttribute.hbm.xml   |   4 +-
 .../db/hibernate/OrderAttributeType.hbm.xml   |   4 +-
 .../api/db/hibernate/OrderFrequency.hbm.xml   |   7 +-
 .../api/db/hibernate/OrderGroup.hbm.xml       |   7 +-
 .../db/hibernate/OrderGroupAttribute.hbm.xml  |   5 +-
 .../hibernate/OrderGroupAttributeType.hbm.xml |   5 +-
 .../openmrs/api/db/hibernate/OrderSet.hbm.xml |   5 +-
 .../db/hibernate/OrderSetAttribute.hbm.xml    |   7 +-
 .../hibernate/OrderSetAttributeType.hbm.xml   |   7 +-
 .../api/db/hibernate/OrderSetMember.hbm.xml   |   5 +-
 .../db/hibernate/PatientIdentifier.hbm.xml    |   5 +-
 .../api/db/hibernate/PatientProgram.hbm.xml   |   7 +-
 .../hibernate/PatientProgramAttribute.hbm.xml |   7 +-
 .../openmrs/api/db/hibernate/Person.hbm.xml   |   7 +-
 .../api/db/hibernate/PersonAttribute.hbm.xml  |   5 +-
 .../api/db/hibernate/PersonMergeLog.hbm.xml   |   7 +-
 .../api/db/hibernate/PersonName.hbm.xml       |   5 +-
 .../api/db/hibernate/Privilege.hbm.xml        |   9 +-
 .../openmrs/api/db/hibernate/Program.hbm.xml  |  11 +-
 .../api/db/hibernate/ProgramWorkflow.hbm.xml  |   9 +-
 .../db/hibernate/ProgramWorkflowState.hbm.xml |  11 +-
 .../openmrs/api/db/hibernate/Provider.hbm.xml |   5 +-
 .../db/hibernate/ProviderAttribute.hbm.xml    |   7 +-
 .../api/db/hibernate/RelationshipType.hbm.xml |   5 +-
 .../org/openmrs/api/db/hibernate/Role.hbm.xml |   5 +-
 .../api/db/hibernate/VisitAttribute.hbm.xml   |   7 +-
 .../api/db/hibernate/VisitType.hbm.xml        |   5 +-
 .../hl7/db/hibernate/HL7InArchive.hbm.xml     |   9 +-
 .../hl7/db/hibernate/HL7InQueue.hbm.xml       |  19 +--
 .../hl7/db/hibernate/HL7Source.hbm.xml        |  11 +-
 .../liquibase-update-to-latest-2.7.x.xml      | 114 ++++++++++++++-
 .../notification/db/hibernate/Alert.hbm.xml   |   7 +-
 .../db/hibernate/Template.hbm.xml             |   7 +-
 .../db/hibernate/TaskDefinition.hbm.xml       |  20 +--
 .../util/DatabaseUpdaterDatabaseIT.java       |   2 +-
 86 files changed, 516 insertions(+), 278 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 29bf44bd4039..17c6f17f2e1b 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -3,63 +3,84 @@ name: Build with Maven
 
 # trigger build on branches that *should* support both Java 8 and Java 11
 on:
-  push:
-    branches:
-      - master
-      - 2.4.x
-      - 2.5.x
-      - 2.6.x
-  pull_request:
-    branches:
-      - master
-      - 2.4.x
-      - 2.5.x
-      - 2.6.x
-  workflow_dispatch:
+    push:
+        branches:
+            - master
+            - 2.4.x
+            - 2.5.x
+            - 2.6.x
+    pull_request:
+        branches:
+            - master
+            - 2.4.x
+            - 2.5.x
+            - 2.6.x
+    workflow_dispatch:
 
 permissions: read-all
 
 jobs:
-  build:
-    strategy:
-      matrix:
-        platform:
-          - ubuntu-latest
-        java-version:
-          - 8
-          - 11
-          - 17
-    runs-on: ${{ matrix.platform }}
-    steps:
-      - uses: actions/checkout@v4
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: ${{ matrix.java-version }}
-          cache: 'maven'
-      - name: Install dependencies
-        run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true --batch-mode --show-version --file pom.xml
-      - name: Build with Maven
-        run: mvn clean install --batch-mode && mvn test -Pskip-default-test -Pintegration-test --batch-mode --file pom.xml
-      # this is necessary to populate the environment variables for Coveralls properly
-      - name: Set branch name and PR number
-        id: refs
-        if: ${{ matrix.java-version == '8' }}
-        continue-on-error: true
-        env:
-          BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
-        run: |
-          echo "::set-output name=branch_name::${BRANCH_NAME_OR_REF#refs/heads/}"
-          echo "::set-output name=pr_number::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")"
-      - name: Update coverage data
-        # only send coverage data for Java 8
-        if: ${{ matrix.java-version == '8' && steps.refs.outcome == 'success' }}
-        continue-on-error: true
-        env:
-          CI_NAME: Github
-          CI_BUILD_NUMBER: ${{ github.run_id }}
-          CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks
-          CI_BRANCH: ${{ steps.refs.outputs.branch_name }}
-          CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }}
-        run: mvn jacoco:report coveralls:report --batch-mode --file pom.xml --no-transfer-progress -DrepoToken=${{ secrets.COVERALLS_TOKEN }}
+    build:
+        strategy:
+            matrix:
+                platform:
+                    - ubuntu-latest
+                java-version:
+                    - 8
+                    - 11
+                    - 17
+        runs-on: ${{ matrix.platform }}
+        steps:
+            - uses: actions/checkout@v4
+            - name: Setup JDK
+              uses: actions/setup-java@v4
+              with:
+                  distribution: 'temurin'
+                  java-version: ${{ matrix.java-version }}
+                  cache: 'maven'
+            - name: Install dependencies
+              run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true --batch-mode --show-version --file pom.xml
+            - name: Build with Maven
+              run: mvn clean install --batch-mode && mvn test -Pskip-default-test -Pintegration-test --batch-mode --file pom.xml
+            # this is necessary to populate the environment variables for Coveralls properly
+            - name: Set branch name and PR number
+              id: refs
+              if: ${{ matrix.java-version == '8' }}
+              continue-on-error: true
+              env:
+                  BRANCH_NAME_OR_REF: ${{ github.head_ref || github.ref }}
+              run: |
+                  echo "::set-output name=branch_name::${BRANCH_NAME_OR_REF#refs/heads/}"
+                  echo "::set-output name=pr_number::$(jq --raw-output .pull_request.number "$GITHUB_EVENT_PATH")"
+            - name: Update coverage data
+                # only send coverage data for Java 8
+              if: ${{ matrix.java-version == '8' && steps.refs.outcome == 'success' }}
+              continue-on-error: true
+              env:
+                  CI_NAME: Github
+                  CI_BUILD_NUMBER: ${{ github.run_id }}
+                  CI_BUILD_URL: https://github.com/${{ github.repository }}/commit/${{ github.event.after }}/checks
+                  CI_BRANCH: ${{ steps.refs.outputs.branch_name }}
+                  CI_PULL_REQUEST: ${{ steps.refs.outputs.pr_number }}
+              run: mvn jacoco:report coveralls:report --batch-mode --file pom.xml --no-transfer-progress -DrepoToken=${{ secrets.COVERALLS_TOKEN }}
+    
+    build_with_mysql:
+        strategy:
+            matrix:
+                platform:
+                    - ubuntu-latest
+                java-version:
+                    - 8
+        runs-on: ${{ matrix.platform }}
+        steps:
+            - uses: actions/checkout@v4
+            - name: Setup JDK
+              uses: actions/setup-java@v4
+              with:
+                  distribution: 'temurin'
+                  java-version: ${{ matrix.java-version }}
+                  cache: 'maven'
+            - name: Install dependencies
+              run: mvn clean install -DskipTests=true -Dmaven.javadoc.skip=true --batch-mode --show-version --file pom.xml
+            - name: Build with Maven with external database
+              run: mvn clean install --batch-mode && mvn test -DuseInMemoryDatabase=false -Pskip-default-test -Pintegration-test --batch-mode --file pom.xml
diff --git a/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java b/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
index 664379ecb89e..d942fd27f53d 100644
--- a/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
+++ b/api/src/main/java/org/openmrs/BaseOpenmrsMetadata.java
@@ -38,7 +38,7 @@ public abstract class BaseOpenmrsMetadata extends BaseOpenmrsObject implements O
 	@Field
 	private String name;
 	
-	@Column(name = "description", length = 255)
+	@Column(name = "description")
 	private String description;
 	
 	@ManyToOne(optional = false)
diff --git a/api/src/main/java/org/openmrs/BaseOpenmrsObject.java b/api/src/main/java/org/openmrs/BaseOpenmrsObject.java
index bb77af4a44b0..7c9458fb7fbe 100644
--- a/api/src/main/java/org/openmrs/BaseOpenmrsObject.java
+++ b/api/src/main/java/org/openmrs/BaseOpenmrsObject.java
@@ -28,7 +28,7 @@
 @Audited
 public abstract class BaseOpenmrsObject implements Serializable, OpenmrsObject {
 	
-	@Column(name = "uuid", unique = true, nullable = false, length = 38, updatable = false)
+	@Column(name = "uuid", unique = true, nullable = false, length = 38, updatable = false, columnDefinition = "char")
 	private String uuid = UUID.randomUUID().toString();
 	
 	/**
diff --git a/api/src/main/java/org/openmrs/Location.java b/api/src/main/java/org/openmrs/Location.java
index ed5f00ddc52a..61beca42fa4f 100644
--- a/api/src/main/java/org/openmrs/Location.java
+++ b/api/src/main/java/org/openmrs/Location.java
@@ -18,6 +18,7 @@
 import org.openmrs.api.context.Context;
 
 import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -47,7 +48,9 @@
 @Entity
 @Table(name = "location")
 @Cache(usage = CacheConcurrencyStrategy.READ_WRITE)
-@AttributeOverride(name = "attributes", column = @Column(name = "location_id"))
+@AttributeOverrides(value = {
+	@AttributeOverride(name = "attributes", column = @Column(name = "location_id"))
+})
 @Audited
 public class Location extends BaseCustomizableMetadata<LocationAttribute> implements java.io.Serializable, Attributable<Location>, Address {
 	
diff --git a/api/src/main/java/org/openmrs/MedicationDispense.java b/api/src/main/java/org/openmrs/MedicationDispense.java
index 5ae4c853859e..24c719a8892d 100644
--- a/api/src/main/java/org/openmrs/MedicationDispense.java
+++ b/api/src/main/java/org/openmrs/MedicationDispense.java
@@ -15,6 +15,7 @@
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
 import javax.persistence.JoinColumn;
+import javax.persistence.Lob;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import java.util.Date;
@@ -191,7 +192,8 @@ public class MedicationDispense extends BaseFormRecordableOpenmrsData {
 	 * FHIR:DosageInstructions.patientInstructions
 	 * Relates to drugOrder.dosingInstructions
 	 */
-	@Column(name = "dosing_instructions", length=65535)
+	@Column(name = "dosing_instructions", columnDefinition = "text")
+	@Lob
 	private String dosingInstructions;
 
 	/**
diff --git a/api/src/main/java/org/openmrs/OrderType.java b/api/src/main/java/org/openmrs/OrderType.java
index d24a573c0ef0..b08b3ac96599 100644
--- a/api/src/main/java/org/openmrs/OrderType.java
+++ b/api/src/main/java/org/openmrs/OrderType.java
@@ -17,8 +17,6 @@
 import org.openmrs.api.APIException;
 import org.openmrs.api.context.Context;
 
-import javax.persistence.AttributeOverride;
-import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -30,7 +28,6 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.UniqueConstraint;
-import java.util.Collection;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
diff --git a/api/src/main/java/org/openmrs/ProgramAttributeType.java b/api/src/main/java/org/openmrs/ProgramAttributeType.java
index fd5a49608ccb..87cfa9f89e72 100644
--- a/api/src/main/java/org/openmrs/ProgramAttributeType.java
+++ b/api/src/main/java/org/openmrs/ProgramAttributeType.java
@@ -16,6 +16,8 @@
 import org.openmrs.attribute.AttributeType;
 import org.openmrs.attribute.BaseAttributeType;
 
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -26,6 +28,9 @@
 @Entity
 @Table(name = "program_attribute_type")
 @Audited
+@AttributeOverrides(value = {
+	@AttributeOverride(name = "description", column = @Column(name = "description", length = 1024))
+})
 public class ProgramAttributeType extends BaseAttributeType<PatientProgram> implements AttributeType<PatientProgram> {
 
 	@Id
diff --git a/api/src/main/java/org/openmrs/ProviderAttributeType.java b/api/src/main/java/org/openmrs/ProviderAttributeType.java
index d2d6f893226b..4790a56f6358 100644
--- a/api/src/main/java/org/openmrs/ProviderAttributeType.java
+++ b/api/src/main/java/org/openmrs/ProviderAttributeType.java
@@ -31,7 +31,7 @@
 @Table(name = "provider_attribute_type")
 @Audited
 @AttributeOverrides(value = {
-	@AttributeOverride(name = "description", column = @Column(name = "description", length = 1024))
+	@AttributeOverride(name = "description", column = @Column(name = "description", length = 1024 ))
 })
 public class ProviderAttributeType extends BaseAttributeType<Provider> implements AttributeType<Provider> {
 
diff --git a/api/src/main/java/org/openmrs/api/db/SerializedObject.java b/api/src/main/java/org/openmrs/api/db/SerializedObject.java
index 7c0aff5026a8..7c9114bfeb9a 100644
--- a/api/src/main/java/org/openmrs/api/db/SerializedObject.java
+++ b/api/src/main/java/org/openmrs/api/db/SerializedObject.java
@@ -15,11 +15,14 @@
 import org.openmrs.BaseChangeableOpenmrsMetadata;
 import org.openmrs.serialization.OpenmrsSerializer;
 
+import javax.persistence.AttributeOverride;
+import javax.persistence.AttributeOverrides;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.Lob;
 import javax.persistence.Table;
 
 /**
@@ -28,6 +31,9 @@
 @Entity
 @Table(name = "serialized_object")
 @Audited
+@AttributeOverrides(value = {
+	@AttributeOverride(name = "description", column = @Column(name = "description", length = 5000))
+})
 public class SerializedObject extends BaseChangeableOpenmrsMetadata {
 
 	@Id
@@ -49,7 +55,8 @@ public class SerializedObject extends BaseChangeableOpenmrsMetadata {
 	@Column(name = "serialization_class", nullable = false, length = 255)
 	private Class<? extends OpenmrsSerializer> serializationClass;
 
-	@Column(name = "serialized_data", length = 16777215)
+	@Column(name = "serialized_data", columnDefinition = "mediumtext")
+	@Lob
 	private String serializedData;
 	
 	/**
diff --git a/api/src/main/java/org/openmrs/attribute/BaseAttributeType.java b/api/src/main/java/org/openmrs/attribute/BaseAttributeType.java
index 06f3af5ea2ea..2d782a398793 100644
--- a/api/src/main/java/org/openmrs/attribute/BaseAttributeType.java
+++ b/api/src/main/java/org/openmrs/attribute/BaseAttributeType.java
@@ -35,14 +35,14 @@ public abstract class BaseAttributeType<OwningType extends Customizable<?>> exte
 	@Column(name = "datatype", length = 255)
 	private String datatypeClassname;
 	
-	@Column(name = "datatype_config", length = 65535 )
+	@Column(name = "datatype_config", columnDefinition = "text")
 	@Lob
 	private String datatypeConfig;
 	
 	@Column(name = "preferred_handler", length = 255)
 	private String preferredHandlerClassname;
 	
-	@Column(name = "handler_config", length = 65535 )
+	@Column(name = "handler_config", columnDefinition = "text")
 	@Lob
 	private String handlerConfig;
 	
diff --git a/api/src/main/java/org/openmrs/hl7/HL7QueueItem.java b/api/src/main/java/org/openmrs/hl7/HL7QueueItem.java
index 087bf00451f0..7153e24a2543 100644
--- a/api/src/main/java/org/openmrs/hl7/HL7QueueItem.java
+++ b/api/src/main/java/org/openmrs/hl7/HL7QueueItem.java
@@ -36,7 +36,8 @@ public abstract class HL7QueueItem extends BaseOpenmrsObject {
 	@JoinColumn(name = "hl7_source")
 	private HL7Source hl7Source;
 	
-	@Column(name = "hl7_source_key", length = 1024)
+	@Column(name = "hl7_source_key", columnDefinition = "text")
+	@Lob
 	private String hl7SourceKey;
 	
 	@Column(name = "hl7_data", nullable = false,  columnDefinition = "text")
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml
index 087d9d966074..4333db576248 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/AllergyReaction.hbm.xml
@@ -25,6 +25,8 @@
         <many-to-one name="allergy" class="Allergy" column="allergy_id" not-null="true"/>
         <many-to-one name="reaction" column="reaction_concept_id" class="org.openmrs.Concept" not-null="true"/>
         <property name="reactionNonCoded" type="java.lang.String" column="reaction_non_coded"/>
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true"/>
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
     </class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml
index 755c8d937720..2c2591b9cbbc 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/CareSetting.hbm.xml
@@ -38,8 +38,9 @@
                   column="date_created" not-null="true" length="19" />
         <many-to-one name="creator" class="org.openmrs.User"
                      not-null="true" />
-        <property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
         <many-to-one name="retiredBy" class="org.openmrs.User"
                      column="retired_by" />
         <property name="dateRetired" type="java.util.Date"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ClobDatatypeStorage.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ClobDatatypeStorage.hbm.xml
index 3c8c1ef11093..e558f5fe5284 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ClobDatatypeStorage.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ClobDatatypeStorage.hbm.xml
@@ -22,8 +22,9 @@
 			<param name="sequence">clob_datatype_storage_id_seq</param>
 		</generator>
 	</id>
-    
-    <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+	<property name="uuid" type="java.lang.String" unique="true">
+		<column name="uuid" sql-type="char(38)" />
+	</property> 
 	<property name="value" type="materialized_clob" column="value" /> 
 
 </class>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml
index 56f0a9c2cd2a..1155f95e5f4f 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Cohort.hbm.xml
@@ -26,9 +26,10 @@
 			not-null="true" length="255" />
 		<property name="description" type="java.lang.String" 
 			not-null="true" length="1000" />
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<set name="memberships" cascade="all-delete-orphan,evict" lazy="true" inverse="true">
 			<key column="cohort_id" not-null="true"/>
@@ -52,4 +53,4 @@
 	</class>
 
 </hibernate-mapping>
-	
\ No newline at end of file
+	
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/CohortMembership.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/CohortMembership.hbm.xml
index ddf4ab656690..e0a32c47522d 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/CohortMembership.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/CohortMembership.hbm.xml
@@ -38,8 +38,9 @@
 				  column="date_voided" length="19" />
 		<property name="voidReason" type="java.lang.String"
 				  column="void_reason" length="255" />
-		<property name="uuid" type="java.lang.String"
-				  column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="creator" class="User" not-null="true" />
 		<many-to-one name="voidedBy" class="User" column="voided_by" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml
index de92ea7a6f11..cfb2a8c47e17 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Concept.hbm.xml
@@ -27,8 +27,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="retired" type="java.lang.Boolean"
 			column="retired" length="1" not-null="true"/>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml
index 73f2e7d35f29..a68af64d61aa 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAnswer.hbm.xml
@@ -37,10 +37,11 @@
 			name="answerDrug" class="org.openmrs.Drug" column="answer_drug" />
 		
 		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" />
-		<many-to-one name="creator" class="User" column="creator" not-null="true"/>		
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />		
+		<many-to-one name="creator" class="User" column="creator" not-null="true"/>
 
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 		<property name="sortWeight" type="java.lang.Double" column="sort_weight"/>
 	</class>
 	
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml
index 2b9295ec5861..7571df38f425 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttribute.hbm.xml
@@ -47,8 +47,10 @@
         <property name="dateVoided" type="java.util.Date" column="date_voided" length="19" />
                
         <property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
-        
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
         
     </class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttributeType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttributeType.hbm.xml
index c211b12eaff7..1233911613a0 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttributeType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptAttributeType.hbm.xml
@@ -57,8 +57,10 @@
         <property name="dateRetired" type="java.util.Date" column="date_retired" length="19" />
                
         <property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
-        
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 	</class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptClass.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptClass.hbm.xml
index 9310f66fe2a2..a23a86da930c 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptClass.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptClass.hbm.xml
@@ -25,8 +25,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="name" type="java.lang.String" not-null="true"
 			length="255" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml
index 7fab8cb03166..7a18c114b6c2 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDatatype.hbm.xml
@@ -24,9 +24,10 @@
 				<param name="sequence">concept_datatype_concept_datatype_id_seq</param>
 			</generator>
 		</id>
-				
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="name" type="java.lang.String" not-null="true"
 			length="255" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml
index d78a95c179dd..63e2c8f838f0 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptDescription.hbm.xml
@@ -29,14 +29,16 @@
 			class="Concept"
 		not-null="true"/>
 		
-		<property name="description" type="text" length="65535" not-null="true"/>
+		<property name="description" type="java.lang.String" length="1024" not-null="true"/>
 		<property name="locale" type="java.util.Locale" length="50" not-null="true"/>
 		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true"/>
 		<many-to-one name="creator" class="User" column="creator" not-null="true"/>
 		<property name="dateChanged" type="java.util.Date" column="date_changed" not-null="false"/>
 		<many-to-one name="changedBy" class="User" column="changed_by" not-null="false"/>
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 	</class>
 	
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptMap.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptMap.hbm.xml
index f4b21722e7c4..f1c7bbb70e98 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptMap.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptMap.hbm.xml
@@ -22,8 +22,10 @@
 				<param name="sequence">concept_reference_map_concept_map_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
  
  		<many-to-one name="concept" column="concept_id" class="Concept" not-null="true"/>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptName.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptName.hbm.xml
index aeb2e83f422d..aa9c0b90dbfc 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptName.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptName.hbm.xml
@@ -57,7 +57,9 @@
 		
 		<property name="localePreferred" type="java.lang.Boolean" column="locale_preferred" 
 		          length="1" not-null="true"/>
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="changedBy" class="org.openmrs.User" column="changed_by"/>
 		<property name="dateChanged" type="java.util.Date"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml
index cb13ee6c1f97..a6f8499e574e 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptNameTag.hbm.xml
@@ -24,7 +24,7 @@
 		</id>
 		
 		<property name="tag" type="java.lang.String" length="50" not-null="true" />
-		<property name="description" type="text" length="65535"/>
+		<property name="description" type="java.lang.String" length="1024"/>
 		
 		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true"/>
 		<many-to-one name="creator" class="User" column="creator" not-null="true"/>
@@ -36,8 +36,10 @@
 		<property name="voidReason" type="java.lang.String"
 			column="void_reason" length="255" />
 		<many-to-one name="voidedBy" class="User" column="voided_by" />
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="changedBy" class="org.openmrs.User" column="changed_by"/>
 		<property name="dateChanged" type="java.util.Date"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml
index 0181ebbbbf32..ad6fe46acca6 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptProposal.hbm.xml
@@ -22,9 +22,10 @@
 				<param name="sequence">concept_proposal_concept_proposal_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="originalText" type="java.lang.String" length="255" not-null="true" column="original_text" />
 		<property name="finalText" type="java.lang.String" length="255" column="final_text" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml
index 064ccd28e4f4..6b098ac17193 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTerm.hbm.xml
@@ -23,8 +23,10 @@
 				<param name="sequence">concept_reference_term_concept_reference_term_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="conceptSource" column="concept_source_id" class="ConceptSource" not-null="true"/>
 					
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml
index bf4010e0c3f7..b52a68a653af 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptReferenceTermMap.hbm.xml
@@ -23,8 +23,10 @@
 				<param name="sequence">concept_reference_term_map_concept_reference_term_map_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true"/>
+
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="termA" class="ConceptReferenceTerm" column="term_a_id" not-null="true" />
 		
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml
index bd2f7f92d42a..53e09b16d897 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSet.hbm.xml
@@ -22,9 +22,10 @@
 				<param name="sequence">concept_set_concept_set_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true"  />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="sortWeight" type="java.lang.Double"
 			column="sort_weight" length="22" not-null="true"/>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSource.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSource.hbm.xml
index e07f93baed6b..765e4246a975 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSource.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptSource.hbm.xml
@@ -23,13 +23,14 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="name" type="java.lang.String"
 			column="name" length="50" not-null="true" />
-		<property name="description" type="java.lang.String"
-			column="description" length="1024" not-null="true" />
+		<property name="description" type="java.lang.String" length="1024"
+			column="description" not-null="true" />
 		<property name="hl7Code" type="java.lang.String"
 			column="hl7_code" length="50" />
 		<property name="uniqueId" type="java.lang.String"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml
index ac08d4c4c88d..f07f08256667 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStateConversion.hbm.xml
@@ -22,11 +22,12 @@
 				<param name="sequence">concept_state_conversion_concept_state_conversion_id_seq</param>
 			</generator>
 		</id>
-		
-		
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="concept" class="Concept" column="concept_id" not-null="true" />
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml
index 10577889bc0f..fb62b0f8a2a4 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ConceptStopWord.hbm.xml
@@ -27,7 +27,9 @@
 
 		<property name="value" column="word" type="java.lang.String" length="50" not-null="true"/>
 		<property name="locale" type="java.util.Locale" length="20" not-null="true"/>
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 	</class>
 
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml
index e6ad2acbb646..1a3732687721 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttribute.hbm.xml
@@ -46,7 +46,9 @@
 
 		<property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 	</class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml
index b4a7022919d3..aead4a946213 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/DiagnosisAttributeType.hbm.xml
@@ -56,7 +56,9 @@
 
 		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 	</class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml
index dfbf404db43c..d09a0a731c9a 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Drug.hbm.xml
@@ -59,8 +59,9 @@
 			<one-to-many class="org.openmrs.DrugIngredient" />
 		</set>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<!-- bi-directional one-to-many association to DrugOrder -->
 		<!--
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml
index 5248f9dde87b..cc344f343734 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/DrugReferenceMap.hbm.xml
@@ -23,8 +23,10 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true"/>
-
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
+		
 		<many-to-one name="drug" class="Drug" column="drug_id" not-null="true"/>
 
 		<many-to-one name="conceptReferenceTerm" class="ConceptReferenceTerm" column="term_id" not-null="true" cascade="save-update"/>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml
index 8471185e7e1c..3303cc93ba20 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterProvider.hbm.xml
@@ -26,8 +26,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String" column="uuid"
-			length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 			
 		<property name="dateCreated" type="java.util.Date" column="date_created"
 			not-null="true" length="19" />
@@ -68,4 +69,4 @@
 			<column name="encounter_role_id" />
 		</many-to-one>
 	</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml
index f77c87b75530..e39d59187c3a 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterRole.hbm.xml
@@ -46,6 +46,7 @@
 
 		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-	</class>
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>	</class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterType.hbm.xml
index 27457790443d..cff71973912a 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/EncounterType.hbm.xml
@@ -24,7 +24,7 @@
 		
 		<property name="name" type="java.lang.String"
 			not-null="true" length="50" unique="true" />
-		<property name="description" type="java.lang.String" length="1024" />
+		<property name="description" type="java.lang.String" length="1024"/>
 		<property name="dateCreated" type="java.util.Date"
 			column="date_created" not-null="true" length="19" />
 		<many-to-one name="creator" class="User"
@@ -33,8 +33,9 @@
 			not-null="false" />
 		<many-to-one name="viewPrivilege" column="view_privilege" class="Privilege"
 			not-null="false" />
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 		<many-to-one name="retiredBy" class="User"
 			column="retired_by" />
 		<property name="dateRetired" type="java.util.Date"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml
index 2be5c7bed175..ad1943ccdda3 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Field.hbm.xml
@@ -22,16 +22,17 @@
 				<param name="sequence">field_field_id_seq</param>
 			</generator>
 		</id>
-		
-		
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
 
+
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
+		
 		<property name="name" type="java.lang.String"
 			length="255" not-null="true"/>
 		
-		<property name="description" type="text" length="65535" />
+		<property name="description" type="java.lang.String" length="1024" />
 
 		<many-to-one name="fieldType" class="FieldType" not-null="true">
 			<column name="field_type" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/FieldType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/FieldType.hbm.xml
index 9d25829eb4ca..d6e9e6d69478 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/FieldType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/FieldType.hbm.xml
@@ -21,11 +21,11 @@
 			</generator>
 		</id>
 
-		
-
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>		
 		<property name="name" type="java.lang.String" column="name" length="50"  />
-		<property name="description" type="java.lang.String" column="description" length="2147483647" />
+		<property name="description" type="java.lang.String" length="1024" column="description" />
 		<property name="isSet" type="boolean" column="is_set" length="1" not-null="true" />
 		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" />
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
index 1e67c45288ab..f4a1d3f68332 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Form.hbm.xml
@@ -23,8 +23,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="name" type="java.lang.String" 
 			column="name" not-null="true" length="255" />
@@ -38,8 +39,8 @@
 		<property name="published" type="boolean" column="published"
 			length="1" not-null="false" />
 
-		<property name="description" type="java.lang.String" 
-			column="description" length="1024" />
+		<property name="description" type="java.lang.String" length="1024" 
+			column="description" />
 
 		<many-to-one name="encounterType" class="EncounterType">
 			<column name="encounter_type" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml
index 8cbbd9003b87..d028f4c10732 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/FormField.hbm.xml
@@ -23,10 +23,11 @@
 			</generator>
 		</id>
 
-		
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="parent" class="FormField" cascade="save-update,merge,evict">
 			<column name="parent_form_field" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
index 37a765870a78..3760d48792c3 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/FormResource.hbm.xml
@@ -43,7 +43,9 @@
         
         <property name="handlerConfig" type="text" column="handler_config" length="65535" />
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" not-null="true" />
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="changedBy" class="org.openmrs.User" column="changed_by"/>
 		<property name="dateChanged" type="java.util.Date"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml
index e67ea95d39e6..e18fb1447ffa 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/GlobalProperty.hbm.xml
@@ -26,7 +26,7 @@
 		<property name="propertyValue" type="text" column="property_value"
 			not-null="false" length="65535"/>
 		
-		<property name="description" type="text" not-null="false" length="65535"/>
+		<property name="description" type="java.lang.String" not-null="false" length="1024"/>
 
         <property name="datatypeClassname" type="java.lang.String" column="datatype" length="255" />
         
@@ -41,9 +41,10 @@
 		<many-to-one name="viewPrivilege" column="view_privilege" class="org.openmrs.Privilege" not-null="false" />
 		
 		<many-to-one name="deletePrivilege" column="delete_privilege" class="org.openmrs.Privilege" not-null="false" />
-
-		<property name="uuid" type="java.lang.String" 
-			column="uuid" length="38" unique="true" />
+		
+		<property name="uuid" type="java.lang.String" unique="true" >
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="changedBy" class="org.openmrs.User" column="changed_by"/>
 		<property name="dateChanged" type="java.util.Date"
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml
index 5124625f6dce..97f3f25e8fe3 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/LocationAttribute.hbm.xml
@@ -45,8 +45,10 @@
         <property name="dateVoided" type="java.util.Date" column="date_voided" length="19" />
                
         <property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
-        
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
         
     </class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/LocationTag.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/LocationTag.hbm.xml
index 86f1dabe2e9c..136767815688 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/LocationTag.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/LocationTag.hbm.xml
@@ -33,7 +33,9 @@
 		<property name="dateRetired" type="java.util.Date" column="date_retired" length="19" />
 		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
 		<property name="retired" type="boolean" length="1" not-null="true" />
-		<property name="uuid" type="java.lang.String" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 		<property name="dateChanged" type="java.util.Date" column="date_changed" length="19" />
 		
 		<many-to-one name="changedBy" class="User">
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/LoginCredential.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/LoginCredential.hbm.xml
index de4048da767e..f65744014cb8 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/LoginCredential.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/LoginCredential.hbm.xml
@@ -22,8 +22,10 @@
 				<param name="sequence">users_user_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>		
 		<property name="hashedPassword" type="java.lang.String" column="password" length="128" />
 		<property name="salt" type="java.lang.String" column="salt" length="128" />
 		<property name="secretQuestion" type="java.lang.String" column="secret_question" length="255" />
@@ -36,4 +38,4 @@
 	</class>
 	
 </hibernate-mapping>
-	
\ No newline at end of file
+	
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml
index daf73b8ebc80..a83e7646091b 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Obs.hbm.xml
@@ -23,10 +23,11 @@
 			</generator>
 		</id>
 
-		
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="personId" type="java.lang.Integer" length="11" 
 			column="person_id" not-null="true" insert="false" update="false" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
index 3a3fba31ca0a..5b52df10fd4f 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Order.hbm.xml
@@ -23,10 +23,11 @@
 			</generator>
 		</id>
 
-		
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="instructions" type="text" column="instructions" length="65535"/>
 		<property name="dateActivated" type="java.util.Date" column="date_activated" length="19" not-null="true"/>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml
index 30de7d7e9655..fc62f2013f79 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttribute.hbm.xml
@@ -46,7 +46,9 @@
 
 		<property name="voidReason" type="java.lang.String" column="void_reason" length="255"/>
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 	</class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml
index 6cc864d5caa7..ba72351c327a 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderAttributeType.hbm.xml
@@ -56,7 +56,9 @@
 
 		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255"/>
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 	</class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml
index 918864043a04..34aa8f35a5b3 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderFrequency.hbm.xml
@@ -40,12 +40,13 @@
 			not-null="false" length="19" />
 		<property name="retireReason" type="java.lang.String" column="retire_reason"
 			length="255" />
-		<property name="uuid" type="java.lang.String" column="uuid"
-			length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
         <many-to-one name="changedBy" class="org.openmrs.User" column="changed_by" />
 
         <property name="dateChanged" type="java.util.Date" column="date_changed" length="19" />
 
 	</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml
index 25cbfdbced19..a273a0e65a01 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroup.hbm.xml
@@ -69,9 +69,10 @@
         
 		<property name="dateChanged" type="java.util.Date"
                   column="date_changed" length="19" />
-        
-		<property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" not-null="true"/>
+
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
         
 		<many-to-one name="parentOrderGroup" class="org.openmrs.OrderGroup"
 		    not-null="false" column="parent_order_group" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttribute.hbm.xml
index 473c90fcf9bb..ec1ff1aa033e 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttribute.hbm.xml
@@ -46,8 +46,9 @@
 
 		<property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 	</class>
 
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttributeType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttributeType.hbm.xml
index 717b462aeaa7..ed886ca2decb 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttributeType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderGroupAttributeType.hbm.xml
@@ -56,8 +56,9 @@
 
 		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-		
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>		
 	</class>
 
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
index 8e7e228dd9e7..f7607673e5f6 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSet.hbm.xml
@@ -66,8 +66,9 @@
         </many-to-one>
         <property name="dateChanged" type="java.util.Date"
                   column="date_changed" length="19" />
-        <property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" not-null="true"/>
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
           <set name="attributes" lazy="true" inverse="true" batch-size="100"
             cascade="all-delete-orphan" order-by="voided asc">
             <key column="order_set_id" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml
index 90041c176b18..1f3e1e3f27d7 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttribute.hbm.xml
@@ -46,8 +46,9 @@
 
         <property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
 
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
     </class>
 
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml
index d1a1732626e6..cb39074b7218 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetAttributeType.hbm.xml
@@ -56,8 +56,9 @@
 
         <property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
 
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
     </class>
 
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml
index 8f4a7b4bdd1f..d03ef48cf96c 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/OrderSetMember.hbm.xml
@@ -62,8 +62,9 @@
         </many-to-one>
         <property name="dateChanged" type="java.util.Date"
                   column="date_changed" length="19" />
-        <property name="uuid" type="java.lang.String"
-                  column="uuid" length="38" unique="true" not-null="true"/>
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
     </class>
 
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml
index 18a92025b9a8..e20eb06d1b25 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientIdentifier.hbm.xml
@@ -23,8 +23,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 		<many-to-one name="patient" column="patient_id" class="org.openmrs.Patient"/>
 		<property name="identifier" type="java.lang.String" length="50"/>
 		<many-to-one name="identifierType" class="org.openmrs.PatientIdentifierType" column="identifier_type"/>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgram.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgram.hbm.xml
index 02252414de1a..ae999c8408a5 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgram.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgram.hbm.xml
@@ -26,8 +26,9 @@
 	<discriminator column="patient_program_id" insert="false" />
 
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+	<property name="uuid" type="java.lang.String" unique="true">
+		<column name="uuid" sql-type="char(38)" />
+	</property>
 
 	<property name="dateEnrolled" type="java.util.Date" column="date_enrolled" not-null="false" length="19" />
     <property name="dateCompleted" type="java.util.Date" column="date_completed" not-null="false" length="19" />
@@ -82,4 +83,4 @@
             <one-to-many class="org.openmrs.PatientProgramAttribute" />
         </set>
 </class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml
index 369c5af39d18..93d307650d00 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/PatientProgramAttribute.hbm.xml
@@ -48,8 +48,9 @@
 
         <property name="voidReason" type="java.lang.String" column="void_reason" length="255"/>
 
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true"/>
-
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
     </class>
 
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Person.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Person.hbm.xml
index 7d808bb04915..b917a1742418 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Person.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Person.hbm.xml
@@ -25,8 +25,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true"/>
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="gender" type="java.lang.String" column="gender"
 			not-null="false" length="50" />
@@ -105,4 +106,4 @@
 	    </property>
 	    		
 	</class>
-</hibernate-mapping>
\ No newline at end of file
+</hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml
index 7804a8f70175..68095eba48a3 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/PersonAttribute.hbm.xml
@@ -25,8 +25,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<many-to-one name="person" class="Person">
 			<column name="person_id" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PersonMergeLog.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PersonMergeLog.hbm.xml
index d8a1ae3ece5c..c0bbfba7d6e4 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PersonMergeLog.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/PersonMergeLog.hbm.xml
@@ -36,10 +36,11 @@
 		<property name="dateCreated" type="java.util.Date" column="date_created"
 			not-null="true" length="19" />
 
-		<property name="uuid" type="java.lang.String" column="uuid"
-			length="38" unique="true" not-null="true" />
+		<property name="uuid" type="java.lang.String" unique="true" not-null="true" >
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
-		<property name="serializedMergedData" type="materialized_clob" column="merged_data"
+		<property name="serializedMergedData" type="text" column="merged_data"
 			not-null="true" />
 			
 		<many-to-one name="changedBy" class="User" column="changed_by" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/PersonName.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/PersonName.hbm.xml
index 097501b9fa0f..003877dea1c7 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/PersonName.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/PersonName.hbm.xml
@@ -26,8 +26,9 @@
 			</generator>
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="preferred" type="boolean" column="preferred"
 			not-null="true" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Privilege.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Privilege.hbm.xml
index f45d0b43956d..1697f112a5f5 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Privilege.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Privilege.hbm.xml
@@ -23,11 +23,12 @@
 			<generator class="assigned" />
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
-		<property name="description" type="java.lang.String"
-			column="description" length="250" />
+		<property name="description" type="java.lang.String" length="250"
+			column="description" />
 
 	</class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Program.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Program.hbm.xml
index 4f8c696bc0ed..098edb174b28 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Program.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Program.hbm.xml
@@ -22,15 +22,16 @@
 				<param name="sequence">program_program_id_seq</param>
 			</generator>
 		</id>
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="name" type="java.lang.String"
 			column="name" not-null="true" length="100" />
 		
-		<property name="description" type="java.lang.String"
-			column="description" length="500" />
+		<property name="description" type="java.lang.String" length="1024"
+			column="description" />
 
 		<property name="dateCreated" type="java.util.Date"
 			column="date_created" not-null="true" length="19" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml
index f2973faa0b4b..7b33e516c8b6 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflow.hbm.xml
@@ -22,11 +22,12 @@
 				<param name="sequence">program_workflow_program_workflow_id_seq</param>
 			</generator>
 		</id>
-	
-		
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" />
 		
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml
index 00673310d075..f70d597472fb 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ProgramWorkflowState.hbm.xml
@@ -22,11 +22,12 @@
 				<param name="sequence">program_workflow_state_program_workflow_state_id_seq</param>
 			</generator>
 		</id>
-		
-		
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="initial" type="java.lang.Boolean" column="initial" length="1" not-null="true" />
 		
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Provider.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Provider.hbm.xml
index 8c2d3facfa28..3702df88bd7a 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Provider.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Provider.hbm.xml
@@ -55,9 +55,10 @@
 		<property name="retireReason" type="java.lang.String" column="retire_reason" length="255" />
 		
 		<property name="retired" type="boolean" length="1" not-null="true" />
-		
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
 
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
         <set name="attributes" lazy="true" inverse="true" batch-size="100"
             cascade="all-delete-orphan" sort="unsorted" order-by="voided asc">
             <key column="provider_id" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml
index 63b9fa49d401..36818f5e95f1 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/ProviderAttribute.hbm.xml
@@ -47,9 +47,10 @@
         <property name="dateVoided" type="java.util.Date" column="date_voided" length="19" />
                
         <property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
-        
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-        
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>        
     </class>
 
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml
index 1bd18ffd827c..7667ad53b3e9 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/RelationshipType.hbm.xml
@@ -23,10 +23,11 @@
 		</generator>
 	</id>
 
-    
 
-    <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
 
+	<property name="uuid" type="java.lang.String" unique="true">
+		<column name="uuid" sql-type="char(38)" />
+	</property>
     <property name="aIsToB" type="java.lang.String" not-null="true" length="50" access="field" column="a_is_to_b"/> <!-- Accessing field so we don't have to use getaIsToB() -->
     
     <property name="bIsToA" type="java.lang.String" not-null="true" length="50" access="field" column="b_is_to_a"/> <!-- Accessing field so we don't have to use getbIsToA() -->
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/Role.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/Role.hbm.xml
index 0db83faf8626..b4019eb67e82 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/Role.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/Role.hbm.xml
@@ -23,8 +23,9 @@
 			<generator class="assigned" />
 		</id>
 
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 
 		<property name="description" type="java.lang.String"
 			column="description" length="255" />
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml
index e063dbec9515..d740cb11292c 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/VisitAttribute.hbm.xml
@@ -47,9 +47,10 @@
         <property name="dateVoided" type="java.util.Date" column="date_voided" length="19" />
                
         <property name="voidReason" type="java.lang.String" column="void_reason" length="255" />
-        
-        <property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-        
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>        
     </class>
 
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/api/db/hibernate/VisitType.hbm.xml b/api/src/main/resources/org/openmrs/api/db/hibernate/VisitType.hbm.xml
index 5c7719e18ee8..15472511dedc 100644
--- a/api/src/main/resources/org/openmrs/api/db/hibernate/VisitType.hbm.xml
+++ b/api/src/main/resources/org/openmrs/api/db/hibernate/VisitType.hbm.xml
@@ -26,8 +26,9 @@
 		
 		<property name="name" type="java.lang.String" not-null="true" length="255" />
 		<property name="description" type="java.lang.String" length="1024" />
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-		
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>		
 		<property name="dateCreated" type="java.util.Date" column="date_created" not-null="true" length="19" />
 		<property name="dateChanged" type="java.util.Date" column="date_changed" length="19"/>
 		<property name="dateRetired" type="java.util.Date" column="date_retired" length="19" />	
diff --git a/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InArchive.hbm.xml b/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InArchive.hbm.xml
index 315ff172e9ff..bad18bb1187d 100644
--- a/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InArchive.hbm.xml
+++ b/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InArchive.hbm.xml
@@ -32,7 +32,7 @@
 		<property name="HL7SourceKey" type="java.lang.String" 
 			column="hl7_source_key" not-null="false" length="1024" />
 			
-		<property name="HL7Data" type="java.lang.String" 
+		<property name="HL7Data" type="text" 
 			column="hl7_data" not-null="true" length="16777215" />
 			
 		<property name="messageState" type="java.lang.Integer" 
@@ -40,8 +40,9 @@
 		
 		<property name="dateCreated" type="java.util.Date" 
 			column="date_created" not-null="true" length="19" />
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 	</class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InQueue.hbm.xml b/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InQueue.hbm.xml
index 27bd5a6c046f..e3edcce21315 100644
--- a/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InQueue.hbm.xml
+++ b/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7InQueue.hbm.xml
@@ -29,22 +29,23 @@
 			<column name="hl7_source" />
 		</many-to-one>
 		
-		<property name="HL7SourceKey" type="java.lang.String" 
-			column="hl7_source_key" not-null="false" length="1024" />
+		<property name="HL7SourceKey" type="text" 
+			column="hl7_source_key" not-null="false" />
 			
-		<property name="HL7Data" type="java.lang.String" 
-			column="hl7_data" not-null="true" length="16777215" />
+		<property name="HL7Data" type="text" 
+			column="hl7_data" not-null="true" />
 			
  		<property name="dateCreated" type="java.util.Date" 
 			column="date_created" not-null="true" length="19" />
 		
-		<property name="errorMessage" type="java.lang.String" 
-			column="error_msg" not-null="false" length="16777215" />
+		<property name="errorMessage" type="text" 
+			column="error_msg" not-null="false" />
 			
 		<property name="messageState" type="java.lang.Integer" 
 			column="message_state" not-null="false" length="4" />
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 	</class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7Source.hbm.xml b/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7Source.hbm.xml
index 01eca66e4e89..c32e5ecbc3d4 100644
--- a/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7Source.hbm.xml
+++ b/api/src/main/resources/org/openmrs/hl7/db/hibernate/HL7Source.hbm.xml
@@ -28,8 +28,8 @@
 		<property name="name" type="java.lang.String" 
 			column="name" not-null="true" length="255" />
 			
-		<property name="description" type="java.lang.String" 
-			column="description" not-null="true" length="2048" />
+		<property name="description" type="java.lang.String" length="1024" 
+			column="description" not-null="true" />
 			
 		<many-to-one name="creator" class="User" not-null="true">
 			<column name="creator" />
@@ -37,8 +37,9 @@
 
 		<property name="dateCreated" type="java.util.Date" 
 			column="date_created" not-null="true" length="19" />
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 	</class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.7.x.xml b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.7.x.xml
index 5911cc7ef823..55a0bff63de8 100644
--- a/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.7.x.xml
+++ b/api/src/main/resources/org/openmrs/liquibase/updates/liquibase-update-to-latest-2.7.x.xml
@@ -169,5 +169,117 @@
 			referencedTableName="obs"
 			referencedColumnNames="obs_id"/>
 	</changeSet>
-	
+
+	<changeSet id="TRUNK-6276-1730035003632-1" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="concept_name_tag" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="concept_name_tag" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-2" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="order_type" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="order_type" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-3" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="form" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="form" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-4" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="concept_reference_source" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="concept_reference_source" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-5" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="global_property" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="global_property" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-6" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="encounter_type" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="encounter_type" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-7" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="patient_identifier_type" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="patient_identifier_type" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-8" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="field" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="field" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-9" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="hl7_source" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="hl7_source" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-10" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="program" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="program" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-11" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="report_schema_xml" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="report_schema_xml" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-12" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="field_type" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="field_type" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-13" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="concept_description" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="concept_description" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-14" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="person_attribute_type" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="person_attribute_type" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-15" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="privilege" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="privilege" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
+	<changeSet id="TRUNK-6276-1730035003632-16" author="wikumChamith">
+		<preConditions>
+			<columnExists tableName="concept" columnName="description" />
+		</preConditions>
+		<modifyDataType tableName="concept" columnName="description" newDataType="varchar(1024)" />
+	</changeSet>
+
 </databaseChangeLog>
diff --git a/api/src/main/resources/org/openmrs/notification/db/hibernate/Alert.hbm.xml b/api/src/main/resources/org/openmrs/notification/db/hibernate/Alert.hbm.xml
index e0ec15b9875d..c95f007b0c7c 100644
--- a/api/src/main/resources/org/openmrs/notification/db/hibernate/Alert.hbm.xml
+++ b/api/src/main/resources/org/openmrs/notification/db/hibernate/Alert.hbm.xml
@@ -48,9 +48,10 @@
 			<key column="alert_id" />
 			<one-to-many class="AlertRecipient" />
 		</set>
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 		
 	</class>
 
diff --git a/api/src/main/resources/org/openmrs/notification/db/hibernate/Template.hbm.xml b/api/src/main/resources/org/openmrs/notification/db/hibernate/Template.hbm.xml
index 530d89aefa7c..2f81c9e9470c 100644
--- a/api/src/main/resources/org/openmrs/notification/db/hibernate/Template.hbm.xml
+++ b/api/src/main/resources/org/openmrs/notification/db/hibernate/Template.hbm.xml
@@ -23,12 +23,13 @@
 		<discriminator column="template_id" insert="false" />
 		
 		<property name="name" type="string" column="name" not-null="true"/>
-		<property name="template" type="string" column="template" not-null="true"/>
+		<property name="template" type="text" column="template" not-null="true"/>
 		<property name="subject" type="string" column="subject" not-null="true"/>
 		<property name="sender" type="string" column="sender" not-null="true"/>
 		<property name="recipients" type="string" column="recipients" not-null="true"/>
 		<property name="ordinal" type="int" column="ordinal" not-null="true"/>
-		<property name="uuid" type="java.lang.String" column="uuid" length="38" unique="true" />
-		
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>		
 	</class>
 </hibernate-mapping>
diff --git a/api/src/main/resources/org/openmrs/scheduler/db/hibernate/TaskDefinition.hbm.xml b/api/src/main/resources/org/openmrs/scheduler/db/hibernate/TaskDefinition.hbm.xml
index 9981bd1dde2e..886f92c4d1d1 100644
--- a/api/src/main/resources/org/openmrs/scheduler/db/hibernate/TaskDefinition.hbm.xml
+++ b/api/src/main/resources/org/openmrs/scheduler/db/hibernate/TaskDefinition.hbm.xml
@@ -24,9 +24,10 @@
 			</generator>
 		</id>
 		<discriminator column="task_config_id" insert="false" />
-		
-		<property name="uuid" type="java.lang.String"
-			column="uuid" length="38" unique="true" />
+
+		<property name="uuid" type="java.lang.String" unique="true">
+			<column name="uuid" sql-type="char(38)" />
+		</property>
 			
 		<!-- Properties -->
 		<property name="name" 
@@ -40,13 +41,12 @@
 				length="1024" />
 		
 		<property name="taskClass" 
-				type="java.lang.String" 
-				column="schedulable_class" 
-				length="1024" />
+				type="text" 
+				column="schedulable_class" />
 		
-		<property name="repeatInterval" 
-				type="java.lang.Long" 
-				column="repeat_interval" />
+		<property name="repeatInterval" type= "java.lang.Long">
+			<column name="repeat_interval" sql-type="integer" />
+		</property>
 		
 		<property name="startTime" 
 				type="java.util.Date" 
@@ -92,7 +92,7 @@
 				cascade="save-update,merge,evict">
 			<key column="task_config_id" not-null="true" />
 			<map-key column="name" type="java.lang.String" length="100" />
-			<element column="value" type="java.lang.String" length="1024" />
+			<element column="value" type="text" />
 		</map>
 
 
diff --git a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
index fb7616ac9cdc..8c42537592ce 100644
--- a/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
+++ b/api/src/test/java/org/openmrs/util/DatabaseUpdaterDatabaseIT.java
@@ -30,7 +30,7 @@ public class DatabaseUpdaterDatabaseIT extends DatabaseIT {
 	 * This constant needs to be updated when adding new Liquibase update files to openmrs-core.
 	 */
 	
-	private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 899;
+	private static final int CHANGE_SET_COUNT_FOR_GREATER_THAN_2_1_X = 915 ;
 
 	private static final int CHANGE_SET_COUNT_FOR_2_1_X = 870;