chrono_model 0.5.3 → 0.8.0

data/lib/chrono_model/utils.rb

@@ -17,28 +17,55 @@ module ChronoModel
     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, but it is here
-    # as this is not a proper API.
-    #
-    # Extend your model with the Utilities model if you want to
-    # use it.
+    # Useful when migrating from legacy systems.
     #
     def amend_period!(hid, from, to)
-      unless [from, to].all? {|ts| ts.respond_to?(:zone) && ts.zone == 'UTC'}
+      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 "valid_from" = #{connection.quote(from)},
-               "valid_to"   = #{connection.quote(to  )}
+           SET "validity" = tsrange(#{connection.quote(from)}, #{connection.quote(to)})
          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
 

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.5.3"
+  VERSION = "0.8.0"
 end

data/spec/adapter_spec.rb

@@ -34,14 +34,15 @@ describe ChronoModel::Adapter do
   context do
     subject { adapter }
     it { should be_a_kind_of(ChronoModel::Adapter) }
+    its(:adapter_name) { should == 'PostgreSQL' }
 
     context do
-      before { adapter.stub(:postgresql_version => 90000) }
+      before { adapter.stub(:postgresql_version => 90300) }
       it { should be_chrono_supported }
     end
 
     context do
-      before { adapter.stub(:postgresql_version => 80400) }
+      before { adapter.stub(:postgresql_version => 90000) }
       it { should_not be_chrono_supported }
     end
   end
@@ -59,10 +60,12 @@ describe ChronoModel::Adapter do
 
     def native.to_proc
       proc {|t|
-        t.string  :test, :null => false
+        t.string  :test, :null => false, :default => 'default-value'
         t.integer :foo
         t.float   :bar
         t.text    :baz
+        t.integer :ary, :array => true, :null => false, :default => []
+        t.boolean :bool, :null => false, :default => false
       }
     end
 
@@ -117,10 +120,27 @@ describe ChronoModel::Adapter do
 
     with_plain_table do
       before :all do
+        adapter.add_index table, :foo
+        adapter.add_index table, :bar, :unique => true
+
         adapter.change_table table, :temporal => true
       end
 
       it_should_behave_like 'temporal table'
+
+      let(:history_indexes) do
+        adapter.on_schema(ChronoModel::Adapter::HISTORY_SCHEMA) do
+          adapter.indexes(table)
+        end
+      end
+
+      it "copies plain index to history" do
+        history_indexes.find {|i| i.columns == ['foo']}.should be_present
+      end
+
+      it "copies unique index to history without uniqueness constraint" do
+        history_indexes.find {|i| i.columns == ['bar'] && i.unique == false}.should be_present
+      end
     end
   end
 
@@ -395,6 +415,17 @@ describe ChronoModel::Adapter do
   end
 
 
+  let(:current) { [ChronoModel::Adapter::TEMPORAL_SCHEMA, table].join('.') }
+  let(:history) { [ChronoModel::Adapter::HISTORY_SCHEMA,  table].join('.') }
+
+  def count(table)
+    adapter.select_value("SELECT COUNT(*) FROM ONLY #{table}").to_i
+  end
+
+  def ids(table)
+    adapter.select_values("SELECT id FROM ONLY #{table} ORDER BY id")
+  end
+
   context 'INSERT multiple values' do
     before :all do
       adapter.create_table table, :temporal => true, &columns
@@ -404,17 +435,6 @@ describe ChronoModel::Adapter do
       adapter.drop_table table
     end
 
-    let(:current) { [ChronoModel::Adapter::TEMPORAL_SCHEMA, table].join('.') }
-    let(:history) { [ChronoModel::Adapter::HISTORY_SCHEMA,  table].join('.') }
-
-    def count(table)
-      adapter.select_value("SELECT COUNT(*) FROM ONLY #{table}").to_i
-    end
-
-    def ids(table)
-      adapter.select_values("SELECT id FROM ONLY #{table} ORDER BY id")
-    end
-
     context 'when succeeding' do
       def insert
         adapter.execute <<-SQL
@@ -461,4 +481,124 @@ describe ChronoModel::Adapter do
     end
   end
 
+  context 'INSERT on NOT NULL columns but with a DEFAULT value' do
+    before :all do
+      adapter.create_table table, :temporal => true, &columns
+    end
+
+    after :all do
+      adapter.drop_table table
+    end
+
+    def insert
+      adapter.execute <<-SQL
+        INSERT INTO #{table} DEFAULT VALUES
+      SQL
+    end
+
+    def select
+      adapter.select_values <<-SQL
+        SELECT test FROM #{table}
+      SQL
+    end
+
+    it { expect { insert }.to_not raise_error }
+    it { insert; select.uniq.should == ['default-value'] }
+  end
+
+  context 'redundant UPDATEs' do
+
+    before :all do
+      adapter.create_table table, :temporal => true, &columns
+
+      adapter.execute <<-SQL
+        INSERT INTO #{table} (test, foo) VALUES ('test1', 1);
+      SQL
+
+      adapter.execute <<-SQL
+        UPDATE #{table} SET test = 'test2';
+      SQL
+
+      adapter.execute <<-SQL
+        UPDATE #{table} SET test = 'test2';
+      SQL
+    end
+
+    after :all do
+      adapter.drop_table table
+    end
+
+    it { count(current).should == 1 }
+    it { count(history).should == 2 }
+
+  end
+
+  context 'updates on non-journaled fields' do
+    before :all do
+      adapter.create_table table, :temporal => true do |t|
+        t.string 'test'
+        t.timestamps
+      end
+
+      adapter.execute <<-SQL
+        INSERT INTO #{table} (test, created_at, updated_at) VALUES ('test', now(), now());
+      SQL
+
+      adapter.execute <<-SQL
+        UPDATE #{table} SET test = 'test2', updated_at = now();
+      SQL
+
+      2.times do
+        adapter.execute <<-SQL # Redundant update with only updated_at change
+          UPDATE #{table} SET test = 'test2', updated_at = now();
+        SQL
+
+        adapter.execute <<-SQL
+          UPDATE #{table} SET updated_at = now();
+        SQL
+      end
+    end
+
+    after :all do
+      adapter.drop_table table
+    end
+
+    it { count(current).should == 1 }
+    it { count(history).should == 2 }
+  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'
+      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
+    end
+
+    after :all do
+      adapter.drop_table table
+    end
+
+    it { count(current).should == 1 }
+    it { count(history).should == 1 }
+
+    it 'preserves options upon column change'
+    it 'changes option upon table change'
+
+  end
+
 end

data/spec/config.yml.example

@@ -1,5 +1,6 @@
 # CREATE ROLE chronomodel LOGIN ENCRYPTED PASSWORD 'chronomodel' CREATEDB;
 #
+adapter:  chronomodel
 hostname: localhost
 username: chronomodel
 password: chronomodel

data/spec/json_ops_spec.rb

@@ -0,0 +1,48 @@
+require 'spec_helper'
+require 'support/helpers'
+
+describe 'JSON equality operator' do
+  include ChronoTest::Helpers::Adapter
+
+  table 'json_test'
+
+  before :all do
+    ChronoModel::Json.create
+  end
+
+  after :all do
+    ChronoModel::Json.drop
+  end
+
+  it { adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a":1}'::json ]).should == 't' }
+  it { adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a" : 1}'::json ]).should == 't' }
+  it { adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a":2}'::json ]).should == 'f' }
+  it { adapter.select_value(%[ SELECT '{"a":1,"b":2}'::json = '{"b":2,"a":1}'::json ]).should == 't' }
+  it { adapter.select_value(%[ SELECT '{"a":1,"b":2,"x":{"c":4,"d":5}}'::json = '{"b":2, "x": { "d": 5, "c": 4}, "a":1}'::json ]).should == 't' }
+
+  context 'on a temporal table' do
+    before :all do
+      adapter.create_table table, :temporal => true do |t|
+        t.json 'data'
+      end
+
+      adapter.execute %[
+        INSERT INTO #{table} ( data ) VALUES ( '{"a":1,"b":2}' )
+      ]
+    end
+
+    after :all do
+      adapter.drop_table table
+    end
+
+    it { expect {
+      adapter.execute "UPDATE #{table} SET data = NULL"
+    }.to_not raise_error }
+
+    it { expect {
+      adapter.execute %[UPDATE #{table} SET data = '{"x":1,"y":2}']
+
+    }.to_not raise_error }
+  end
+
+end

data/spec/support/connection.rb

@@ -1,6 +1,5 @@
 require 'pathname'
 require 'active_record'
-require 'active_support/core_ext/logger'
 
 module ChronoTest
   extend self
@@ -29,24 +28,20 @@ module ChronoTest
 
   def recreate_database!
     database = config.fetch(:database)
-    connect! config.merge(:database => 'postgres')
-
-    unless AR.supports_chrono?
-      raise 'Your postgresql version is not supported. >= 9.0 is required.'
-    end
+    connect! config.merge(:database => :postgres)
 
     connection.drop_database   database
     connection.create_database database
+    connect! config
 
-  ensure
-    connect!
+    connection.execute 'CREATE EXTENSION btree_gist'
     logger.info "Connected to #{config}"
   end
 
   def config
     @config ||= YAML.load(config_file.read).tap do |conf|
       conf.symbolize_keys!
-      conf.update(:adapter => 'postgresql')
+      conf.update(:adapter => 'chronomodel')
 
       def conf.to_s
         'pgsql://%s:%s@%s/%s' % [

data/spec/support/helpers.rb

@@ -48,7 +48,12 @@ module ChronoTest::Helpers
     end
 
     module DSL
+      @@schema_setup = false
+
       def setup_schema!
+        return if @@schema_setup
+        @@schema_setup = true
+
         # Set up database structure
         #
         adapter.create_table 'foos', :temporal => true do |t|
@@ -75,6 +80,15 @@ module ChronoTest::Helpers
           t.string :title
           t.string :type
         end
+
+        adapter.create_table 'plains' do |t|
+          t.string :foo
+        end
+
+        adapter.create_table 'events' do |t|
+          t.string :name
+          t.daterange :interval
+        end
       end
 
       Models = lambda {
@@ -104,7 +118,7 @@ module ChronoTest::Helpers
         class ::Defoo < ActiveRecord::Base
           include ChronoModel::TimeMachine
 
-          default_scope where(:active => true)
+          default_scope proc { where(:active => true) }
         end
 
         # STI case (https://github.com/ifad/chronomodel/issues/5)
@@ -114,9 +128,20 @@ module ChronoTest::Helpers
 
         class ::Publication < Element
         end
+
+        class ::Plain < ActiveRecord::Base
+        end
+
+        class ::Event < ActiveRecord::Base
+          extend ChronoModel::TimeMachine::TimeQuery
+        end
       }
 
+      @@models_defined = false
       def define_models!
+        return if @@models_defined
+        @@models_defined = true
+
         Models.call
       end
 
@@ -141,7 +166,7 @@ module ChronoTest::Helpers
           define_method(:ts) { @_ts ||= [] }
         end unless obj.methods.include?(:ts)
 
-        now = ChronoTest.connection.select_value('select now()::timestamp')
+        now = ChronoTest.connection.select_value('select now()::timestamp') + 'Z'
         obj.ts.push(Time.parse(now))
       end
     end

data/spec/support/matchers/column.rb

@@ -7,6 +7,10 @@ module ChronoTest::Matchers
         @schema  = schema
       end
 
+      def description
+        'have columns'
+      end
+
       def matches?(table)
         super(table)
 
@@ -68,8 +72,7 @@ module ChronoTest::Matchers
     class HaveHistoryExtraColumns < HaveColumns
       def initialize
         super([
-          ['valid_from',  'timestamp without time zone'],
-          ['valid_to',    'timestamp without time zone'],
+          ['validity',    'tsrange'],
           ['recorded_at', 'timestamp without time zone'],
           ['hid',         'integer']
         ], history_schema)