cequel 2.1.0 → 3.0.0

data/spec/examples/metal/keyspace_spec.rb

@@ -86,17 +86,17 @@ describe Cequel::Metal::Keyspace do
     end
   end
 
-  describe "#drop_table", cassandra: '~> 3.x' do
+  describe "#drop_table", cql: "~> 3.1" do
     it "allows IF EXISTS" do
       expect { cequel.schema.drop_table(:unknown) }.to raise_error(Cassandra::Errors::InvalidError)
-      expect { cequel.schema.drop_table(:unknown, exists: true) }.not_to raise_error(Cassandra::Errors::InvalidError)
+      expect { cequel.schema.drop_table(:unknown, exists: true) }.not_to raise_error
     end
   end
 
-  describe "#drop_materialized_view", cassandra: '~> 3.x' do
+  describe "#drop_materialized_view", cql: "~> 3.4" do
     it "allows IF EXISTS" do
       expect { cequel.schema.drop_materialized_view(:unknown) }.to raise_error(Cassandra::Errors::ConfigurationError)
-      expect { cequel.schema.drop_materialized_view(:unknown, exists: true) }.not_to raise_error(Cassandra::Errors::ConfigurationError)
+      expect { cequel.schema.drop_materialized_view(:unknown, exists: true) }.not_to raise_error
     end
   end
 

data/spec/examples/record/associations_spec.rb

@@ -104,6 +104,7 @@ describe Cequel::Record::Associations do
       expect do
         Class.new do
           include Cequel::Record
+          self.table_name = "foo"
           key :permalink, :text
           belongs_to :blog
         end
@@ -114,6 +115,7 @@ describe Cequel::Record::Associations do
       expect do
         Class.new do
           include Cequel::Record
+          self.table_name = "foo"
           belongs_to :blog
           belongs_to :user
         end
@@ -169,6 +171,8 @@ describe Cequel::Record::Associations do
         expect do
           Class.new do
             include Cequel::Record
+            self.table_name = "foo"
+
             key :permalink, :text
             belongs_to :post, partition: true
           end
@@ -179,6 +183,8 @@ describe Cequel::Record::Associations do
         expect do
           Class.new do
             include Cequel::Record
+            self.table_name = "foo"
+
             belongs_to :post, partition: true
             belongs_to :user
           end

data/spec/examples/record/mass_assignment_spec.rb

@@ -2,7 +2,7 @@
 require_relative 'spec_helper'
 
 describe Cequel::Record::MassAssignment do
-  context 'with strong parameters', :rails => '~> 4.0' do
+  context 'with strong parameters', rails: '>= 4.0' do
     model :Post do
       key :permalink, :text
       column :title, :text
@@ -34,7 +34,7 @@ describe Cequel::Record::MassAssignment do
     end
   end
 
-  context 'with mass-assignment protection', :rails => '~> 3.1' do
+  context 'with mass-assignment protection', rails: '~> 3.0' do
     model :Post do
       key :permalink, :text
       column :title, :text

data/spec/examples/record/properties_spec.rb

@@ -203,6 +203,7 @@ describe Cequel::Record::Properties do
       expect do
         Class.new do
           include Cequel::Record
+          self.table_name = "foo"
           key :subdomain, :text, auto: true
         end
       end.to raise_error(ArgumentError)

data/spec/examples/record/record_set_spec.rb

@@ -806,7 +806,7 @@ describe Cequel::Record::RecordSet do
       end
     end
 
-    context 'allow_filtering!', cassandra: '~> 3.x' do
+    context 'allow_filtering!', cql: '~> 3.4' do
       it 'should allow filtering for none indexed columns' do
         expect(Post.allow_filtering!.where(title: 'Cequel 0').entries.length).to be(1)
       end

data/spec/examples/schema/patch_spec.rb

