<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
<base href="https://hibernate.atlassian.net">
<title>Message Title</title>
</head>
<body class="jira" style="color: #333333; font-family: Arial, sans-serif; font-size: 14px; line-height: 1.429">
<table id="background-table" cellpadding="0" cellspacing="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; background-color: #f5f5f5; border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0" bgcolor="#f5f5f5">
<!-- header here -->
<tbody>
<tr>
<td id="header-pattern-container" style="padding: 0; border-collapse: collapse; padding: 10px 20px">
<table id="header-pattern" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td id="header-avatar-image-container" valign="top" style="padding: 0; border-collapse: collapse; vertical-align: top; width: 32px; padding-right: 8px" width="32"> <img id="header-avatar-image" class="image_fix" src="https://avatar-cdn.atlassian.com/deaa0a38371dd2756ccdc5888735b842?s=48&d=https%3A%2F%2Fsecure.gravatar.com%2Favatar%2Fdeaa0a38371dd2756ccdc5888735b842%3Fd%3Dmm%26s%3D48%26noRedirect%3Dtrue" height="32" width="32" border="0" style="border-radius: 3px; vertical-align: top"> </td>
<td id="header-text-container" valign="middle" style="padding: 0; border-collapse: collapse; vertical-align: middle; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px"> <a class="user-hover" rel="bostandyksoft" id="email_bostandyksoft" href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?name=bostandyksoft" style="color:#6c797f;; color: #3b73af; text-decoration: none">Алексей Макаров</a> <strong>updated</strong> an issue </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="email-content-container" style="padding: 0; border-collapse: collapse; padding: 0 20px">
<table id="email-content-table" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; border-spacing: 0; border-collapse: separate">
<tbody>
<tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<td class="email-content-rounded-top mobile-expand" style="padding: 0; border-collapse: collapse; color: #ffffff; padding: 0 15px 0 16px; height: 15px; background-color: #ffffff; border-left: 1px solid #cccccc; border-top: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom: 0; border-top-right-radius: 5px; border-top-left-radius: 5px; height: 10px; line-height: 10px; padding: 0 15px 0 16px; mso-line-height-rule: exactly" height="10" bgcolor="#ffffff"> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff" bgcolor="#ffffff">
<table class="page-title-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td class="page-title-pattern-first-line " style="padding: 0; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; padding-top: 10px"> <a href="https://hibernate.atlassian.net/browse/HHH?atlOrigin=eyJpIjoiNmY4NmE5N2U0MTYxNGZlMmFlNmM3ZGY5NWVkYzNiNjIiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none">Hibernate ORM</a> / <a href="https://hibernate.atlassian.net/browse/HHH-13063?atlOrigin=eyJpIjoiNmY4NmE5N2U0MTYxNGZlMmFlNmM3ZGY5NWVkYzNiNjIiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none"><img src="cid:jira-generated-image-avatar-1b985896-1658-4938-8227-4e4d5b570704" height="16" width="16" border="0" align="absmiddle" alt="Bug" style="vertical-align: text-bottom"></a> <a href="https://hibernate.atlassian.net/browse/HHH-13063?atlOrigin=eyJpIjoiNmY4NmE5N2U0MTYxNGZlMmFlNmM3ZGY5NWVkYzNiNjIiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none">HHH-13063</a> </td>
</tr>
<tr>
<td style="vertical-align: top;; padding: 0; border-collapse: collapse; padding-right: 5px; font-size: 20px; line-height: 30px; mso-line-height-rule: exactly" class="page-title-pattern-header-container"> <span class="page-title-pattern-header" style="font-family: Arial, sans-serif; padding: 0; font-size: 20px; line-height: 30px; mso-text-raise: 2px; mso-line-height-rule: exactly; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-13063?atlOrigin=eyJpIjoiNmY4NmE5N2U0MTYxNGZlMmFlNmM3ZGY5NWVkYzNiNjIiLCJwIjoiaiJ9" style="color: #3b73af; text-decoration: none">@MapsId does not work with "merge" operation</a> </span> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand wrapper-special-margin" style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff; padding-top: 10px; padding-bottom: 5px" bgcolor="#ffffff">
<table class="keyvalue-table" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<th style="color: #707070; font: normal 14px/20px Arial, sans-serif; text-align: left; vertical-align: top; padding: 2px 0">Change By:</th>
<td style="padding: 0; border-collapse: collapse; font: normal 14px/20px Arial, sans-serif; padding: 2px 0 2px 5px; vertical-align: top"> <a class="user-hover" rel="bostandyksoft" id="email_bostandyksoft" href="https://hibernate.atlassian.net/secure/ViewProfile.jspa?name=bostandyksoft" style="color:#6c797f;; color: #3b73af; text-decoration: none">Алексей Макаров</a> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand issue-description-container" style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff; padding-top: 5px; padding-bottom: 10px" bgcolor="#ffffff">
<table class="text-paragraph-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 2px">
<tbody>
<tr>
<td class="text-paragraph-pattern-container mobile-resize-text " style="padding: 0; border-collapse: collapse; padding: 0 0 10px"> <span class="diffcontext">I have an entity with child one-to-one entity, that could be skipped. I decided to use @MapsId and use same identifier for both entities. But when CrudRepository fires "save" operation, it calls hibernate's method "merge" and saving crushes.<br><br><br>{code:java}<br>public class MapsIdTestCase extends BaseCoreFunctionalTestCase {<br><br><br> @Override<br> protected Class[] getAnnotatedClasses() {<br> return new Class[]{<br> Foo.class,<br> Bar.class<br> };<br> }<br><br> // If you use *.hbm.xml mappings, instead of annotations, add the mappings here.<br> @Override<br> protected String[] getMappings() {<br> return new String[]{};<br> }<br><br> // If those mappings reside somewhere other than resources/org/hibernate/test, change this.<br> @Override<br> protected String getBaseForMappings() {<br> return "org/hibernate/test/";<br> }<br><br> // Add in any settings that are specific to your test. See resources/hibernate.properties for the defaults.<br> @Override<br> protected void configure(Configuration configuration) {<br> super.configure(configuration);<br><br> configuration.setProperty(AvailableSettings.SHOW_SQL, Boolean.TRUE.toString());<br> configuration.setProperty(AvailableSettings.FORMAT_SQL, Boolean.TRUE.toString());<br></span> <span class="diffremovedchars" style="background-color: #ffe7e7; text-decoration:line-through;"><br> configuration.setProperty("hibernate.temp.use_jdbc_metadata_defaults", Boolean.FALSE.toString());<br> configuration.setProperty("cache.provider_class", "org.hibernate.cache.internal.NoCachingRegionFactory");<br> configuration.setProperty(Environment.DIALECT, "org.hibernate.dialect.Oracle10gDialect");<br> configuration.setProperty(Environment.ORDER_UPDATES, Boolean.TRUE.toString());<br> configuration.setProperty(Environment.AUTOCOMMIT, Boolean.FALSE.toString());<br> configuration.setProperty(Environment.USE_STREAMS_FOR_BINARY, Boolean.TRUE.toString());<br> configuration.setProperty(Environment.USE_SCROLLABLE_RESULTSET, Boolean.TRUE.toString());<br> configuration.setProperty(Environment.USE_NEW_ID_GENERATOR_MAPPINGS, Boolean.TRUE.toString());<br><br><br> //configuration.setProperty( AvailableSettings.GENERATE_STATISTICS, "true" );<br></span> <span class="diffcontext"> }<br><br> // Add your tests, using standard JUnit.<br> @Test<br> public void mainTest() throws Exception {<br><br> final Long fooId = 500L;<br><br> doInHibernate(this::sessionFactory, session -> {<br><br> Foo foo = new Foo();<br> foo.setId(fooId);<br> foo.setName("Foo1");<br> session.save(foo);<br> });<br><br> doInHibernate(this::sessionFactory, session -> {<br><br> Foo foo = session.find(Foo.class, fooId);<br><br> Bar bar = foo.getBar();<br> if (bar == null) {<br> bar = new Bar(foo);<br> foo.setBar(bar);<br> }<br> bar.setName("Bar2");<br> session.merge(foo);<br> });<br><br> doInHibernate(this::sessionFactory, session -> {<br> Foo foo = session.find(Foo.class, fooId);<br> assertNotNull(foo.getBar());<br> });<br> }<br><br> @Entity<br> @Table(name = "TEST_FOO")<br> public static class Foo {<br><br> private Long id;<br> private String name;<br> private Bar bar;<br><br> @Id<br> @Column(name = "ID")<br> public Long getId() {<br> return id;<br> }<br><br> public void setId(Long id) {<br> this.id = id;<br> }<br><br> @Column(name = "name")<br> public String getName() {<br> return name;<br> }<br><br> public void setName(String name) {<br> this.name = name;<br> }<br><br> @OneToOne(cascade = CascadeType.ALL)<br> @JoinColumn(name = "foo_id")<br> public Bar getBar() {<br> return bar;<br> }<br><br> public void setBar(Bar bar) {<br> this.bar = bar;<br> }<br> }<br><br> @Entity<br> @Table(name = "TEST_BAR")<br> public static class Bar {<br><br> private Long id;<br> private Foo foo;<br> private String name;<br><br> public Bar() {<br> }<br><br> Bar(Foo foo) {<br> this.foo = foo;<br> }<br><br> @Id<br> @GeneratedValue(generator = "foreign")<br> @GenericGenerator(name = "foreign", strategy = "foreign", parameters = {<br> @org.hibernate.annotations.Parameter(name = "property", value = "foo")<br> })<br> @Column(name = "foo_id")<br> public Long getId() {<br> return id;<br> }<br><br> public void setId(Long id) {<br> this.id = id;<br> }<br><br> @OneToOne(mappedBy = "bar")<br> @MapsId("foo_id")<br> public Foo getFoo() {<br> return foo;<br> }<br><br> public void setFoo(Foo foo) {<br> this.foo = foo;<br> }<br><br> @Column(name = "name")<br> public String getName() {<br> return name;<br> }<br><br> public void setName(String name) {<br> this.name = name;<br> }<br> }<br>}<br>{code}<br></span> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td class="email-content-main mobile-expand " style="padding: 0; border-collapse: collapse; border-left: 1px solid #cccccc; border-right: 1px solid #cccccc; border-top: 0; border-bottom: 0; padding: 0 15px 0 16px; background-color: #ffffff" bgcolor="#ffffff"> <script type="application/ld+json">
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"description": "View Issue",
"potentialAction": {
"@type": "ViewAction",
"target": "https://hibernate.atlassian.net/browse/HHH-13063?inbox=true&",
"name": "View Issue"
},
"publisher": {
"@type": "Organization",
"name": "Atlassian",
"url": "https://www.atlassian.com"
}
}
</script>
<table id="actions-pattern" cellspacing="0" cellpadding="0" border="0" width="100%" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 1px">
<tbody>
<tr>
<td id="actions-pattern-container" valign="middle" style="padding: 0; border-collapse: collapse; padding: 10px 0 10px 24px; vertical-align: middle; padding-left: 0">
<table align="left" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td class="actions-pattern-action-icon-container" style="padding: 0; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 0; vertical-align: middle"> <a href="https://hibernate.atlassian.net/browse/HHH-13063#add-comment?atlOrigin=eyJpIjoiNmY4NmE5N2U0MTYxNGZlMmFlNmM3ZGY5NWVkYzNiNjIiLCJwIjoiaiJ9" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none"> <img class="actions-pattern-action-icon-image" src="cid:jira-generated-image-static-comment-icon-e57f7974-f8b5-4cf3-b714-f08484d19cd4" alt="Add Comment" title="Add Comment" height="16" width="16" border="0" style="vertical-align: middle"> </a> </td>
<td class="actions-pattern-action-text-container" style="padding: 0; border-collapse: collapse; font-family: Arial, sans-serif; font-size: 14px; line-height: 20px; mso-line-height-rule: exactly; mso-text-raise: 4px; padding-left: 5px"> <a href="https://hibernate.atlassian.net/browse/HHH-13063#add-comment?atlOrigin=eyJpIjoiNmY4NmE5N2U0MTYxNGZlMmFlNmM3ZGY5NWVkYzNiNjIiLCJwIjoiaiJ9" target="_blank" title="Add Comment" style="color: #3b73af; text-decoration: none">Add Comment</a> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table> </td>
</tr>
<!-- there needs to be content in the cell for it to render in some clients -->
<tr>
<td class="email-content-rounded-bottom mobile-expand" style="padding: 0; border-collapse: collapse; color: #ffffff; padding: 0 15px 0 16px; height: 5px; line-height: 5px; background-color: #ffffff; border-top: 0; border-left: 1px solid #cccccc; border-bottom: 1px solid #cccccc; border-right: 1px solid #cccccc; border-bottom-right-radius: 5px; border-bottom-left-radius: 5px; mso-line-height-rule: exactly" height="5" bgcolor="#ffffff"> </td>
</tr>
</tbody>
</table> </td>
</tr>
<tr>
<td id="footer-pattern" style="padding: 0; border-collapse: collapse; padding: 12px 20px">
<table id="footer-pattern-container" cellspacing="0" cellpadding="0" border="0" style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td id="footer-pattern-mobile-separated-links" class="mobile-resize-text" width="100%" colspan="2" style="padding: 0; border-collapse: collapse; color: #999999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px"> Get Jira notifications on your phone! Download the Jira Cloud app for <a href="https://play.google.com/store/apps/details?id=com.atlassian.android.jira.core&referrer=utm_source%3DNotificationLink%26utm_medium%3DEmail" style="color: #3b73af; text-decoration: none">Android</a> or <a href="https://itunes.apple.com/app/apple-store/id1006972087?pt=696495&ct=EmailNotificationLink&mt=8" style="color: #3b73af; text-decoration: none">iOS</a>
<hr> </td>
</tr>
<tr>
<td id="footer-pattern-text" class="mobile-resize-text" width="100%" style="padding: 0; border-collapse: collapse; color: #999999; font-size: 12px; line-height: 18px; font-family: Arial, sans-serif; mso-line-height-rule: exactly; mso-text-raise: 2px"> This message was sent by Atlassian Jira <span id="footer-build-information">(v1001.0.0-SNAPSHOT#100094-<span title="650e5e67a519c69a0f7515313a896b43b000fa11" data-commit-id="650e5e67a519c69a0f7515313a896b43b000fa11}">sha1:650e5e6</span>)</span> </td>
<td id="footer-pattern-logo-desktop-container" valign="top" style="padding: 0; border-collapse: collapse; padding-left: 20px; vertical-align: top">
<table style="border-collapse: collapse; mso-table-lspace: 0; mso-table-rspace: 0">
<tbody>
<tr>
<td id="footer-pattern-logo-desktop-padding" style="padding: 0; border-collapse: collapse; padding-top: 3px; opacity: 0.150"> <img id="footer-pattern-logo-desktop" src="cid:jira-generated-image-static-footer-desktop-logo-6dcde43e-2fb2-456e-a110-15de24fcae6d" alt="Atlassian logo" title="Atlassian logo" width="192" height="24" class="image_fix"> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table> </td>
</tr>
</tbody>
</table>
<img border="0" width="1" height="1" alt="" src="http://atlassian.et.e.sparkpost.com/q/ipt5OJK__Ksl_Cb0zkC52w~~/AAAAAQA~/RgRdsl7cPlcLYXRsYXNzaWFudXNCCgAAXCvRWwPJHHxSIGhpYmVybmF0ZS1pc3N1ZXNAbGlzdHMuamJvc3Mub3JnWAQAAAAE">
</body>
</html>