Merge pull request #5345 from ryanto/check-wrapped-function

Check if adapter#query is a wrapped function
emberjs · Mar 28, 2018 · 9875086 · 9875086
2 parents fe685f6 + 56a37b5
commit 9875086
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/addon/-private/system/store/finders.js b/addon/-private/system/store/finders.js
@@ -138,7 +138,10 @@ export function _query(adapter, store, modelName, query, recordArray) {
   let modelClass = store.modelFor(modelName); // adapter.query needs the class
 
   let promise;
-  if (adapter.query.length > 3) {
+  let createRecordArray = adapter.query.length > 3 ||
+    (adapter.query.wrappedFunction && adapter.query.wrappedFunction.length > 3);
+
+  if (createRecordArray) {
     recordArray = recordArray || store.recordArrayManager.createAdapterPopulatedRecordArray(modelName, query);
     promise = Promise.resolve().then(() => adapter.query(store, modelClass, query, recordArray));
   } else {