chrono_model 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c5c3d3c7a91b99e025dbf9dbd961962cc36914
-  data.tar.gz: 0d120a3f68b711f77031e3e3df5d203efd812a23
+  metadata.gz: cee551e571642d52fea58087df5f10e7462867ed
+  data.tar.gz: e1e4ba037b6fdda2b322743d777e0ba5fab27109
 SHA512:
-  metadata.gz: 17f0b8f514b94579d9cd5f4b32fad9c5d8bed4d95282c361acf10f930d7f1fd64d503139b6eb6f5bde6e9c2c51134f3bcfafdb5034b0dde95af1814bdae563c4
-  data.tar.gz: 4f7d2ee5109d774d3217cec430bf74964b269e9fff6c8b790a6a328fd7bcb043c3e18c87defc3601a4c85e2c2a597bf314c4e0a0251054ca923d4250cc89b6c2
+  metadata.gz: 105ae80bfc9669dba6eadee46d113d5c57276924cb2d702fde777a75a628c297ade0acf338bfc7fcce418676938c20bb66e371866c4f1763c81f5d7ec03926e0
+  data.tar.gz: 5285cbce3977b45c8580e649a859ea16c42a69871b9a8a7a23f2a6225db808fba5439754c84d24e86ec2ca920c4558a1eabffade89953104aa777da1f38d2e57

data/lib/chrono_model/adapter.rb

@@ -152,7 +152,7 @@ module ChronoModel
             end
           end
 
-          chrono_alter(table_name) { super table_name, options, &block }
+          chrono_alter(table_name, options) { super table_name, options, &block }
         else
           if options[:temporal] == false && is_chrono?(table_name)
             # Remove temporal features from this table
@@ -567,8 +567,8 @@ module ChronoModel
             metadata = chrono_metadata_for(table_name)
             version = metadata['chronomodel']
 
-            if version.blank? # FIXME
-              raise Error, "ChronoModel found structures created by a too old version. Cannot upgrade right now."
+            if version.blank?
+              upgrade_from_legacy(table_name)
             end
 
             next if version == current
@@ -587,6 +587,46 @@ module ChronoModel
         $stderr.puts message
       end
 
