sequel_bitemporal 0.8.9 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 68ac021c3521e98f78d3f9bc44c21267cc07c60a
-  data.tar.gz: fa89baf10e99cbed3ed83b2072a1c2e5b2a73ca8
+SHA256:
+  metadata.gz: 4f44bf401ad71c80c9815ff7d2e3508edf8e5bdbef4112b36bf86d06a6d02523
+  data.tar.gz: 19b320461ebbdac3b2e7ace0117ffa2921180dd602b59e5145d2c1771987d993
 SHA512:
-  metadata.gz: 18a5b6e13d4c74e905262dd6844db54b5550f8f626bfad46aff2093d82bc06217294f1cef60ca25361d6fd6604c48a1fdfb29531ea448a6de9f802075e6cfa1c
-  data.tar.gz: 132614240d0c4244938b136a7b5be58bd741368cd616c6fcd9335f4c4fc3156bd79fe1df1c4e4392a11988ca117ff690c5cde95c8e3e30fb7bb7f9ac46a97cbe
+  metadata.gz: 1e9928807145999a4ba2215b10e3169bb26e63bc42137c28b9fc05ad6ac9a2e66f10c69ccdda40ae1ae8d7bbfabad0f1f921122fc3e0bb155da559b335ffa97f
+  data.tar.gz: a7fac94af384e4478fd9d6f98a6381bf03278e1310d8d97dff5bea449f2e3c5baeb962e3552774535a14b0a021a5b0ce22d76b659b08f7fcf9fe9a17a36d31dc

data/.travis.yml

@@ -3,13 +3,22 @@ cache:
   bundler: true
 sudo: false
 rvm:
-  - 1.9.3
-  - 2.0
-  - 2.1
-  - 2.2
-  - jruby-19mode
+  - 2.2.7
+  - 2.3.4
+  - 2.4.2
+  - jruby-9.1.13.0
+before_script:
+  - psql  -c 'create database sequel_bitemporal_test;' -U postgres
 env:
-  - SQLITE=1
-  - PG=1
-addons:
-  postgresql: 9.2
+  - SQLITE=1 SEQUEL='~> 4.0'
+  - SQLITE=1 SEQUEL='~> 5.0'
+  - PG=1 SEQUEL='~> 4.0'
+  - PG=1 SEQUEL='~> 5.0'
+gemfile:
+  - ci/sequel.gemfile
+matrix:
+  allow_failures:
+    - rvm: jruby-9.1.13.0
+      env: PG=1 SEQUEL='~> 4.0'
+    - rvm: jruby-9.1.13.0
+      env: PG=1 SEQUEL='~> 5.0'

data/Gemfile

@@ -1,8 +1,6 @@
 source "http://rubygems.org"
 gemspec
 
-gem "pry"
-
 platforms :ruby do
   gem "pg"
   gem "sqlite3"

data/ci/sequel.gemfile

@@ -0,0 +1,17 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../'
+
+gem 'sequel', "#{ENV['SEQUEL']}"
+
+# MRI/Rubinius Adapter Dependencies
+platforms :ruby do
+  gem "pg"
+  gem "sqlite3"
+end
+
+# JRuby Adapter Dependencies
+platforms :jruby do
+  gem "jdbc-postgres"
+  gem "jdbc-sqlite3"
+end

data/lib/sequel/plugins/bitemporal.rb

@@ -46,12 +46,25 @@ module Sequel
         missing = bitemporal_version_columns - version.columns
         raise Error, "bitemporal plugin requires the following missing column#{"s" if missing.size>1} on version class: #{missing.join(", ")}" unless missing.empty?
 
-        if Sequel::Plugins::Bitemporal.pg_jdbc?(master.db)
-          master.plugin :pg_typecast_on_load, *master.columns
-        elsif Sequel::Plugins::Bitemporal.jdbc?(master.db)
+        if Sequel::Plugins::Bitemporal.jdbc?(master.db)
           master.plugin :typecast_on_load, *master.columns
         end
 
+        # Sequel::Model.def_dataset_method has been deprecated and moved to the
+        # def_dataset_method plugin in Sequel 4.46.0, it was not loaded by
+        # default from 5.0
+        begin
+          master.plugin :def_dataset_method
+        rescue LoadError
+        end
+        # Sequel::Model#set_all has been deprecated and moved to the whitelist
+        # security plugin in Sequel 4.46.0, it was not loaded by default from 5.0
+        begin
+          master.plugin :whitelist_security
+          version.plugin :whitelist_security
+        rescue LoadError
+        end
+
         master.instance_eval do
           @version_class = version
           base_alias = opts.fetch :base_alias do
