cequel 2.1.0 → 3.0.0

data/spec/examples/schema/table_updater_spec.rb

@@ -83,18 +83,6 @@ describe Cequel::Schema::TableUpdater do
     end
   end
 
-  describe '#change_column' do
-    before do
-      cequel.schema.alter_table(table_name) do
-        change_column :title, :text
-      end
-    end
-
-    it 'should change the type' do
-      expect(table.data_column(:title).type).to eq(Cequel::Type[:text])
-    end
-  end
-
   describe '#rename_column' do
     before do
       cequel.schema.alter_table(table_name) do

data/spec/examples/spec_helper.rb

@@ -17,11 +17,11 @@ RSpec.configure do |config|
 
   {
     rails: ActiveSupport::VERSION::STRING,
-    cassandra: ENV.fetch('CASSANDRA_VERSION', '3.0'),
-  }.each do |tag, version|
-    config.filter_run_excluding tag => ->(requirement) {
-      !Gem::Requirement.new(requirement).
-        satisfied_by?(Gem::Version.new(version))
+    cql: Cequel::SpecSupport::Helpers.cql_version,
+  }.each do |tag, actual_version|
+    config.filter_run_excluding tag => ->(required_version) {
+      !Gem::Requirement.new(required_version).
+        satisfied_by?(Gem::Version.new(actual_version))
     }
   end
 

data/spec/examples/spec_support/preparation_spec.rb

@@ -74,6 +74,10 @@ describe Cequel::SpecSupport::Preparation do
 
   # background
 
+  before(:each) do
+    Cequel::Record.forget_all_descendants!
+  end
+
   after(:each) do
     begin
       Cequel::Record.connection.clear_active_connections!

data/spec/support/helpers.rb

@@ -51,6 +51,14 @@ module Cequel
 
     module Helpers
 
