chrono_model 1.0.1 → 1.1.0

data/spec/{adapter_spec.rb → chrono_model/adapter_spec.rb}

@@ -78,6 +78,33 @@ describe ChronoModel::Adapter do
     native
   end
 
+  describe '.is_chrono?' do
+    with_temporal_table do
+      it { expect(adapter.is_chrono?(table)).to be(true) }
+    end
+
+    with_plain_table do
+      it { expect(adapter.is_chrono?(table)).to be(false) }
+    end
+
+    context 'when schemas are not there yet' do
+      before(:all) do
+        adapter.execute 'BEGIN'
+        adapter.execute 'DROP SCHEMA temporal CASCADE'
+        adapter.execute 'DROP SCHEMA history CASCADE'
+        adapter.execute 'CREATE TABLE test_table (id integer)'
+      end
+
+      after(:all) do
+        adapter.execute 'ROLLBACK'
+      end
+
+      it { expect { adapter.is_chrono?(table) }.to_not raise_error }
+
+      it { expect(adapter.is_chrono?(table)).to be(false) }
+    end
+  end
+
   describe '.create_table' do
     with_temporal_table do
       it_should_behave_like 'temporal table'
@@ -395,11 +422,15 @@ describe ChronoModel::Adapter do
 
   describe '.on_schema' do
     before(:all) do
+      adapter.execute 'BEGIN'
       5.times {|i| adapter.execute "CREATE SCHEMA test_#{i}"}
     end
 
-    context 'with nesting' do
+    after(:all) do
+      adapter.execute 'ROLLBACK'
+    end
 
+    context 'by default' do
       it 'saves the schema at each recursion' do
         is_expected.to be_in_schema(:default)
 
@@ -415,15 +446,37 @@ describe ChronoModel::Adapter do
         is_expected.to be_in_schema(:default)
       end
 
+      context 'when errors occur' do
+        subject do
+          adapter.on_schema('test_1') do
+
+            adapter.on_schema('test_2') do
+              adapter.execute 'BEGIN'
+              adapter.execute 'ERRORING ON PURPOSE'
+            end
+
+          end
+        end
+
+        it {
+          expect { subject }.
+            to raise_error(/current transaction is aborted/).
+            and change { adapter.instance_variable_get(:@schema_search_path) }
+        }
+
+        after do
+          adapter.execute 'ROLLBACK'
+        end
+      end
     end
 
-    context 'without nesting' do
+    context 'with recurse: :ignore' do
       it 'ignores recursive calls' do
         is_expected.to be_in_schema(:default)
 