@@ -153,14 +166,12 @@ module Sequel
         end
         master.def_dataset_method :with_current_or_future_versions do
           eager_graph(:current_or_future_versions).where(
-            Sequel.negate(current_or_future_versions__id: nil)
+            Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil)
           )
         end
         version.many_to_one :master, class: master, key: :master_id
         version.class_eval do
-          if Sequel::Plugins::Bitemporal.pg_jdbc?(master.db)
-            plugin :pg_typecast_on_load, *columns
-          elsif Sequel::Plugins::Bitemporal.jdbc?(master.db)
+          if Sequel::Plugins::Bitemporal.jdbc?(master.db)
             plugin :typecast_on_load, *columns
           end
 
@@ -355,7 +366,11 @@ module Sequel
 
         def destroy
           point_in_time = ::Sequel::Plugins::Bitemporal.point_in_time
-          versions_dataset.where(expired_at: nil).where("valid_to>valid_from").update expired_at: point_in_time
+          versions_dataset.where(
+            expired_at: nil
+          ).where(
+            Sequel.lit("valid_to>valid_from")
+          ).update expired_at: point_in_time
         end
 
         def destroy_version(version, expand_previous_version)
@@ -370,7 +385,7 @@ module Sequel
               previous = versions_dataset.where({
                 expired_at: nil,
                 valid_to: version.valid_from,
-              }).where("valid_to>valid_from").first
+              }).where(Sequel.lit("valid_to>valid_from")).first
               if previous
                 if version_was_valid
                   success &&= save_fossil previous, created_at: point_in_time, valid_from: now, valid_to: version.valid_to
@@ -471,11 +486,11 @@ module Sequel
           lock!
           set master_changes
           expired = versions_dataset.where expired_at: nil
-          expired = expired.exclude "valid_from=valid_to"
-          expired = expired.exclude "valid_to<=?", pending_version.valid_from
-          pending_version.valid_to ||= expired.where("valid_from>?", pending_version.valid_from).min(:valid_from)
+          expired = expired.exclude Sequel.lit("valid_from=valid_to")
+          expired = expired.exclude Sequel.lit("valid_to<=?", pending_version.valid_from)
+          pending_version.valid_to ||= expired.where(Sequel.lit("valid_from>?", pending_version.valid_from)).min(:valid_from)
           pending_version.valid_to ||= Time.utc 9999
-          expired = expired.exclude "valid_from>=?", pending_version.valid_to
+          expired = expired.exclude Sequel.lit("valid_from>=?", pending_version.valid_to)
           expired = expired.all
           expired.each do |expired_version|
             if expired_version.valid_from<pending_version.valid_from && expired_version.valid_to>pending_version.valid_from
@@ -492,9 +507,9 @@ module Sequel
           @propagated_during_last_save = []
           lock!
           futures = versions_dataset.where expired_at: nil
-          futures = futures.exclude "valid_from=valid_to"
-          futures = futures.exclude "valid_to<=?", pending_version.valid_from
-          futures = futures.where "valid_from>?", pending_version.valid_from
+          futures = futures.exclude Sequel.lit("valid_from=valid_to")
+          futures = futures.exclude Sequel.lit("valid_to<=?", pending_version.valid_from)
+          futures = futures.where Sequel.lit("valid_from>?", pending_version.valid_from)
           futures = futures.order(:valid_from).all
 
           to_check_columns = self.class.version_class.columns - excluded_columns

data/lib/sequel_bitemporal.rb

@@ -10,10 +10,6 @@ module Sequel
       def self.jdbc?(db)
         db.adapter_scheme==:jdbc
       end
-
-      def self.pg_jdbc?(db)
-        db.database_type==:postgres && jdbc?(db)
-      end
     end
   end
 end

data/sequel_bitemporal.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "sequel_bitemporal"
-  s.version     = "0.8.9"
+  s.version     = "0.9.0"
   s.authors     = ["Joseph HALTER", "Jonathan TRON"]
   s.email       = ["joseph.halter@thetalentbox.com", "jonathan.tron@thetalentbox.com"]
   s.homepage    = "https://github.com/TalentBox/sequel_bitemporal"
@@ -16,9 +16,9 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_runtime_dependency "sequel", ">= 3.41", "< 5.0"
+  s.add_runtime_dependency "sequel", ">= 4.0", "< 6.0"
 
-  s.add_development_dependency "rspec", "~> 3.2.0"
+  s.add_development_dependency "rspec", "~> 3.6.0"
   s.add_development_dependency "timecop"
   s.add_development_dependency "rake"
 end

