From 30165d4aef5408e118259cb4f680f06e8d887135 Mon Sep 17 00:00:00 2001
From: Andrea Boriero <andrea@hibernate.org>
Date: Fri, 23 Sep 2016 13:47:39 +0100
Subject: [PATCH] HHH-11092 - NamedNativeQueries ordinal parameters are zero
 based

---
 .../hibernate/engine/query/spi/HQLQueryPlan.java |  2 +-
 .../internal/AbstractSharedSessionContract.java  |  4 +++-
 .../query/internal/ParameterMetadataImpl.java    | 16 ++++++++++++++++
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java
index 113de2d970..4a9054b3dd 100644
--- a/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java
+++ b/hibernate-core/src/main/java/org/hibernate/engine/query/spi/HQLQueryPlan.java
@@ -151,7 +151,7 @@ public class HQLQueryPlan implements Serializable {
 	}
 
 	public ParameterMetadataImpl getParameterMetadata() {
-		return parameterMetadata;
+		return parameterMetadata.getOrdinalParametersZeroBasedCopy();
 	}
 
 	public ReturnMetadata getReturnMetadata() {
diff --git a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
index 05842181fc..327516c8a2 100644
--- a/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
+++ b/hibernate-core/src/main/java/org/hibernate/internal/AbstractSharedSessionContract.java
@@ -727,7 +727,9 @@ public abstract class AbstractSharedSessionContract implements SharedSessionCont
 
 	@Override
 	public QueryImplementor createNamedQuery(String name) {
-		return buildQueryFromName( name, null );
+		final QueryImplementor<Object> query = buildQueryFromName( name, null );
+		query.getParameterMetadata().setOrdinalParametersZeroBased( false );
+		return query;
 	}
 
 	protected  <T> QueryImplementor<T> buildQueryFromName(String name, Class<T> resultType) {
diff --git a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
index f560ec2e82..c913ceceeb 100644
--- a/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
+++ b/hibernate-core/src/main/java/org/hibernate/query/internal/ParameterMetadataImpl.java
@@ -33,6 +33,14 @@ public class ParameterMetadataImpl implements ParameterMetadata {
 	private final Map<String,NamedParameterDescriptor> namedDescriptorMap;
 	private boolean isOrdinalParametersZeroBased = true;
 
+	private ParameterMetadataImpl(
+			OrdinalParameterDescriptor[] ordinalDescriptors,
+			Map<String, NamedParameterDescriptor> namedDescriptorMap, boolean isOrdinalParametersZeroBased) {
+		this.ordinalDescriptors = ordinalDescriptors;
+		this.namedDescriptorMap = namedDescriptorMap;
+		this.isOrdinalParametersZeroBased = isOrdinalParametersZeroBased;
+	}
+
 	/**
 	 * Instantiates a ParameterMetadata container.
 	 *
@@ -252,4 +260,12 @@ public class ParameterMetadataImpl implements ParameterMetadata {
 	public void setOrdinalParametersZeroBased(boolean isZeroBased) {
 		this.isOrdinalParametersZeroBased = isZeroBased;
 	}
+
+	public ParameterMetadataImpl getOrdinalParametersZeroBasedCopy() {
+		return new ParameterMetadataImpl(
+				this.ordinalDescriptors,
+				this.namedDescriptorMap,
+				true
+		);
+	}
 }