Merge pull request #245 from ml054/v4.2

gregolsky · web-flow · commit e0202f7996e6 · 2020-12-14T08:47:02.000+01:00
sync with latest java version
diff --git a/src/Documents/DocumentStore.ts b/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);
     }
 }
diff --git a/src/Documents/DocumentStoreBase.ts b/src/Documents/DocumentStoreBase.ts
@@ -37,6 +37,7 @@ import { AbstractIndexCreationTask } from "./Indexes/AbstractIndexCreationTask";
 import { SessionOptions } from "./Session/SessionOptions";
 import { DatabaseSmuggler } from "./Smuggler/DatabaseSmuggler";
 import { IDisposable } from "../Types/Contracts";
+import { StringUtil } from "../Utility/StringUtil";
 
 export abstract class DocumentStoreBase
     extends EventEmitter
@@ -113,7 +114,7 @@ export abstract class DocumentStoreBase
             : databaseOrCallback as string;
 
         const resultPromise = this.maintenance
-            .forDatabase(database || this.database)
+            .forDatabase(this.getEffectiveDatabase(database))
             .send(new PutIndexesOperation(...indexesToAdd))
             // tslint:disable-next-line:no-empty
             .then(() => {});
@@ -360,4 +361,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?");
+    }
 }
diff --git a/src/Documents/Identity/HiloMultiDatabaseIdGenerator.ts b/src/Documents/Identity/HiloMultiDatabaseIdGenerator.ts
@@ -2,6 +2,7 @@ import { IHiloIdGenerator } from "./IHiloIdGenerator";
 import { HiloMultiTypeIdGenerator } from "./HiloMultiTypeIdGenerator";
 import { AbstractHiloIdGenerator } from "./AbstractHiloIdGenerator";
 import { IDocumentStore } from "../IDocumentStore";
+import { DocumentStoreBase } from "../DocumentStoreBase";
 
 export class HiloMultiDatabaseIdGenerator extends AbstractHiloIdGenerator implements IHiloIdGenerator {
 
@@ -10,7 +11,7 @@ export class HiloMultiDatabaseIdGenerator extends AbstractHiloIdGenerator implem
     }
 
     public generateDocumentId(dbName: string, entity: object): Promise<string> {
-        return this._getGeneratorForDatabase(dbName || this._store.database)
+        return this._getGeneratorForDatabase(DocumentStoreBase.getEffectiveDatabase(this._store, dbName))
             .generateDocumentId(entity);
     }
 
diff --git a/src/Documents/Indexes/AbstractIndexCreationTaskBase.ts b/src/Documents/Indexes/AbstractIndexCreationTaskBase.ts
@@ -6,6 +6,7 @@ import { PutIndexesOperation } from "../Operations/Indexes/PutIndexesOperation";
 import { ErrorFirstCallback } from "../../Types/Callbacks";
 import { TypeUtil } from "../../Utility/TypeUtil";
 import { passResultToCallback } from "../../Utility/PromiseUtil";
