OGM-1221 Add discriminator column and value in TupleTypeContext

Author: DavideD

core/src/main/java/org/hibernate/ogm/dialect/impl/TupleTypeContextImpl.java

@@ -26,6 +26,9 @@ public class TupleTypeContextImpl implements TupleTypeContext {
 	private final List<String> selectableColumns;
 	private final OptionsContext optionsContext;
 
+	private final String discriminatorColumn;
+	private final Object discriminatorValue;
+
 	/**
 	 * Information of the associated entity stored per foreign key column names
 	 */
@@ -36,12 +39,16 @@ public class TupleTypeContextImpl implements TupleTypeContext {
 	public TupleTypeContextImpl(List<String> selectableColumns,
 			Map<String, AssociatedEntityKeyMetadata> associatedEntityMetadata,
 			Map<String, String> roles,
-			OptionsContext optionsContext) {
+			OptionsContext optionsContext,
+			String discriminatorColumn,
+			Object discriminatorValue) {
 
 		this.selectableColumns = Collections.unmodifiableList( selectableColumns );
 		this.associatedEntityMetadata = Collections.unmodifiableMap( associatedEntityMetadata );
 		this.roles = Collections.unmodifiableMap( roles );
 		this.optionsContext = optionsContext;
+		this.discriminatorColumn = discriminatorColumn;
+		this.discriminatorValue = discriminatorValue;
 	}
 
 	@Override
@@ -79,6 +86,16 @@ public Map<String, String> getAllRoles() {
 		return roles;
 	}
 
+	@Override
+	public String getDiscriminatorColumn() {
+		return discriminatorColumn;
+	}
+
+	@Override
+	public Object getDiscriminatorValue() {
+		return discriminatorValue;
+	}
+
 	@Override
 	public String toString() {
 		final StringBuilder builder = new StringBuilder( "Tuple Context {" );

core/src/main/java/org/hibernate/ogm/dialect/spi/TupleTypeContext.java

@@ -79,4 +79,18 @@ public interface TupleTypeContext {
 	 */
 	Map<String, String> getAllRoles();
 
+	/**
+	 * Get the name of the column with the discriminator.
+	 *
+	 * @return the name of the column or null if the discriminator is not column based
+	 */
+	String getDiscriminatorColumn();
+
+	/**
+	 * The discriminator value for dealing with inheritance; it might be {@code null} because some strategies don't need
+	 * it.
+	 *
+	 * @return the value of the discriminator. It can return {@code null}.
+	 */
+	Object getDiscriminatorValue();
 }

core/src/main/java/org/hibernate/ogm/persister/impl/OgmEntityPersister.java

@@ -596,7 +596,9 @@ private TupleTypeContextImpl createTupleTypeContext() {
 				selectableColumnNames( discriminator ),
 				associatedEntityKeyMetadata,
 				roles,
-				optionsService.context().getEntityOptions( getMappedClass() )
+				optionsService.context().getEntityOptions( getMappedClass() ),
+				getDiscriminatorColumnName(),
+				getDiscriminatorValue()
 		);
 	}
 

core/src/test/java/org/hibernate/ogm/utils/GridDialectOperationContexts.java

@@ -81,7 +81,7 @@ public TupleTypeContextBuilder optionContext(OptionsContext optionsContext) {
 
 		public TupleTypeContext buildTupleTypeContext() {
 			return new TupleTypeContextImpl( Collections.unmodifiableList( selectableColumns ), Collections.unmodifiableMap( associatedEntityMetadata ),
-					Collections.unmodifiableMap( roles ), optionsContext );
+					Collections.unmodifiableMap( roles ), optionsContext, null, null );
 		}
 	}