-
Notifications
You must be signed in to change notification settings - Fork 3.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
TRUNK-5671 Replace Provider hbm mapping file with annotations #3031
Conversation
@wluyima did you take a look at the travis build failure? |
@Table(name = "provider") | ||
@SecondaryTable(name = "provider_unused_fields") | ||
@AttributeOverrides({ @AttributeOverride(name = "name", column = @Column), | ||
@AttributeOverride(name = "description", column = @Column(table = "provider_unused_fields", name = "description", insertable = false, updatable = false)) }) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we wanna add a comment explaining why we introduced provider_unused_fields
?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What would be the effect of using the same unused_fields
table like we already have users_unused_fields
instead of creating a new one for each of these scenarios?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should be able to work
When i run these changes with the providermanagement module, i get this error: Caused by: org.hibernate.MappingException: No discriminator found for org.openmrs.module.providermanagement.Provider. Discriminator is needed when 'single-table-per-hierarchy' is used and a class has subclasses |
Did you see the merge conflicts? |
Fixed |
@wluyima i have just run these changes again on the reference application and i still get this error: Caused by: org.hibernate.MappingException: No discriminator found for org.openmrs.module.providermanagement.Provider. Discriminator is needed when 'single-table-per-hierarchy' is used and a class has subclasses |
TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations
Should be fine now |
When i run these changes with the reference application, on selecting a patient in order to go to their dashboard, i get this error: https://pastebin.com/t5RVEZV5 |
Well, if it too many joins, then it's bound to happen with or without this change |
Now that this change exposes it, what would you suggest as the way forward? |
…s#3031) TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations
TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations
…s#3031) TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations TRUNK-5671 Replace Provider hbm mapping file with annotations
…openmrs#3031)" This reverts commit 3a66cab.
…openmrs#3031)" This reverts commit 3a66cab.
…openmrs#3031)" This reverts commit 3a66cab.
Description of what I changed
Issue I worked on
see https://issues.openmrs.org/browse/TRUNK-5671
Checklist: I completed these to help reviewers :)
My pull request only contains ONE single commit
(the number above, next to the 'Commits' tab is 1).
No? -> read here on how to squash multiple commits into one
My IDE is configured to follow the code style of this project.
No? Unsure? -> configure your IDE, format the code and add the changes with
git add . && git commit --amend
I have added tests to cover my changes. (If you refactored
existing code that was well tested you do not have to add tests)
No? -> write tests and add them to this commit
git add . && git commit --amend
I ran
mvn clean package
right before creating this pull request andadded all formatting changes to my commit.
No? -> execute above command
All new and existing tests passed.
No? -> figure out why and add the fix to your commit. It is your responsibility to make sure your code works.
My pull request is based on the latest changes of the master branch.
No? Unsure? -> execute command
git pull --rebase upstream master