temporal_tables 0.6.9 → 0.6.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9863a5343174db0c24c2d0019fd9403d196824cc13cb3438598e8f8d950be485
-  data.tar.gz: 5aa981d770362f0a8a341991cf18cd0a7ea1e2dda5719275d03445b82f6f28ad
+  metadata.gz: e2c3cea031083df1bc590ff4e74869b1574b4a312145692efe11c6cd616dfc31
+  data.tar.gz: 928adaf78e5bfb5dfbfb57e942755bba2609be2a82d482544799ac4db25cabd4
 SHA512:
-  metadata.gz: 1bc55839b61a4c816c650994ea297c1ea9a3fc9b9f37c3a89529c77c9e81e6049cd052707198c3b14501f0aec810c3e7a7350d5d94d1aa57e9ffbf3c9ee0255a
-  data.tar.gz: 7026b3448055ebf8eb1bcbf77898bff845eca5bcb728a4bed53dd40c562ec0710e9fe3eb3c7631394d8c2c137b0d1ad6f2b179b2951491d6da95e12983e51edc
+  metadata.gz: 5312c5a461f6ae0546a6173b8618e21649bc76dec62ece50245135da97a19caf570323da027556cb5517045bdd3c8340a201bcfc582c0d0d5d52995d20079ea2
+  data.tar.gz: fe4b025bd68e8ea38c2d69eb942949cbb3a015ec9f20e9409d67d639d51cd2fadd5cb84d5fbd81c7ff0bdbddd1722fcc410970b0056f5f6d71539a119f83539e

data/gemfiles/Gemfile.5.0.mysql.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.9)
+    temporal_tables (0.6.10)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.0.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.9)
+    temporal_tables (0.6.10)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.1.mysql.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.9)
+    temporal_tables (0.6.10)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.1.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.9)
+    temporal_tables (0.6.10)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.2.mysql.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.9)
+    temporal_tables (0.6.10)
       rails (~> 5.0)
 
 GEM

data/gemfiles/Gemfile.5.2.pg.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    temporal_tables (0.6.9)
+    temporal_tables (0.6.10)
       rails (~> 5.0)
 
 GEM

data/lib/temporal_tables/association_extensions.rb

@@ -0,0 +1,20 @@
+module TemporalTables
+	# Uses the time from the "at" field stored in the record to filter queries
+	# made to associations.
+	module AssociationExtensions
+		def target_scope
+			# Kludge: Check +public_methods+ instead of using +responds_to?+ to
+			# bypass +delegate_missing_to+ calls, as in +ActiveStorage::Attachment+.
+			# Using responds_to? results in an infinite loop stack overflow.
+			if @owner.public_methods.include?(:at_value)
+				# If this is a history record but no at time was given,
+				# assume the record's effective to date
+				super.at(@owner.at_value || @owner.eff_to)
+			else
+				super
+			end
+		end
+	end
+end
+
+ActiveRecord::Associations::Association.prepend TemporalTables::AssociationExtensions

data/lib/temporal_tables/join_extensions.rb

@@ -0,0 +1,20 @@
+module TemporalTables
+	# This is required for eager_load to work in Rails 5.0.x
+	module JoinDependencyExtensions
+		def build_constraint(klass, table, key, foreign_table, foreign_key)
+			constraint = super
+			if at_value = Thread.current[:at_time]
+				constraint = constraint.and(klass.build_temporal_constraint(at_value))
+			end
+			constraint
+		end
+	end
+end
+
+case Rails::VERSION::MAJOR
+when 5
+	case Rails::VERSION::MINOR
+	when 0, 1
+		ActiveRecord::Associations::JoinDependency::JoinAssociation.prepend TemporalTables::JoinDependencyExtensions
+	end
+end

data/lib/temporal_tables/preloader_extensions.rb

@@ -0,0 +1,19 @@
+module TemporalTables
+	# Uses the at time when fetching preloaded records
+	module PreloaderExtensions
+		def build_scope
+			# It seems the at time can be in either of these places, but not both,
+			# depending on when the preloading happens to be done
+			at_time = @owners.first.at_value if @owners.first.respond_to?(:at_value)
+			at_time ||= Thread.current[:at_time]
+
+			if at_time
+				super.at(at_time)
+			else
+				super
+			end
+		end
+	end
+end
+
+ActiveRecord::Associations::Preloader::Association.prepend TemporalTables::PreloaderExtensions

data/lib/temporal_tables/reflection_extensions.rb

@@ -0,0 +1,21 @@
+module TemporalTables
+	# This is required for eager_load to work in Rails 5.2.x
+	module AbstractReflectionExtensions
+		def build_join_constraint(table, foreign_table)
+			constraint = super
+			if at_value = Thread.current[:at_time]
+				constraint = constraint.and(klass.build_temporal_constraint(at_value))
+			end
+			constraint
+		end
+	end
+end
+
+case Rails::VERSION::MAJOR
+when 5
+	case Rails::VERSION::MINOR
+	when 2
+		ActiveRecord::Reflection::AbstractReflection.prepend TemporalTables::AbstractReflectionExtensions
+	end
+end
+

data/lib/temporal_tables/relation_extensions.rb

