Test merge

Author: schmidt-sebastian

packages/firestore/src/local/indexeddb_schema.ts

@@ -642,11 +642,13 @@ export const V1_STORES = [
   DbTargetDocument.store
 ];
 
-const V3_STORES = [DbClientMetadata.store, DbTargetChange.store];
+export const V2_STORES = V1_STORES;
+
+const V3_STORES = [...V2_STORES, DbClientMetadata.store, DbTargetChange.store];
 
 /**
  * The list of all default IndexedDB stores used throughout the SDK. This is
  * used when creating transactions so that access across all stores is done
  * atomically.
  */
-export const ALL_STORES = [...V1_STORES, ...V3_STORES];
+export const ALL_STORES = V3_STORES;

packages/firestore/src/local/memory_persistence.ts

@@ -52,14 +52,10 @@ export class MemoryPersistence implements Persistence {
 
   private started = false;
 
-<<<<<<< HEAD
   constructor(private readonly queue: AsyncQueue) {}
 
-  start(): Promise<void> {
-=======
   async start(): Promise<void> {
     // No durable state to read on startup.
->>>>>>> master
     assert(!this.started, 'MemoryPersistence double-started!');
     this.started = true;
   }

packages/firestore/test/unit/local/indexeddb_schema.test.ts

@@ -21,10 +21,11 @@ import {
   createOrUpgradeDb,
   DbTarget,
   DbTargetGlobal,
-  DbTargetGlobalKey
+  DbTargetGlobalKey, V1_STORES, V2_STORES
 } from '../../../src/local/indexeddb_schema';
 import { SimpleDb, SimpleDbTransaction } from '../../../src/local/simple_db';
 import { PersistencePromise } from '../../../src/local/persistence_promise';
+import {asyncQueue} from '../../integration/util/internal_helpers';
 
 const INDEXEDDB_TEST_DATABASE = 'schemaTest';
 
@@ -88,11 +89,10 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
   beforeEach(() => SimpleDb.delete(INDEXEDDB_TEST_DATABASE));
 
   it('can install schema version 1', () => {
-    return withDb(1, db => {
+    return withDb(1, async db => {
       expect(db.version).to.equal(1);
       // Version 1 adds all of the stores so far.
-      expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
-      return Promise.resolve();
+      expect(getAllObjectStores(db)).to.have.members(V2_STORES);
     });
   });
 
@@ -101,14 +101,21 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
       expect(db.version).to.equal(2);
       // We should have all of the stores, we should have the target global row
       // and we should not have any targets counted, because there are none.
-      expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
+      expect(getAllObjectStores(db)).to.have.members(V2_STORES);
       // Check the target count. We haven't added any targets, so we expect 0.
       return getTargetCount(db).then(targetCount => {
         expect(targetCount).to.equal(0);
       });
     });
   });
 
+  it('can install schema version 3', () => {
+    return withDb(3, async db => {
+      expect(db.version).to.be.equal(3);
+      expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
+    });
+  });
+
   it('can upgrade from schema version 1 to 2', () => {
     const expectedTargetCount = 5;
     return withDb(1, db => {
@@ -126,11 +133,20 @@ describe('IndexedDbSchema: createOrUpgradeDb', () => {
     }).then(() =>
       withDb(2, db => {
         expect(db.version).to.equal(2);
-        expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
+        expect(getAllObjectStores(db)).to.have.members(V2_STORES);
         return getTargetCount(db).then(targetCount => {
           expect(targetCount).to.equal(expectedTargetCount);
         });
       })
     );
   });
+
+  it('can upgrade from schema version 2 to 3', () => {
+    return withDb(2, async () => {}).then(() =>
+        withDb(3, async db => {
+          expect(db.version).to.be.equal(3);
+          expect(getAllObjectStores(db)).to.have.members(ALL_STORES);
+        })
+    );
+  });
 });

packages/firestore/test/unit/local/schema_migration.test.ts

@@ -43,7 +43,7 @@ export class TestQueryCache {
   }
 
   updateQueryData(queryData: QueryData): Promise<void> {
-    return this.persistence.runTransaction('updateQueryData', txn => {
+    return this.persistence.runTransaction('updateQueryData', true, txn => {
       return this.cache.updateQueryData(txn, queryData);
     });
   }