Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Allow referencing result map from @One and @Many #1771

Merged
merged 6 commits into from Feb 5, 2020
Merged

Allow referencing result map from @One and @Many #1771

merged 6 commits into from Feb 5, 2020

Conversation

moonService
Copy link
Contributor

@many and @one add resultMapId

@moonService moonService changed the title Dev/add resultmap id to annotion many one Add resultmap id to annotion many one Dec 10, 2019
@harawata
Copy link
Member

Thank you for the, @moonService !
I have been thinking about this for a while.
Please give me some time to check the details.

harawata
harawata requested changes Dec 23, 2019
View reviewed changes
Copy link
Member

@harawata harawata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for the PR, @moonService !
I added a few change requests.
Let me know if you have any question.

src/main/java/org/apache/ibatis/annotations/Many.java Outdated Show resolved Hide resolved
src/main/java/org/apache/ibatis/annotations/One.java Outdated Show resolved Hide resolved
src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/CreateDB.sql Outdated Show resolved Hide resolved
src/main/java/org/apache/ibatis/builder/annotation/MapperAnnotationBuilder.java Show resolved Hide resolved
src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/UserDao.java Outdated Show resolved Hide resolved
@moonService
Copy link
Contributor Author

@harawata At your request,I modified some places,please check them If you have time.

harawata
harawata requested changes Dec 26, 2019
View reviewed changes
Copy link
Member

@harawata harawata left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just noticed that there are two files copyrighted by your organization. Please see the comments.

src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/UserDao.java Show resolved Hide resolved
src/test/java/org/apache/ibatis/submitted/annotion_many_one_add_resultmapid/RoleDao.java Show resolved Hide resolved
moonService and others added 2 commits December 27, 2019 10:28
@moonService
remove Copyright
6945700
@harawata
Polishing
dd8d87e 
- Applied formatter.
- Renamed tests to clarify intention.
- Removed redundant comments.
- Added license headers.
@harawata harawata force-pushed the dev/add_resultmapId_to_annotion_many_one branch from d519d24 to dd8d87e Compare December 27, 2019 17:23
@harawata harawata added this to the 3.5.5 milestone Dec 31, 2019
@harawata harawata self-assigned this Dec 31, 2019
@harawata harawata added the enhancement Improve a feature or add a new feature label Dec 31, 2019
@harawata
Copy link
Member

Thank you, @moonService for the update!

Just to be safe, let me merge this after the 3.5.4 release.

@moonService
Copy link
Contributor Author

@harawata ok

@harawata harawata changed the title Add resultmap id to annotion many one Allow referencing result map from @One and @Many Feb 5, 2020
@harawata harawata changed the title Allow referencing result map from @One and @Many Allow referencing result map from @One and @Many Feb 5, 2020
@harawata harawata merged commit c7c810a into mybatis:master Feb 5, 2020
@harawata
Copy link
Member

harawata commented Feb 5, 2020

It's merged. Thank you again, @moonService !

I plan to add columnPrefix once I find the time.
Please let me know if you are keen to work on it.

@moonService
Copy link
Contributor Author

@harawata I added this on #1829

@harawata
Copy link
Member

harawata commented Feb 6, 2020

Thank you, @moonService !
I'll review it as soon as I get the time.

kazuki43zoo added a commit that referenced this pull request Mar 21, 2020
@kazuki43zoo
Update documentation for gh-1771
3558137
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harawata harawata harawata approved these changes

Assignees

@harawata harawata

Labels
enhancement Improve a feature or add a new feature
Projects
None yet
Milestone
3.5.5
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@moonService @harawata