Merge pull request #246 from ml054/v5.0

V5.0

Author: gregolsky

src/Documents/DocumentStore.ts

@@ -189,9 +189,7 @@ export class DocumentStore extends DocumentStoreBase {
     public getRequestExecutor(database?: string): RequestExecutor {
         this.assertInitialized();
 
-        if (!database) {
-            database = this.database;
-        }
+        database = this.getEffectiveDatabase(database);
 
         const databaseLower = database.toLowerCase();
 
@@ -239,7 +237,7 @@ export class DocumentStore extends DocumentStoreBase {
     requestTimeout(timeoutInMs: number, database?: string): IDisposable {
         this.assertInitialized();
 
-        database = database || this.database;
+        database = this.getEffectiveDatabase(database);
 
         if (!database) {
             throwError("InvalidOperationException", "Cannot use requestTimeout without a default database defined " +
@@ -415,6 +413,6 @@ export class DocumentStore extends DocumentStoreBase {
     public bulkInsert(database?: string): BulkInsertOperation {
         this.assertInitialized();
 
-        return new BulkInsertOperation(database || this.database, this);
+        return new BulkInsertOperation(this.getEffectiveDatabase(database), this);
     }
 }

src/Documents/DocumentStoreBase.ts

@@ -36,6 +36,7 @@ import { DatabaseSmuggler } from "./Smuggler/DatabaseSmuggler";
 import { IDisposable } from "../Types/Contracts";
 import { TimeSeriesOperations } from "./TimeSeries/TimeSeriesOperations";
 import { IAbstractIndexCreationTask } from "./Indexes/IAbstractIndexCreationTask";
+import { StringUtil } from "../Utility/StringUtil";
 
 export abstract class DocumentStoreBase
     extends EventEmitter
@@ -91,7 +92,7 @@ export abstract class DocumentStoreBase
         const indexesToAdd = IndexCreation.createIndexesToAdd(tasks, this.conventions);
 
         await this.maintenance
-            .forDatabase(database || this.database)
+            .forDatabase(this.getEffectiveDatabase(database))
             .send(new PutIndexesOperation(...indexesToAdd));
     }
 
@@ -343,4 +344,23 @@ export abstract class DocumentStoreBase
     protected _assertValidConfiguration(): void {
         this.conventions.validate();
     }
+
+    public getEffectiveDatabase(database: string): string {
+        return DocumentStoreBase.getEffectiveDatabase(this, database);
+    }
+
+    public static getEffectiveDatabase(store: IDocumentStore, database: string) {
+        if (!database) {
+            database = store.database;
+        }
+
+        if (!StringUtil.isNullOrWhitespace(database)) {
+            return database;
+        }
+
+        throwError("InvalidArgumentException", "Cannot determine database to operate on. " +
+            "Please either specify 'database' directly as an action parameter " +
+            "or set the default database to operate on using 'DocumentStore.database' property. " +
+            "Did you forget to pass 'database' parameter?");
+    }
 }

src/Documents/Identity/MultiDatabaseHiLoIdGenerator.ts

@@ -1,6 +1,7 @@
 import { MultiTypeHiLoIdGenerator } from "./MultiTypeHiLoIdGenerator";
 import { DocumentStore } from "../DocumentStore";
 import { IRavenObject } from "../../Types/IRavenObject";
+import { DocumentStoreBase } from "../DocumentStoreBase";
 
 export class MultiDatabaseHiLoIdGenerator {
 
@@ -13,7 +14,7 @@ export class MultiDatabaseHiLoIdGenerator {
     }
 
     public generateDocumentId(database: string, entity: object): Promise<string> {
-        return this._getGeneratorForDatabase(database || this._store.database)
+        return this._getGeneratorForDatabase(DocumentStoreBase.getEffectiveDatabase(this._store, database))
             .generateDocumentId(entity);
     }
 

src/Documents/Indexes/AbstractIndexCreationTaskBase.ts

@@ -5,11 +5,11 @@ import { IDocumentStore } from "../IDocumentStore";
 import { PutIndexesOperation } from "../Operations/Indexes/PutIndexesOperation";
 import { AbstractCommonApiForIndexes } from "./AbstractCommonApiForIndexes";
 import { IAbstractIndexCreationTask } from "./IAbstractIndexCreationTask";
+import { DocumentStoreBase } from "../DocumentStoreBase";
 
 export abstract class AbstractIndexCreationTaskBase<TIndexDefinition extends IndexDefinition>
     extends AbstractCommonApiForIndexes implements IAbstractIndexCreationTask {
-
-
+    
     /**
      *  Creates the index definition.
      */
@@ -47,8 +47,8 @@ export abstract class AbstractIndexCreationTaskBase<TIndexDefinition extends Ind
         const oldConventions = this.conventions;
 
         try {
-            const databaseForConventions = database || store.database;
-            this.conventions = conventions || this.conventions || store.getRequestExecutor(databaseForConventions).conventions;
+            database = DocumentStoreBase.getEffectiveDatabase(store, database);
+            this.conventions = conventions || this.conventions || store.getRequestExecutor(database).conventions;
 
             const indexDefinition = this.createIndexDefinition();
             indexDefinition.name = this.getIndexName();
@@ -61,7 +61,7 @@ export abstract class AbstractIndexCreationTaskBase<TIndexDefinition extends Ind
                 indexDefinition.priority = this.priority;
             }
 
-            await store.maintenance.forDatabase(database || store.database)
+            await store.maintenance.forDatabase(database)
                 .send(new PutIndexesOperation(indexDefinition));
         } finally {
             this.conventions = oldConventions;

src/Documents/Operations/OperationExecutor.ts

@@ -15,6 +15,7 @@ import { DocumentType } from "../DocumentAbstractions";
 import { PatchResult } from "./PatchResult";
 import { IDocumentStore } from "../IDocumentStore";
 import { StatusCodes } from "../../Http/StatusCode";
+import { StringUtil } from "../../Utility/StringUtil";
 
 export class OperationExecutor {
 
@@ -27,7 +28,7 @@ export class OperationExecutor {
     public constructor(store: DocumentStoreBase, databaseName?: string) {
         this._store = store;
         this._databaseName = databaseName ? databaseName : store.database;
-        if (this._databaseName) {
+        if (!StringUtil.isNullOrWhitespace(this._databaseName)) {
             this._requestExecutor = store.getRequestExecutor(this._databaseName);
         } else {
             throwError("InvalidOperationException",

src/Documents/Queries/Facets/AggregationQueryBase.ts

@@ -43,7 +43,7 @@ export abstract class AggregationQueryBase {
         return (this._session as DocumentSession)
             .addLazyOperation(
                 new LazyAggregationQueryOperation(
-                    this._session.conventions,
+                    this._session,
                     this._query,
                     this,
                     (queryResult: QueryResult) =>
@@ -65,6 +65,8 @@ export abstract class AggregationQueryBase {
             results[facetResult.name] = facetResult;
         }
 
+        this._session.registerIncludes(queryResult.includes);
+
         QueryOperation.ensureIsAcceptable(
             queryResult, this._query.waitForNonStaleResults, this._duration, this._session);
 

src/Documents/Queries/Suggestions/SuggestionQueryBase.ts

@@ -54,7 +54,7 @@ export abstract class SuggestionQueryBase {
 
         return (this._session as DocumentSession).addLazyOperation(
             new LazySuggestionQueryOperation(
-                this._session.conventions,
+                this._session,
                 this._query,
                 result => this._invokeAfterQueryExecuted(result),
                 (result) => this._processResults(result)

src/Documents/Session/AbstractDocumentQuery.ts

@@ -428,7 +428,7 @@ export abstract class AbstractDocumentQuery<T extends object, TSelf extends Abst
 
         const clazz = this._conventions.getJsTypeByDocumentType(this._clazz);
         return  new LazyQueryOperation<T>(
-            this._theSession.conventions,
+            this._theSession,
             this._queryOperation,
             this,
             clazz);
@@ -2157,7 +2157,7 @@ export abstract class AbstractDocumentQuery<T extends object, TSelf extends Abst
         const clazz = this._conventions.getJsTypeByDocumentType(this._clazz);
         const lazyQueryOperation =
             new LazyQueryOperation<T>(
-                this._theSession.conventions,
+                this._theSession,
                 this._queryOperation,
                 this,
                 clazz);

src/Documents/Session/IDocumentQuery.ts

@@ -74,7 +74,7 @@ export interface IDocumentQuery<T extends object>
      * If the field is not stored in index, value will come from document directly.
      */
     selectFields<TProjection extends object>(
-        queryData: QueryData, projectionClass: DocumentType<TProjection>): IDocumentQuery<TProjection>; //TODO: update in 4.2 as well
+        queryData: QueryData, projectionClass: DocumentType<TProjection>): IDocumentQuery<TProjection>;
 
     /**
      * Selects a Time Series Aggregation based on

src/Documents/Session/Operations/Lazy/LazyAggregationQueryOperation.ts

@@ -7,21 +7,22 @@ import { GetRequest } from "../../../Commands/MultiGet/GetRequest";
 import { GetResponse } from "../../../Commands/MultiGet/GetResponse";
 import { FacetQueryCommand } from "../../../Commands/FacetQueryCommand";
 import { stringToReadable } from "../../../../Utility/StreamUtil";
+import { InMemoryDocumentSessionOperations } from "../../InMemoryDocumentSessionOperations";
 
 export class LazyAggregationQueryOperation implements ILazyOperation {
 
-    private readonly _conventions: DocumentConventions;
+    private readonly _session: InMemoryDocumentSessionOperations;
     private readonly _indexQuery: IndexQuery;
     private readonly _parent: AggregationQueryBase;
     private readonly _processResults:
         (queryResult: QueryResult) => FacetResultObject;
 
     public constructor(
-        conventions: DocumentConventions,
+        session: InMemoryDocumentSessionOperations,
         indexQuery: IndexQuery,
         parent: AggregationQueryBase,
         processResults: (queryResult: QueryResult) => FacetResultObject) {
-        this._conventions = conventions;
+        this._session = session;
         this._indexQuery = indexQuery;
         this._processResults = processResults;
         this._parent = parent;
@@ -32,7 +33,7 @@ export class LazyAggregationQueryOperation implements ILazyOperation {
         request.url = "/queries";
         request.method = "POST";
         request.query = "?queryHash=" + this._indexQuery.getQueryHash();
-        request.body = writeIndexQuery(this._conventions, this._indexQuery);
+        request.body = writeIndexQuery(this._session.conventions, this._indexQuery);
         return request;
     }
 
@@ -72,7 +73,7 @@ export class LazyAggregationQueryOperation implements ILazyOperation {
         }
 
         const result = await FacetQueryCommand.parseQueryResultResponseAsync(
-            stringToReadable(response.result), this._conventions, false);
+            stringToReadable(response.result), this._session.conventions, false);
         this._handleResponse(result);
     }