Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2082d923ff4d
Choose a base ref
...
head repository: openmrs/openmrs-core
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 12396aadccfd
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on May 31, 2013

  1. Applying auto format changes

    @wluyima
    wluyima committed May 31, 2013
    Copy the full SHA
    f70754a View commit details

  2. Foreign key constraint violation when altering privilege.privilege co… 

    …lumn - TRUNK-3993
    @wluyima
    wluyima committed May 31, 2013
    Copy the full SHA
    55cd035 View commit details

  3. Merge branch 'working'

    @wluyima
    wluyima committed May 31, 2013
    Copy the full SHA
    12396aa View commit details
2 changes: 1 addition & 1 deletion api/src/main/java/org/openmrs/api/db/hibernate/HibernatePatientDAO.java
View file
Original file line number Diff line number Diff line change
@@ -336,7 +336,7 @@ public List<PatientIdentifierType> getAllPatientIdentifierTypes(boolean includeR
@SuppressWarnings("unchecked")
public List<PatientIdentifierType> getPatientIdentifierTypes(String name, String format, Boolean required,
Boolean hasCheckDigit) throws DAOException {

Criteria criteria = sessionFactory.getCurrentSession().createCriteria(PatientIdentifierType.class);

if (name != null)
25 changes: 19 additions & 6 deletions api/src/main/resources/liquibase-update-to-latest.xml
View file
Original file line number Diff line number Diff line change
@@ -6953,31 +6953,44 @@
</changeSet>

<changeSet id="1-increase-privilege-col-size-privilege" author="dkayiwa">
<validCheckSum>3:b5f33650ea723f2304f40fd60fde36df</validCheckSum>
<preConditions onFail="MARK_RAN">
<columnExists tableName="privilege" columnName="privilege"/>
</preConditions>
<comment>
Increasing the size of the privilege column in the privilege table
</comment>
<dropForeignKeyConstraint constraintName="privilege_which_can_edit" baseTableName="person_attribute_type" />
<dropForeignKeyConstraint constraintName="privilege_definitons" baseTableName="role_privilege" />
<ext:modifyColumn tableName="privilege">
<column name="privilege" type="varchar(255)">
<constraints nullable="false" />
</column>
</ext:modifyColumn>
<addForeignKeyConstraint baseTableName="person_attribute_type" baseColumnNames="edit_privilege" constraintName="privilege_which_can_edit"
referencedTableName="privilege" referencedColumnNames="privilege"/>
<addForeignKeyConstraint constraintName="privilege_definitions"
baseTableName="role_privilege" baseColumnNames="privilege"
referencedTableName="privilege" referencedColumnNames="privilege"/>
</changeSet>

<changeSet id="2-increase-privilege-col-size-rol-privilege" author="dkayiwa">
<validCheckSum>3:96a937a1719f8e7a98ad682a5608f54b </validCheckSum>
<preConditions onFail="MARK_RAN">
<columnExists tableName="role_privilege" columnName="privilege"/>
</preConditions>
<comment>
Increasing the size of the privilege column in the role_privilege table
</comment>
<dropForeignKeyConstraint constraintName="privilege_definitions" baseTableName="role_privilege" />
<ext:modifyColumn tableName="role_privilege">
<column name="privilege" type="varchar(255)">
<constraints nullable="false" />
</column>
</ext:modifyColumn>
<addForeignKeyConstraint constraintName="privilege_definitions"
baseTableName="role_privilege" baseColumnNames="privilege"
referencedTableName="privilege" referencedColumnNames="privilege"/>
</changeSet>

<changeSet id="201205241728-1" author="mvorobey">
@@ -7374,8 +7387,8 @@
<addForeignKeyConstraint constraintName="test_order_specimen_source_fk"
baseTableName="test_order" baseColumnNames="specimen_source"
referencedTableName="concept" referencedColumnNames="concept_id" />
</changeSet>

</changeSet>

<changeSet id="20121016-1504" author="wyclif">
<validCheckSum>3:ca4bde46e2fe247d1d4d227a539ff465</validCheckSum><!-- TRUNK-3909 -->
<preConditions onFail="MARK_RAN">
@@ -7390,7 +7403,7 @@
baseTableName="test_order" baseColumnNames="order_id"
referencedTableName="orders" referencedColumnNames="order_id" />
</changeSet>


<changeSet id="20121020-TRUNK-3610" author="lluismf">
<comment>
Rename global property autoCloseVisits.visitType to visits.autoCloseVisitType
@@ -7402,7 +7415,7 @@
<update tableName="scheduler_task_config">
<column name="description" value="Stops all active visits that match the visit type(s) specified by the value of the global property 'visits.autoCloseVisitType'"/>
<where>name='Auto Close Visits Task'</where>
</update>
</update>
</changeSet>

<changeSet id="20121025-TRUNK-213" author="lluismf">
@@ -7413,14 +7426,14 @@
<ext:modifyColumn tableName="concept_word">
<column name="locale" type="varchar(50)"/>
</ext:modifyColumn>
</changeSet>
</changeSet>

<changeSet id="20121021-TRUNK-333" author="lluismf">
<preConditions onFail="MARK_RAN">
<tableExists tableName="concept_set_derived" />
</preConditions>
<comment>Removing concept set derived table</comment>
<dropTable tableName="concept_set_derived"/>
<dropTable tableName="concept_set_derived"/>
</changeSet>

<changeSet id="20121109-TRUNK-3474" author="patandre">
Loading