@@ -0,0 +1,190 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Cequel::Schema
+  describe Patch do
+
+    let(:table_name) { |ex| unique_table_name("posts", ex) }
+    let(:table) {
+      Table.new(table_name).tap do |t|
+        t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+      end
+    }
+
+    describe ".new" do
+      it "returns a Patch" do
+        expect(
+          described_class.new([])
+        ).to be_kind_of described_class
+      end
+    end
+
+    describe "#changes" do
+      context "no changes" do
+        subject { described_class.new([]) }
+
+        it "returns the changes" do
+          expect( subject.changes ).to be_empty
+        end
+      end
+
+      context "no some changes" do
+        let(:change) {
+          Patch::AddColumn.new(table, DataColumn.new(:author_name, Cequel::Type[:text]))
+        }
+
+        subject { described_class.new([change]) }
+
+        it "returns the changes" do
+          expect( subject.changes ).to eq [change]
+        end
+      end
+    end
+
+    describe "#statements" do
+      let(:change) {
+        Patch::AddColumn.new(table, DataColumn.new(:author_name, Cequel::Type[:text]))
+      }
+
+      subject { described_class.new([change]) }
+
+      it "returns a statement for each change" do
+        expect( subject.statements.count ).to eq subject.changes.count
+        expect( subject.statements.count ).to eq 1
+      end
+    end
+  end
+
+  describe Patch::SetTableProperties do
+    let(:table_name) { |ex| unique_table_name("posts", ex) }
+    let(:table) {
+      Table.new(table_name).tap do |t|
+        t.add_property TableProperty.build(:comment, "hello")
+      end
+    }
+
+    describe "#new" do
+      it "returns #{described_class}" do
+        expect( described_class.new(table) ).to be_kind_of described_class
+      end
+    end
+
+    subject { described_class.new(table) }
+
+    describe "#to_cql" do
+      it "sets the property" do
+        expect( subject.to_cql ).to match /alter +table +"?#{table_name}"? +with/i
+        expect( subject.to_cql ).to match /"?comment"? *= *'hello'/i
+      end
+    end
+
+    describe "#properties" do
+      it "returns collection of Table properties to be set" do
+        expect( subject.properties ).to all be_kind_of TableProperty
+        expect( subject.properties ).to eq table.properties.values
+      end
+
+    end
+  end
+
+  describe Patch::DropIndex do
+    let(:table_name) { |ex| unique_table_name("posts", ex) }
+    let(:table) { Table.new(table_name) }
+    let(:column_with_obsolete_idx) {
+      DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+    }
+
+    describe "#new" do
+      it "returns #{described_class}" do
+        expect(
+          described_class.new(table, column_with_obsolete_idx)
+        ).to be_kind_of described_class
+      end
+    end
+
+    subject { described_class.new(table, column_with_obsolete_idx) }
+
+    describe "#to_cql" do
+      it "drops index" do
+        expect( subject.to_cql ).to match /drop +index/i
+        expect( subject.to_cql ).to match /"?#{column_with_obsolete_idx.index_name}"?/i
+      end
+    end
+
+    describe "#index_name" do
+      it "returns the index name" do
+        expect( subject.index_name ).to eq column_with_obsolete_idx.index_name
+      end
+    end
+  end
+
+  describe Patch::AddIndex do
+    let(:table_name) { |ex| unique_table_name("posts", ex) }
+    let(:table) { Table.new(table_name) }
+    let(:column) {
+      DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+    }
+
+    describe "#new" do
+      it "returns #{described_class}" do
+        expect(
+          described_class.new(table, column)
+        ).to be_kind_of described_class
+      end
+    end
+
+    subject { described_class.new(table, column) }
+
+    describe "#to_cql" do
+      it "creates the index" do
+        expect( subject.to_cql ).to match /create +index/i
+        expect( subject.to_cql ).to match /"#{column.index_name}"/i
+        expect( subject.to_cql ).to match /( *"#{column.name}" *)/i
+      end
+    end
+
+    describe "#index_name" do
+      it "returns the index name" do
+        expect( subject.index_name ).to eq column.index_name
+      end
+    end
+
+    describe "#column" do
+      it "returns the column" do
+        expect( subject.column ).to eq column
+      end
+    end
+  end
+
+    describe Patch::AddColumn do
+    let(:table_name) { |ex| unique_table_name("posts", ex) }
+    let(:table) { Table.new(table_name) }
+    let(:column) {
+      DataColumn.new(:author_name, Cequel::Type[:text])
+    }
+
+    describe "#new" do
+      it "returns #{described_class}" do
+        expect(
+          described_class.new(table, column)
+        ).to be_kind_of described_class
+      end
+    end
+
+    subject { described_class.new(table, column) }
+
+    describe "#to_cql" do
+      it "adds the column" do
+        expect( subject.to_cql ).to match /alter +table/i
+        expect( subject.to_cql ).to match /"#{table_name}"/i
+        expect( subject.to_cql ).to match /add +"#{column.name}"/i
+      end
+    end
+
+    describe "#column" do
+      it "returns the column" do
+        expect( subject.column ).to eq column
+      end
+    end
+    end
+end

data/spec/examples/schema/table_differ_spec.rb

