@openui5/sap.ui.core 1.98.0 → 1.101.0

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

@@ -176,33 +176,33 @@ sap.ui.define([
 
 	/**
 	 * Decides whether the given query options can be fulfilled by this binding and merges them into
-	 * this binding's aggregated query options if necessary.
+	 * this binding's <code>mAggregatedQueryOptions</code> if necessary.
 	 *
 	 * The query options cannot be fulfilled if there are conflicts. A conflict is an option other
-	 * than $expand, $select and $count which has different values in the aggregate and the options
-	 * to be merged. This is checked recursively.
-	 *
-	 * Merging is not necessary if the binding's cache has already requested its data and the query
-	 * options would extend $select. In this case the binding's cache will request the resp.
-	 * property and add it when it is accessed.
-	 *
-	 * Note: * is an item in $select and $expand just as others, that is it must be part of the
-	 * array of items and one must not ignore the other items if * is provided. See
-	 * "5.1.2 System Query Option $expand" and "5.1.3 System Query Option $select" in specification
-	 * "OData Version 4.0 Part 2: URL Conventions".
-	 *
-	 * @param {object} mQueryOptions The query options to be merged
-	 * @param {string} sBaseMetaPath This binding's meta path
-	 * @param {boolean} bCacheImmutable Whether the cache of this binding is immutable
+	 * than <code>$expand</code>, <code>$select</code> and <code>$count</code> which has different
+	 * values in the aggregate and the options to be merged. This is checked recursively.
+	 *
+	 * If the cache is already immutable the query options are aggregated into
+	 * <code>mLateQueryOptions</code>. Then they also cannot be fulfilled if they contain a
+	 * <code>$expand</code> using a collection-valued navigation property.
+	 *
+	 * Note: * is an item in <code>$select</code> and <code>$expand</code> just as others, that is
+	 * it must be part of the array of items and one must not ignore the other items if * is
+	 * provided. See "5.1.2 System Query Option $expand" and "5.1.3 System Query Option $select" in
+	 * specification "OData Version 4.0 Part 2: URL Conventions".
+	 *
+	 * @param {object} mQueryOptions - The query options to be merged
+	 * @param {string} sBaseMetaPath - This binding's meta path
+	 * @param {boolean} bCacheImmutable - Whether the cache of this binding is immutable
+	 * @param {boolean} bIsProperty - Whether the child is a property binding
 	 * @returns {boolean} Whether the query options can be fulfilled by this binding
 	 *
 	 * @private
 	 */
 	ODataParentBinding.prototype.aggregateQueryOptions = function (mQueryOptions, sBaseMetaPath,
-			bCacheImmutable) {
+			bCacheImmutable, bIsProperty) {
 		var mAggregatedQueryOptionsClone = _Helper.merge({},
 				bCacheImmutable && this.mLateQueryOptions || this.mAggregatedQueryOptions),
-			bChanged = false,
 			that = this;
 
 		/*
@@ -234,7 +234,6 @@ sap.ui.define([
 							.fetchObject(sExpandMetaPath).getResult().$isCollection) {
 						return false;
 					}
-					bChanged = true;
 				}
 				return merge(mAggregatedQueryOptions.$expand[sExpandPath],
 					mQueryOptions0.$expand[sExpandPath], sExpandMetaPath, true, bAddExpand);
@@ -248,7 +247,6 @@ sap.ui.define([
 			 */
 			function mergeSelectPath(sSelectPath) {
 				if (mAggregatedQueryOptions.$select.indexOf(sSelectPath) < 0) {
-					bChanged = true;
 					mAggregatedQueryOptions.$select.push(sSelectPath);
 				}
 				return true;
@@ -256,8 +254,9 @@ sap.ui.define([
 
 			// Top-level all query options in the aggregate are OK, even if not repeated in the
 			// child. In a $expand the child must also have them (and the second loop checks that
-			// they're equal).
-			return (!bInsideExpand || Object.keys(mAggregatedQueryOptions).every(function (sName) {
+			// they're equal). Property bindings are an exception to this rule.
+			return (bIsProperty || !bInsideExpand
+				|| Object.keys(mAggregatedQueryOptions).every(function (sName) {
 					return sName in mQueryOptions0 || sName === "$count" || sName === "$expand"
 						|| sName === "$select";
 				}))
@@ -288,7 +287,7 @@ sap.ui.define([
 		if (merge(mAggregatedQueryOptionsClone, mQueryOptions, sBaseMetaPath)) {
 			if (!bCacheImmutable) {
 				this.mAggregatedQueryOptions = mAggregatedQueryOptionsClone;
-			} else if (bChanged) {
+			} else {
 				this.mLateQueryOptions = mAggregatedQueryOptionsClone;
 			}
 			return true;
@@ -321,6 +320,8 @@ sap.ui.define([
 	 *   pending changes are ignored if all parameters are unchanged. Since 1.97.0, pending changes
 	 *   are ignored if they relate to a
 	 *   {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this binding.
+	 *   Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts
+	 *   of a {@link #getRootBinding root binding} do not count as pending changes.
 	 *
 	 * @public
 	 * @since 1.45.0
@@ -460,6 +461,9 @@ sap.ui.define([
 	 *   A (temporary) key predicate for the transient entity: "($uid=...)"
 	 * @param {object} [oInitialData={}]
 	 *   The initial data for the created entity
+	 * @param {boolean} bAtEndOfCreated
+	 *   Whether the newly created entity should be inserted after previously created entities, not
+	 *   before them
 	 * @param {function} fnErrorCallback
 	 *   A function which is called with an error object each time a POST request for the create
 	 *   fails
@@ -472,7 +476,8 @@ sap.ui.define([
 	 * @private
 	 */
 	ODataParentBinding.prototype.createInCache = function (oUpdateGroupLock, vCreatePath,
-			sCollectionPath, sTransientPredicate, oInitialData, fnErrorCallback, fnSubmitCallback) {
+			sCollectionPath, sTransientPredicate, oInitialData, bAtEndOfCreated, fnErrorCallback,
+			fnSubmitCallback) {
 		var that = this;
 
 		return this.oCachePromise.then(function (oCache) {
@@ -481,7 +486,8 @@ sap.ui.define([
 			if (oCache) {
 				sPathInCache = _Helper.getRelativePath(sCollectionPath, that.getResolvedPath());
 				return oCache.create(oUpdateGroupLock, vCreatePath, sPathInCache,
-					sTransientPredicate, oInitialData, fnErrorCallback, fnSubmitCallback
+					sTransientPredicate, oInitialData, bAtEndOfCreated, fnErrorCallback,
+					fnSubmitCallback
 				).then(function (oCreatedEntity) {
 					if (that.mCacheByResourcePath) {
 						// Ensure that cache containing non-transient created entity is recreated
@@ -492,8 +498,8 @@ sap.ui.define([
 				});
 			}
 			return that.oContext.getBinding().createInCache(oUpdateGroupLock, vCreatePath,
-				sCollectionPath, sTransientPredicate, oInitialData, fnErrorCallback,
-				fnSubmitCallback);
+				sCollectionPath, sTransientPredicate, oInitialData, bAtEndOfCreated,
+				fnErrorCallback, fnSubmitCallback);
 		});
 	};
 
@@ -609,7 +615,7 @@ sap.ui.define([
 	 * @since 1.61
 	 */
 	ODataParentBinding.prototype.destroy = function () {
-//		this.mAggregatedQueryOptions = undefined;
+		// this.mAggregatedQueryOptions = undefined;
 		this.aChildCanUseCachePromises = [];
 		this.removeReadGroupLock();
 		this.oResumePromise = undefined;
@@ -638,6 +644,8 @@ sap.ui.define([
 	 *   The child binding's binding path relative to <code>oContext</code>
 	 * @param {object|sap.ui.base.SyncPromise} vChildQueryOptions
 	 *   The child binding's (aggregated) query options or a promise resolving with them
+	 * @param {boolean} bIsProperty
+	 *   Whether the child is a property binding
 	 * @returns {sap.ui.base.SyncPromise}
 	 *   A promise resolved with the reduced path for the child binding if the child binding can use
 	 *   this binding's or an ancestor binding's cache; resolved with <code>undefined</code>
@@ -647,7 +655,7 @@ sap.ui.define([
 	 * @see sap.ui.model.odata.v4.ODataMetaModel#getReducedPath
 	 */
 	ODataParentBinding.prototype.fetchIfChildCanUseCache = function (oContext, sChildPath,
-			vChildQueryOptions) {
+			vChildQueryOptions, bIsProperty) {
 		// getBaseForPathReduction must be called early, because the (virtual) parent context may be
 		// lost again when the path is needed
 		var sBaseForPathReduction = this.getBaseForPathReduction(),
@@ -759,7 +767,7 @@ sap.ui.define([
 			if (bIsAdvertisement) {
 				mWrappedChildQueryOptions = {$select : [sReducedChildMetaPath.slice(1)]};
 				return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
-						bCacheImmutable)
+						bCacheImmutable, bIsProperty)
 					? sReducedPath
 					: undefined;
 			}
@@ -771,7 +779,7 @@ sap.ui.define([
 					that.oModel.oInterface.fetchMetadata);
 				if (mWrappedChildQueryOptions) {
 					return that.aggregateQueryOptions(mWrappedChildQueryOptions, sBaseMetaPath,
-							bCacheImmutable)
+							bCacheImmutable, bIsProperty)
 						? sReducedPath
 						: undefined;
 				}
@@ -779,7 +787,7 @@ sap.ui.define([
 			}
 			if (sReducedChildMetaPath === "value") { // symbolic name for operation result
 				return that.aggregateQueryOptions(mChildQueryOptions, sBaseMetaPath,
-						bCacheImmutable)
+						bCacheImmutable, bIsProperty)
 					? sReducedPath
 					: undefined;
 			}
@@ -808,7 +816,8 @@ sap.ui.define([
 
 				// Note: in operation bindings mAggregatedQueryOptions misses the options from
 				// $$inheritExpandSelect
-				if (oCache && !oCache.hasSentRequest() && !that.oOperation) {
+				// If the cache is immutable, only mLateQueryOptions may have changed
+				if (!bCacheImmutable && oCache && !oCache.hasSentRequest() && !that.oOperation) {
 					if (that.bSharedRequest) {
 						oCache.setActive(false);
 						oCache = that.createAndSetCache(that.mAggregatedQueryOptions,
@@ -856,9 +865,13 @@ sap.ui.define([
 		sMetaPath = _Helper.getMetaPath(oModel.resolve(this.sPath, oContext));
 		mConvertedQueryOptions = Object.assign({}, mQueryOptions, {$select : []});
 		return SyncPromise.all(mQueryOptions.$select.map(function (sSelectPath) {
-			return _Helper.fetchPropertyAndType(
-				fnFetchMetadata, sMetaPath + "/" + sSelectPath
-			).then(function () {
+			var sMetaSelectPath = sMetaPath + "/" + sSelectPath;
+
+			if (sMetaSelectPath.endsWith(".*")) { // fetch metadata for namespace itself
+				sMetaSelectPath = sMetaSelectPath.slice(0, -1);
+			}
+
+			return _Helper.fetchPropertyAndType(fnFetchMetadata, sMetaSelectPath).then(function () {
 				var mWrappedQueryOptions = _Helper.wrapChildQueryOptions(
 						sMetaPath, sSelectPath, {}, fnFetchMetadata);
 
@@ -989,17 +1002,24 @@ sap.ui.define([
 	 * @override
 	 * @see sap.ui.model.odata.v4.ODataBinding#hasPendingChangesInDependents
 	 */
-	ODataParentBinding.prototype.hasPendingChangesInDependents = function (bIgnoreKeptAlive) {
+	ODataParentBinding.prototype.hasPendingChangesInDependents = function (bIgnoreKeptAlive0) {
 		return this.getDependentBindings().some(function (oDependent) {
 			var oCache = oDependent.oCache,
-				bHasPendingChanges;
+				bHasPendingChanges,
+				bIgnoreKeptAlive = bIgnoreKeptAlive0; // new copy for this dependent only
 
-			if (bIgnoreKeptAlive && oDependent.oContext.isKeepAlive()) {
-				return false;
+			if (bIgnoreKeptAlive) {
+				if (oDependent.oContext.isKeepAlive()) {
+					return false; // changes can be safely ignored here
+				}
+				if (oDependent.oContext.getIndex() !== undefined) {
+					bIgnoreKeptAlive = false; // context of ODLB which is not kept alive: unsafe!
+				}
 			}
 			if (oCache !== undefined) {
 				// Pending changes for this cache are only possible when there is a cache already
-				if (oCache && oCache.hasPendingChangesForPath("")) {
+				if (oCache && oCache.hasPendingChangesForPath("", false, bIgnoreKeptAlive
+						&& oDependent.mParameters && oDependent.mParameters.$$ownRequest)) {
 					return true;
 				}
 			} else if (oDependent.hasPendingChangesForPath("")) {
@@ -1018,7 +1038,7 @@ sap.ui.define([
 				}
 			}
 			// Ask dependents, they might have no cache, but pending changes in mCacheByResourcePath
-			return oDependent.hasPendingChangesInDependents();
+			return oDependent.hasPendingChangesInDependents(bIgnoreKeptAlive);
 		})
 		|| this.oModel.withUnresolvedBindings("hasPendingChangesInCaches",
 				this.getResolvedPath().slice(1));
@@ -1047,36 +1067,6 @@ sap.ui.define([
 		return false;
 	};
 
-	/**
-	 * Refreshes all dependent bindings with the given parameters and waits for them to have
-	 * finished.
-	 *
-	 * @param {string} sResourcePathPrefix
-	 *   The resource path prefix which is used to delete the dependent caches and corresponding
-	 *   messages; may be "" but not <code>undefined</code>
-	 * @param {string} [sGroupId]
-	 *   The group ID to be used for refresh
-	 * @param {boolean} [bCheckUpdate]
-	 *   If <code>true</code>, a property binding is expected to check for updates
-	 * @param {boolean} [bKeepCacheOnError]
-	 *   If <code>true</code>, the binding data remains unchanged if the refresh fails
-	 * @returns {sap.ui.base.SyncPromise}
-	 *   A promise resolving when all dependent bindings are refreshed; it is rejected
-	 *   when the refresh fails; the promise is resolved immediately on a suspended binding
-	 * @throws {Error}
-	 *   If the binding's root binding is suspended and a group ID different from the binding's
-	 *   group ID is given
-	 *
-	 * @private
-	 */
-	ODataParentBinding.prototype.refreshDependentBindings = function (sResourcePathPrefix, sGroupId,
-			bCheckUpdate, bKeepCacheOnError) {
-		return SyncPromise.all(this.getDependentBindings().map(function (oDependentBinding) {
-			return oDependentBinding.refreshInternal(sResourcePathPrefix, sGroupId, bCheckUpdate,
-				bKeepCacheOnError);
-		}));
-	};
-
 	/**
 	 * Recursively refreshes all dependent list bindings that have no own cache.
 	 *
@@ -1256,10 +1246,10 @@ sap.ui.define([
 	 * @throws {Error}
 	 *   If this binding
 	 *   <ul>
-	 *   <li>is relative to a {@link sap.ui.model.odata.v4.Context},</li>
-	 *   <li>is an operation binding,</li>
-	 *   <li>has {@link sap.ui.model.Binding#isSuspended} set to <code>false</code>,</li>
-	 *   <li>is not a root binding. Use {@link #getRootBinding} to determine the root binding.</li>
+	 *   <li>is relative to a {@link sap.ui.model.odata.v4.Context},
+	 *   <li>is an operation binding,
+	 *   <li>has {@link sap.ui.model.Binding#isSuspended} set to <code>false</code>,
+	 *   <li>is not a root binding. Use {@link #getRootBinding} to determine the root binding.
 	 *   </ul>
 	 *
 	 * @public
@@ -1314,16 +1304,17 @@ sap.ui.define([
 	 * data service requests. Call {@link #resume} to resume the binding. Before 1.53.0, this method
 	 * was not supported and threw an error. Since 1.97.0, pending changes are ignored if they
 	 * relate to a {@link sap.ui.model.odata.v4.Context#setKeepAlive kept-alive} context of this
-	 * binding.
+	 * binding. Since 1.98.0, {@link sap.ui.model.odata.v4.Context#isTransient transient} contexts
+	 * of a {@link #getRootBinding root binding} do not count as pending changes.
 	 *
 	 * @throws {Error}
 	 *   If this binding
-	 *  <ul>
-	 *   <li>is relative to a {@link sap.ui.model.odata.v4.Context},</li>
-	 *   <li>is an operation binding,</li>
-	 *   <li>has {@link sap.ui.model.Binding#isSuspended} set to <code>true</code>,</li>
-	 *   <li>has pending changes that cannot be ignored,</li>
-	 *   <li>is not a root binding. Use {@link #getRootBinding} to determine the root binding.</li>
+	 *   <ul>
+	 *   <li>is relative to a {@link sap.ui.model.odata.v4.Context},
+	 *   <li>is an operation binding,
+	 *   <li>has {@link sap.ui.model.Binding#isSuspended} set to <code>true</code>,
+	 *   <li>has pending changes that cannot be ignored,
+	 *   <li>is not a root binding. Use {@link #getRootBinding} to determine the root binding.
 	 *   </ul>
 	 *
 	 * @public

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

@@ -29,7 +29,38 @@ sap.ui.define([
 			dataRequested : true,
 			DataStateChange : true
 		},
-		sVirtualPath = "/" + Context.VIRTUAL; // a snippet indicating a virtual path
+		sVirtualPath = "/" + Context.VIRTUAL, // a snippet indicating a virtual path
+		/**
+		 * @alias sap.ui.model.odata.v4.ODataPropertyBinding
+		 * @author SAP SE
+		 * @class Property binding for an OData V4 model.
+		 *   An event handler can only be attached to this binding for the following events:
+		 *   'AggregatedDataStateChange', 'change', 'dataReceived', 'dataRequested' and
+		 *   'DataStateChange'. For unsupported events, an error is thrown.
+		 * @extends sap.ui.model.PropertyBinding
+		 * @hideconstructor
+		 * @mixes sap.ui.model.odata.v4.ODataBinding
+		 * @public
+		 * @since 1.37.0
+		 * @version 1.101.0
+		 * @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
+		 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
+		 * @borrows sap.ui.model.odata.v4.ODataBinding#isInitial as #isInitial
+		 * @borrows sap.ui.model.odata.v4.ODataBinding#refresh as #refresh
+		 * @borrows sap.ui.model.odata.v4.ODataBinding#requestRefresh as #requestRefresh
+		 * @borrows sap.ui.model.odata.v4.ODataBinding#resetChanges as #resetChanges
+		 * @borrows sap.ui.model.odata.v4.ODataBinding#toString as #toString
+		 */
+		ODataPropertyBinding
+			= PropertyBinding.extend("sap.ui.model.odata.v4.ODataPropertyBinding", {
+				constructor : constructor
+			});
+
+	//*********************************************************************************************
+	// ODataPropertyBinding
+	//*********************************************************************************************
 
 	/**
 	 * Do <strong>NOT</strong> call this private constructor, but rather use
@@ -45,65 +76,37 @@ sap.ui.define([
 	 *   Map of binding parameters
 	 * @throws {Error}
 	 *   If disallowed binding parameters are provided
-	 *
-	 * @alias sap.ui.model.odata.v4.ODataPropertyBinding
-	 * @author SAP SE
-	 * @class Property binding for an OData V4 model.
-	 *   An event handler can only be attached to this binding for the following events:
-	 *   'AggregatedDataStateChange', 'change', 'dataReceived', 'dataRequested' and
-	 *   'DataStateChange'. For unsupported events, an error is thrown.
-	 * @extends sap.ui.model.PropertyBinding
-	 * @hideconstructor
-	 * @mixes sap.ui.model.odata.v4.ODataBinding
-	 * @public
-	 * @since 1.37.0
-	 * @version 1.98.0
-	 * @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
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#hasPendingChanges as #hasPendingChanges
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#isInitial as #isInitial
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#refresh as #refresh
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#requestRefresh as #requestRefresh
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#resetChanges as #resetChanges
-	 * @borrows sap.ui.model.odata.v4.ODataBinding#toString as #toString
-	 */
-	var ODataPropertyBinding
-		= PropertyBinding.extend("sap.ui.model.odata.v4.ODataPropertyBinding", {
-			constructor : function (oModel, sPath, oContext, mParameters) {
-				PropertyBinding.call(this, oModel, sPath);
-				// initialize mixin members
-				asODataBinding.call(this);
-
-				if (sPath.endsWith("/")) {
-					throw new Error("Invalid path: " + sPath);
-				}
-				if (mParameters) {
-					this.checkBindingParameters(mParameters,
-						["$$groupId", "$$ignoreMessages", "$$noPatch"]);
-					this.sGroupId = mParameters.$$groupId;
-					this.bNoPatch = mParameters.$$noPatch;
-					this.setIgnoreMessages(mParameters.$$ignoreMessages);
-				} else {
-					this.sGroupId = undefined;
-					this.bNoPatch = false;
-				}
-				this.oCheckUpdateCallToken = undefined;
-				this.oContext = oContext;
-				this.bHasDeclaredType = undefined; // whether the binding info declares a type
-				this.bInitial = true;
-				// Note: system query options supported at property binding only for ".../$count"
-				this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
-					/*bSystemQueryOptionsAllowed*/sPath.endsWith("$count"));
-				this.vValue = undefined;
-				// BEWARE: #doFetchQueryOptions uses #isRoot which relies on this.oContext!
-				this.fetchCache(oContext);
-				oModel.bindingCreated(this);
-			},
-			metadata : {
-				publicMethods : []
-			}
-		});
+	 */
+	function constructor(oModel, sPath, oContext, mParameters) {
+		PropertyBinding.call(this, oModel, sPath);
+		// initialize mixin members
+		asODataBinding.call(this);
+
+		if (sPath.endsWith("/")) {
+			throw new Error("Invalid path: " + sPath);
+		}
+		if (mParameters) {
+			this.checkBindingParameters(mParameters,
+				["$$groupId", "$$ignoreMessages", "$$noPatch"]);
+			this.sGroupId = mParameters.$$groupId;
+			this.bNoPatch = mParameters.$$noPatch;
+			this.setIgnoreMessages(mParameters.$$ignoreMessages);
+		} else {
+			this.sGroupId = undefined;
+			this.bNoPatch = false;
+		}
+		this.oCheckUpdateCallToken = undefined;
+		this.oContext = oContext;
+		this.bHasDeclaredType = undefined; // whether the binding info declares a type
+		this.bInitial = true;
+		// Note: system query options supported at property binding only for ".../$count"
+		this.mQueryOptions = this.oModel.buildQueryOptions(_Helper.clone(mParameters),
+			/*bSystemQueryOptionsAllowed*/sPath.endsWith("$count"));
+		this.vValue = undefined;
+		// BEWARE: #doFetchQueryOptions uses #isRoot which relies on this.oContext!
+		this.fetchCache(oContext);
+		oModel.bindingCreated(this);
+	}
 
 	asODataBinding(ODataPropertyBinding.prototype);
 
@@ -266,7 +269,8 @@ sap.ui.define([
 				&& !bIsMeta) {
 			vType = oMetaModel.fetchUI5Type(sResolvedPath);
 		}
-		if (arguments.length < 4) {
+		if (vValue === undefined) {
+			// if called via #onChange, we need to fetch implicit values
 			vValue = this.oCachePromise.then(function (oCache) {
 				var sDataPath, sMetaPath;
 

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

@@ -108,6 +108,8 @@ sap.ui.define([
 		 *   <li> <code>type</code>:  the EDM data type (like "Edm.String") if it could be
 		 *      determined
 		 *   <li> <code>constraints</code>: {object} type constraints if result is "binding"
+		 *   <li> <code>formatOptions</code>: {object} format options if result is "binding"
+		 *   <li> <code>parameters</code>: {object} binding parameters if result is "binding"
 		 * </ul>
 		 *
 		 * @private
@@ -405,7 +407,8 @@ sap.ui.define([
 					return Expression.path(oPathValue);
 				}
 
-				["$And", "$Apply", "$Date", "$DateTimeOffset", "$Decimal", "$Float", "$Eq",
+				[
+					"$And", "$Apply", "$Date", "$DateTimeOffset", "$Decimal", "$Float", "$Eq",
 					"$Ge", "$Gt", "$Guid", "$If", "$Int", "$Le", "$Lt", "$Name", "$Ne", "$Not",
 					"$Null", "$Or", "$Path", "$PropertyPath", "$TimeOfDay", "$LabeledElement"
 				].forEach(function (sProperty) {
@@ -539,6 +542,52 @@ sap.ui.define([
 			});
 		},
 
+		/**
+		 * Fetch the result object for a date/time with timezone.
+		 * If <code>oPathValue.path</code> references a property which has a
+		 * <code>com.sap.vocabularies.Common.v1.Timezone</code> annotation, a composite result
+		 * object for a <code>sap.ui.model.odata.type.DateTimeWithTimezone</code> type with the
+		 * date/time and the timezone as parts is returned.
+		 *
+		 * @param {object} oPathValue
+		 *   model, path (and value) information pointing to the path (see Expression object)
+		 * @param {string} sValue
+		 *   use this value instead of <code>oPathValue.value</code>!
+		 * @param {object} mConstraints
+		 *   the type constraints for the property referenced by <code>oPathValue.path</code>
+		 * @returns {sap.ui.base.SyncPromise|undefined}
+		 *   a sync promise which resolves with a result object for the date/time with timezone, or
+		 *   is rejected with an error; <code>undefined</code> if there is no timezone annotation
+		 *   for the property referenced by <code>oPathValue.path</code>
+		 */
+		fetchDateTimeWithTimezone : function (oPathValue, sValue, mConstraints) {
+			var oModel = oPathValue.model,
+				sPath = oPathValue.path + "@com.sap.vocabularies.Common.v1.Timezone/$Path",
+				sTargetPath = oModel.getObject(sPath);
+
+			function formatPart(mConstraints0, sType, sPath0) {
+				return Basics.resultToString(
+					Expression.pathResult(oPathValue, sType, sPath0, mConstraints0),
+					false, true);
+			}
+
+			if (!sTargetPath) {
+				return undefined;
+			}
+			return oModel.fetchObject(sPath + "/$").then(function (oTarget) {
+				return {
+					result : "composite",
+					type : "sap.ui.model.odata.type.DateTimeWithTimezone",
+					value : "{mode:'TwoWay',parts:["
+						+ formatPart(mConstraints, "Edm.DateTimeOffset", sValue)
+						+ ","
+						+ formatPart(oModel.getConstraints(oTarget, sPath), oTarget.$Type,
+							sTargetPath)
+						+ "],type:'sap.ui.model.odata.type.DateTimeWithTimezone'}"
+				};
+			});
+		},
+
 		/**
 		 * Handling of "14.5.3.1.2 Function odata.fillUriTemplate".
 		 *
@@ -771,6 +820,11 @@ sap.ui.define([
 		 * <code>Org.OData.Measures.V1.Unit</code> annotation, a composite result object for a
 		 * <code>sap.ui.model.odata.type.Unit</code> type with the measures, the unit and the unit
 		 * customizing as parts is returned.
+		 * If <code>oPathValue.path</code> references a property with type
+		 * <code>Edm.DateTimeOffset</code> and a
+		 * <code>com.sap.vocabularies.Common.v1.Timezone</code> annotation, a composite result
+		 * object for a <code>sap.ui.model.odata.type.DateTimeWithTimezone</code> type with the
+		 * date/time and the timezone as parts is returned.
 		 *
 		 * @param {object} oPathValue
 		 *   model, path and value information pointing to the path (see Expression object)
@@ -795,16 +849,17 @@ sap.ui.define([
 			}
 
 			return oPromise.then(function (oProperty) {
-				var mConstraints,
-					oCurrencyOrUnitPromise,
+				var oAnnotationBasedPromise,
+					mConstraints,
 					sType = oProperty && oProperty.$Type;
 
 				if (oProperty && oPathValue.complexBinding) {
 					mConstraints = oModel.getConstraints(oProperty, oPathValue.path);
-					oCurrencyOrUnitPromise
-						= Expression.fetchCurrencyOrUnit(oPathValue, sValue, sType, mConstraints);
+					oAnnotationBasedPromise = sType === "Edm.DateTimeOffset"
+						? Expression.fetchDateTimeWithTimezone(oPathValue, sValue, mConstraints)
+						: Expression.fetchCurrencyOrUnit(oPathValue, sValue, sType, mConstraints);
 				}
-				return oCurrencyOrUnitPromise
+				return oAnnotationBasedPromise
 					|| Expression.pathResult(oPathValue, sType, sValue, mConstraints);
 			});
 		},

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

@@ -437,6 +437,21 @@ sap.ui.define([
 		return this.drillDown(this.aElements, sPath, oGroupLock);
 	};
 
+	/**
+	 * Nothing to do here, we have no created elements.
+	 *
+	 * @param {string} [_sPath]
+	 *   Relative path to drill-down into
+	 * @returns {object[]}
+	 *   An empty array
+	 *
+	 * @public
+	 */
+	// @override sap.ui.model.odata.v4.lib._Cache#getCreatedElements
+	_AggregationCache.prototype.getCreatedElements = function (_sPath) {
+		return [];
+	};
+
 	/**
 	 * @override
 	 * @see sap.ui.model.odata.v4.lib._Cache#getDownloadQueryOptions