Support named collections in _default scope (#94)

Motivation
------------
Currently doesn't work correctly with collections in the _default scope
except for the _default collection.

Modifications
---------------
Check for _default in both scope and collection before assuming that an
index is in the default collection.

Fixes #93

packages/couchbase-index-manager/app/configuration/index-validation.ts

@@ -91,10 +91,6 @@ export const IndexValidators: ValidatorSet<IndexConfigurationBase> = {
         }
     },
     post_validate: function(): void {
-        if (!!this.scope !== !!this.collection) {
-            throw new Error('if scope is supplied collection must also be supplied');
-        }
-
         if (!this.is_primary) {
             const isDrop = this.lifecycle && this.lifecycle.drop;
 

packages/couchbase-index-manager/app/index-manager.ts

@@ -133,7 +133,7 @@ function isStatusMatch(index: CouchbaseIndex, status: IndexStatus): boolean {
 }
 
 export function getKeyspace(bucket: string, scope = DEFAULT_SCOPE, collection = DEFAULT_COLLECTION): string {
-    if (scope === DEFAULT_SCOPE) {
+    if (scope === DEFAULT_SCOPE && collection === DEFAULT_COLLECTION) {
         return ensureEscaped(bucket);
     } else {
         return `${ensureEscaped(bucket)}.${ensureEscaped(scope)}.${ensureEscaped(collection)}`;
@@ -260,7 +260,7 @@ export class IndexManager {
     private getAlterStatement(indexName: string, scope: string, collection: string, withClause: WithClause): string {
         let statement: string;
 
-        if (scope === DEFAULT_SCOPE) {
+        if (scope === DEFAULT_SCOPE && collection === DEFAULT_COLLECTION) {
             // We need to use the old syntax for the default collection for backward compatibilty
             statement = `ALTER INDEX ${ensureEscaped(this.bucketName)}.${ensureEscaped(indexName)} WITH `;
         } else {

packages/couchbase-index-manager/app/plan/index-mutation.ts

@@ -1,5 +1,5 @@
 import { IndexDefinition } from "../definition";
-import { DEFAULT_SCOPE, IndexManager } from "../index-manager";
+import { DEFAULT_COLLECTION, DEFAULT_SCOPE, IndexManager } from "../index-manager";
 import { Logger } from "../options";
 
 /**
@@ -15,7 +15,7 @@ export abstract class IndexMutation {
      * A display name for the index which includes the scope and collection if non-default.
      */
     get displayName(): string {
-        if (this.scope === DEFAULT_SCOPE) {
+        if (this.scope === DEFAULT_SCOPE && this.collection === DEFAULT_COLLECTION) {
             return this.name;
         } else {
             return `${this.scope}.${this.collection}.${this.name}`;

packages/couchbase-index-manager/app/plan/plan.ts

@@ -1,6 +1,6 @@
 import chalk from 'chalk';
 import { padStart, flatten } from 'lodash';
-import { DEFAULT_SCOPE, IndexManager, WaitForIndexBuildOptions } from '../index-manager';
+import { DEFAULT_COLLECTION, DEFAULT_SCOPE, IndexManager, WaitForIndexBuildOptions } from '../index-manager';
 import { IndexMutation } from './index-mutation';
 import { Logger } from '../options';
 
@@ -172,7 +172,7 @@ export class Plan {
 
         // Build each collection separately
         for (const collection of collections) {
-            if (collection.scope === DEFAULT_SCOPE) {
+            if (collection.scope === DEFAULT_SCOPE && collection.collection === DEFAULT_COLLECTION) {
                 this.options.logger.info(chalk.greenBright('Building indexes...'));
             } else {
                 this.options.logger.info(chalk.greenBright(`Building indexes on ${collection.scope}.${collection.collection}...`));