@@ -32,18 +32,7 @@ module TemporalTables
 
 		def at!(value)
 			self.at_value = value
-			self
-		end
-
-		def where_clause
-			s = super
-
-			at_clauses = []
-			if historical?
-				at_clauses << where_clause_factory.build(build_temporal_constraint(at_value), [])
-			end
-
-			[s, *at_clauses.compact].sum
+			self.where!(klass.build_temporal_constraint(value))
 		end
 
 		def to_sql(*args)
@@ -100,53 +89,6 @@ module TemporalTables
 			end
 		end
 	end
-
-	# Uses the time from the "at" field stored in the record to filter queries
-	# made to associations.
-	module AssociationExtensions
-		def target_scope
-			# Kludge: Check +public_methods+ instead of using +responds_to?+ to
-			# bypass +delegate_missing_to+ calls, as in +ActiveStorage::Attachment+.
-			# Using responds_to? results in an infinite loop stack overflow.
-			if @owner.public_methods.include?(:at_value)
-				# If this is a history record but no at time was given,
-				# assume the record's effective to date
-				super.at(@owner.at_value || @owner.eff_to)
-			else
-				super
-			end
-		end
-	end
-
-	# Uses the at time when fetching preloaded records
-	module PreloaderExtensions
-		def build_scope
-			# It seems the at time can be in either of these places, but not both,
-			# depending on when the preloading happens to be done
-			at_time = @owners.first.at_value if @owners.first.respond_to?(:at_value)
-			at_time ||= Thread.current[:at_time]
-
-			if at_time
-				super.at(at_time)
-			else
-				super
-			end
-		end
-	end
-
-	# This is required for eager_load to work in Rails 5.0.x
-	module JoinDependencyExtensions
-		def build_constraint(klass, table, key, foreign_table, foreign_key)
-			constraint = super
-			if at_value = Thread.current[:at_time]
-				constraint = constraint.and(klass.build_temporal_constraint(at_value))
-			end
-			constraint
-		end
-	end
 end
 
-ActiveRecord::Relation.send :prepend, TemporalTables::RelationExtensions
-ActiveRecord::Associations::Association.send :prepend, TemporalTables::AssociationExtensions
-ActiveRecord::Associations::Preloader::Association.send :prepend, TemporalTables::PreloaderExtensions
-ActiveRecord::Associations::JoinDependency::JoinAssociation.send :prepend, TemporalTables::JoinDependencyExtensions
+ActiveRecord::Relation.prepend TemporalTables::RelationExtensions

data/lib/temporal_tables/version.rb

@@ -1,3 +1,3 @@
 module TemporalTables
-	VERSION = "0.6.9"
+	VERSION = "0.6.10"
 end

data/lib/temporal_tables.rb

@@ -5,6 +5,10 @@ require "temporal_tables/whodunnit"
 require "temporal_tables/temporal_class"
 require "temporal_tables/history_hook"
 require "temporal_tables/relation_extensions"
+require "temporal_tables/association_extensions"
+require "temporal_tables/join_extensions"
+require "temporal_tables/preloader_extensions"
+require "temporal_tables/reflection_extensions"
 require "temporal_tables/version"
 
 module TemporalTables

data/spec/basic_history_spec.rb

@@ -74,6 +74,20 @@ describe Person do
 			it 'should include the correct time' do
 				expect(orig_emily.warts).to be_empty
 			end
+
+			it 'should generate sensible sql' do
+				sql = emily.history.at(@init_time).eager_load(:warts).where(Wart.history.arel_table[:hairiness].gteq(2)).to_sql.split(/(FROM)|(WHERE)|(ORDER)/)
+				from = sql[2]
+				where = sql[4]
+
+				expect(from.scan(/.warts_h.\..eff_from./i).count).to eq(1)
+				expect(from.scan(/.warts_h.\..eff_to./i).count).to eq(1)
+
+				expect(where.scan(/.people_h.\..eff_from./i).count).to eq(1)
+				expect(where.scan(/.people_h.\..eff_to./i).count).to eq(1)
+				expect(where.scan(/.warts_h.\..eff_from./i).count).to eq(0)
+				expect(where.scan(/.warts_h.\..eff_to./i).count).to eq(0)
+			end
 		end
 
 		describe "when checking simple code values" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: temporal_tables
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.6.10
 platform: ruby
 authors:
 - Brent Kroeker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-11 00:00:00.000000000 Z
+date: 2019-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -97,9 +97,13 @@ files:
 - gemfiles/Gemfile.5.2.pg
 - gemfiles/Gemfile.5.2.pg.lock
 - lib/temporal_tables.rb
+- lib/temporal_tables/association_extensions.rb
 - lib/temporal_tables/connection_adapters/mysql_adapter.rb
 - lib/temporal_tables/connection_adapters/postgresql_adapter.rb
 - lib/temporal_tables/history_hook.rb
+- lib/temporal_tables/join_extensions.rb
+- lib/temporal_tables/preloader_extensions.rb
+- lib/temporal_tables/reflection_extensions.rb
 - lib/temporal_tables/relation_extensions.rb
 - lib/temporal_tables/temporal_adapter.rb
 - lib/temporal_tables/temporal_class.rb