@@ -0,0 +1,280 @@
+# -*- encoding : utf-8 -*-
+require File.expand_path('../../spec_helper', __FILE__)
+
+module Cequel::Schema
+  describe TableDiffer do
+
+    let(:table_name) { |ex| unique_table_name("posts", ex) }
+    let(:orig_table) {
+      Table.new(table_name).tap do |t|
+        t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+        t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+        t.add_column DataColumn.new(:body, Cequel::Type[:text])
+        t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+        t.add_property TableProperty.build(:comment, "Orig comment")
+      end
+    }
+
+    describe ".new" do
+      it "returns a TableDiffer" do
+        expect(
+          described_class.new(orig_table, orig_table)
+        ).to be_kind_of described_class
+      end
+    end
+
+    describe ".call" do
+      it "returns a Patch" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to be_kind_of Patch
+      end
+
+      it "fails for table name changes" do
+        renamed_table = Table.new(:fancy_new_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect{
+          described_class.new(orig_table, renamed_table).call
+        }.to raise_error(Cequel::InvalidSchemaMigration)
+      end
+
+      it "succeed if name difference it immaterial" do
+        equiv_table = Table.new(table_name.to_s).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect{
+          described_class.new(orig_table, equiv_table).call
+        }.not_to raise_error
+      end
+
+      it "fails for type changes" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:ascii])
+        end
+
+        expect{
+          described_class.new(orig_table, updated_table).call
+        }.to raise_error(Cequel::InvalidSchemaMigration)
+      end
+
+      it "fails for partition key changes" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column PartitionKey.new(:date, Cequel::Type[:timestamp])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect{
+          described_class.new(orig_table, updated_table).call
+        }.to raise_error(Cequel::InvalidSchemaMigration)
+      end
+
+      it "fails for clustering order changes" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text], :desc)
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect{
+          described_class.new(orig_table, updated_table).call
+        }.to raise_error(Cequel::InvalidSchemaMigration)
+      end
+
+      it "ignore immaterial changes to clustering order" do
+        unchanged_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text], :asc)
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect{
+          described_class.new(orig_table, unchanged_table).call
+        }.not_to raise_error
+      end
+
+      it "detects a lack of changes changes" do
+        unchanged_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text], :author_name_idx)
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect(
+          described_class.new(orig_table, unchanged_table).call
+        ).to be_empty
+      end
+
+      it "detects new columns" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:created_at, Cequel::Type[:timestamp])
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to add_column(:created_at).of_type(:timestamp)
+      end
+
+      it "detects added index to existing column" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text], :my_index_name)
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to add_index(:my_index_name).of_column(:body)
+      end
+
+      it "detects dropped index" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_column DataColumn.new(:author_name, Cequel::Type[:text])
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to drop_index(:author_name_idx)
+      end
+
+      it "detects added index to new column" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:category, Cequel::Type[:text], :posts_category_idx)
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to add_index(:posts_category_idx).of_column(:category)
+      end
+
+      it "ignores dropped columns" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_column DataColumn.new(:body, Cequel::Type[:text])
+          t.add_property TableProperty.build(:comment, "Orig comment")
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to be_empty
+      end
+
+      it "detects new property" do
+        updated_table = Table.new(table_name).tap do |t|
+          t.add_column PartitionKey.new(:blog_subdomain, Cequel::Type[:text])
+          t.add_column ClusteringColumn.new(:slug, Cequel::Type[:text])
+          t.add_property TableProperty.build(:comment, "test")
+        end
+
+        expect(
+          described_class.new(orig_table, updated_table).call
+        ).to set_property(:comment, "test")
+      end
+    end
+
+    # Background
+
+    matcher :set_property do |expected_name, expected_val|
+      match do |actual_patch|
+        actual_patch.changes
+          .any? { |actual_change|
+          actual_change.is_a?(Cequel::Schema::Patch::SetTableProperties) &&
+            actual_change.properties
+            .any?{|p|
+            p.name.to_s == expected_name.to_s &&
+              expected_val === p.value
+          }
+        }
+      end
+    end
+
+    matcher :drop_index do |index_name|
+      match do |actual_patch|
+        actual_patch.changes
+          .any? { |actual_change|
+          actual_change.is_a?(Cequel::Schema::Patch::DropIndex) &&
+            actual_change.index_name.to_s == index_name.to_s
+        }
+      end
+    end
+
+    matcher :add_index do |index_name|
+      @column_matcher = ->(_){true}
+
+      match do |actual_patch|
+        actual_patch.changes
+          .any? { |actual_change|
+          actual_change.is_a?(Cequel::Schema::Patch::AddIndex) &&
+            @column_matcher === actual_change.column &&
+            actual_change.index_name.to_s == index_name.to_s
+        }
+      end
+
+      chain :of_column do |col_name|
+        @column_matcher = ->(col) { col.name.to_s == col_name.to_s }
+      end
+    end
+
+    matcher :add_column do |name|
+      @type_matcher = ->(_){true}
+
+      match do |actual_patch|
+        actual_patch.changes
+          .any? { |actual_change|
+          actual_change.is_a?(Cequel::Schema::Patch::AddColumn) &&
+            actual_change.column.name == name &&
+            @type_matcher === actual_change.column.type
+        }
+      end
+
+      chain :of_type do |type_or_matcher|
+        @type_matcher = if type_or_matcher.respond_to?(:call)
+                          type_or_matcher
+                        elsif t = Cequel::Type[type_or_matcher]
+                          ->(type) { type == t }
+                        else
+                          fail "unsupported type matcher: #{type_or_matcher.inspect}"
+                        end
+      end
+    end
+  end
+end