data/spec/bitemporal_date_spec.rb

@@ -382,10 +382,10 @@ describe "Sequel::Plugins::Bitemporal" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98
     master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
-    expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be
+    expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be
     Timecop.freeze Date.today+1
     master.destroy
-    expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be_nil
+    expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be_nil
   end
   it "allows eager loading via a separate query" do
     master = @master_class.new
@@ -468,25 +468,25 @@ describe "Sequel::Plugins::Bitemporal" do
     }
     expect(master.current_version.price).to eq(94)
     Sequel::Plugins::Bitemporal.at(Date.today-1) do
-      expect(master.current_version(true).price).to eq(98)
+      expect(master.current_version(:reload => true).price).to eq(98)
     end
     Sequel::Plugins::Bitemporal.at(Date.today+1) do
-      expect(master.current_version(true).price).to eq(93)
+      expect(master.current_version(:reload => true).price).to eq(93)
     end
     Sequel::Plugins::Bitemporal.at(Date.today+2) do
-      expect(master.current_version(true).price).to eq(96)
+      expect(master.current_version(:reload => true).price).to eq(96)
     end
     Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today-1) do
-      expect(master.current_version(true).price).to eq(95)
+      expect(master.current_version(:reload => true).price).to eq(95)
       expect(master.current_version).to be_current
       Sequel::Plugins::Bitemporal.at(Date.today-1) do
-        expect(master.current_version(true).price).to eq(98)
+        expect(master.current_version(:reload => true).price).to eq(98)
       end
       Sequel::Plugins::Bitemporal.at(Date.today+1) do
-        expect(master.current_version(true).price).to eq(93)
+        expect(master.current_version(:reload => true).price).to eq(93)
       end
       Sequel::Plugins::Bitemporal.at(Date.today+2) do
-        expect(master.current_version(true).price).to eq(91)
+        expect(master.current_version(:reload => true).price).to eq(91)
       end
     end
   end
@@ -511,17 +511,17 @@ describe "Sequel::Plugins::Bitemporal" do
     Timecop.freeze Date.today+1
     master.update_attributes name: "Single Standard", price: 99
     master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
-    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 99}).all.first
+    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 99}).all.first
     expect(res).to be
     expect(res.current_or_future_versions.size).to eq(1)
     expect(res.current_or_future_versions.first.price).to eq(99)
-    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 94}).all.first
+    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 94}).all.first
     expect(res).to be
     expect(res.current_or_future_versions.size).to eq(1)
     expect(res.current_or_future_versions.first.price).to eq(94)
     Timecop.freeze Date.today+1
     master.destroy
-    expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil)).all).to be_empty
+    expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil)).all).to be_empty
   end
   it "association current or future versions ignores versions with valid_from==valid_to" do
     master = @master_class.new
@@ -613,7 +613,7 @@ describe "Sequel::Plugins::Bitemporal" do
       plugin :bitemporal, version_class: MyNameVersion
     end
     expect do
-      MyName.eager_graph(:current_version).where("my_name_current_version.id IS NOT NULL").first
+      MyName.eager_graph(:current_version).where(Sequel.lit("my_name_current_version.id IS NOT NULL")).first
     end.not_to raise_error
     Object.send :remove_const, :MyName
     Object.send :remove_const, :MyNameVersion
@@ -653,7 +653,7 @@ describe "Sequel::Plugins::Bitemporal" do
       | King Size       | 98    | 2009-11-29 |            | 2009-11-28 | MAX DATE   |         |
     }
     Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today+2) do
-      master.current_version(true).destroy
+      master.current_version(:reload => true).destroy
     end
     expect(master).to have_versions %Q{
       | name            | price | created_at | expired_at | valid_from | valid_to   | current |
@@ -937,7 +937,7 @@ describe "Sequel::Plugins::Bitemporal", "with audit, specifying how to get the a
     expect do
       redefined_base_alias.eager_graph(
         :current_version
-      ).where("anything_current_version.id IS NOT NULL").first
+      ).where(Sequel.lit("anything_current_version.id IS NOT NULL")).first
     end.not_to raise_error
   end
 end

data/spec/bitemporal_date_with_range_spec.rb

@@ -373,10 +373,10 @@ if DbHelpers.pg?
       master = @master_class.new
       master.update_attributes name: "Single Standard", price: 98
       master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
-      expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be
+      expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be
       Timecop.freeze Date.today+1
       master.destroy