+import { DocumentStoreBase } from "../DocumentStoreBase";
 
 export abstract class AbstractIndexCreationTaskBase {
 
@@ -114,8 +115,8 @@ export abstract class AbstractIndexCreationTaskBase {
         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();
@@ -128,7 +129,7 @@ export abstract class AbstractIndexCreationTaskBase {
                 indexDefinition.priority = this.priority;
             }
 
-            await store.maintenance.forDatabase(database || store.database)
+            await store.maintenance.forDatabase(database)
                 .send(new PutIndexesOperation(indexDefinition));
         } finally {
             this.conventions = oldConventions;
diff --git a/src/Documents/Operations/OperationExecutor.ts b/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",
diff --git a/src/Documents/Session/DocumentSessionRevisionsBase.ts b/src/Documents/Session/DocumentSessionRevisionsBase.ts
@@ -1,8 +1,8 @@
-import {ForceRevisionStrategy} from "./ForceRevisionStrategy";
-import {throwError} from "../../Exceptions";
-import {TypeUtil} from "../../Utility/TypeUtil";
-import {StringUtil} from "../../Utility/StringUtil";
-import {AdvancedSessionExtensionBase} from "./AdvancedSessionExtensionBase";
+import { ForceRevisionStrategy } from "./ForceRevisionStrategy";
+import { throwError } from "../../Exceptions";
+import { TypeUtil } from "../../Utility/TypeUtil";
+import { StringUtil } from "../../Utility/StringUtil";
+import { AdvancedSessionExtensionBase } from "./AdvancedSessionExtensionBase";
 
 export class DocumentSessionRevisionsBase extends AdvancedSessionExtensionBase {
     forceRevisionCreationFor<T extends object>(entity: T)
diff --git a/src/Documents/Session/GraphDocumentQuery.ts b/src/Documents/Session/GraphDocumentQuery.ts
@@ -79,7 +79,7 @@ export class GraphDocumentQuery<T extends object> extends AbstractDocumentQuery<
             const rawQuery  = queryRawQueryOrBuilder;
             return this._withInternal(alias, documentType, this.session.advanced.rawQuery(rawQuery, documentType) as unknown as AbstractDocumentQuery<TOther, any>);
         } else if (queryRawQueryOrBuilder instanceof DocumentQuery) {
-            //TODO: ParameterPrefix = $"w{WithTokens.Count}p
+            this.parameterPrefix = "w" + this._withTokens.length + "p";
             const documentQuery = queryRawQueryOrBuilder;
             return this._withInternal(alias, documentQuery.getQueryType(), documentQuery);
         } else {
diff --git a/src/Documents/Session/Tokens/FromToken.ts b/src/Documents/Session/Tokens/FromToken.ts
@@ -1,6 +1,6 @@
 import { QueryToken } from "./QueryToken";
 import { throwError } from "../../../Exceptions";
-import {StringUtil} from "../../../Utility/StringUtil";
+import { StringUtil } from "../../../Utility/StringUtil";
 
 export class FromToken extends QueryToken {
 
diff --git a/src/Documents/Subscriptions/DocumentSubscriptions.ts b/src/Documents/Subscriptions/DocumentSubscriptions.ts
@@ -71,7 +71,7 @@ export class DocumentSubscriptions implements IDisposable {
             throwError("InvalidArgumentException", "Cannot create a subscription if the script is null");
         }
 
-        const requestExecutor = this._store.getRequestExecutor(database || this._store.database);
+        const requestExecutor = this._store.getRequestExecutor(this._store.getEffectiveDatabase(database));
 
         const command = new CreateSubscriptionCommand(this._store.conventions, options);
         await requestExecutor.execute(command);
@@ -291,7 +291,7 @@ export class DocumentSubscriptions implements IDisposable {
      * It downloads a list of all existing subscriptions in a database.
      */
     public async getSubscriptions(start: number, take: number, database?: string): Promise<SubscriptionState[]> {
-        const requestExecutor = this._store.getRequestExecutor(database || this._store.database);
+        const requestExecutor = this._store.getRequestExecutor(this._store.getEffectiveDatabase(database));
 
         const command = new GetSubscriptionsCommand(start, take);
         await requestExecutor.execute(command);
@@ -313,7 +313,7 @@ export class DocumentSubscriptions implements IDisposable {
      * Delete a subscription.
      */
     public async delete(name: string, database?: string): Promise<void> {
-        const requestExecutor = this._store.getRequestExecutor(database || this._store.database);
+        const requestExecutor = this._store.getRequestExecutor(this._store.getEffectiveDatabase(database));
 
         const command = new DeleteSubscriptionCommand(name);
         return requestExecutor.execute(command);
@@ -337,7 +337,7 @@ export class DocumentSubscriptions implements IDisposable {
             throwError("InvalidArgumentException", "SubscriptionName cannot be null");
         }
 
-        const requestExecutor = this._store.getRequestExecutor(database || this._store.database);
+        const requestExecutor = this._store.getRequestExecutor(this._store.getEffectiveDatabase(database));
 
         const command = new GetSubscriptionStateCommand(subscriptionName);
         await requestExecutor.execute(command);
@@ -366,7 +366,7 @@ export class DocumentSubscriptions implements IDisposable {
      * Force server to close current client subscription connection to the server
      */
     public async dropConnection(name: string, database?: string): Promise<void> {
-        const requestExecutor = this._store.getRequestExecutor(database || this._store.database);
+        const requestExecutor = this._store.getRequestExecutor(this._store.getEffectiveDatabase(database));
 
         const command = new DropSubscriptionConnectionCommand(name);
         return requestExecutor.execute(command);
@@ -376,15 +376,15 @@ export class DocumentSubscriptions implements IDisposable {
     public async enable(name: string, database: string)
     public async enable(name: string, database?: string) {
         const operation = new ToggleOngoingTaskStateOperation(name, "Subscription", false);
-        await this._store.maintenance.forDatabase(database || this._store.database)
+        await this._store.maintenance.forDatabase(this._store.getEffectiveDatabase(database))
             .send(operation);
     }
 
     public async disable(name: string)
     public async disable(name: string, database: string)
     public async disable(name: string, database?: string) {
         const operation = new ToggleOngoingTaskStateOperation(name, "Subscription", true);
-        await this._store.maintenance.forDatabase(database || this._store.database)
+        await this._store.maintenance.forDatabase(this._store.getEffectiveDatabase(database))
             .send(operation);
     }
 }
diff --git a/src/Documents/Subscriptions/SubscriptionWorker.ts b/src/Documents/Subscriptions/SubscriptionWorker.ts
@@ -68,7 +68,7 @@ export class SubscriptionWorker<T extends object> implements IDisposable {
         }
 
         this._store = documentStore;
-        this._dbName = dbName || documentStore.database;
+        this._dbName = documentStore.getEffectiveDatabase(dbName);
     }
 
     public dispose(): void {
@@ -151,7 +151,7 @@ export class SubscriptionWorker<T extends object> implements IDisposable {
 
         this._ensureParser();
 
-        const databaseName = this._dbName || this._store.database;
+        const databaseName = this._store.getEffectiveDatabase(this._dbName);
 
         const parameters = {
             database: databaseName,
diff --git a/src/Utility/StringUtil.ts b/src/Utility/StringUtil.ts
@@ -139,10 +139,10 @@ export class StringUtil {
             return;
         }
 
-        StringUtil.escapeStringInternal(builder, value);
+        StringUtil._escapeStringInternal(builder, value);
     }
 
-    private static escapeStringInternal(builder: StringBuilder, value: string) {
+    private static _escapeStringInternal(builder: StringBuilder, value: string) {
         let escaped = JSON.stringify(value);
 
         escaped = escaped.replace(/'/g, "\\\'");
diff --git a/test/Issues/RavenDB_11770.ts b/test/Issues/RavenDB_11770.ts
@@ -29,26 +29,32 @@ describe("RavenDB_11770Test", function () {
             await session.saveChanges();
         }
 
+        await delay(2);
+
         const fst = new Date();
-        await delay(1000);
+
         for (let i = 0; i < 3; i++) {
             {
                 const session = store.openSession();
                 const company = await session.load<Company>(id);
                 company.name = "Fitzchak" + i;
                 await session.saveChanges();
+
+                await delay(2);
             }
         }
 
         const snd = new Date();
-        await delay(1000);
+
         for (let i = 0; i < 3; i++) {
             {
                 const session = store.openSession();
                 const company = await session.load<Company>(id);
                 company.name = "Oren" + i;
                 await session.saveChanges();
             }
+
+            await delay(2);
         }
 
         {
diff --git a/test/Ported/Cluster/ClusterOperationTest.ts b/test/Ported/Cluster/ClusterOperationTest.ts
@@ -15,7 +15,7 @@ import { TypeUtil } from "../../../src/Utility/TypeUtil";
 
 describe("ClusterOperationTest", function () {
 
-    let testContext = new ClusterTestContext();
+    const testContext = new ClusterTestContext();
 
     it("nextIdentityForOperationShouldBroadcast", async () => {
         const cluster = await testContext.createRaftCluster(3);
@@ -82,7 +82,7 @@ describe("ClusterOperationTest", function () {
                 store.initialize();
 
                 const re = store.getRequestExecutor(database);
-                let result = await store.maintenance.forDatabase(database).send(new NextIdentityForOperation("person|"));
+                const result = await store.maintenance.forDatabase(database).send(new NextIdentityForOperation("person|"));
                 assertThat(result)
                     .isEqualTo(1);
 
diff --git a/test/Ported/Counters/SessionCountersTest.ts b/test/Ported/Counters/SessionCountersTest.ts
@@ -72,7 +72,7 @@ describe("SessionCountersTest", function () {
             await session.saveChanges();
         }
 
-        let { counters } = (await store.operations
+        const { counters } = (await store.operations
                    .send(new GetCountersOperation("users/1-A", ["likes", "downloads"])));
         assert.strictEqual(counters.length, 2);
 
diff --git a/test/Ported/CustomEntityName.ts b/test/Ported/CustomEntityName.ts
@@ -16,7 +16,7 @@ describe("CustomEntityName", function () {
 
     const getCharactersToTestWithSpecial = () => {
         const basicChars = getChars();
-        const specialChars = [ 'Ā', 'Ȁ', 'Ѐ', 'Ԁ', '؀', '܀', 'ऀ', 'ਅ', 'ଈ', 'అ', 'ഊ', 'ข', 'ဉ', 'ᄍ', 'ሎ', 'ጇ', 'ᐌ', 'ᔎ', 'ᘀ', 'ᜩ', 'ᢹ', 'ᥤ', 'ᨇ' ];
+        const specialChars = [ "Ā", "Ȁ", "Ѐ", "Ԁ", "؀", "܀", "ऀ", "ਅ", "ଈ", "అ", "ഊ", "ข", "ဉ", "ᄍ", "ሎ", "ጇ", "ᐌ", "ᔎ", "ᘀ", "ᜩ", "ᢹ", "ᥤ", "ᨇ" ];
         return [...basicChars, ...specialChars];
     }
 
diff --git a/test/Ported/Graph/ClientGraphQueriesTest.ts b/test/Ported/Graph/ClientGraphQueriesTest.ts
@@ -78,7 +78,7 @@ describe("ClientGraphQueriesTest", function () {
                 [ "Fi", "Foozy", "Fah", "Fah", "Foozy" ]
             ];
 
-            for (let names of namesList) {
+            for (const names of namesList) {
                 const res = await session.advanced.graphQuery<FooBar>("match (Foos as foo)-[bars as _]->(Bars as bar)", FooBar)
                     .withQuery("foo", b => b.query<Foo>(Foo).whereIn("name", names))
                     .withQuery("bar", session.query<Bar>(Bar).whereGreaterThanOrEqual("age", 18))
diff --git a/test/Ported/Issues/RavenDB_12030.ts b/test/Ported/Issues/RavenDB_12030.ts
@@ -128,6 +128,7 @@ class Fox {
     public name: string;
 }
 
+// tslint:disable-next-line:class-name
 class Fox_Search extends AbstractIndexCreationTask {
     public constructor() {
         super();
diff --git a/test/Ported/Issues/RavenDB_15690.ts b/test/Ported/Issues/RavenDB_15690.ts
@@ -0,0 +1,39 @@
+import { IDocumentStore } from "../../../src";
+import { disposeTestDocumentStore, testContext } from "../../Utils/TestUtil";
+import { Company } from "../../Assets/Orders";
+import { assertThat } from "../../Utils/AssertExtensions";
+
+describe("RavenDB_15690Test", function () {
+
+    let store: IDocumentStore;
+
+    beforeEach(async function () {
+        store = await testContext.getDocumentStore();
+    });
+
+    afterEach(async () =>
+        await disposeTestDocumentStore(store));
+
+    it("hasChanges_ShouldDetectDeletes", async () => {
+        {
+            const session = store.openSession();
+            const company = new Company();
+            company.name = "HR";
+            await session.store(company, "companies/1");
+            await session.saveChanges();
+        }
+
+        {
+            const session = store.openSession();
+
+            const company = await session.load("companies/1", Company);
+            await session.delete(company);
+
+            const changes = session.advanced.whatChanged();
+            assertThat(changes)
+                .hasSize(1);
+            assertThat(session.advanced.hasChanges())
+                .isTrue();
+        }
+    });
+});
diff --git a/test/Ported/Issues/RavenDB_15706.ts b/test/Ported/Issues/RavenDB_15706.ts
@@ -21,7 +21,7 @@ describe("RavenDB_15706", function () {
 
             await assertThrows(() => store.bulkInsert(), err => {
                 assertThat(err.name)
-                    .isEqualTo("InvalidOperationException");
+                    .isEqualTo("InvalidArgumentException");
             })
         } finally {
             outerStore.dispose();
diff --git a/test/Ported/Server/Replication/ReplicationWriteAssuranceTest.ts b/test/Ported/Server/Replication/ReplicationWriteAssuranceTest.ts
diff --git a/test/Utils/TestUtil.ts b/test/Utils/TestUtil.ts

Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@ import { IHiloIdGenerator } from "./IHiloIdGenerator";`
`2`	`2`	`import { HiloMultiTypeIdGenerator } from "./HiloMultiTypeIdGenerator";`
`3`	`3`	`import { AbstractHiloIdGenerator } from "./AbstractHiloIdGenerator";`
`4`	`4`	`import { IDocumentStore } from "../IDocumentStore";`
	`5`	`+import { DocumentStoreBase } from "../DocumentStoreBase";`
`5`	`6`
`6`	`7`	`export class HiloMultiDatabaseIdGenerator extends AbstractHiloIdGenerator implements IHiloIdGenerator {`
`7`	`8`
`@@ -10,7 +11,7 @@ export class HiloMultiDatabaseIdGenerator extends AbstractHiloIdGenerator implem`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`public generateDocumentId(dbName: string, entity: object): Promise<string> {`
`13`		`- return this._getGeneratorForDatabase(dbName \|\| this._store.database)`
	`14`	`+ return this._getGeneratorForDatabase(DocumentStoreBase.getEffectiveDatabase(this._store, dbName))`
`14`	`15`	`.generateDocumentId(entity);`
`15`	`16`	`}`
`16`	`17`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ export class SubscriptionWorker<T extends object> implements IDisposable {`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`this._store = documentStore;`
`71`		`- this._dbName = dbName \|\| documentStore.database;`
	`71`	`+ this._dbName = documentStore.getEffectiveDatabase(dbName);`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`public dispose(): void {`
`@@ -151,7 +151,7 @@ export class SubscriptionWorker<T extends object> implements IDisposable {`
`151`	`151`
`152`	`152`	`this._ensureParser();`
`153`	`153`
`154`		`- const databaseName = this._dbName \|\| this._store.database;`
	`154`	`+ const databaseName = this._store.getEffectiveDatabase(this._dbName);`
`155`	`155`
`156`	`156`	`const parameters = {`
`157`	`157`	`database: databaseName,`