move changes since version 2.0.x from liquibase-update-to-latest.xml … #1804
Conversation
…to liquibase-update-2.1.xml
| try { | ||
| upgradeTestUtil.upgrade("liquibase-master.xml"); | ||
| } catch (Exception e) { | ||
| e.printStackTrace(); |
There was a problem hiding this comment.
Did you just forget to remove the above printStackTrace? :)
There was a problem hiding this comment.
Also do not catch the exception. It's better to fail with an exception and not Assert.fail()
|
You haven't modified any code, which is run in production... just tests, thus only liquibase-update-to-latest.xml is still used. In production if you have unrun changesets they are applied on server restart. I think you will need to modify some logic in https://github.com/openmrs/openmrs-core/blob/master/web/src/main/java/org/openmrs/web/filter/update/UpdateFilter.java to run liquibase-master.xml |
| referencedColumnNames="user_id"/> | ||
| </changeSet> | ||
|
|
||
| </databaseChangeLog> |
There was a problem hiding this comment.
To me it seems that all those changes happened in 2.0 and not 2.1. It's what the pull request title suggests (I may be wrong here so please reassure me). Since 2.0 has been released in beta already we cannot move those changesets out of liquibase-update-to-latest.xml. This file should really contain only changesets introduced in 2.1 (probably none at the moment).
There was a problem hiding this comment.
Actually let me answer myself. They happened in 1.12.x and have been released in 1.12.0. It means we cannot move them out of liquibase-update-to-latest.xml and this file should be empty initially.
There was a problem hiding this comment.
I had put changes prior to and including 2.1 into the file and changes after 2.1 into liquibase-update-to-latest.xml. Happy to reshuffle changes but I would need some help here what should go where. Can we have a quick chat some time so that I understand the constraints you mentioned better?
|
@WolfSchlegel thanks for working on this! 👍 |
(cherry picked from commit 0046642)
properties file by using it as specified instead of modifying it
to avoid having to restart the servlet container to see the login page
…ed by default - TRUNK-3422
ModuleFileParser is missing 1.5 and 1.6 as valid config versions.
HibernateOrderDAO has a whitespace in one of its exceptions message codes in getNextOrderNumberSeedSequenceValue * remove whitespace in message code string * remove unused code in getNextOrderNumberSeedSequenceValue
Add unit tests for ComplexObsHandler.getSupportedViews() and ComplexObsHandler.supportsView(), as discussed in review notes
* add Order.isActivated() * add Order.isActivated(Date) * fix issues introduced by switching isFuture with isStarted/!isStarted for orders scheduled in the future ** Order.isActive(Date) of stopped orders scheduled for the future were considered active ** Order.isDiscontinued(Date) of stopped orders scheduled for the future which were not considered discontinued * add OrderService tests to ensure we can revise orders scheduled in the future and that the original orders are considered discontinued * add OrderService tests to ensure we can discontinue orders scheduled in the future
(cherry picked from commit e2e4730)
|
@WolfSchlegel this branch has conflicts. Did you forget to pull the latest upstream changes? :) |
|
Closing in favour of #1841 |
Description
Related Issue
see https://issues.openmrs.org/browse/TRUNK-
Checklist:
git pull --rebase upstream master.mvn clean packageright before creating this pull request andadded all formatting changes to my commit.
…to liquibase-update-2.1.xml