-      expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be_nil
+      expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be_nil
     end
     it "allows loading masters with a current version" do
       master_destroyed = @master_class.new
@@ -428,25 +428,25 @@ if DbHelpers.pg?
       }
       expect(master.current_version.price).to eq(94)
       Sequel::Plugins::Bitemporal.at(Date.today-1) do
-        expect(master.current_version(true).price).to eq(98)
+        expect(master.current_version(:reload => true).price).to eq(98)
       end
       Sequel::Plugins::Bitemporal.at(Date.today+1) do
-        expect(master.current_version(true).price).to eq(93)
+        expect(master.current_version(:reload => true).price).to eq(93)
       end
       Sequel::Plugins::Bitemporal.at(Date.today+2) do
-        expect(master.current_version(true).price).to eq(96)
+        expect(master.current_version(:reload => true).price).to eq(96)
       end
       Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today-1) do
-        expect(master.current_version(true).price).to eq(95)
+        expect(master.current_version(:reload => true).price).to eq(95)
         expect(master.current_version).to be_current
         Sequel::Plugins::Bitemporal.at(Date.today-1) do
-          expect(master.current_version(true).price).to eq(98)
+          expect(master.current_version(:reload => true).price).to eq(98)
         end
         Sequel::Plugins::Bitemporal.at(Date.today+1) do
-          expect(master.current_version(true).price).to eq(93)
+          expect(master.current_version(:reload => true).price).to eq(93)
         end
         Sequel::Plugins::Bitemporal.at(Date.today+2) do
-          expect(master.current_version(true).price).to eq(91)
+          expect(master.current_version(:reload => true).price).to eq(91)
         end
       end
     end
@@ -471,17 +471,17 @@ if DbHelpers.pg?
       Timecop.freeze Date.today+1
       master.update_attributes name: "Single Standard", price: 99
       master.update_attributes name: "Single Standard", price: 94, valid_from: Date.today+2
-      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 99}).all.first
+      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 99}).all.first
       expect(res).to be
       expect(res.current_or_future_versions.size).to eq(1)
       expect(res.current_or_future_versions.first.price).to eq(99)
-      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 94}).all.first
+      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 94}).all.first
       expect(res).to be
       expect(res.current_or_future_versions.size).to eq(1)
       expect(res.current_or_future_versions.first.price).to eq(94)
       Timecop.freeze Date.today+1
       master.destroy
-      expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil)).all).to be_empty
+      expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil)).all).to be_empty
     end
     it "allows loading masters with current or future versions" do
       master_destroyed = @master_class.new
@@ -519,7 +519,7 @@ if DbHelpers.pg?
         plugin :bitemporal, version_class: MyNameVersion
       end
       expect do
-        MyName.eager_graph(:current_version).where("my_name_current_version.id IS NOT NULL").first
+        MyName.eager_graph(:current_version).where(Sequel.lit("my_name_current_version.id IS NOT NULL")).first
       end.not_to raise_error
       Object.send :remove_const, :MyName
       Object.send :remove_const, :MyNameVersion
@@ -559,7 +559,7 @@ if DbHelpers.pg?
         | King Size       | 98    | 2009-11-29 |            | 2009-11-28 | MAX DATE   |         |
       }
       Sequel::Plugins::Bitemporal.as_we_knew_it(Date.today+2) do
-        master.current_version(true).destroy
+        master.current_version(:reload => true).destroy
       end
       expect(master).to have_versions %Q{
         | name            | price | created_at | expired_at | valid_from | valid_to   | current |

data/spec/bitemporal_time_spec.rb

@@ -292,10 +292,10 @@ describe "Sequel::Plugins::Bitemporal" do
     master = @master_class.new
     master.update_attributes name: "Single Standard", price: 98
     master.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
-    expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be
+    expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be
     Timecop.freeze Time.now+hour
     master.destroy
-    expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be_nil
+    expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be_nil
   end
   it "allows loading masters with a current version" do
     master_destroyed = @master_class.new
@@ -334,7 +334,7 @@ describe "Sequel::Plugins::Bitemporal" do
     master.update_attributes price: 94
     expect(master.current_version.price).to eq(94)
     Sequel::Plugins::Bitemporal.as_we_knew_it(Time.now-1*hour) do
-      expect(master.current_version(true).price).to eq(98)
+      expect(master.current_version(:reload => true).price).to eq(98)
     end
   end
   it "correctly reset time if failure when going back in time" do
@@ -358,17 +358,17 @@ describe "Sequel::Plugins::Bitemporal" do
     Timecop.freeze Time.now+1*hour
     master.update_attributes name: "Single Standard", price: 99
     master.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
-    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 99}).all.first
+    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 99}).all.first
     expect(res).to be
     expect(res.current_or_future_versions.size).to eq(1)
     expect(res.current_or_future_versions.first.price).to eq(99)
