HHH-13763 : Update all load-by-key handling to use SQL AST

minor fix-ups
This commit is contained in:
Steve Ebersole 2019-12-03 13:27:37 -06:00
parent e112d9631e
commit d5125d8e31
1 changed files with 6 additions and 6 deletions

View File

@ -67,7 +67,7 @@ public class NaturalIdLoaderStandardImpl<T> implements NaturalIdLoader<T> {
final List<JdbcParameter> jdbcParameters = new ArrayList<>(); final List<JdbcParameter> jdbcParameters = new ArrayList<>();
final SelectStatement sqlSelect = LoaderSelectBuilder.createSelect( final SelectStatement sqlSelect = LoaderSelectBuilder.createSelect(
entityDescriptor, entityDescriptor,
Collections.singletonList( entityDescriptor.getIdentifierMapping() ), Collections.emptyList(),
naturalIdMapping, naturalIdMapping,
null, null,
1, 1,
@ -113,7 +113,8 @@ public class NaturalIdLoaderStandardImpl<T> implements NaturalIdLoader<T> {
); );
} }
final List<Object[]> results = session.getFactory().getJdbcServices().getJdbcSelectExecutor().list( //noinspection unchecked
final List<T> results = session.getFactory().getJdbcServices().getJdbcSelectExecutor().list(
jdbcSelect, jdbcSelect,
jdbcParamBindings, jdbcParamBindings,
new ExecutionContext() { new ExecutionContext() {
@ -138,7 +139,7 @@ public class NaturalIdLoaderStandardImpl<T> implements NaturalIdLoader<T> {
}; };
} }
}, },
row -> row row -> (T) row[0]
); );
if ( results.size() > 1 ) { if ( results.size() > 1 ) {
@ -150,8 +151,7 @@ public class NaturalIdLoaderStandardImpl<T> implements NaturalIdLoader<T> {
); );
} }
//noinspection unchecked return results.get( 0 );
return (T) results.get( 0 );
} }
@Override @Override
@ -255,7 +255,7 @@ public class NaturalIdLoaderStandardImpl<T> implements NaturalIdLoader<T> {
final List<JdbcParameter> jdbcParameters = new ArrayList<>(); final List<JdbcParameter> jdbcParameters = new ArrayList<>();
final SelectStatement sqlSelect = LoaderSelectBuilder.createSelect( final SelectStatement sqlSelect = LoaderSelectBuilder.createSelect(
entityDescriptor, entityDescriptor,
Collections.emptyList(), Collections.singletonList( entityDescriptor.getIdentifierMapping() ),
naturalIdMapping, naturalIdMapping,
null, null,
1, 1,