Merge pull request #372 from ml054/RDBC-714

RDBC-714 ProjectionBehavior test

Author: ml054

src/Documents/Session/DocumentQuery.ts

@@ -148,13 +148,14 @@ export class DocumentQuery<T extends object>
             propertiesOrQueryData.isProjectInto = true;
             const queryData = propertiesOrQueryData as QueryData;
 
-            // add nested object types to result so we can properly read types
+            // add nested object types to result, so we can properly read types
             if (!queryData.isCustomFunction) {
                 queryData.fields = [...queryData.fields, `${CONSTANTS.Documents.Metadata.KEY}.${CONSTANTS.Documents.Metadata.NESTED_OBJECT_TYPES}`];
                 queryData.projections = [...queryData.projections, CONSTANTS.Documents.Metadata.NESTED_OBJECT_TYPES_PROJECTION_FIELD];
             }
 
-            queryData.projectionBehavior = projectionBehavior;
+            // we don't assign here projection behavior as it comes from override which already holds proper behavior from QueryData
+            // queryData.projectionBehavior = projectionBehavior;
 
             return this.createDocumentQueryInternal(projectionType, queryData);
         }
@@ -211,10 +212,10 @@ export class DocumentQuery<T extends object>
     public includeExplanations(
         explanationsCallback: ValueCallback<Explanations>): IDocumentQuery<T>;
     public includeExplanations(
-        options: ExplanationOptions, 
+        options: ExplanationOptions,
         explanationsCallback?: ValueCallback<Explanations>): IDocumentQuery<T>;
     public includeExplanations(
-        optionsOrExplanationsCallback: ExplanationOptions | ValueCallback<Explanations>, 
+        optionsOrExplanationsCallback: ExplanationOptions | ValueCallback<Explanations>,
         explanationsCallback?: ValueCallback<Explanations>): IDocumentQuery<T> {
         if (arguments.length === 1) {
             return this.includeExplanations(
@@ -223,7 +224,7 @@ export class DocumentQuery<T extends object>
 
         this._includeExplanations(
             optionsOrExplanationsCallback as ExplanationOptions, explanationsCallback);
-            
+
         return this;
     }
 
@@ -667,7 +668,7 @@ export class DocumentQuery<T extends object>
     }
 
     public highlight(
-        parameters: HighlightingParameters, 
+        parameters: HighlightingParameters,
         hightlightingsCallback: ValueCallback<Highlightings>): IDocumentQuery<T> {
         this._highlight(parameters, hightlightingsCallback);
         return this;
@@ -740,8 +741,8 @@ export class DocumentQuery<T extends object>
         fieldName: Field<T>, shapeWkt: string, relation: SpatialRelation, distanceErrorPct: number): IDocumentQuery<T>;
     public relatesToShape(
         fieldName: Field<T>,
-        shapeWkt: string, 
-        relation: SpatialRelation, 
+        shapeWkt: string,
+        relation: SpatialRelation,
         units: SpatialUnits,
         distanceErrorPct: number): IDocumentQuery<T>;
     public relatesToShape(
@@ -750,7 +751,7 @@ export class DocumentQuery<T extends object>
         relation: SpatialRelation,
         distanceErrorPctOrUnits?: SpatialUnits | number,
         distanceErrorPct?: number): IDocumentQuery<T> {
-        
+
         let units;
         if (TypeUtil.isNullOrUndefined(distanceErrorPct)) {
             if (TypeUtil.isString(distanceErrorPctOrUnits)) {

test/Issues/RDBC_714.ts

@@ -0,0 +1,57 @@
+import { AbstractJavaScriptIndexCreationTask, IDocumentStore } from "../../src";
+import { disposeTestDocumentStore, testContext, } from "../Utils/TestUtil";
+import { assertThat, assertThrows } from "../Utils/AssertExtensions";
+import { Employee } from "../Assets/Entities";
+
+describe("RDBC-714", function () {
+
+    let store: IDocumentStore;
+
+    beforeEach(async function () {
+        store = await testContext.getDocumentStore();
+    });
+
+    afterEach(async () => {
+        await disposeTestDocumentStore(store);
+    });
+
+    it("can use projection behavior", async () => {
+        await store.executeIndex(new Employee_ByFullName());
+
+        const session = store.openSession();
+        await session.store(Object.assign(new Employee(), { firstName: "Robert", lastName: "King" }));
+        await session.saveChanges();
+
+        await testContext.waitForIndexing(store);
+
+        const query = session.query(Employee, Employee_ByFullName)
+            .selectFields(["fullName"], EmployeeProjectedDetails, "FromDocumentOrThrow")
+
+        await assertThrows(async () => await query.all(),
+            err => {
+                assertThat(err.name)
+                    .isEqualTo("InvalidQueryException");
+            });
+    });
+})
+
+class Employee_ByFullName extends AbstractJavaScriptIndexCreationTask<Employee> {
+    public constructor() {
+        super();
+
+        this.map(Employee, e => {
+            return {
+                fullName: e.firstName + " " + e.lastName
+            }
+        })
+
+        this.store("fullName", "Yes");
+    }
+}
+
+class EmployeeProjectedDetails {
+    private fullName: null;
+    constructor() {
+        this.fullName = null;
+    }
+}