-    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 94}).all.first
+    res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 94}).all.first
     expect(res).to be
     expect(res.current_or_future_versions.size).to eq(1)
     expect(res.current_or_future_versions.first.price).to eq(94)
     Timecop.freeze Time.now+1*hour
     master.destroy
-    expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil)).all).to be_empty
+    expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil)).all).to be_empty
   end
   it "allows loading masters with current or future versions" do
     master_destroyed = @master_class.new

data/spec/bitemporal_time_with_range_spec.rb

@@ -292,10 +292,10 @@ if DbHelpers.pg?
       master = @master_class.new
       master.update_attributes name: "Single Standard", price: 98
       master.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
-      expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be
+      expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be
       Timecop.freeze Time.now+hour
       master.destroy
-      expect(@master_class.eager_graph(:current_version).where("rooms_current_version.id IS NOT NULL").first).to be_nil
+      expect(@master_class.eager_graph(:current_version).where(Sequel.lit("rooms_current_version.id IS NOT NULL")).first).to be_nil
     end
     it "allows loading masters with a current version" do
       master_destroyed = @master_class.new
@@ -334,7 +334,7 @@ if DbHelpers.pg?
       master.update_attributes price: 94
       expect(master.current_version.price).to eq(94)
       Sequel::Plugins::Bitemporal.as_we_knew_it(Time.now-1*hour) do
-        expect(master.current_version(true).price).to eq(98)
+        expect(master.current_version(:reload => true).price).to eq(98)
       end
     end
     it "correctly reset time if failure when going back in time" do
@@ -358,17 +358,17 @@ if DbHelpers.pg?
       Timecop.freeze Time.now+1*hour
       master.update_attributes name: "Single Standard", price: 99
       master.update_attributes name: "Single Standard", price: 94, valid_from: Time.now+2*hour
-      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 99}).all.first
+      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 99}).all.first
       expect(res).to be
       expect(res.current_or_future_versions.size).to eq(1)
       expect(res.current_or_future_versions.first.price).to eq(99)
-      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil) & {price: 94}).all.first
+      res = @master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil) & {price: 94}).all.first
       expect(res).to be
       expect(res.current_or_future_versions.size).to eq(1)
       expect(res.current_or_future_versions.first.price).to eq(94)
       Timecop.freeze Time.now+1*hour
       master.destroy
-      expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(current_or_future_versions__id: nil)).all).to be_empty
+      expect(@master_class.eager_graph(:current_or_future_versions).where(Sequel.negate(Sequel.qualify(:current_or_future_versions, :id) => nil)).all).to be_empty
     end
     it "allows loading masters with current or future versions" do
       master_destroyed = @master_class.new

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 require "sequel"
 require "timecop"
-require "pry"
 
 Dir[File.expand_path("../support/*.rb", __FILE__)].each{|f| require f}
 ENV["TZ"]="UTC"
 
 require "sequel_bitemporal"
+Sequel::Deprecation.output = false
 
 rspec_exclusions = {}
 

data/spec/support/db.rb

@@ -46,6 +46,21 @@ module DbHelpers
       set_dataset :rooms
       plugin :bitemporal, bitemporal_options
     end
+
+    DB.drop_table(:my_name_versions) if DB.table_exists?(:my_name_versions)
+    DB.drop_table(:my_names) if DB.table_exists?(:my_names)
+
+    DB.create_table! :my_names do
+      primary_key :id
+    end
+    DB.create_table! :my_name_versions do
+      primary_key :id
+      foreign_key :master_id, :my_names
+      send(use_time ? :Time : :Date, :created_at)
+      send(use_time ? :Time : :Date, :expired_at)
+      send(use_time ? :Time : :Date, :valid_from)
+      send(use_time ? :Time : :Date, :valid_to)
+    end
   end
 
   def db_truncate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sequel_bitemporal
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.9.0
 platform: ruby
 authors:
 - Joseph HALTER
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sequel
@@ -17,34 +17,34 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.41'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.41'
+        version: '4.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -89,6 +89,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- ci/sequel.gemfile
 - lib/sequel/plugins/bitemporal.rb
 - lib/sequel_bitemporal.rb
 - sequel_bitemporal.gemspec
@@ -120,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Bitemporal versioning for sequel.