@openui5/sap.ui.core 1.96.20 → 1.96.21

package/src/sap/ui/model/odata/ODataMessageParser.js

@@ -84,7 +84,7 @@ var sClassName = "sap.ui.model.odata.ODataMessageParser",
  * @extends sap.ui.core.message.MessageParser
  *
  * @author SAP SE
- * @version 1.96.20
+ * @version 1.96.21
  * @public
  * @alias sap.ui.model.odata.ODataMessageParser
  */

package/src/sap/ui/model/odata/ODataMetaModel.js

@@ -209,7 +209,7 @@ sap.ui.define([
 	 * {@link #loaded loaded} has been resolved!
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 * @alias sap.ui.model.odata.ODataMetaModel
 	 * @extends sap.ui.model.MetaModel
 	 * @public

package/src/sap/ui/model/odata/ODataMetadata.js

@@ -44,7 +44,7 @@ sap.ui.define([
 	 * Implementation to access OData metadata
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.ODataMetadata

package/src/sap/ui/model/odata/ODataModel.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @public
 	 * @deprecated As of version 1.48, please use {@link sap.ui.model.odata.v2.ODataModel} instead.

package/src/sap/ui/model/odata/type/Boolean.js

@@ -87,7 +87,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Boolean
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Byte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Byte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Currency.js

@@ -61,7 +61,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Currency
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var Currency = BaseCurrency.extend("sap.ui.model.odata.type.Currency", {
 		constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/Date.js

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Date
 	 * @param {object} [oFormatOptions]
@@ -180,6 +180,13 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * @override
+	 */
+	EdmDate.prototype.getFormat = function () {
+		return getFormatter(this);
+	};
+
 	/**
 	 * Returns a formatter that converts between the model format and a Javascript Date. It has two
 	 * methods: <code>format</code> takes a Date and returns a date as a String in the format

package/src/sap/ui/model/odata/type/DateTime.js

@@ -59,7 +59,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.DateTime
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/DateTimeBase.js

@@ -132,7 +132,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.27.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var DateTimeBase = ODataType.extend("sap.ui.model.odata.type.DateTimeBase", {
 			constructor : function (oFormatOptions, oConstraints) {
@@ -185,6 +185,13 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * @override
+	 */
+	DateTimeBase.prototype.getFormat = function () {
+		return getFormatter(this);
+	};
+
 	/**
 	 * Parses the given value to a <code>Date</code> instance (OData V2).
 	 *

package/src/sap/ui/model/odata/type/DateTimeOffset.js

@@ -28,7 +28,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.DateTimeBase
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.DateTimeOffset
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Decimal.js

@@ -197,7 +197,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Decimal
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Double.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Double
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Guid.js

@@ -62,7 +62,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Guid
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int.js

@@ -80,7 +80,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.Int

package/src/sap/ui/model/odata/type/Int16.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Int16
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int32.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Int32
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Int64.js

@@ -137,7 +137,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Int64
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/ODataType.js

@@ -115,7 +115,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @abstract
 	 * @alias sap.ui.model.odata.type.ODataType
@@ -136,6 +136,33 @@ sap.ui.define([
 			}
 		);
 
+	/**
+	 * Returns a format converting between the internal and external representation of a value for this type. The
+	 * implementation of this method by subclasses is optional.
+	 *
+	 * @returns {object}
+	 *   A format converting between the internal and external representation
+	 *
+	 * @abstract
+	 * @function
+	 * @name sap.ui.model.ODataType.prototype.getFormat
+	 * @private
+	 */
+
+	/**
+	 * Returns a language-dependent placeholder text such as "e.g. <sample value>" where <sample value> is formatted
+	 * using this type.
+	 *
+	 * @returns {string|undefined}
+	 *   The language-dependent placeholder text or <code>undefined</code> if the type does not offer a placeholder
+	 *
+	 * @private
+	 * @ui5-restricted sap.m
+	 */
+	ODataType.prototype.getPlaceholderText = function () {
+		return this.getFormat && this.getFormat().getPlaceholderText && this.getFormat().getPlaceholderText();
+	};
+
 	/**
 	 * ODataTypes are immutable and do not allow modifying the type's constraints.
 	 * This function overwrites the <code>setConstraints</code> of

package/src/sap/ui/model/odata/type/Raw.js

@@ -30,7 +30,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var Raw = ODataType.extend("sap.ui.model.odata.type.Raw", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/SByte.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.Int
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.SByte
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Single.js

@@ -95,7 +95,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Single
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Stream.js

@@ -60,7 +60,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.51.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var Stream = ODataType.extend("sap.ui.model.odata.type.Stream", {
 			constructor : function (oFormatOptions, oConstraints) {

package/src/sap/ui/model/odata/type/String.js

@@ -84,7 +84,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/odata/type/Time.js

@@ -154,7 +154,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @alias sap.ui.model.odata.type.Time
 	 * @param {object} [oFormatOptions]
@@ -211,6 +211,13 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * @override
+	 */
+	Time.prototype.getFormat = function () {
+		return getFormatter(this);
+	};
+
 	/**
 	 * Returns a formatter that converts between the model format and a Javascript Date. It has two
 	 * methods: <code>format</code> takes a Date and returns an object as described in

package/src/sap/ui/model/odata/type/TimeOfDay.js

@@ -110,7 +110,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.odata.type.ODataType
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var TimeOfDay = ODataType.extend("sap.ui.model.odata.type.TimeOfDay", {
 			constructor : function (oFormatOptions, oConstraints) {
@@ -196,6 +196,13 @@ sap.ui.define([
 		}
 	};
 
+	/**
+	 * @override
+	 */
+	TimeOfDay.prototype.getFormat = function () {
+		return getUiFormat(this);
+	};
+
 	/**
 	 * Returns a formatter that converts between the model format and a Javascript Date. It has two
 	 * methods: <code>format</code> takes a Date and returns a date as a String in the format

package/src/sap/ui/model/odata/type/Unit.js

@@ -63,7 +63,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.type.Unit
 	 * @public
 	 * @since 1.63.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var Unit = BaseUnit.extend("sap.ui.model.odata.type.Unit", {
 		constructor : function (oFormatOptions, oConstraints, aDynamicFormatOptionNames) {

package/src/sap/ui/model/odata/v2/Context.js

@@ -52,7 +52,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.93.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v2.Context", {
 			constructor : function (oModel, sPath, sDeepPath, oCreatePromise) {

package/src/sap/ui/model/odata/v2/ODataAnnotations.js

@@ -35,7 +35,7 @@ sap.ui.define([
 	 * @class Annotation loader for OData V2 services
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @public
 	 * @since 1.37.0

package/src/sap/ui/model/odata/v2/ODataModel.js

@@ -201,7 +201,7 @@ sap.ui.define([
 	 * This model is not prepared to be inherited from.
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @public
 	 * @alias sap.ui.model.odata.v2.ODataModel

package/src/sap/ui/model/odata/v2/ODataTreeBinding.js

@@ -92,7 +92,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.TreeBinding
 	 * @hideconstructor
 	 * @public
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var ODataTreeBinding = TreeBinding.extend("sap.ui.model.odata.v2.ODataTreeBinding", /** @lends sap.ui.model.odata.v2.ODataTreeBinding.prototype */ {
 

package/src/sap/ui/model/odata/v4/Context.js

@@ -98,7 +98,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.39.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var Context = BaseContext.extend("sap.ui.model.odata.v4.Context", {
 			constructor : function (oModel, oBinding, sPath, iIndex, oCreatePromise, iGeneration) {

package/src/sap/ui/model/odata/v4/ODataBinding.js

@@ -367,8 +367,8 @@ sap.ui.define([
 	 * Hook method for {@link #fetchQueryOptionsForOwnCache} to determine the query options for this
 	 * binding.
 	 *
-	 * @param {sap.ui.model.Context} oContext
-	 *   The context instance to be used
+	 * @param {sap.ui.model.Context} [oContext]
+	 *   The context instance to be used for a relative binding
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise resolving with the binding's query options
 	 *
@@ -438,7 +438,9 @@ sap.ui.define([
 		this.oCachePromise = SyncPromise.all(aPromises).then(function (aResult) {
 			var mQueryOptions = aResult[0].mQueryOptions;
 
-			that.sReducedPath = aResult[0].sReducedPath;
+			if (aResult[0].sReducedPath) {
+				that.sReducedPath = aResult[0].sReducedPath;
+			}
 
 			// Note: do not create a cache for a virtual context
 			if (mQueryOptions && !(oContext && oContext.iIndex === Context.VIRTUAL)) {

package/src/sap/ui/model/odata/v4/ODataContextBinding.js

@@ -106,7 +106,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding

package/src/sap/ui/model/odata/v4/ODataListBinding.js

@@ -76,7 +76,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataParentBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -380,6 +380,7 @@ sap.ui.define([
 			sApply = _AggregationHelper.buildApply(mParameters.$$aggregation).$apply;
 		}
 		this.mQueryOptions = this.oModel.buildQueryOptions(mParameters, true);
+		this.oQueryOptionsPromise = undefined; // @see #doFetchQueryOptions
 		this.mParameters = mParameters; // store mParameters at binding after validation
 		if (sApply) {
 			this.mQueryOptions.$apply = sApply;
@@ -949,6 +950,7 @@ sap.ui.define([
 		this.mPreviousContextsByPath = undefined;
 		this.aPreviousData = undefined;
 		this.mQueryOptions = undefined;
+		this.oQueryOptionsPromise = undefined;
 		this.aSorters = undefined;
 
 		asODataParentBinding.prototype.destroy.call(this);
@@ -1041,14 +1043,23 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataBinding#doFetchQueryOptions
 	 */
 	ODataListBinding.prototype.doFetchQueryOptions = function (oContext) {
-		var that = this;
+		// Note: an absolute binding needs no parent context :-)
+		var sMetaPath = oContext && _Helper.getMetaPath(oContext.getPath()),
+			that = this;
 
-		return this.fetchResolvedQueryOptions(oContext).then(function (mQueryOptions) {
-			return that.fetchFilter(oContext, mQueryOptions.$filter).then(function (aFilters) {
-				return _Helper.mergeQueryOptions(mQueryOptions,
-					that.getOrderby(mQueryOptions.$orderby), aFilters);
-			});
-		});
+		if (!(this.oQueryOptionsPromise && this.oQueryOptionsPromise.$metaPath === sMetaPath)) {
+			this.oQueryOptionsPromise
+				= this.fetchResolvedQueryOptions(oContext).then(function (mQueryOptions) {
+					return that.fetchFilter(oContext, mQueryOptions.$filter)
+						.then(function (aFilters) {
+							return _Helper.mergeQueryOptions(mQueryOptions,
+								that.getOrderby(mQueryOptions.$orderby), aFilters);
+						});
+				});
+			this.oQueryOptionsPromise.$metaPath = sMetaPath;
+		}
+
+		return this.oQueryOptionsPromise;
 	};
 
 	/**
@@ -1573,6 +1584,7 @@ sap.ui.define([
 		} else {
 			this.aApplicationFilters = _Helper.toArray(vFilters);
 		}
+		this.oQueryOptionsPromise = undefined;
 
 		if (this.isRootBindingSuspended()) {
 			this.setResumeChangeReason(ChangeReason.Filter);
@@ -3137,6 +3149,7 @@ sap.ui.define([
 		}
 
 		this.aSorters = _Helper.toArray(vSorters);
+		this.oQueryOptionsPromise = undefined;
 
 		if (this.isRootBindingSuspended()) {
 			this.setResumeChangeReason(ChangeReason.Sort);

package/src/sap/ui/model/odata/v4/ODataMetaModel.js

@@ -658,7 +658,7 @@ sap.ui.define([
 	 * @hideconstructor
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var ODataMetaModel = MetaModel.extend("sap.ui.model.odata.v4.ODataMetaModel", {
 		/*
@@ -2157,6 +2157,9 @@ sap.ui.define([
 			if (oProperty.$Nullable === false) {
 				setConstraint("nullable", false);
 			}
+			if (oProperty.$Type === "Edm.DateTimeOffset") {
+				setConstraint("V4", true);
+			}
 		}
 		return mConstraints;
 	};

package/src/sap/ui/model/odata/v4/ODataModel.js

@@ -210,7 +210,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.Model
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var ODataModel = Model.extend("sap.ui.model.odata.v4.ODataModel",
 			/** @lends sap.ui.model.odata.v4.ODataModel.prototype */

package/src/sap/ui/model/odata/v4/ODataPropertyBinding.js

@@ -57,7 +57,7 @@ sap.ui.define([
 	 * @mixes sap.ui.model.odata.v4.ODataBinding
 	 * @public
 	 * @since 1.37.0
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getGroupId as #getGroupId
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getRootBinding as #getRootBinding
 	 * @borrows sap.ui.model.odata.v4.ODataBinding#getUpdateGroupId as #getUpdateGroupId
@@ -260,12 +260,9 @@ sap.ui.define([
 			that = this;
 
 		this.oCheckUpdateCallToken = oCallToken;
-		if (this.bHasDeclaredType === undefined) {
-			this.bHasDeclaredType = !!vType;
-		}
-		if (sResolvedPath && !this.bHasDeclaredType && this.sInternalType !== "any"
-				&& !bIsMeta) {
-			vType = oMetaModel.fetchUI5Type(sResolvedPath);
+		if (!vType && sResolvedPath && this.sInternalType !== "any" && !bIsMeta
+				&& !sResolvedPath.includes(sVirtualPath)) {
+			vType = oMetaModel.fetchUI5Type(this.sReducedPath || sResolvedPath);
 		}
 		if (arguments.length < 4) {
 			vValue = this.oCachePromise.then(function (oCache) {
@@ -283,9 +280,7 @@ sap.ui.define([
 							return vResult;
 						});
 				}
-				if (!that.sReducedPath || !that.isResolved()) {
-					// binding is unresolved or context was reset by another call to
-					// checkUpdateInternal
+				if (!that.isResolved()) {
 					return undefined;
 				}
 				if (sResolvedPath.includes(sVirtualPath)) {
@@ -327,7 +322,7 @@ sap.ui.define([
 			});
 			if (bForceUpdate && vValue.isFulfilled()) {
 				if (vType && vType.isFulfilled && vType.isFulfilled()) {
-					this.setType(vType.getResult(), this.sInternalType);
+					this.oType = vType.getResult();
 				}
 				this.vValue = vValue.getResult();
 			}
@@ -341,7 +336,7 @@ sap.ui.define([
 
 			if (oCallToken === that.oCheckUpdateCallToken) { // latest call to checkUpdateInternal
 				that.oCheckUpdateCallToken = undefined;
-				that.setType(oType, that.sInternalType);
+				that.oType = oType;
 				if (oCallToken.forceUpdate || that.vValue !== vValue) {
 					that.bInitial = false;
 					that.vValue = vValue;
@@ -655,6 +650,15 @@ sap.ui.define([
 			if (this.bRelative) {
 				this.checkSuspended(true);
 				this.deregisterChange();
+				if (oContext) {
+					if (this.oType && !this.bHasDeclaredType
+						// Note: this.oType => this.sReducedPath
+						&& _Helper.getMetaPath(this.oModel.resolve(this.sPath, oContext))
+							!== _Helper.getMetaPath(this.sReducedPath)) {
+						this.oType = undefined;
+					}
+					this.sReducedPath = undefined;
+				}
 			}
 			this.oContext = oContext;
 			this.sResumeChangeReason = undefined;
@@ -684,6 +688,7 @@ sap.ui.define([
 	ODataPropertyBinding.prototype.setType = function (oType, _sInternalType) {
 		var oOldType = this.oType;
 
+		this.bHasDeclaredType = !!oType;
 		if (oType && oType.getName() === "sap.ui.model.odata.type.DateTimeOffset") {
 			oType.setV4();
 		}

package/src/sap/ui/model/odata/v4/lib/_Helper.js

@@ -1466,7 +1466,7 @@ sap.ui.define([
 			}
 
 			if (aPaths.indexOf("*") >= 0) {
-				aSelects = mCacheQueryOptions && mCacheQueryOptions.$select || [];
+				aSelects = (mCacheQueryOptions && mCacheQueryOptions.$select || []).slice();
 			} else if (mCacheQueryOptions && mCacheQueryOptions.$select
 					&& mCacheQueryOptions.$select.indexOf("*") < 0) {
 				_Helper.addChildrenWithAncestor(aPaths, mCacheQueryOptions.$select, mSelects);

package/src/sap/ui/model/resource/ResourceModel.js

@@ -228,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.96.20
+	 * @version 1.96.21
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]