Merge pull request #216 from andrykonchin/fix-index-detection-in-where

Fix global index detection

lib/dynamoid/criteria/chain.rb

@@ -294,7 +294,7 @@ def key_present?
         # But only do so if projects ALL attributes otherwise we won't
         # get back full data
         source.global_secondary_indexes.each do |_, gsi|
-          next unless query_keys.include?(gsi.hash_key.to_s) && gsi.projected_attributes == :all
+          next unless query.keys.map(&:to_s).include?(gsi.hash_key.to_s) && gsi.projected_attributes == :all
           @hash_key = gsi.hash_key
           @range_key = gsi.range_key
           @index_name = gsi.name

spec/dynamoid/criteria/chain_spec.rb

@@ -604,6 +604,15 @@ def request_params
         expect(chain).to receive(:records_via_query).and_call_original
         expect(chain.where(city: 'San Francisco').start(@customer2).all).to contain_exactly(@customer3)
       end
+
+      it "does not use index if a condition for index hash key is other than 'equal'" do
+        chain = Dynamoid::Criteria::Chain.new(model)
+        expect(chain).to receive(:records_via_scan).and_call_original
+        expect(chain.where('city.begins_with' => 'San').count).to eq(3)
+        expect(chain.hash_key).to be_nil
+        expect(chain.range_key).to be_nil
+        expect(chain.index_name).to be_nil
+      end
     end
 
     it 'supports query on global secondary index with correct start key without table range key' do