-        adapter.on_schema('test_1', false) { is_expected.to be_in_schema('test_1')
-          adapter.on_schema('test_2', false) { is_expected.to be_in_schema('test_1')
-            adapter.on_schema('test_3', false) { is_expected.to be_in_schema('test_1')
+        adapter.on_schema('test_1', recurse: :ignore) { is_expected.to be_in_schema('test_1')
+          adapter.on_schema('test_2', recurse: :ignore) { is_expected.to be_in_schema('test_1')
+            adapter.on_schema('test_3', recurse: :ignore) { is_expected.to be_in_schema('test_1')
         } } }
 
         is_expected.to be_in_schema(:default)
@@ -431,6 +484,72 @@ describe ChronoModel::Adapter do
     end
   end
 
+  context 'migration extensions' do
+    before :all do
+      adapter.create_table :meetings do |t|
+        t.string :name
+        t.tsrange :interval
+      end
+    end
+
+    after :all do
+      adapter.drop_table :meetings
+    end
+
+    describe '.add_temporal_indexes' do
+      before do
+        adapter.add_temporal_indexes :meetings, :interval
+      end
+
+      it { expect(adapter.indexes(:meetings).map(&:name)).to eq [
+        'index_meetings_temporal_on_interval',
+        'index_meetings_temporal_on_lower_interval',
+        'index_meetings_temporal_on_upper_interval'
+      ] }
+
+      after do
+        adapter.remove_temporal_indexes :meetings, :interval
+      end
+    end
+
+    describe '.remove_temporal_indexes' do
+      before :all do
+        adapter.add_temporal_indexes :meetings, :interval
+      end
+
+      before do
+        adapter.remove_temporal_indexes :meetings, :interval
+      end
+
+      it { expect(adapter.indexes(:meetings)).to be_empty }
+    end
+
+    describe '.add_timeline_consistency_constraint' do
+      before do
+        adapter.add_timeline_consistency_constraint(:meetings, :interval)
+      end
+
+      it { expect(adapter.indexes(:meetings).map(&:name)).to eq [
+        'meetings_timeline_consistency'
+      ] }
+
+      after do
+        adapter.remove_timeline_consistency_constraint(:meetings)
+      end
+    end
+
+    describe '.remove_timeline_consistency_constraint' do
+      before :all do
+        adapter.add_timeline_consistency_constraint :meetings, :interval
+      end
+
+      before do
+        adapter.remove_timeline_consistency_constraint(:meetings)
+      end
+
+      it { expect(adapter.indexes(:meetings)).to be_empty }
+    end
+  end
 
   let(:current) { [ChronoModel::Adapter::TEMPORAL_SCHEMA, table].join('.') }
   let(:history) { [ChronoModel::Adapter::HISTORY_SCHEMA,  table].join('.') }

data/spec/{json_ops_spec.rb → chrono_model/json_ops_spec.rb}

@@ -1,6 +1,14 @@
+##########################################################
+### DEPRECATED: JSON operators are an hack and there is no
+### reason not to use jsonb other than migrating your data
+##########################################################
+if ENV['HAVE_PLPYTHON'] == '1'
+
 require 'spec_helper'
 require 'support/helpers'
 
+require 'chrono_model/json'
+
 describe 'JSON equality operator' do
   include ChronoTest::Helpers::Adapter
 
@@ -46,3 +54,6 @@ describe 'JSON equality operator' do
   end
 
 end
+
+
+end

data/spec/{time_machine_spec.rb → chrono_model/time_machine_spec.rb}

@@ -82,14 +82,16 @@ describe ChronoModel::TimeMachine do
     it { is_expected.to include(Publication) }
   end
 
-  describe '.chrono_models' do
-    subject { ChronoModel::TimeMachine.chrono_models }
+  describe '.history_models' do
+    subject { ChronoModel.history_models }
 
     it { is_expected.to eq(
+      'articles' => Article::History,
       'foos'     => Foo::History,
       'defoos'   => Defoo::History,
       'bars'     => Bar::History,
       'elements' => Element::History,
+      'sections' => Section::History,
       'sub_bars' => SubBar::History,
     ) }
   end
@@ -210,9 +212,17 @@ describe ChronoModel::TimeMachine do
       it { expect(Bar.as_of(bar.ts[2]).includes(foo: :sub_bars).first.foo.name).to eq 'new foo' }
       it { expect(Bar.as_of(bar.ts[3]).includes(foo: :sub_bars).first.foo.name).to eq 'new foo' }
 
-      it { expect(Foo.as_of(foo.ts[0]).includes(bars: :sub_bars).first.sub_bars.count).to eq 0 }
-      it { expect(Foo.as_of(foo.ts[1]).includes(bars: :sub_bars).first.sub_bars.count).to eq 0 }
-      it { expect(Foo.as_of(foo.ts[2]).includes(bars: :sub_bars).first.sub_bars.count).to eq 1 }
+      it { expect(Foo.as_of(foo.ts[0]).includes(:bars, :sub_bars).first.sub_bars.count).to eq 0 }
+      it { expect(Foo.as_of(foo.ts[1]).includes(:bars, :sub_bars).first.sub_bars.count).to eq 0 }
+      it { expect(Foo.as_of(foo.ts[2]).includes(:bars, :sub_bars).first.sub_bars.count).to eq 1 }
+
+      it { expect(Foo.as_of(foo.ts[0]).includes(:bars, :sub_bars).first.sub_bars.first).to be nil }
+      it { expect(Foo.as_of(foo.ts[1]).includes(:bars, :sub_bars).first.sub_bars.first).to be nil }
+
+      it { expect(Foo.as_of(subbar.ts[0]).includes(:bars, :sub_bars).first.sub_bars.first.name).to eq 'sub-bar' }
+      it { expect(Foo.as_of(subbar.ts[1]).includes(:bars, :sub_bars).first.sub_bars.first.name).to eq 'bar sub-bar' }
+      it { expect(Foo.as_of(subbar.ts[2]).includes(:bars, :sub_bars).first.sub_bars.first.name).to eq 'sub-bar sub-bar' }
+      it { expect(Foo.as_of(subbar.ts[3]).includes(:bars, :sub_bars).first.sub_bars.first.name).to eq 'new sub-bar' }
     end
 
     it 'doesn\'t raise RecordNotFound when no history records are found' do

data/spec/config.travis.yml

@@ -2,3 +2,4 @@ hostname: localhost
 username: postgres
 password: ""
 database: chronomodel
+pool: 11

data/spec/config.yml.example

@@ -5,4 +5,5 @@ hostname: localhost
 username: chronomodel
 password: chronomodel
 database: chronomodel
+pool: 11
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -218,13 +218,30 @@ files:
 - lib/active_record/tasks/chronomodel_database_tasks.rb
 - lib/chrono_model.rb
 - lib/chrono_model/adapter.rb
+- lib/chrono_model/adapter/ddl.rb
+- lib/chrono_model/adapter/indexes.rb
+- lib/chrono_model/adapter/migrations.rb
+- lib/chrono_model/adapter/tsrange.rb
+- lib/chrono_model/adapter/upgrade.rb
+- lib/chrono_model/conversions.rb
+- lib/chrono_model/json.rb
 - lib/chrono_model/patches.rb
+- lib/chrono_model/patches/as_of_time_holder.rb
+- lib/chrono_model/patches/as_of_time_relation.rb
+- lib/chrono_model/patches/association.rb
+- lib/chrono_model/patches/db_console.rb
+- lib/chrono_model/patches/join_node.rb
+- lib/chrono_model/patches/preloader.rb
+- lib/chrono_model/patches/relation.rb
 - lib/chrono_model/railtie.rb
 - lib/chrono_model/time_gate.rb
 - lib/chrono_model/time_machine.rb
-- lib/chrono_model/utils.rb
+- lib/chrono_model/time_machine/history_model.rb
+- lib/chrono_model/time_machine/time_query.rb
+- lib/chrono_model/time_machine/timeline.rb
+- lib/chrono_model/utilities.rb
 - lib/chrono_model/version.rb
-- spec/adapter_spec.rb
+- spec/aruba/dbconsole_spec.rb
 - spec/aruba/fixtures/database_with_default_username_and_password.yml
 - spec/aruba/fixtures/database_without_username_and_password.yml
 - spec/aruba/fixtures/empty_structure.sql
@@ -235,9 +252,14 @@ files:
 - spec/aruba/fixtures/railsapp/config/environments/development.rb
 - spec/aruba/migrations_spec.rb
 - spec/aruba/rake_task_spec.rb
+- spec/chrono_model/adapter/counter_cache_race_spec.rb
+- spec/chrono_model/adapter_spec.rb
+- spec/chrono_model/conversions_spec.rb
+- spec/chrono_model/json_ops_spec.rb
+- spec/chrono_model/time_machine_spec.rb
+- spec/chrono_model/time_query_spec.rb
 - spec/config.travis.yml
 - spec/config.yml.example
-- spec/json_ops_spec.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/connection.rb
@@ -248,9 +270,6 @@ files:
 - spec/support/matchers/index.rb
 - spec/support/matchers/schema.rb
 - spec/support/matchers/table.rb
-- spec/time_machine_spec.rb
-- spec/time_query_spec.rb
-- spec/utils_spec.rb
 - sql/json_ops.sql
 - sql/uninstall-json_ops.sql
 homepage: https://github.com/ifad/chronomodel
@@ -272,12 +291,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Temporal extensions (SCD Type II) for Active Record
 test_files:
-- spec/adapter_spec.rb
+- spec/aruba/dbconsole_spec.rb
 - spec/aruba/fixtures/database_with_default_username_and_password.yml
 - spec/aruba/fixtures/database_without_username_and_password.yml
 - spec/aruba/fixtures/empty_structure.sql
@@ -288,9 +307,14 @@ test_files:
 - spec/aruba/fixtures/railsapp/config/environments/development.rb
 - spec/aruba/migrations_spec.rb
 - spec/aruba/rake_task_spec.rb
+- spec/chrono_model/adapter/counter_cache_race_spec.rb
+- spec/chrono_model/adapter_spec.rb
+- spec/chrono_model/conversions_spec.rb
+- spec/chrono_model/json_ops_spec.rb
+- spec/chrono_model/time_machine_spec.rb
+- spec/chrono_model/time_query_spec.rb
 - spec/config.travis.yml
 - spec/config.yml.example
-- spec/json_ops_spec.rb
 - spec/spec_helper.rb
 - spec/support/aruba.rb
 - spec/support/connection.rb
@@ -301,6 +325,3 @@ test_files:
 - spec/support/matchers/index.rb
 - spec/support/matchers/schema.rb
 - spec/support/matchers/table.rb
-- spec/time_machine_spec.rb
-- spec/time_query_spec.rb
-- spec/utils_spec.rb

data/lib/chrono_model/utils.rb

@@ -1,117 +0,0 @@
-module ChronoModel
-
-  module Conversions
-    extend self
-
-    ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(?:\.(\d+))?\z/
-
-    def string_to_utc_time(string)
-      if string =~ ISO_DATETIME
-        usec = $7.nil? ? '000000' : $7.ljust(6, '0') # .1 is .100000, not .000001
-        Time.utc $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, usec.to_i
-      end
-    end
-
-    def time_to_utc_string(time)
-      [time.to_s(:db), sprintf('%06d', time.usec)].join '.'
-    end
-  end
-
-  module Json
-    extend self
-
-    def create
-      adapter.execute 'CREATE OR REPLACE LANGUAGE plpythonu'
-      adapter.execute File.read(sql 'json_ops.sql')
-    end
-
-    def drop
-      adapter.execute File.read(sql 'uninstall-json_ops.sql')
-      adapter.execute 'DROP LANGUAGE IF EXISTS plpythonu'
-    end
-
-    private
-    def sql(file)
-      File.dirname(__FILE__) + '/../../sql/' + file
-    end
-
-    def adapter
-      ActiveRecord::Base.connection
-    end
-  end
-
-  module Utilities
-    # Amends the given history item setting a different period.
-    # Useful when migrating from legacy systems.
-    #
-    def amend_period!(hid, from, to)
-      unless [from, to].any? {|ts| ts.respond_to?(:zone) && ts.zone == 'UTC'}
-        raise 'Can amend history only with UTC timestamps'
-      end
-
-      connection.execute %[
-        UPDATE #{quoted_table_name}
-           SET "validity" = tsrange(#{connection.quote(from)}, #{connection.quote(to)}),
-               "recorded_at" = #{connection.quote(from)}
-         WHERE "hid" = #{hid.to_i}
-      ]
-    end
-
-    # Returns true if this model is backed by a temporal table,
-    # false otherwise.
-    #
-    def chrono?
-      connection.is_chrono?(table_name)
-    end
-  end
-
-  ActiveRecord::Base.extend Utilities
-
-  module Migrate
-    extend self
-
-    def upgrade_indexes!(base = ActiveRecord::Base)
-      use base
-
-      db.on_schema(Adapter::HISTORY_SCHEMA) do
-        db.tables.each do |table|
-          if db.is_chrono?(table)
-            upgrade_indexes_for(table)
-          end
-        end
-      end
-    end
-
-    private
-      attr_reader :db
-
-      def use(ar)
-        @db = ar.connection
-      end
-
-      def upgrade_indexes_for(table_name)
-        upgradeable =
-          %r{_snapshot$|_valid_(?:from|to)$|_recorded_at$|_instance_(?:update|history)$}
-
-        indexes_sql = %[
-          SELECT DISTINCT i.relname
-          FROM pg_class t
-          INNER JOIN pg_index d ON t.oid = d.indrelid
-          INNER JOIN pg_class i ON d.indexrelid = i.oid
-          WHERE i.relkind = 'i'
-          AND d.indisprimary = 'f'
-          AND t.relname = '#{table_name}'
-          AND i.relnamespace IN (SELECT oid FROM pg_namespace WHERE nspname = ANY(current_schemas(false)) )
-        ]
-
-        db.select_values(indexes_sql).each do |idx|
-          if idx =~ upgradeable
-            db.execute "DROP INDEX #{idx}"
-          end
-        end
-
-        db.send(:chrono_create_history_indexes_for, table_name)
-      end
-  end
-
-end