Fix adding and removing index in the same upgrade

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nosqlprovider",
-  "version": "0.6.16",
+  "version": "0.6.17",
   "description": "A cross-browser/platform indexeddb-like client library",
   "author": "David de Regt <David.de.Regt@microsoft.com>",
   "scripts": {

src/SqlProviderBase.ts

@@ -327,8 +327,8 @@ export abstract class SqlProviderBase extends NoSqlProvider.DbProvider {
                             const indexIdentifierDictionary = _.keyBy(storeSchema.indexes, index => getIndexIdentifier(storeSchema, index));
                             const indexMetaDictionary = _.keyBy(currentIndexMetas, meta => meta.key);
 
-                            // find indices in the schema that did not exist before
-                            const newIndices = _.filter(storeSchema.indexes, index =>
+                            // find which indices in the schema existed / did not exist before
+                            const [newIndices, existingIndices] = _.partition(storeSchema.indexes, index =>
                                 !indexMetaDictionary[getIndexIdentifier(storeSchema, index)]);
 
                             // find indices in the meta that do not exist in the new schema
@@ -470,10 +470,13 @@ export abstract class SqlProviderBase extends NoSqlProvider.DbProvider {
 
                             if (doSqlInPlaceMigration) {
                                 const sqlInPlaceMigrator = () => {
-                                    return trans.runQuery('INSERT INTO ' + storeSchema.name +
-                                        ' SELECT ' + ['nsp_pk', 'nsp_data', ...indexColumns].join(', ') + 
-                                        ' FROM temp_' + storeSchema.name);
+                                    const columnsToCopy = ['nsp_pk', 'nsp_data',  
+                                        ..._.map(existingIndices, index => getIndexIdentifier(storeSchema, index))
+                                    ].join(', ');
 
+                                    return trans.runQuery('INSERT INTO ' + storeSchema.name + '(' + columnsToCopy + ')' +
+                                        ' SELECT ' + columnsToCopy + 
+                                        ' FROM temp_' + storeSchema.name);
                                 };
 
                                 tableQueries.push(

src/tests/NoSqlProviderTests.ts

@@ -2228,6 +2228,62 @@ describe('NoSqlProvider', function () {
                                 });
                             });
                         });
+
+                        it('Add and remove index in the same upgrade', () => {
+                            return openProvider(provName, {
+                                version: 1,
+                                stores: [
+                                    {
+                                        name: 'test',
+                                        primaryKeyPath: 'id',
+                                        indexes: [{
+                                            name: 'ind1',
+                                            keyPath: 'tt',
+                                            doNotBackfill: true
+                                        }]
+                                    }
+                                ]
+                            }, true)
+                            .then(prov => {
+                                return prov.put('test', { id: 'abc', tt: 'a' , zz: 'aa'}).then(() => {
+                                    return prov.close();
+                                });
+                            })
+                            .then(() => {
+                                return openProvider(provName, {
+                                    version: 2,
+                                    stores: [
+                                        {
+                                            name: 'test',
+                                            primaryKeyPath: 'id',
+                                            indexes: [{
+                                                name: 'ind2',
+                                                keyPath: 'zz',
+                                                doNotBackfill: true
+                                            }]
+                                        }
+                                    ]
+                                }, false)
+                                .then(prov => {
+                                    const p1 = prov.getOnly('test', undefined, 'abc').then((items: any[]) => {
+                                        assert.equal(items.length, 1);
+                                        assert.equal(items[0].id, 'abc');
+                                        assert.equal(items[0].tt, 'a');
+                                        assert.equal(items[0].zz, 'aa');
+                                    });
+                                    const p2 = prov.getOnly('test', 'ind1', 'a').then(items => {
+                                        return SyncTasks.Rejected<void>('Shouldn\'t have worked');
+                                    }, () => {
+                                        // Expected to fail, so chain from failure to success
+                                        return undefined;
+                                    });
+
+                                    return SyncTasks.all([p1, p2]).then(() => {
+                                        return prov.close();
+                                    });
+                                });
+                            });
+                        });
                     }
                 });
             }