+      def upgrade_from_legacy(table_name)
+        # roses are red
+        # violets are blue
+        # and this is the most boring piece of code ever
+        history_table = "#{HISTORY_SCHEMA}.#{table_name}"
+        p_pkey = primary_key(table_name)
+
+        execute "ALTER TABLE #{history_table} ADD COLUMN validity tsrange;"
+        execute """
+          UPDATE #{history_table} SET validity = tsrange(valid_from,
+            CASE WHEN extract(year from valid_to) = 9999 THEN NULL
+                 ELSE valid_to
+            END
+          );
+        """
+
+        execute "DROP INDEX #{history_table}_temporal_on_valid_from;"
+        execute "DROP INDEX #{history_table}_temporal_on_valid_from_and_valid_to;"
+        execute "DROP INDEX #{history_table}_temporal_on_valid_to;"
+        execute "DROP INDEX #{history_table}_inherit_pkey"
+        execute "DROP INDEX #{history_table}_recorded_at"
+        execute "DROP INDEX #{history_table}_instance_history"
+        execute "ALTER TABLE #{history_table} DROP CONSTRAINT #{table_name}_valid_from_before_valid_to;"
+        execute "ALTER TABLE #{history_table} DROP CONSTRAINT #{table_name}_timeline_consistency;"
+        execute "DROP RULE #{table_name}_upd_first ON #{table_name};"
+        execute "DROP RULE #{table_name}_upd_next ON #{table_name};"
+        execute "DROP RULE #{table_name}_del ON #{table_name};"
+        execute "DROP RULE #{table_name}_ins ON #{table_name};"
+        execute "DROP TRIGGER history_ins ON #{TEMPORAL_SCHEMA}.#{table_name};"
+        execute "DROP FUNCTION #{TEMPORAL_SCHEMA}.#{table_name}_ins();"
+        execute "ALTER TABLE #{history_table} DROP COLUMN valid_from;"
+        execute "ALTER TABLE #{history_table} DROP COLUMN valid_to;"
+
+        execute "CREATE EXTENSION IF NOT EXISTS btree_gist;"
+
+        chrono_create_view_for(table_name)
+        _on_history_schema { add_history_validity_constraint(table_name, p_pkey) }
+        _on_history_schema { chrono_create_history_indexes_for(table_name, p_pkey) }
+      end
+
       def chrono_metadata_for(table)
         comment = select_value(
           "SELECT obj_description(#{quote(table)}::regclass)",
@@ -811,9 +851,9 @@ module ChronoModel
       # types, the view must be dropped and recreated, while the change has
       # to be applied to the table in the temporal schema.
       #
-      def chrono_alter(table_name)
+      def chrono_alter(table_name, opts = {})
         transaction do
-          options = chrono_metadata_for(table_name)
+          options = chrono_metadata_for(table_name).merge(opts)
 
           execute "DROP VIEW #{table_name}"
 

data/lib/chrono_model/time_machine.rb

@@ -451,7 +451,7 @@ module ChronoModel
       end
 
       def past
-        time_query(:before, :now).where('NOT upper_inf(validity)')
+        time_query(:before, :now).where("NOT upper_inf(#{quoted_table_name}.validity)")
       end
 
       # To identify this class as the History subclass

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/spec/adapter_spec.rb

@@ -572,37 +572,85 @@ describe ChronoModel::Adapter do
   end
 
   context 'selective journaled fields' do
-    before :all do
-      adapter.create_table table, :temporal => true, :journal => %w( foo ) do |t|
-        t.string 'foo'
-        t.string 'bar'
+    describe 'basic behaviour' do
+      specify do
+        adapter.create_table table, :temporal => true, :journal => %w( foo ) do |t|
+          t.string 'foo'
+          t.string 'bar'
+        end
+
+        adapter.execute <<-SQL
+          INSERT INTO #{table} (foo, bar) VALUES ('test foo', 'test bar');
+        SQL
+
+        adapter.execute <<-SQL
+          UPDATE #{table} SET foo = 'test foo', bar = 'no history';
+        SQL
+
+        2.times do
+          adapter.execute <<-SQL
+            UPDATE #{table} SET bar = 'really no history';
+          SQL
+        end
+
+        expect(count(current)).to eq 1
+        expect(count(history)).to eq 1
+
+        adapter.drop_table table
       end
+    end
 
-      adapter.execute <<-SQL
-        INSERT INTO #{table} (foo, bar) VALUES ('test foo', 'test bar');
-      SQL
+    describe 'schema changes' do
+      table 'journaled_things'
 
-      adapter.execute <<-SQL
-        UPDATE #{table} SET foo = 'test foo', bar = 'no history';
-      SQL
+      before do
+        adapter.create_table table, :temporal => true, :journal => %w( foo ) do |t|
+          t.string 'foo'
+          t.string 'bar'
+          t.string 'baz'
+        end
+      end
+
+      after do
+        adapter.drop_table table
+      end
+
+      it 'preserves options upon column change' do
+        adapter.change_table table, temporal: true, journal: %w(foo bar)
+
+        adapter.execute <<-SQL
+          INSERT INTO #{table} (foo, bar) VALUES ('test foo', 'test bar');
+        SQL
+
+        expect(count(current)).to eq 1
+        expect(count(history)).to eq 1
 
-      2.times do
         adapter.execute <<-SQL
-          UPDATE #{table} SET bar = 'really no history';
+          UPDATE #{table} SET foo = 'test foo', bar = 'chronomodel';
         SQL
+
+        expect(count(current)).to eq 1
+        expect(count(history)).to eq 2
       end
-    end
 
-    after :all do
-      adapter.drop_table table
-    end
+      it 'changes option upon table change' do
+        adapter.change_table table, temporal: true, journal: %w(bar)
 
-    it { expect(count(current)).to eq 1 }
-    it { expect(count(history)).to eq 1 }
+        adapter.execute <<-SQL
+          INSERT INTO #{table} (foo, bar) VALUES ('test foo', 'test bar');
+          UPDATE #{table} SET foo = 'test foo', bar = 'no history';
+        SQL
 
-    it 'preserves options upon column change'
-    it 'changes option upon table change'
+        expect(count(current)).to eq 1
+        expect(count(history)).to eq 1
 
-  end
+        adapter.execute <<-SQL
+          UPDATE #{table} SET foo = 'test foo again', bar = 'no history';
+        SQL
 
+        expect(count(current)).to eq 1
+        expect(count(history)).to eq 1
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-29 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord