fixed issue #10062: AQL: Could not extract custom attribute (#10067)

CHANGELOG

@@ -1,6 +1,8 @@
 v3.5.1 (XXXX-XX-XX)
 -------------------
 
+* Fixed issue #10062: AQL: could not extract custom attribute.
+
 * Fix compilation issue with clang 10.
 
 * Fixed error message for error 1928 ("not in orphan") to "collection is

arangod/Aql/Functions.cpp

@@ -5998,8 +5998,9 @@ AqlValue Functions::Append(ExpressionContext* expressionContext, transaction::Me
     return AqlValue(AqlValueHintNull());
   }
 
+  auto options = trx->transactionContextPtr()->getVPackOptions();
   std::unordered_set<VPackSlice, basics::VelocyPackHelper::VPackHash, basics::VelocyPackHelper::VPackEqual> added(
-      11, basics::VelocyPackHelper::VPackHash(), basics::VelocyPackHelper::VPackEqual());
+      11, basics::VelocyPackHelper::VPackHash(), basics::VelocyPackHelper::VPackEqual(options));
 
   transaction::BuilderLeaser builder(trx);
   builder->openArray();

js/common/modules/@arangodb/aql/explainer.js

@@ -2057,7 +2057,8 @@ function inspectDump(filename, outfile) {
     for (let i = keys.length; i > 0; --i) {
       let collection = keys[i - 1];
       let details = data.collections[collection];
-      if (details.name[0] === '_') {
+      let name = details.name || collection;
+      if (name[0] === '_') {
         // system collection
         print("try { db._drop(" + JSON.stringify(collection) + ", true); } catch (err) { print(String(err)); }");
       } else {

tests/js/server/aql/aql-functions-list.js

@@ -859,11 +859,38 @@ function ahuacatlListTestSuite () {
   };
 }
 
+function ahuacatlDocumentAppendTestSuite () {
+  var collectionName = "UnitTestList";
+  var collection; 
+
+  return {
+
+    setUpAll : function () {
+      internal.db._drop(collectionName);
+      collection = internal.db._create(collectionName);
+    },
+
+    tearDownAll: function () {
+      internal.db._drop(collectionName);
+    },
+
+    testAppendWithDocuments : function () {
+      for (let i = 0; i < 2000; ++i) {
+        collection.insert({ _key: "test" + i, value: i });
+      }
+
+      let query = "LET results = APPEND((FOR doc IN " + collectionName + " FILTER doc.value < 1000 RETURN doc), (FOR doc IN " + collectionName + " FILTER doc.value >= 500 RETURN doc), true) FOR doc IN results SORT doc.updated LIMIT 2000 RETURN doc";
+      assertEqual(2000, getQueryResults(query).length);
+    }
+  };
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief executes the test suite
 ////////////////////////////////////////////////////////////////////////////////
 
 jsunity.run(ahuacatlListTestSuite);
+jsunity.run(ahuacatlDocumentAppendTestSuite);
 
 return jsunity.done();