Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Move most of the sql package to orm.test, remove unnecessary JdbcValuesMappingProducer implementations and make it clear that ResultSetMapping is required for native queries. Fix quoting and some hbm issues

This commit is contained in:
Christian Beikov 2021-05-03 17:27:02 +02:00
parent fef3e53132
commit 27662f91a9
61 changed files with 204 additions and 489 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
hibernate-core/src/main/java/org/hibernate/boot/query/HbmResultSetMappingDescriptor.java
View File

@ -317,9 +317,12 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr
MetadataBuildingContext context) {
assert joinDescriptorsAccess != null;
this.entityName = hbmEntityReturn.getEntityName() != null
? hbmEntityReturn.getEntityName()
: hbmEntityReturn.getClazz();
if ( hbmEntityReturn.getEntityName() == null ) {
this.entityName = context.getMetadataCollector().getImports().get( hbmEntityReturn.getClazz() );
}
else {
this.entityName = hbmEntityReturn.getEntityName();
}
if ( entityName == null ) {
throw new MappingException(
"Entity <return/> mapping did not specify entity name"
@ -340,7 +343,9 @@ public class HbmResultSetMappingDescriptor implements NamedResultSetMappingDescr
registrationName
);
this.discriminatorColumnAlias = hbmEntityReturn.getClazz();
this.discriminatorColumnAlias = hbmEntityReturn.getReturnDiscriminator() == null
? null
: hbmEntityReturn.getReturnDiscriminator().getColumn();
this.lockMode = hbmEntityReturn.getLockMode();
this.joinDescriptorsAccess = joinDescriptorsAccess;
this.registrationName = registrationName;

3
hibernate-core/src/main/java/org/hibernate/engine/query/internal/NativeQueryInterpreterStandardImpl.java
View File

@ -8,7 +8,6 @@ package org.hibernate.engine.query.internal;
import org.hibernate.engine.query.spi.NativeQueryInterpreter;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.query.results.ResultSetMapping;
import org.hibernate.query.sql.internal.NativeSelectQueryPlanImpl;
import org.hibernate.query.sql.internal.ParameterParser;
import org.hibernate.query.sql.spi.NativeSelectQueryDefinition;
@ -37,7 +36,7 @@ public class NativeQueryInterpreterStandardImpl implements NativeQueryInterprete
queryDefinition.getSqlString(),
queryDefinition.getAffectedTableNames(),
queryDefinition.getQueryParameterList(),
(ResultSetMapping) queryDefinition.getJdbcValuesMappingProducer(),
queryDefinition.getResultSetMapping(),
queryDefinition.getRowTransformer(),
sessionFactory
);

3
hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeQueryInterpreter.java
View File

@ -9,7 +9,6 @@ package org.hibernate.engine.query.spi;
import org.hibernate.Incubating;
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.query.results.ResultSetMapping;
import org.hibernate.query.sql.internal.NativeSelectQueryPlanImpl;
import org.hibernate.query.sql.spi.NativeNonSelectQueryDefinition;
import org.hibernate.query.sql.spi.NativeNonSelectQueryPlan;
@ -46,7 +45,7 @@ public interface NativeQueryInterpreter extends Service {
queryDefinition.getSqlString(),
queryDefinition.getAffectedTableNames(),
queryDefinition.getQueryParameterList(),
(ResultSetMapping) queryDefinition.getJdbcValuesMappingProducer(),
queryDefinition.getResultSetMapping(),
queryDefinition.getRowTransformer(),
sessionFactory
);

7
hibernate-core/src/main/java/org/hibernate/query/sql/internal/NativeQueryImpl.java
View File

@ -64,6 +64,7 @@ import org.hibernate.query.internal.ResultSetMappingResolutionContext;
import org.hibernate.query.named.NamedResultSetMappingMemento;
import org.hibernate.query.results.Builders;
import org.hibernate.query.results.ResultBuilder;
import org.hibernate.query.results.ResultSetMapping;
import org.hibernate.query.results.ResultSetMappingImpl;
import org.hibernate.query.results.dynamic.DynamicFetchBuilderLegacy;
import org.hibernate.query.results.dynamic.DynamicResultBuilderEntityStandard;
@ -480,7 +481,7 @@ public class NativeQueryImpl<R>
}
}
private NativeSelectQueryPlan<R> createQueryPlan(JdbcValuesMappingProducer jdbcValuesMappingProducer) {
private NativeSelectQueryPlan<R> createQueryPlan(ResultSetMapping resultSetMapping) {
final RowTransformer<?> rowTransformer = null;
final NativeSelectQueryDefinition queryDefinition = new NativeSelectQueryDefinition() {
@ -500,8 +501,8 @@ public class NativeQueryImpl<R>
}
@Override
public JdbcValuesMappingProducer getJdbcValuesMappingProducer() {
return jdbcValuesMappingProducer;
public ResultSetMapping getResultSetMapping() {
return resultSetMapping;
}
@Override

3
hibernate-core/src/main/java/org/hibernate/query/sql/spi/NativeSelectQueryDefinition.java
View File

@ -9,6 +9,7 @@ package org.hibernate.query.sql.spi;
import java.util.List;
import java.util.Set;
import org.hibernate.query.results.ResultSetMapping;
import org.hibernate.query.spi.QueryParameterImplementor;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
import org.hibernate.sql.results.spi.RowTransformer;
@ -27,7 +28,7 @@ public interface NativeSelectQueryDefinition<R> {
*/
List<QueryParameterImplementor<?>> getQueryParameterList();
JdbcValuesMappingProducer getJdbcValuesMappingProducer();
ResultSetMapping getResultSetMapping();
Set<String> getAffectedTableNames();

9
hibernate-core/src/main/java/org/hibernate/query/sqm/sql/internal/EntityValuedPathInterpretation.java
View File

@ -12,6 +12,7 @@ import java.util.List;
import org.hibernate.LockMode;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.metamodel.mapping.BasicEntityIdentifierMapping;
import org.hibernate.metamodel.mapping.CollectionPart;
import org.hibernate.metamodel.mapping.EntityAssociationMapping;
import org.hibernate.metamodel.mapping.EntityIdentifierMapping;
import org.hibernate.metamodel.mapping.EntityMappingType;
@ -188,7 +189,13 @@ public class EntityValuedPathInterpretation<T> extends AbstractSqmPathInterpreta
final TableGroup tableGroup = fromClauseAccess.resolveTableGroup(
navigablePath,
np -> {
final TableGroup parentTableGroup = getTableGroup();
final TableGroup parentTableGroup;
if ( getExpressionType() instanceof CollectionPart ) {
parentTableGroup = fromClauseAccess.findTableGroup( np.getParent().getParent() );
}
else {
parentTableGroup = getTableGroup();
}
final TableGroupJoin tableGroupJoin = associationMapping.createTableGroupJoin(
navigablePath,

5
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
View File

@ -10,6 +10,7 @@ import java.sql.ResultSetMetaData;
import java.sql.SQLException;
import org.hibernate.engine.spi.SharedSessionContractImplementor;
import org.hibernate.internal.util.StringHelper;
/**
* @author Steve Ebersole
@ -59,7 +60,9 @@ public abstract class AbstractResultSetAccess implements ResultSetAccess {
@Override
public int resolveColumnPosition(String columnName) {
try {
return getResultSet().findColumn( columnName );
return getResultSet().findColumn(
StringHelper.unquote( columnName, persistenceContext.getJdbcServices().getDialect() )
);
}
catch (SQLException e) {
throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(

52
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerDefined.java
View File

@ -1,52 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.sql.results.jdbc.internal;
import java.util.List;
import java.util.Set;
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.sql.ast.spi.SqlSelection;
import org.hibernate.sql.results.graph.DomainResult;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
/**
* ResultSetMapping for handling selections for a {@link org.hibernate.query.NativeQuery}
* which (partially) defines its result mappings. At the very least we will need
* to resolve the `columnAlias` to its ResultSet index. For scalar results
* ({@link javax.persistence.ColumnResult}) we may additionally need to resolve
* its "type" for reading.
*
* Specifically needs to
* @author Steve Ebersole
*/
public class JdbcValuesMappingProducerDefined implements JdbcValuesMappingProducer {
private final Set<SqlSelection> selections;
private final List<DomainResult> domainResults;
public JdbcValuesMappingProducerDefined(Set<SqlSelection> selections, List<DomainResult> domainResults) {
this.selections = selections;
this.domainResults = domainResults;
}
@Override
public JdbcValuesMapping resolve(
JdbcValuesMetadata jdbcResultsMetadata,
SessionFactoryImplementor sessionFactory) {
throw new NotYetImplementedFor6Exception( getClass() );
// for ( SqlSelection sqlSelection : selections ) {
// sqlSelection.prepare( jdbcResultsMetadata, sessionFactory );
// }
//
// return new StandardResultSetMapping( selections, domainResults );
}
}

178
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerLegacy.java
View File

@ -1,178 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.sql.results.jdbc.internal;
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
import org.hibernate.type.spi.TypeConfiguration;
/**
* ResultSetMappingDescriptor implementation implementing support
* for Hibernate's native legacy support for defining the mapping
* dynamically via {@link org.hibernate.query.NativeQuery#addScalar},
* {@link org.hibernate.query.NativeQuery#addRoot},
* {@link org.hibernate.query.NativeQuery#addEntity},
* ect
*
* @author Steve Ebersole
*/
public class JdbcValuesMappingProducerLegacy implements JdbcValuesMappingProducer {
private final TypeConfiguration typeConfiguration;
// private TableReference scalarTableReference;
//
// private List<ResultRootNode> roots;
// private List<ResultFetchNode> fetches;
// private Map<String,FetchParentNode> fetchParentsByAlias;
public JdbcValuesMappingProducerLegacy(TypeConfiguration typeConfiguration) {
this.typeConfiguration = typeConfiguration;
}
// public RootNodeScalar makeScalarRoot(String alias, JavaTypeDescriptor javaTypeDescriptor) {
// throw new NotYetImplementedFor6Exception( getClass() );
// }
//
// public RootNodeDynamicInstantiation makeDynamicInstantiationRoot(String instantiationTarget) {
// throw new NotYetImplementedFor6Exception( getClass() );
// }
//
// public RootNodeEntity makeEntityRoot(String entityName, String alias) {
// throw new NotYetImplementedFor6Exception( getClass() );
// }
//
// public RootNodeCollection makeCollectionRoot(String collectionRole, String alias) {
// throw new NotYetImplementedFor6Exception( getClass() );
// }
//
// public ResultFetchNode makeFetch(String parentAlias, String relativePath, String fetchAlias) {
// throw new NotYetImplementedFor6Exception( getClass() );
// }
// ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// ResultSetMappingDescriptor
@Override
public JdbcValuesMapping resolve(
JdbcValuesMetadata jdbcResultsMetadata,
SessionFactoryImplementor sessionFactory) {
// if ( roots == null || roots.isEmpty() ) {
//
// }
throw new NotYetImplementedFor6Exception( getClass() );
// final int columnCount = jdbcResultsMetadata.getColumnCount();
// final List<SqlSelection> sqlSelections = CollectionHelper.arrayList( columnCount );
//
// for ( int i = 0; i < jdbcResultsMetadata.getColumnCount(); i++ ) {
//
// }
//
// if ( roots == null || roots.isEmpty() ) {
//
// }
// final List<QueryResult> queryResults;
// for ( ResultRootNode root : roots ) {
//
// }
}
// /**
// * Simple unification interface for all returns from the various `#addXYZ` methods .
// * Allows control over the "shape" of that particular part of the fetch graph.
// *
// * Some GraphNodes can be query results, while others simply describe a part
// * of one of the results, while still others define fetches.
// */
// public interface ResultNode extends ColumnReferenceQualifier {
// JavaTypeDescriptor<?> getJavaTypeDescriptor();
// }
//
// /**
// * Allows access to further control how properties within a root or join
// * fetch are mapped back from the result set. Generally used in composite
// * value scenarios.
// */
// public interface ReturnProperty extends ResultNode {
// /**
// * Add a column alias to this property mapping.
// *
// * @param columnAlias The column alias.
// */
// void addColumnAlias(String columnAlias);
// }
//
//
// // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// // Specializations
//
// public interface ScalarNode extends ResultNode {
// }
//
// public interface FetchParentNode extends ResultNode {
// String getAlias();
// }
//
//
// // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// // ResultRoot
//
// /**
// * ResultNode which can be a query result
// */
// public interface ResultRootNode extends ResultNode {
// DomainResult makeQueryResult();
// }
//
// public interface RootNodeScalar extends ResultRootNode, ScalarNode {
// @Override
// ScalarResult makeQueryResult();
// }
//
// public interface RootNodeDynamicInstantiation extends ResultRootNode {
// @Override
// DynamicInstantiationResult makeQueryResult();
// }
//
// public interface RootNodeEntity extends ResultRootNode, FetchParentNode, NativeQuery.RootReturn {
// EntityTypeDescriptor<?> getEntityDescriptor();
//
// @Override
// default EntityJavaDescriptor<?> getJavaTypeDescriptor() {
// return getEntityDescriptor().getJavaTypeDescriptor();
// }
//
// @Override
// EntityResult makeQueryResult();
// }
//
// public interface RootNodeCollection extends ResultRootNode, FetchParentNode {
// PersistentCollectionDescriptor getCollectionDescriptor();
//
// @Override
// default JavaTypeDescriptor<?> getJavaTypeDescriptor() {
// return getCollectionDescriptor().getJavaTypeDescriptor();
// }
//
// @Override
// CollectionResult makeQueryResult();
// }
//
//
// // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
// // FetchResult
//
// public interface ResultFetchNode extends ResultNode, FetchParentNode, NativeQuery.FetchReturn {
// Fetch makeFetch(FetchParent parent);
// }
}

108
hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesMappingProducerUndefined.java
View File

@ -1,108 +0,0 @@
/*
* Hibernate, Relational Persistence for Idiomatic Java
*
* License: GNU Lesser General Public License (LGPL), version 2.1 or later
* See the lgpl.txt file in the root directory or http://www.gnu.org/licenses/lgpl-2.1.html
*/
package org.hibernate.sql.results.jdbc.internal;
import org.hibernate.NotYetImplementedFor6Exception;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMapping;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMappingProducer;
import org.hibernate.sql.results.jdbc.spi.JdbcValuesMetadata;
import org.jboss.logging.Logger;
/**
* ResultSetMappingDescriptor implementation for cases where we have
* no mapping info - everything will be discovered
*
* @author Steve Ebersole
*/
public class JdbcValuesMappingProducerUndefined implements JdbcValuesMappingProducer {
private static final Logger log = Logger.getLogger( JdbcValuesMappingProducerUndefined.class );
@SuppressWarnings("WeakerAccess")
public static JdbcValuesMapping resolveStatic(
JdbcValuesMetadata jdbcResultsMetadata,
SessionFactoryImplementor sessionFactory) {
throw new NotYetImplementedFor6Exception( JdbcValuesMappingProducerUndefined.class );
// final int columnCount = jdbcResultsMetadata.getColumnCount();
//
// final HashSet<SqlSelection> sqlSelections = new HashSet<>( columnCount );
// final List<DomainResult> domainResults = CollectionHelper.arrayList( columnCount );
//
// final TypeConfiguration typeConfiguration = sessionFactory.getMetamodel().getTypeConfiguration();
//
// for ( int columnPosition = 0; columnPosition < columnCount; columnPosition++ ) {
// final String columnName = jdbcResultsMetadata.resolveColumnName( columnPosition );
// log.tracef( "Discovering JDBC result column metadata [%s (%s)]", columnName, columnPosition );
//
// final SqlTypeDescriptor sqlTypeDescriptor = jdbcResultsMetadata.resolveSqlTypeDescriptor( columnPosition );
// final JavaTypeDescriptor javaTypeDescriptor = sqlTypeDescriptor.getJdbcRecommendedJavaTypeMapping( typeConfiguration );
//
// log.debugf( "Discovered JDBC result column metadata [%s (%s)] : %s, %s ", columnName, columnPosition, sqlTypeDescriptor, javaTypeDescriptor );
//
// final SqlSelection sqlSelection = new SqlSelectionImpl(
// columnPosition,
// columnName,
// javaTypeDescriptor,
// sqlTypeDescriptor,
// typeConfiguration
// );
// sqlSelections.add( sqlSelection );
//
// domainResults.add(
// new ResolvedScalarDomainResult(
// sqlSelection,
// columnName,
// javaTypeDescriptor
// )
// );
// }
//
// return new StandardResultSetMapping( sqlSelections, domainResults );
}
@Override
public JdbcValuesMapping resolve(
JdbcValuesMetadata jdbcResultsMetadata,
SessionFactoryImplementor sessionFactory) {
return resolveStatic( jdbcResultsMetadata, sessionFactory );
}
// private static class SqlSelectionImpl implements SqlSelection {
// private final int valuesArrayPosition;
// private JdbcValueExtractor jdbcValueExtractor;
//
// @SuppressWarnings("unchecked")
// public SqlSelectionImpl(
// int columnPosition,
// String columnName,
// JavaTypeDescriptor javaTypeDescriptor,
// SqlTypeDescriptor sqlTypeDescriptor,
// TypeConfiguration typeConfiguration) {
// log.tracef( "Creating SqlSelection for auto-discovered column : %s (%s)", columnName, columnPosition );
// this.valuesArrayPosition = columnPosition - 1;
//
// this.jdbcValueExtractor = sqlTypeDescriptor.getSqlExpressableType( javaTypeDescriptor, typeConfiguration )
// .getJdbcValueExtractor();
// }
//
// @Override
// public JdbcValueExtractor getJdbcValueExtractor() {
// return jdbcValueExtractor;
// }
//
// @Override
// public int getValuesArrayPosition() {
// return valuesArrayPosition;
// }
//
// @Override
// public void accept(SqlAstWalker interpreter) {
// throw new UnsupportedOperationException();
// }
// }
}

2
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/AutoDiscoveryTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/AutoDiscoveryTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.autodiscovery;
package org.hibernate.orm.test.sql.autodiscovery;
import javax.persistence.PersistenceException;
import java.sql.Connection;

2
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Group.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Group.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.autodiscovery;
package org.hibernate.orm.test.sql.autodiscovery;
import java.util.Set;
import javax.persistence.Entity;

2
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/Membership.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/Membership.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.autodiscovery;
package org.hibernate.orm.test.sql.autodiscovery;
import java.util.Date;
import javax.persistence.Entity;

2
hibernate-core/src/test/java/org/hibernate/test/sql/autodiscovery/User.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/autodiscovery/User.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.autodiscovery;
package org.hibernate.orm.test.sql.autodiscovery;
import java.util.Set;
import javax.persistence.Entity;

2
hibernate-core/src/test/java/org/hibernate/test/sql/check/ExceptionCheckingEntity.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ExceptionCheckingEntity.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.check;
package org.hibernate.orm.test.sql.check;
/**

13
hibernate-core/src/test/java/org/hibernate/test/sql/check/OracleCheckStyleTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/OracleCheckStyleTest.java
View File

@ -4,16 +4,23 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.check;
package org.hibernate.orm.test.sql.check;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.testing.RequiresDialect;
/**
* @author Steve Ebersole
*/
@RequiresDialect( value = Oracle9iDialect.class )
@RequiresDialect( value = OracleDialect.class )
public class OracleCheckStyleTest extends ResultCheckStyleTest {
@Override
protected String getBaseForMappings() {
return "org/hibernate/orm/test/";
}
@Override
public String[] getMappings() {
return new String[] { "sql/check/oracle-mappings.hbm.xml" };
}

2
hibernate-core/src/test/java/org/hibernate/test/sql/check/ParamCheckingEntity.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ParamCheckingEntity.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.check;
package org.hibernate.orm.test.sql.check;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/check/ResultCheckStyleTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/ResultCheckStyleTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.check;
package org.hibernate.orm.test.sql.check;
import org.hibernate.Session;

2
hibernate-core/src/test/java/org/hibernate/test/sql/check/oracle-mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/check/oracle-mappings.hbm.xml
View File

@ -7,7 +7,7 @@
-->
<!DOCTYPE hibernate-mapping PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" "http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping package="org.hibernate.test.sql.check">
<hibernate-mapping package="org.hibernate.orm.test.sql.check">
<class name="ExceptionCheckingEntity" table="ENTITY_E">
<id name="id" unsaved-value="0" column="ID">

21
hibernate-core/src/test/java/org/hibernate/test/sql/function/JpaFunctionTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/function/JpaFunctionTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.function;
package org.hibernate.orm.test.sql.function;
import java.sql.Timestamp;
import java.util.Date;
@ -13,7 +13,7 @@ import javax.persistence.Id;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.jpa.test.BaseEntityManagerFunctionalTestCase;
import org.hibernate.query.SemanticException;
import org.hibernate.query.sqm.ParsingException;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.TestForIssue;
@ -26,7 +26,7 @@ import static org.junit.Assert.fail;
/**
* @author Vlad Mihalcea
*/
@TestForIssue( jiraKey = "HHH-11620")
@TestForIssue( jiraKey = "HHH-11233")
@RequiresDialect(H2Dialect.class)
public class JpaFunctionTest extends BaseEntityManagerFunctionalTestCase {
@ -76,23 +76,10 @@ public class JpaFunctionTest extends BaseEntityManagerFunctionalTestCase {
} );
}
catch ( Exception e ) {
assertEquals( SemanticException.class, e.getCause().getClass() );
assertEquals( ParsingException.class, e.getCause().getClass() );
}
}
@Test
public void testWithComma() {
doInJPA( this::entityManagerFactory, entityManager -> {
Date now = entityManager.createQuery(
"select FUNCTION('now',) " +
"from Event " +
"where id = :id", Date.class)
.setParameter( "id", 1L )
.getSingleResult();
log.infof( "Current time: {}", now );
} );
}
@Entity(name = "Event")
public static class Event {

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Dimension.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Dimension.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Employment.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Employment.java Executable file → Normal file
View File

@ -6,7 +6,7 @@
*/
//$Id: Employment.java 11486 2007-05-08 21:57:24Z steve.ebersole@jboss.com $
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.util.Date;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Group.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Group.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.util.ArrayList;
import java.util.List;

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/ImageHolder.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/ImageHolder.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/MonetaryAmount.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmount.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.io.Serializable;
import java.math.BigDecimal;
import java.util.Currency;

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/MonetaryAmountUserType.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/MonetaryAmountUserType.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.io.Serializable;
import java.math.BigDecimal;

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Order.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Order.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.io.Serializable;
public class Order {

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Organization.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Organization.java Executable file → Normal file
View File

@ -6,7 +6,7 @@
*/
//$Id: Organization.java 11486 2007-05-08 21:57:24Z steve.ebersole@jboss.com $
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.util.Collection;
import java.util.HashSet;

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Person.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Person.java Executable file → Normal file
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Product.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Product.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
import java.io.Serializable;
import java.util.HashSet;
import java.util.Set;

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/SpaceShip.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/SpaceShip.java
View File

@ -6,7 +6,7 @@
*/
//$Id: $
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/Speech.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/Speech.java
View File

@ -6,7 +6,7 @@
*/
//$Id: $
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/TextHolder.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/TextHolder.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand;
package org.hibernate.orm.test.sql.hand;
/**

13
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/CustomSQLTestSupport.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomSQLTestSupport.java
View File

@ -4,9 +4,8 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom;
package org.hibernate.orm.test.sql.hand.custom;
import java.io.Serializable;
import java.util.Arrays;
import java.util.Date;
import java.util.Iterator;
@ -16,11 +15,11 @@ import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.test.sql.hand.Employment;
import org.hibernate.test.sql.hand.ImageHolder;
import org.hibernate.test.sql.hand.Organization;
import org.hibernate.test.sql.hand.Person;
import org.hibernate.test.sql.hand.TextHolder;
import org.hibernate.orm.test.sql.hand.Employment;
import org.hibernate.orm.test.sql.hand.ImageHolder;
import org.hibernate.orm.test.sql.hand.Organization;
import org.hibernate.orm.test.sql.hand.Person;
import org.hibernate.orm.test.sql.hand.TextHolder;
import org.junit.Test;
import static org.junit.Assert.assertEquals;

16
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/CustomStoredProcTestSupport.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/CustomStoredProcTestSupport.java
View File

@ -4,10 +4,8 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom;
package org.hibernate.orm.test.sql.hand.custom;
import java.sql.CallableStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.List;
@ -18,9 +16,9 @@ import org.hibernate.query.Query;
import org.hibernate.Session;
import org.hibernate.Transaction;
import org.hibernate.engine.query.ParameterRecognitionException;
import org.hibernate.test.sql.hand.Employment;
import org.hibernate.test.sql.hand.Organization;
import org.hibernate.test.sql.hand.Person;
import org.hibernate.orm.test.sql.hand.Employment;
import org.hibernate.orm.test.sql.hand.Organization;
import org.hibernate.orm.test.sql.hand.Person;
import static org.junit.Assert.assertEquals;
@ -34,6 +32,12 @@ import static org.junit.Assert.fail;
*/
@SuppressWarnings( {"UnusedDeclaration"})
public abstract class CustomStoredProcTestSupport extends CustomSQLTestSupport {
@Override
protected String getBaseForMappings() {
return "org/hibernate/orm/test/";
}
@Test
public void testScalarStoredProcedure() throws HibernateException, SQLException {
Session s = openSession();

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/datadirect/oracle/StoredProcedures.hbm.xml
View File

@ -12,7 +12,7 @@
<!--
This version is for DataDirect drivers jdbc standard handling of stored procedures/functions.
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<sql-query name="simpleScalar" callable="true">
<return-scalar column="name" type="string"/>

10
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/DB2CustomSQLTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/db2/DB2CustomSQLTest.java
View File

@ -4,14 +4,13 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.db2;
package org.hibernate.orm.test.sql.hand.custom.db2;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.orm.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.SkipForDialect;
import org.junit.Ignore;
/**
* Custom SQL tests for DB2
@ -19,7 +18,8 @@ import org.hibernate.testing.SkipForDialect;
* @author Max Rydahl Andersen
*/
@RequiresDialect( DB2Dialect.class )
@SkipForDialect( DerbyDialect.class )
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class DB2CustomSQLTest extends CustomStoredProcTestSupport {
public String[] getMappings() {
return new String[] { "sql/hand/custom/db2/Mappings.hbm.xml" };

4
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/db2/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/db2/Mappings.hbm.xml
View File

@ -14,7 +14,7 @@
NOTE : this version is for DB2 & variants
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization" table="ORGANIZATION">
<id name="id" unsaved-value="0" column="ORGID">
@ -56,7 +56,7 @@
<property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/>
<property name="endDate" column="ENDDATE" insert="false"/>
<property name="regionCode" column="REGIONCODE" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="`VALUE`" sql-type="float"/>
<column name="CURRENCY"/>
</property>

7
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/derby/DerbyCustomSQLTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/derby/DerbyCustomSQLTest.java
View File

@ -4,17 +4,20 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.derby;
package org.hibernate.orm.test.sql.hand.custom.derby;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.orm.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.junit.Ignore;
/**
* @author Andrea Boriero
*/
@RequiresDialect(DerbyDialect.class)
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class DerbyCustomSQLTest extends CustomStoredProcTestSupport {
public String[] getMappings() {
return new String[] {"sql/hand/custom/derby/Mappings.hbm.xml"};

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/derby/DerbyStoreProcedures.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/derby/DerbyStoreProcedures.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.derby;
package org.hibernate.orm.test.sql.hand.custom.derby;
import java.sql.Connection;
import java.sql.DriverManager;

46
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/derby/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/derby/Mappings.hbm.xml
View File

@ -14,7 +14,7 @@
NOTE : this version is for DB2 & variants
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization" table="ORGANIZATION">
<id name="id" unsaved-value="0" column="ORGID">
@ -56,7 +56,7 @@
<property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/>
<property name="endDate" column="ENDDATE" insert="false"/>
<property name="regionCode" column="REGIONCODE" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="`VALUE`" sql-type="float"/>
<column name="CURRENCY"/>
</property>
@ -232,13 +232,13 @@
<database-object>
<create>
CREATE PROCEDURE selectAllEmployments ()
PARAMETER STYLE JAVA
LANGUAGE JAVA
READS SQL DATA
DYNAMIC RESULT SETS 2
EXTERNAL NAME 'org.hibernate.test.sql.hand.custom.derby.DerbyStoreProcedures.selectAllEmployments'
</create>
CREATE PROCEDURE selectAllEmployments ()
PARAMETER STYLE JAVA
LANGUAGE JAVA
READS SQL DATA
DYNAMIC RESULT SETS 2
EXTERNAL NAME 'org.hibernate.orm.test.sql.hand.custom.derby.DerbyStoreProcedures.selectAllEmployments'
</create>
<drop>
DROP PROCEDURE selectAllEmployments
</drop>
@ -247,13 +247,13 @@
<database-object>
<create>
CREATE PROCEDURE paramHandling (j SMALLINT, i SMALLINT)
PARAMETER STYLE JAVA
LANGUAGE JAVA
READS SQL DATA
DYNAMIC RESULT SETS 2
EXTERNAL NAME 'org.hibernate.test.sql.hand.custom.derby.DerbyStoreProcedures.paramHandling'
</create>
CREATE PROCEDURE paramHandling (j SMALLINT, i SMALLINT)
PARAMETER STYLE JAVA
LANGUAGE JAVA
READS SQL DATA
DYNAMIC RESULT SETS 2
EXTERNAL NAME 'org.hibernate.orm.test.sql.hand.custom.derby.DerbyStoreProcedures.paramHandling'
</create>
<drop>
DROP PROCEDURE paramHandling
</drop>
@ -261,13 +261,13 @@
<database-object>
<create>
CREATE PROCEDURE simpleScalar (j SMALLINT)
PARAMETER STYLE JAVA
LANGUAGE JAVA
READS SQL DATA
DYNAMIC RESULT SETS 2
EXTERNAL NAME 'org.hibernate.test.sql.hand.custom.derby.DerbyStoreProcedures.simpleScalar'
</create>
CREATE PROCEDURE simpleScalar (j SMALLINT)
PARAMETER STYLE JAVA
LANGUAGE JAVA
READS SQL DATA
DYNAMIC RESULT SETS 2
EXTERNAL NAME 'org.hibernate.orm.test.sql.hand.custom.derby.DerbyStoreProcedures.simpleScalar'
</create>
<drop>
DROP PROCEDURE simpleScalar
</drop>

4
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/mysql/Mappings.hbm.xml Executable file → Normal file
View File

@ -15,7 +15,7 @@
This version is for MySQL
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization">
<id name="id" unsaved-value="0" column="orgid">
@ -57,7 +57,7 @@
<property name="startDate" not-null="true" update="false" insert="false"/>
<property name="endDate" insert="false"/>
<property name="regionCode" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="`VALUE`" sql-type="float"/>
<column name="CURRENCY"/>
</property>

8
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/mysql/MySQLCustomSQLTest.java Executable file → Normal file
View File

@ -4,11 +4,13 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.mysql;
package org.hibernate.orm.test.sql.hand.custom.mysql;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.orm.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.testing.RequiresDialect;
import org.junit.Ignore;
/**
* Custom SQL tests for MySQL
@ -16,6 +18,8 @@ import org.hibernate.testing.RequiresDialect;
* @author Gavin King
*/
@RequiresDialect( MySQLDialect.class )
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class MySQLCustomSQLTest extends CustomStoredProcTestSupport {
public String[] getMappings() {
return new String[] { "sql/hand/custom/mysql/Mappings.hbm.xml" };

4
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/Mappings.hbm.xml
View File

@ -14,7 +14,7 @@
Note: this version is for Oracle
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization">
<id name="id" unsaved-value="0" column="orgid">
@ -57,7 +57,7 @@
<property name="startDate" not-null="true" update="false" insert="false"/>
<property name="endDate" insert="false"/>
<property name="regionCode" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="`VALUE`" sql-type="float"/>
<column name="CURRENCY"/>
</property>

12
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/OracleCustomSQLTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/OracleCustomSQLTest.java
View File

@ -4,18 +4,22 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.oracle;
package org.hibernate.orm.test.sql.hand.custom.oracle;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.orm.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.dialect.Oracle9iDialect;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.testing.RequiresDialect;
import org.junit.Ignore;
/**
* Custom SQL tests for Oracle
*
* @author Gavin King
*/
@RequiresDialect( Oracle9iDialect.class )
@RequiresDialect( OracleDialect.class )
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class OracleCustomSQLTest extends CustomStoredProcTestSupport {
public String[] getMappings() {
return new String[] { "sql/hand/custom/oracle/Mappings.hbm.xml", "sql/hand/custom/oracle/StoredProcedures.hbm.xml" };

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/oracle/StoredProcedures.hbm.xml
View File

@ -12,7 +12,7 @@
<!--
This version is for Oracle drivers proprietary handling of stored procedures/functions.
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<sql-query name="simpleScalar" callable="true">
<return-scalar column="name" type="string"/>

4
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sqlserver/Mappings.hbm.xml
View File

@ -14,7 +14,7 @@
NOTE: this version is for SQLServer
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization" table="ORGANIZATION">
<id name="id" unsaved-value="0" column="ORGID">
@ -56,7 +56,7 @@
<property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/>
<property name="endDate" column="ENDDATE" insert="false"/>
<property name="regionCode" column="REGIONCODE" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="VALUE" sql-type="float"/>
<column name="CURRENCY"/>
</property>

7
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sqlserver/SQLServerCustomSQLTest.java
View File

@ -4,12 +4,13 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.sqlserver;
package org.hibernate.orm.test.sql.hand.custom.sqlserver;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.orm.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.junit.Ignore;
/**
* Custom SQL tests for SQLServer
@ -17,6 +18,8 @@ import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
* @author Gail Badner
*/
@RequiresDialect( SQLServerDialect.class )
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class SQLServerCustomSQLTest extends CustomStoredProcTestSupport {
public String[] getMappings() {
return new String[] { "sql/hand/custom/sqlserver/Mappings.hbm.xml" };

4
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sybase/Mappings.hbm.xml Executable file → Normal file
View File

@ -14,7 +14,7 @@
NOTE: this version is for Sybase
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization" table="ORGANIZATION">
<id name="id" unsaved-value="0" column="ORGID">
@ -56,7 +56,7 @@
<property name="startDate" column="STARTDATE" not-null="true" update="false" insert="false"/>
<property name="endDate" column="ENDDATE" insert="false"/>
<property name="regionCode" column="REGIONCODE" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="`VALUE`" sql-type="float"/>
<column name="CURRENCY"/>
</property>

13
hibernate-core/src/test/java/org/hibernate/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/custom/sybase/SybaseCustomSQLTest.java
View File

@ -4,21 +4,22 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.custom.sybase;
package org.hibernate.orm.test.sql.hand.custom.sybase;
import org.hibernate.dialect.Sybase11Dialect;
import org.hibernate.dialect.SybaseASE15Dialect;
import org.hibernate.dialect.SybaseAnywhereDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.orm.test.sql.hand.custom.CustomStoredProcTestSupport;
import org.hibernate.testing.RequiresDialect;
import org.junit.Ignore;
/**
* Custom SQL tests for Sybase dialects
*
* @author Gavin King
*/
@RequiresDialect( { SybaseDialect.class, SybaseASE15Dialect.class, Sybase11Dialect.class, SybaseAnywhereDialect.class })
@RequiresDialect( { SybaseDialect.class })
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class SybaseCustomSQLTest extends CustomStoredProcTestSupport {
public String[] getMappings() {
return new String[] { "sql/hand/custom/sybase/Mappings.hbm.xml" };

11
hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/CustomInsertSQLWithIdentityColumnTest.java
View File

@ -4,13 +4,13 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.identity;
package org.hibernate.orm.test.sql.hand.identity;
import org.junit.Test;
import org.hibernate.JDBCException;
import org.hibernate.Session;
import org.hibernate.test.sql.hand.Organization;
import org.hibernate.orm.test.sql.hand.Organization;
import org.hibernate.testing.DialectChecks;
import org.hibernate.testing.RequiresDialectFeature;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
@ -24,6 +24,13 @@ import static org.junit.Assert.fail;
*/
@RequiresDialectFeature( DialectChecks.SupportsIdentityColumns.class )
public class CustomInsertSQLWithIdentityColumnTest extends BaseCoreFunctionalTestCase {
@Override
protected String getBaseForMappings() {
return "org/hibernate/orm/test/";
}
@Override
public String[] getMappings() {
return new String[] {"sql/hand/identity/Mappings.hbm.xml"};
}

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/identity/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/identity/Mappings.hbm.xml
View File

@ -16,7 +16,7 @@
@author : Gail Badner
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization" table="ORGANIZATION">
<id name="id" column="ORG_ID">

4
hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueries.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueries.hbm.xml
View File

@ -15,7 +15,7 @@
all-handwritten SQL!
-->
<hibernate-mapping package="org.hibernate.test.sql.hand" default-access="field">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand" default-access="field">
<class name="Organization" table="ORGANIZATION">
<id name="id" unsaved-value="0" column="ORGID">
@ -58,7 +58,7 @@
<property name="startDate" column="STARTDATE" not-null="false"/>
<property name="endDate" column="ENDDATE" insert="false"/>
<property name="regionCode" column="REGIONCODE" update="false"/>
<property name="salary" type="org.hibernate.test.sql.hand.MonetaryAmountUserType">
<property name="salary" type="org.hibernate.orm.test.sql.hand.MonetaryAmountUserType">
<column name="AMOUNT" sql-type="float"/>
<column name="CURRENCY"/>
</property>

35
hibernate-core/src/test/java/org/hibernate/test/sql/hand/query/NativeSQLQueriesTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/query/NativeSQLQueriesTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.query;
package org.hibernate.orm.test.sql.hand.query;
import java.io.Serializable;
import java.math.BigDecimal;
@ -40,17 +40,19 @@ import org.hibernate.testing.FailureExpected;
import org.hibernate.testing.RequiresDialect;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.junit4.BaseCoreFunctionalTestCase;
import org.hibernate.test.sql.hand.Dimension;
import org.hibernate.test.sql.hand.Employment;
import org.hibernate.test.sql.hand.Group;
import org.hibernate.test.sql.hand.ImageHolder;
import org.hibernate.test.sql.hand.Order;
import org.hibernate.test.sql.hand.Organization;
import org.hibernate.test.sql.hand.Person;
import org.hibernate.test.sql.hand.Product;
import org.hibernate.test.sql.hand.SpaceShip;
import org.hibernate.test.sql.hand.Speech;
import org.hibernate.test.sql.hand.TextHolder;
import org.hibernate.orm.test.sql.hand.Dimension;
import org.hibernate.orm.test.sql.hand.Employment;
import org.hibernate.orm.test.sql.hand.Group;
import org.hibernate.orm.test.sql.hand.ImageHolder;
import org.hibernate.orm.test.sql.hand.Order;
import org.hibernate.orm.test.sql.hand.Organization;
import org.hibernate.orm.test.sql.hand.Person;
import org.hibernate.orm.test.sql.hand.Product;
import org.hibernate.orm.test.sql.hand.SpaceShip;
import org.hibernate.orm.test.sql.hand.Speech;
import org.hibernate.orm.test.sql.hand.TextHolder;
import org.junit.Ignore;
import org.junit.Test;
import static org.hibernate.testing.junit4.ExtraAssertions.assertClassAssignability;
@ -65,7 +67,16 @@ import static org.junit.Assert.fail;
*
* @author Steve Ebersole
*/
// todo (6.0): needs a composite user type mechanism e.g. by providing a custom ComponentTuplizer/Instantiator
@Ignore( "Missing support for composite user types" )
public class NativeSQLQueriesTest extends BaseCoreFunctionalTestCase {
@Override
protected String getBaseForMappings() {
return "org/hibernate/orm/test/";
}
@Override
public String[] getMappings() {
return new String[] { "sql/hand/query/NativeSQLQueries.hbm.xml" };
}

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Mappings.hbm.xml → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/Mappings.hbm.xml Executable file → Normal file
View File

@ -9,7 +9,7 @@
"-//Hibernate/Hibernate Mapping DTD 3.0//EN"
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
<hibernate-mapping package="org.hibernate.test.sql.hand.quotedidentifiers">
<hibernate-mapping package="org.hibernate.orm.test.sql.hand.quotedidentifiers">
<class name="Person" table="`Person`">
<id name="id" unsaved-value="0" column="`pId`">

9
hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/NativeSqlAndQuotedIdentifiersTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.quotedidentifiers;
package org.hibernate.orm.test.sql.hand.quotedidentifiers;
import org.hibernate.Session;
import org.hibernate.dialect.Dialect;
@ -22,6 +22,13 @@ import org.junit.Test;
*/
@RequiresDialectFeature( value = NativeSqlAndQuotedIdentifiersTest.LocalDialectCheck.class )
public class NativeSqlAndQuotedIdentifiersTest extends BaseCoreFunctionalTestCase {
@Override
protected String getBaseForMappings() {
return "org/hibernate/orm/test/";
}
@Override
public String[] getMappings() {
return new String[] { "sql/hand/quotedidentifiers/Mappings.hbm.xml" };
}

2
hibernate-core/src/test/java/org/hibernate/test/sql/hand/quotedidentifiers/Person.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/hand/quotedidentifiers/Person.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.hand.quotedidentifiers;
package org.hibernate.orm.test.sql.hand.quotedidentifiers;
/**

2
hibernate-core/src/test/java/org/hibernate/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/sql/syncSpace/NativeQuerySyncSpaceCachingTest.java
View File

@ -4,7 +4,7 @@
* License: GNU Lesser General Public License (LGPL), version 2.1 or later.
* See the lgpl.txt file in the root directory or <http://www.gnu.org/licenses/lgpl-2.1.html>.
*/
package org.hibernate.test.sql.syncSpace;
package org.hibernate.orm.test.sql.syncSpace;
import java.util.Map;
import javax.persistence.Cacheable;

4
hibernate-core/src/test/java/org/hibernate/test/hql/WithClauseTest.java
View File

@ -15,8 +15,8 @@ import org.hibernate.QueryException;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.query.Query;
import org.hibernate.testing.SkipForDialect;
import org.hibernate.testing.TestForIssue;
import org.hibernate.testing.orm.junit.SkipForDialect;
import org.hibernate.testing.orm.junit.DomainModel;
import org.hibernate.testing.orm.junit.SessionFactory;
import org.hibernate.testing.orm.junit.SessionFactoryScope;
@ -195,7 +195,7 @@ public class WithClauseTest {
@Test
@TestForIssue(jiraKey = "HHH-11401")
@SkipForDialect(value = DerbyDialect.class,comment = "Derby does not support cast from INTEGER to VARCHAR")
@SkipForDialect(dialectClass = DerbyDialect.class, reason = "Derby does not support cast from INTEGER to VARCHAR")
public void testWithClauseAsSubqueryWithKeyAndOtherJoinReference(SessionFactoryScope scope) {
scope.inTransaction(
(s) -> {

4
hibernate-core/src/test/java/org/hibernate/test/sql/refcursor/CursorFromCallableTest.java
View File

@ -12,7 +12,7 @@ import java.sql.SQLException;
import java.util.Arrays;
import org.hibernate.Session;
import org.hibernate.dialect.Oracle8iDialect;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.engine.jdbc.spi.JdbcCoordinator;
import org.hibernate.engine.jdbc.spi.ResultSetReturn;
import org.hibernate.engine.jdbc.spi.StatementPreparer;
@ -30,7 +30,7 @@ import org.junit.Test;
/**
* @author Lukasz Antoniak (lukasz dot antoniak at gmail dot com)
*/
@RequiresDialect( Oracle8iDialect.class )
@RequiresDialect( OracleDialect.class )
public class CursorFromCallableTest extends BaseCoreFunctionalTestCase {
@Override
protected Class<?>[] getAnnotatedClasses() {

3
hibernate-core/src/test/java/org/hibernate/test/sql/storedproc/PostgresRefCursorSupportTest.java
View File

@ -23,6 +23,7 @@ import org.hibernate.cfg.Configuration;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.PostgreSQL81Dialect;
import org.hibernate.dialect.PostgreSQL82Dialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.procedure.ProcedureCall;
import org.hibernate.procedure.ProcedureOutputs;
import org.hibernate.result.ResultSetOutput;
@ -39,7 +40,7 @@ import static org.hibernate.testing.junit4.ExtraAssertions.assertTyping;
/**
* @author Steve Ebersole
*/
@RequiresDialect( value = PostgreSQL81Dialect.class, strictMatching = false )
@RequiresDialect( value = PostgreSQLDialect.class, strictMatching = false )
@FailureExpected( jiraKey = "HHH-8445", message = "Waiting on EG clarification" )
public class PostgresRefCursorSupportTest extends BaseUnitTestCase {