rails_event_store_active_record 0.35.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0543625e5144d53c19de64b10aded2fa8a0c5583d68d409a0fe0e46b786e2a9b
-  data.tar.gz: dcbe74fad2d9995ae8de47416c1db4c798919d0ef435a7db56a90b7b4969ac3e
+  metadata.gz: 36a5383474a79cf9cbc254f18f21d93042303fb02bcad2a055808c91fec35495
+  data.tar.gz: 99e12ab33094ea9873b2bd203d8d43976f5eb86ce968ea04f81dd1ad1b8fc895
 SHA512:
-  metadata.gz: 913a22954ba77274a6332302d079844f604cc8e02829bcb42ed54f5e475841cebd96f33a85a9a80f648d729f9ee215b3e31b5cba6aad903a84438c3505f5aadd
-  data.tar.gz: a42226376f9ecd60891ec6069bddabe77e4ad8c50311f210b211e14cac6881c5f165e27423ff5c33e105044dbdcc63c717e1004a7843228e82d9a26900178ecb
+  metadata.gz: 1fe6b41a3bbdeb22692c0ab73c52afab4c9cb5da1dd34b5e9a40b9d38f79c9d987469c9e735503d13e4dee9a7c07c9d9b1ccc045d361e537c4ee48a096995e58
+  data.tar.gz: 63ec9fd3e10431d8cdfb7eef15101c76d7669a5b10cec837da0340f04592722e330476ce6d2b6c98af6df5cda19e5e9bd468e05891f90d5051c56c52badcdde5

data/Makefile

@@ -20,7 +20,9 @@ remove-lock: remove-lockfiles
 install-gemfiles:
 	@BUNDLE_GEMFILE=../lib/Gemfile.0_33_0 bundle check || BUNDLE_GEMFILE=../lib/Gemfile.0_33_0 bundle install
 	@BUNDLE_GEMFILE=../lib/Gemfile.0_34_0 bundle check || BUNDLE_GEMFILE=../lib/Gemfile.0_34_0 bundle install
+	@BUNDLE_GEMFILE=../lib/Gemfile.0_35_0 bundle check || BUNDLE_GEMFILE=../lib/Gemfile.0_35_0 bundle install
 
 remove-lockfiles:
 	-rm ../lib/Gemfile.0_33_0.lock
 	-rm ../lib/Gemfile.0_34_0.lock
+	-rm ../lib/Gemfile.0_35_0.lock

data/lib/rails_event_store_active_record/correct_schema_verifier.rb

@@ -6,38 +6,60 @@ module RailsEventStoreActiveRecord
 
   class CorrectSchemaVerifier
     def verify
-      return unless connected? && table_exists?
-      raise_invalid_db_schema if legacy_columns.eql?(current_columns)
+      with_connection do
+        return if no_tables_yet? || correct_schema?
+        raise_invalid_db_schema
+      end
     end
 
     private
 
+    def with_connection(&block)
+      return unless connected?
+      block.call
+    end
+
     def connected?
       ActiveRecord::Base.connected?
     end
 
-    def table_exists?
-      ActiveRecord::Base.connection.table_exists?(:event_store_events)
+    def correct_schema?
+      correct_events_schema? && correct_streams_schema?
+    end
+
+    def correct_events_schema?
+      table_exists?(:event_store_events) &&
+        event_store_events_columns.eql?(current_columns(:event_store_events))
+    end
+
+    def correct_streams_schema?
+      table_exists?(:event_store_events_in_streams) &&
+        event_store_events_in_streams_columns.eql?(current_columns(:event_store_events_in_streams))
+    end
+
+    def table_exists?(table_name)
+      ActiveRecord::Base.connection.table_exists?(table_name)
     end
 
     def raise_invalid_db_schema
       raise EventRepository::InvalidDatabaseSchema.new(incorrect_schema_message)
     end
 
-    def legacy_columns
-      [
-        "id",
-        "stream",
-        "event_type",
-        "event_id",
-        "metadata",
-        "data",
-        "created_at"
-      ]
+    def no_tables_yet?
+      !table_exists?('event_store_events') &&
+        !table_exists?('event_store_events_in_streams')
+    end
+
+    def event_store_events_columns
+      %w(id event_type metadata data created_at)
     end
 
-    def current_columns
-      ActiveRecord::Base.connection.columns("event_store_events").map(&:name)
+    def event_store_events_in_streams_columns
+      %w(id stream position event_id created_at)
+    end
+
+    def current_columns(table_name)
+      ActiveRecord::Base.connection.columns(table_name).map(&:name)
     end
 
     def incorrect_schema_message
@@ -45,30 +67,9 @@ module RailsEventStoreActiveRecord
 Oh no!
 
 It seems you're using RailsEventStoreActiveRecord::EventRepository
-with incompaible database schema.
-
-We've redesigned database structure in order to fix several concurrency-related
-bugs. This repository is intended to work on that improved data layout.
-
-We've prepared migration that would take you from old schema to new one.
-This migration must be run offline -- take that into consideration:
-
-  rails g rails_event_store_active_record:v1_v2_migration
-  rake db:migrate
-
-
-If you cannot migrate right now -- you can for some time continue using
-old repository. In order to do so:
-1. install 'rails_event_store_active_record-legacy' gem
-2. change configuration accordingly:
-
-  require 'rails_event_store_active_record/legacy'
-
-  config.event_store = RailsEventStore::Client.new(
-                         repository: RailsEventStoreActiveRecord::Legacy::EventRepository.new
-                       )
-
+with incompatible database schema.
 
+See release notes how to migrate to current database schema.
       MESSAGE
     end
   end

data/lib/rails_event_store_active_record/version.rb

@@ -1,3 +1,3 @@
 module RailsEventStoreActiveRecord
-  VERSION = "0.35.0"
+  VERSION = "0.36.0"
 end

data/rails_event_store_active_record.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'ruby_event_store', '= 0.35.0'
+  spec.add_dependency 'ruby_event_store', '= 0.36.0'
   spec.add_dependency 'activesupport', '>= 3.0'
   spec.add_dependency 'activemodel', '>= 3.0'
   spec.add_dependency 'activerecord-import', '~> 0.21'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store_active_record
 version: !ruby/object:Gem::Version
-  version: 0.35.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Arkency
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-07 00:00:00.000000000 Z
+date: 2019-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_event_store
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.35.0
+        version: 0.36.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -120,8 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Active Record events repository for Rails Event Store