Multiple GSI Support (#42)

* increment version

* index option now supports multiple indexes

Author: ferrants

README.md

@@ -159,7 +159,7 @@ HighScore: {
 ```
 
 #### Fields with multiple indexes
-A field can be both the primary and part of a GSI index. Participating in multiple GSI indexes is not currently supported.
+A field can be both the primary and part of a GSI index. Participating in multiple GSI indexes is supported as of v0.12.5.
 
 ```
 GameTitle: {
@@ -169,7 +169,7 @@ GameTitle: {
 }
 ```
 
-__Not Supported Yet__:
+Multiple GSIs:
 ```
 GameTitle: {
   type: 'string',
@@ -178,6 +178,15 @@ GameTitle: {
 }
 ```
 
+Multiple GSIs and a secondary index:
+```
+GameTitle: {
+  type: 'string',
+  primaryKey: 'hash'
+  index: ['secondary', GameTitleIndex-hash'. 'SomeOtherIndex-hash']
+}
+```
+
 ### Sorting By Indexes
 Sorting does not look like how it looks with the normal sails database adapters. You can not sort by an arbitrary field, you must sort by a range field in an index. The index is automatically inferred by what you are querying and you can specify a direction to sort the range fields of the used index. Using the GSI defined above, this will query for descending highscores of Super Mario World:
 ```

index.js

@@ -187,15 +187,29 @@ module.exports = (function () {
 
               index = attributes.index;
 
-              indexParts = adapter._parseIndex(index, columnName);
-              indexName = indexParts[0];
-              indexType = indexParts[1];
+              if (_.isArray(index)){
+                index.forEach((oneIndex) => {
+                  indexParts = adapter._parseIndex(oneIndex, columnName);
+                  indexName = indexParts[0];
+                  indexType = indexParts[1];
+
+                  if (typeof indices[indexName] === 'undefined') {
+                    indices[indexName] = {};
+                  }
+
+                  indices[indexName][indexType] = columnName;
+                });
+              }else{
+                indexParts = adapter._parseIndex(index, columnName);
+                indexName = indexParts[0];
+                indexType = indexParts[1];
 
-              if (typeof indices[indexName] === 'undefined') {
-                indices[indexName] = {};
-              }
+                if (typeof indices[indexName] === 'undefined') {
+                  indices[indexName] = {};
+                }
 
-              indices[indexName][indexType] = columnName;
+                indices[indexName][indexType] = columnName;
+              }
 
             }
 
@@ -549,6 +563,8 @@ module.exports = (function () {
             scanning  = false;
 
         if (indexing) {
+          // console.log("USING INDEX")
+          // console.log(indexing);
            query = model.query(options.where[hash])
           delete options.where[hash];
 
@@ -758,6 +774,14 @@ module.exports = (function () {
       var indexInfo;
       var indexName;
       var indexType;
+
+      if (!(_.isArray(fields))){
+        fields = Object.keys(fields);
+      }
+
+      // console.log("FIELDS")
+      // console.log(fields);
+
       for (var i = 0; i < fields.length; i++) {
 
         fieldName = fields[i];
@@ -778,8 +802,25 @@ module.exports = (function () {
 
         // using secondary or GSIs
         if (column.index){
+          // console.log("COLUMN.INDEX")
+          // console.log(column.index)
           if (_.isArray(column.index)){
-            throw new Error(`No support yet for multiple non-primary indexes, ${fieldName} = ${column.index}`);
+            column.index.forEach((oneIndex) => {
+              if (oneIndex === 'secondary'){
+                secondaryRange = fieldName;
+              }else{
+                indexInfo = adapter._parseIndex(oneIndex, fieldName);
+                indexName = indexInfo[0];
+                indexType = indexInfo[1];
+
+                if (typeof indices[indexName] === 'undefined') {
+                  indices[indexName] = {};
+                }
+
+                indices[indexName][indexType] = fieldName;
+              }
+            });
+            // throw new Error(`No support yet for multiple non-primary indexes, ${fieldName} = ${column.index}`);
           }else if (column.index === 'secondary'){
             secondaryRange = fieldName;
           }else{
@@ -797,6 +838,9 @@ module.exports = (function () {
 
       }
 
+      // console.log("INDICES")
+      // console.log(indices)
+
       // set global secondary hash info
       var indicesHashed;
       var indicesRanged;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "sails-dynamodb",
-  "version": "0.12.3",
+  "version": "0.12.5",
   "description": "Amazon DynamoDB adapter for Sails / Waterline",
   "main": "index.js",
   "scripts": {