Skip to content

Commit 8b706fb

Browse files
gbadnergbadner
committed
HHH-7843 : Add support for one-to-one to new metamodel
1 parent 910ba3b commit 8b706fb

File tree

3 files changed

+3
-16
lines changed

3 files changed

+3
-16
lines changed

‎hibernate-core/src/main/java/org/hibernate/metamodel/internal/source/hbm/AbstractToOneAttributeSourceImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ else if ( "false".equals( getOuterJoinSelectionString() ) ) {
114114
else if ( "extra".equals( lazySelection ) ) {
115115
return FetchTiming.EXTRA_DELAYED;
116116
}
117-
else if ( "true".equals( lazySelection ) || "proxy".equals( lazySelection ) ) {
117+
else if ( "true".equals( lazySelection ) || "proxy".equals( lazySelection ) || "no-proxy".equals( lazySelection ) ) {
118118
return FetchTiming.DELAYED;
119119
}
120120
else if ( "false".equals( lazySelection ) ) {

‎hibernate-core/src/test/java/org/hibernate/test/lazyonetoone/LazyOneToOneTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
condition = LazyOneToOneTest.DomainClassesInstrumentedMatcher.class,
4949
message = "Test domain classes were not instrumented"
5050
)
51-
@FailureExpectedWithNewMetamodel
5251
public class LazyOneToOneTest extends BaseCoreFunctionalTestCase {
5352
@Override
5453
public String[] getMappings() {

‎hibernate-core/src/test/java/org/hibernate/test/readonly/ReadOnlySessionLazyNonLazyTest.java

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public String[] getMappings() {
7575

7676
@Test
7777
@SuppressWarnings( {"unchecked"})
78-
@FailureExpectedWithNewMetamodel
7978
public void testExistingModifiableAfterSetSessionReadOnly() {
8079
Container cOrig = createContainer();
8180
Set expectedInitializedObjects = new HashSet(
@@ -170,7 +169,6 @@ public void testExistingModifiableAfterSetSessionReadOnly() {
170169
s.close();
171170

172171
}
173-
@FailureExpectedWithNewMetamodel
174172
@Test
175173
@SuppressWarnings( {"unchecked"})
176174
public void testExistingReadOnlyAfterSetSessionModifiable() {
@@ -260,7 +258,6 @@ public void testExistingReadOnlyAfterSetSessionModifiable() {
260258
s.close();
261259

262260
}
263-
@FailureExpectedWithNewMetamodel
264261
@Test
265262
@SuppressWarnings( {"unchecked"})
266263
public void testExistingReadOnlyAfterSetSessionModifiableExisting() {
@@ -351,7 +348,6 @@ public void testExistingReadOnlyAfterSetSessionModifiableExisting() {
351348
s.close();
352349

353350
}
354-
@FailureExpectedWithNewMetamodel
355351
@SuppressWarnings( {"unchecked"})
356352
@Test
357353
public void testExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnly() {
@@ -445,7 +441,6 @@ public void testExistingReadOnlyAfterSetSessionModifiableExistingEntityReadOnly(
445441
s.close();
446442
}
447443

448-
@FailureExpectedWithNewMetamodel
449444
@SuppressWarnings( {"unchecked"})
450445
@Test
451446
public void testExistingReadOnlyAfterSetSessionModifiableProxyExisting() {
@@ -536,7 +531,6 @@ public void testExistingReadOnlyAfterSetSessionModifiableProxyExisting() {
536531
s.close();
537532

538533
}
539-
@FailureExpectedWithNewMetamodel
540534
@SuppressWarnings( {"unchecked"})
541535
@Test
542536
public void testExistingReadOnlyAfterSetSessionModifiableExistingProxyReadOnly() {
@@ -629,7 +623,6 @@ public void testExistingReadOnlyAfterSetSessionModifiableExistingProxyReadOnly()
629623
t.commit();
630624
s.close();
631625
}
632-
@FailureExpectedWithNewMetamodel
633626
@SuppressWarnings( {"unchecked"})
634627
@Test
635628
public void testDefaultModifiableWithReadOnlyQueryForEntity() {
@@ -716,7 +709,7 @@ public void testDefaultModifiableWithReadOnlyQueryForEntity() {
716709
t.commit();
717710
s.close();
718711
}
719-
@FailureExpectedWithNewMetamodel
712+
720713
@SuppressWarnings( {"unchecked"})
721714
@Test
722715
public void testDefaultReadOnlyWithModifiableQueryForEntity() {
@@ -791,7 +784,6 @@ public void testDefaultReadOnlyWithModifiableQueryForEntity() {
791784
t.commit();
792785
s.close();
793786
}
794-
@FailureExpectedWithNewMetamodel
795787
@SuppressWarnings( {"unchecked"})
796788
@Test
797789
public void testDefaultReadOnlyWithQueryForEntity() {
@@ -879,7 +871,6 @@ public void testDefaultReadOnlyWithQueryForEntity() {
879871
t.commit();
880872
s.close();
881873
}
882-
@FailureExpectedWithNewMetamodel
883874
@SuppressWarnings( {"unchecked"})
884875
@Test
885876
public void testDefaultModifiableWithQueryForEntity() {
@@ -1001,7 +992,7 @@ public void testDefaultModifiableWithReadOnlyQueryForCollectionEntities() {
1001992
t.commit();
1002993
s.close();
1003994
}
1004-
@FailureExpectedWithNewMetamodel
995+
1005996
@Test
1006997
@SuppressWarnings( {"unchecked"})
1007998
public void testDefaultReadOnlyWithModifiableFilterCollectionEntities() {
@@ -1093,7 +1084,6 @@ public void testDefaultReadOnlyWithModifiableFilterCollectionEntities() {
10931084
t.commit();
10941085
s.close();
10951086
}
1096-
@FailureExpectedWithNewMetamodel
10971087
@SuppressWarnings( {"unchecked"})
10981088
@Test
10991089
public void testDefaultModifiableWithReadOnlyFilterCollectionEntities() {
@@ -1171,7 +1161,6 @@ public void testDefaultModifiableWithReadOnlyFilterCollectionEntities() {
11711161
t.commit();
11721162
s.close();
11731163
}
1174-
@FailureExpectedWithNewMetamodel
11751164
@SuppressWarnings( {"unchecked"})
11761165
@Test
11771166
public void testDefaultReadOnlyWithFilterCollectionEntities() {
@@ -1260,7 +1249,6 @@ public void testDefaultReadOnlyWithFilterCollectionEntities() {
12601249
t.commit();
12611250
s.close();
12621251
}
1263-
@FailureExpectedWithNewMetamodel
12641252
@SuppressWarnings( {"unchecked"})
12651253
@Test
12661254
public void testDefaultModifiableWithFilterCollectionEntities() {

0 commit comments

Comments
 (0)