+      def self.cql_version
+        Cequel.connect(host: host,
+                       port: port,
+                       keyspace: "system")
+          .execute("SELECT cql_version FROM system.local")
+          .first["cql_version"]
+      end
+
       def self.cequel
         @cequel ||= Cequel.connect(
           host: host,
@@ -151,6 +159,21 @@ module Cequel
         0.001
       end
 
+      def example_slug(example, max_length=1000)
+        example.description.downcase.gsub(/[^a-z]+/, '_')[/.{1,#{max_length}}$/]
+      end
+
+      # figures a table name starting with `base_name` that is unique to the
+      # specified example
+      #
+      # Examples
+      #
+      #   let(:table_name) { |ex| unique_table_name("posts", ex) }
+      #
+      def unique_table_name(base_name, example)
+        max_suffix = 45 - base_name.size
+        :"#{base_name}_#{example_slug(example, max_suffix)}"
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cequel
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Mat Brown
@@ -29,7 +29,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-26 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -269,13 +269,14 @@ files:
 - lib/cequel/record/validations.rb
 - lib/cequel/schema.rb
 - lib/cequel/schema/column.rb
-- lib/cequel/schema/create_table_dsl.rb
 - lib/cequel/schema/keyspace.rb
 - lib/cequel/schema/migration_validator.rb
+- lib/cequel/schema/patch.rb
 - lib/cequel/schema/table.rb
+- lib/cequel/schema/table_desc_dsl.rb
+- lib/cequel/schema/table_differ.rb
 - lib/cequel/schema/table_property.rb
 - lib/cequel/schema/table_reader.rb
-- lib/cequel/schema/table_synchronizer.rb
 - lib/cequel/schema/table_updater.rb
 - lib/cequel/schema/table_writer.rb
 - lib/cequel/schema/update_table_dsl.rb
@@ -308,8 +309,9 @@ files:
 - spec/examples/record/timestamps_spec.rb
 - spec/examples/record/validations_spec.rb
 - spec/examples/schema/keyspace_spec.rb
+- spec/examples/schema/patch_spec.rb
+- spec/examples/schema/table_differ_spec.rb
 - spec/examples/schema/table_reader_spec.rb
-- spec/examples/schema/table_synchronizer_spec.rb
 - spec/examples/schema/table_updater_spec.rb
 - spec/examples/schema/table_writer_spec.rb
 - spec/examples/spec_helper.rb
@@ -368,8 +370,9 @@ test_files:
 - spec/examples/record/timestamps_spec.rb
 - spec/examples/record/validations_spec.rb
 - spec/examples/schema/keyspace_spec.rb
+- spec/examples/schema/patch_spec.rb
+- spec/examples/schema/table_differ_spec.rb
 - spec/examples/schema/table_reader_spec.rb
-- spec/examples/schema/table_synchronizer_spec.rb
 - spec/examples/schema/table_updater_spec.rb
 - spec/examples/schema/table_writer_spec.rb
 - spec/examples/spec_helper.rb

data/lib/cequel/schema/create_table_dsl.rb

@@ -1,88 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Cequel
-  module Schema
-    #
-    # Implements a DSL that can be used to define a table schema
-    #
-    # @see Keyspace#create_table
-    #
-    class CreateTableDSL < BasicObject
-      extend ::Cequel::Util::Forwardable
-      #
-      # Evaluate `block` in the context of this DSL, and apply directives to
-      # `table`
-      #
-      # @param table [Table] a table
-      # @yield block evaluated in the context of the create table DSL
-      # @return [void]
-      #
-      # @api private
-      #
-      def self.apply(table, &block)
-        dsl = new(table)
-        dsl.instance_eval(&block)
-      end
-
-      #
-      # @param table [Table] table to apply directives to
-      #
-      # @api private
-      #
-      def initialize(table)
-        @table = table
-      end
-
-      #
-      # @!method partition_key(name, type)
-      #   (see Cequel::Schema::Table#add_partition_key)
-      #
-      def_delegator :@table, :add_partition_key, :partition_key
-
-      #
-      # @!method key(name, type, clustering_order = nil)
-      #   (see Cequel::Schema::Table#add_key)
-      #
-      def_delegator :@table, :add_key, :key
-
-      #
-      # @!method column(name, type, options = {})
-      #   (see Cequel::Schema::Table#add_data_column)
-      #
-      def_delegator :@table, :add_data_column, :column
-
-      #
-      # @!method list(name, type)
-      #   (see Cequel::Schema::Table#add_list)
-      #
-      def_delegator :@table, :add_list, :list
-
-      #
-      # @!method set(name, type)
-      #   (see Cequel::Schema::Table#add_set)
-      #
-      def_delegator :@table, :add_set, :set
-
-      #
-      # @!method map(name, key_type, value_type)
-      #   (see Cequel::Schema::Table#add_map)
-      #
-      def_delegator :@table, :add_map, :map
-
-      #
-      # @!method with(name, value)
-      #   (see Cequel::Schema::Table#add_property)
-      #
-      def_delegator :@table, :add_property, :with
-
-      #
-      # Direct that this table use "compact storage". This is primarily useful
-      # for backwards compatibility with legacy CQL2 table schemas.
-      #
-      # @return [void]
-      #
-      def compact_storage
-        @table.compact_storage = true
-      end
-    end
-  end
-end

data/lib/cequel/schema/table_synchronizer.rb

@@ -1,180 +0,0 @@
-# -*- encoding : utf-8 -*-
-module Cequel
-  module Schema
-    #
-    # Synchronize a table schema in the database with a desired table schema
-    #
-    # @see .apply
-    # @see Keyspace#synchronize_table
-    #
-    class TableSynchronizer
-      # @return [Table] table as it is currently defined
-      # @api private
-      attr_reader :existing
-      # @return [Table] table schema as it is desired
-      # @api private
-      attr_reader :updated
-      #
-      # Takes an existing table schema read from the database, and a desired
-      # schema for that table. Modifies the table schema in the database to
-      # match the desired schema, or creates the table as specified if it does
-      # not yet exist
-      #
-      # @param keyspace [Metal::Keyspace] keyspace that contains table
-      # @param existing [Table] table schema as it is currently defined
-      # @param updated [Table] table schema as it is desired
-      # @return [void]
-      # @raise (see #apply)
-      #
-      def self.apply(keyspace, existing, updated)
-        if existing
-          TableUpdater.apply(keyspace, existing.name) do |updater|
-            new(updater, existing, updated).apply
-          end
-        else
-          TableWriter.apply(keyspace, updated)
-        end
-      end
-
-      #
-      # @param updater [TableUpdater] table updater to hold schema
-      #   modifications
-      # @param existing [Table] table schema as it is currently defined
-      # @param updated [Table] table schema as it is desired
-      # @return [void]
-      # @private
-      #
-      def initialize(updater, existing, updated)
-        @updater, @existing, @updated = updater, existing, updated
-      end
-      private_class_method :new
-
-      #
-      # Apply the changes needed to synchronize the schema in the database with
-      # the desired schema
-      #
-      # @return [void]
-      # @raise (see MigrationValidator#validate!)
-      #
-      # @api private
-      #
-      def apply
-        validate!
-        update_keys
-        update_columns
-        update_properties
-      end
-
-      #
-      # Iterate over pairs of (old_key, new_key)
-      #
-      # @yieldparam old_key [Column] key in existing schema
-      # @yieldparam new_key [Column] corresponding key in updated schema
-      # @return [void]
-      #
-      # @api private
-      #
-      def each_key_pair(&block)
-        existing.key_columns.zip(updated.key_columns, &block)
-      end
-
-      #
-      # Iterate over pairs of (old_column, new_column)
-      #
-      # @yieldparam old_column [Column] column in existing schema
-      # @yieldparam new_column [Column] corresponding column in updated schema
-      # @return [void]
-      #
-      # @api private
-      #
-      def each_data_column_pair(&block)
-        if existing.compact_storage? && existing.clustering_columns.any?
-          yield existing.data_columns.first, updated.data_columns.first
-        else
-          old_columns = existing.data_columns.index_by { |col| col.name }
-          new_columns = updated.data_columns.index_by { |col| col.name }
-          all_column_names = (old_columns.keys + new_columns.keys).tap(&:uniq!)
-          all_column_names.each do |name|
-            yield old_columns[name], new_columns[name]
-          end
-        end
-      end
-
-      #
-      # Iterate over pairs of (old_clustering_column, new_clustering_column)
-      #
-      # @yieldparam old_clustering_column [Column] key in existing schema
-      # @yieldparam new_clustering_column [Column] corresponding key in updated
-      #   schema
-      # @return [void]
-      #
-      # @api private
-      #
-      def each_clustering_column_pair(&block)
-        existing.clustering_columns.zip(updated.clustering_columns, &block)
-      end
-
-      protected
-
-      attr_reader :updater
-
-      private
-
-      def update_keys
-        each_key_pair do |old_key, new_key|
-          if old_key.name != new_key.name
-            updater.rename_column(old_key.name || :column1, new_key.name)
-          end
-        end
-      end
-
-      def update_columns
-        each_data_column_pair do |old_column, new_column|
-          if old_column.nil?
-            add_column(new_column)
-          elsif new_column
-            update_column(old_column, new_column)
-            update_index(old_column, new_column)
-          end
-        end
-      end
-
-      def add_column(column)
-        updater.add_data_column(column)
-        updater.create_index(column.name, column.index_name) if column.indexed?
-      end
-
-      def update_column(old_column, new_column)
-        if old_column.name != new_column.name
-          updater.rename_column(old_column.name || :value, new_column.name)
-        end
-        if old_column.type != new_column.type
-          updater.change_column(new_column.name, new_column.type)
-        end
-      end
-
-      def update_index(old_column, new_column)
-        if !old_column.indexed? && new_column.indexed?
-          updater.create_index(new_column.name, new_column.index_name)
-        elsif old_column.indexed? && !new_column.indexed?
-          updater.drop_index(old_column.index_name)
-        end
-      end
-
-      def update_properties
-        changes = {}
-        updated.properties.each_pair do |name, new_property|
-          old_property = existing.property(name)
-          if old_property != new_property.value
-            changes[name] = new_property.value
-          end
-        end
-        updater.change_properties(changes) if changes.any?
-      end
-
-      def validate!
-        MigrationValidator.validate!(self)
-      end
-    end
-  end
-end

data/spec/examples/schema/table_synchronizer_spec.rb

@@ -1,200 +0,0 @@
-# -*- encoding : utf-8 -*-
-require File.expand_path('../../spec_helper', __FILE__)
-
-describe Cequel::Schema::TableSynchronizer do
-  let(:table_name) { :"posts_#{SecureRandom.hex(4)}" }
-
-  let(:table) { cequel.schema.read_table(table_name) }
-
-  context 'with no existing table' do
-    before do
-      cequel.schema.sync_table table_name do
-        key :blog_subdomain, :text
-        key :permalink, :text
-        column :title, :text
-        column :body, :text
-        column :created_at, :timestamp
-        set :author_names, :text
-        with :comment, 'Test Table'
-      end
-    end
-
-    after { cequel.schema.drop_table(table_name) }
-
-    it 'should create table' do
-      expect(table.column(:title).type).to eq(Cequel::Type[:text]) #etc.
-    end
-  end
-
-  context 'with an existing table' do
-    before do
-      cequel.schema.create_table table_name do
-        key :blog_subdomain, :text
-        key :permalink, :text
-        column :title, :ascii, :index => true
-        column :body, :ascii
-        column :created_at, :timestamp
-        set :author_names, :text
-        with :comment, 'Test Table'
-      end
-    end
-
-    after { cequel.schema.drop_table(table_name) }
-
-    context 'with valid changes' do
-
-      before do
-        cequel.schema.sync_table table_name do
-          key :blog_subdomain, :text
-          key :post_permalink, :text
-          column :title, :ascii
-          column :body, :text
-          column :primary_author_id, :uuid, :index => true
-          column :created_at, :timestamp, :index => true
-          column :published_at, :timestamp
-          set :author_names, :text
-          list :categories, :text
-          with :comment, 'Test Table 2.0'
-        end
-      end
-
-      it 'should rename keys' do
-        expect(table.clustering_columns.first.name).to eq(:post_permalink)
-      end
-
-      it 'should add new columns' do
-        expect(table.column(:published_at).type).to eq(Cequel::Type[:timestamp])
-      end
-
-      it 'should add new collections' do
-        expect(table.column(:categories)).to be_a(Cequel::Schema::List)
-      end
-
-      it 'should add new column with index' do
-        expect(table.column(:primary_author_id)).to be_indexed
-      end
-
-      it 'should add index to existing columns' do
-        expect(table.column(:created_at)).to be_indexed
-      end
-
-      it 'should drop index from existing columns' do
-        expect(table.column(:title)).not_to be_indexed
-      end
-
-      it 'should change column type' do
-        expect(table.column(:body).type).to eq(Cequel::Type[:text])
-      end
-
-      it 'should change properties' do
-        expect(table.property(:comment)).to eq('Test Table 2.0')
-      end
-
-    end
-
-    context 'invalid migrations' do
-
-      it 'should not allow changing type of key' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            key :permalink, :ascii
-            column :title, :ascii
-            column :body, :text
-            column :created_at, :timestamp
-            set :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-      it 'should not allow adding a key' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            key :permalink, :text
-            key :year, :int
-            column :title, :ascii
-            column :body, :text
-            column :created_at, :timestamp
-            set :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-      it 'should not allow removing a key' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            column :title, :ascii
-            column :body, :text
-            column :created_at, :timestamp
-            set :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-      it 'should not allow changing the partition status of a key' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            partition_key :permalink, :text
-            column :title, :ascii
-            column :body, :text
-            column :created_at, :timestamp
-            set :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-      it 'should not allow changing the data structure of a column' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            key :permalink, :text
-            column :title, :ascii
-            column :body, :text
-            column :created_at, :timestamp
-            list :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-      it 'should not allow invalid type transitions of a data column' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            key :permalink, :text
-            column :title, :ascii, :index => true
-            column :body, :int
-            column :created_at, :timestamp
-            set :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-      it 'should not allow changing clustering order' do
-        expect {
-          cequel.schema.sync_table table_name do
-            key :blog_subdomain, :text
-            key :permalink, :text, :desc
-            column :title, :ascii, :index => true
-            column :body, :ascii
-            column :created_at, :timestamp
-            set :author_names, :text
-            with :comment, 'Test Table'
-          end
-        }.to raise_error(Cequel::InvalidSchemaMigration)
-      end
-
-    end
-
-
-  end
-
-end