cequel 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8997183e82dc1c78a6bf30f6abbb311802ff4d37
-  data.tar.gz: c97d4925764150e9bd7ec574ecc0bc1500752196
+  metadata.gz: 06737301a7c04005670f2c38aa69a50d08a8166a
+  data.tar.gz: 9253937c264d5d6ef64a3861aa1d909779b9f853
 SHA512:
-  metadata.gz: 568edad894b06c8fb5092e7db1c6e5cee98fdb8e06f61c452f769ea5d057895b0075f8e62a916f47bb36edec35e2c3e0f2e3ab894a1256a86c95b3f9cb8b8746
-  data.tar.gz: 10d23590a90648be41f774ca525ca911d37c63ef4c9d1c54ef1b9102a01318b722dd7c398306254c0819f0874f56afba44456251d301ae012e0c8428ba079260
+  metadata.gz: 3e1d63bb14b7f0f7d365533274a54805cce8298c65bb8128715af69338487f41190dda0912ae2980e27a5b021de60d763cc2a697043ef087607ea1071d1776c1
+  data.tar.gz: 1c0f57e5b8f3a53624da0a5eb694a4786ab59a362883cf0e3d4296a805947c0106e67310ba8bb5adf6c66cb17fd3ef1b8888b1ea3f9a0bed4c34656327b547b9

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 3.2.0
+- Can filter on more than one non-indexed columns (https://github.com/cequel/cequel/pull/404)
+
 ## 3.1.0
 - Can now drop columns (https://github.com/cequel/cequel/pull/398)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cequel (3.1.0)
+    cequel (3.2.0)
       activemodel (>= 4.0)
       cassandra-driver (~> 3.0)
 

data/README.md

@@ -150,6 +150,25 @@ module Blogger
 end
 ```
 
+### Compound Partition Keys ###
+
+If you wish to declare a compound partition key in a model, you can do something like:
+
+```ruby
+class Post
+  include Cequel::Record
+
+  key :country, :text, partition: true
+  key :blog, :text, partition: true
+  key :id, :timeuuid, auto: true
+  column :title, :text
+  column :body, :text
+end
+```
+
+Your compound partition key here is `(country, blog)`, and the entire compound primary key is `((country, blog), id)`.
+Any key values defined after the last partition key value are clustering columns.
+
 ### Timestamps ###
 
 If your final primary key column is a `timeuuid` with the `:auto` option set,

data/lib/cequel/record/record_set.rb

@@ -846,7 +846,7 @@ module Cequel
                "Can't scope key column #{column_name} without also scoping " \
                "#{missing_column_names.join(', ')}"
         end
-        if scoped_indexed_column
+        if scoped_indexed_column && !allow_filtering
           fail IllegalQuery,
                "Can't scope by more than one indexed column in the same query"
         end

data/lib/cequel/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 module Cequel
   # The current version of the library
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/spec/examples/record/record_set_spec.rb

@@ -819,9 +819,16 @@ describe Cequel::Record::RecordSet do
     end
 
     context 'allow_filtering!', cql: '~> 3.4' do
-      it 'should allow filtering for none indexed columns' do
+      it 'should allow filtering for non-indexed columns' do
         expect(Post.allow_filtering!.where(title: 'Cequel 0').entries.length).to be(1)
       end
+
+      it 'should allow filtering for more than one non-indexed column' do
+        expect(Post.allow_filtering!.where(
+          title: 'Cequel 0',
+          body: 'Post number 0'
+        ).entries.length).to be(1)
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Mat Brown
@@ -31,7 +31,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-14 00:00:00.000000000 Z
+date: 2019-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel