chrono_model 0.9.2 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4e2c2ec8b0a57f2078ffabc946175c86b70b7201
-  data.tar.gz: 6ad882f7558a940c9e3766e5abf6a6101107ffd2
+  metadata.gz: 67617b7e3802061ce8bff217ddbed05e33dea83e
+  data.tar.gz: 0e0172b002fe5f355461acb4c643ce8867394058
 SHA512:
-  metadata.gz: 92eff9be8173deeb5092553a23403ff87918b5c993338825a79783470b74ec0988419ecc5f3c62075da785954e353f0d1f9447301c8c8b21349e7f9fc312788c
-  data.tar.gz: d62529c7d3c49aae5dde87ab4304377bdc290dffa7054b2fca4c421f6a7042b001cc4cf3dd7237af45bb81210c406488491b837661f0652b4c906faac647b854
+  metadata.gz: f1b8ad21da3c8a9856c7865f1586a45760552c4d8b60e2999ff98ba5ea91d62f75ecf573ba0fdc3df5c7c048b7f9245b2a0427d2d2d5c1c005a12d84315a45c3
+  data.tar.gz: 1b94a4c721bc99472464b6160fd99c3e4e7ca66fddb893bfc538d83863dbd1ecdd30624f49ce020643dddce44f6d79d7ecbe1d0d10f415f18eb91a47a1710721

data/.travis.yml

@@ -1,8 +1,16 @@
 rvm:
-  - 2.0.0
-  - 2.1
-  - 2.2.5
-  - 2.3.1
+  - 2.2.7
+  - 2.3
+  - 2.4
+
+gemfile:
+  - gemfiles/rails_4.2.gemfile
+  - gemfiles/rails_5.0.gemfile
+
+matrix:
+  exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails_4.2.gemfile
 
 sudo: false
 
@@ -13,9 +21,14 @@ addons:
   postgresql: "9.4"
   apt:
     packages: postgresql-plpython-9.4
+  code_climate:
+    repo_token: dedfb7472ee410eec459bff3681d9a8fd8dd237e9bd7e8675a7c8eb7e253bba9
 
 before_script:
   - psql -c "CREATE DATABASE chronomodel;" -U postgres
 
 script:
-  - bundle exec rake TEST_CONFIG=./spec/config.travis.yml CODECLIMATE_REPO_TOKEN=dedfb7472ee410eec459bff3681d9a8fd8dd237e9bd7e8675a7c8eb7e253bba9
+  - bundle exec rake TEST_CONFIG=./spec/config.travis.yml
+
+after_success:
+  - bundle exec codeclimate-test-reporter

data/README.md

@@ -1,4 +1,4 @@
-# Temporal database system on PostgreSQL using [updatable views][], [table inheritance][] and [INSTEAD OF triggers][].
+# Temporal database system on PostgreSQL using [updatable views][pg-updatable-views], [table inheritance][pg-table-inheritance] and [INSTEAD OF triggers][pg-instead-of-triggers].
 
 [![Build Status][build-status-badge]][build-status]
 [![Dependency Status][deps-status-badge]][deps-status]
@@ -25,21 +25,23 @@ beneath.
 
 The application model is backed by an updatable view in the default `public`
 schema that behaves like a plain table to any database client.  When data in
-manipulated on it, INSTEAD OF [triggers][] redirect the manipulations to
-concrete tables.
+manipulated on it, INSTEAD OF [triggers][pg-triggers] redirect the manipulations
+to concrete tables.
 
-Current data is hold in a table in the `temporal` [schema][], while history in
-hold in a specular one in the `history` schema.  The latter [inherits][] from
-the former, to get automated schema updates and for free and other benefits.
+*Current* data is held in a table in the `temporal` [schema][pg-schema], while
+*History* is held in a table in the `history` schema that [inherits][pg-table-inheritance]
+from the *Current* one, to get automated schema updates for free and other
+benefits.
 
-The current time is taken using [`current_timestamp`][], so that multiple data
-manipulations in the same transaction on the same records always create a
-single history entry (they are _squashed_ together).
+The current time is taken using [`current_timestamp`][pg-current-timestamp], so
+that multiple data manipulations in the same transaction on the same records
+always create a single history entry (they are _squashed_ together).
 
-[Partitioning][] of history is also possible: this design [fits the
-requirements][partitioning-excl-constraints] but it's not implemented yet.
+[Partitioning][pg-partitioning] of history is also possible: this design [fits the
+requirements][pg-partitioning-excl-constraints] but it's not implemented yet.
 
-See [README.sql][] for a SQL example defining the machinery for a simple table.
+See [README.sql][cm-readme-sql] for a SQL example defining the machinery for a
+simple table.
 
 
 ## Active Record integration
@@ -52,9 +54,10 @@ Data extraction at a single point in time and even `JOIN`s between temporal and
 non-temporal data is implemented using sub-selects and a `WHERE` generated by
 the provided `TimeMachine` module to be included in your models.
 
-The `WHERE` is optimized using [GiST indexes][] on the `tsrange` defining
-record validity. Overlapping history is prevented through [exclusion
-constraints][] and the [btree_gist][] extension.
+The `WHERE` is optimized using [GiST indexes][pg-gist-indexes] on the
+`tsrange` defining record validity. Overlapping history is prevented
+through [exclusion constraints][pg-exclusion-constraints] and the
+[btree_gist][pg-btree-gist] extension.
 
 All timestamps are _forcibly_ stored in as UTC, bypassing the
 `default_timezone` setting.
@@ -62,10 +65,11 @@ All timestamps are _forcibly_ stored in as UTC, bypassing the
 
 ## Requirements
 
-* Ruby >= 2.0 (1.9 is still supported, but support will be dropped soon).
-* Active Record = 4.2
+* Ruby >= 2.2 (1.9 to 2.1 could still work, but aren't supported).
+* Active Record 4.2 or 5.0 (4.2 doesn't work with Ruby 2.4, though)
 * PostgreSQL >= 9.3
-* The `btree_gist` and `plpython` PostgreSQL extensions:
+* The `btree_gist` PostgreSQL extension
+* The `plpython` PostgreSQL extension if you have *JSON* (*not* JSONB) columns
 
 With Homebrew:
 
@@ -79,7 +83,7 @@ With Apt:
 
 Add this line to your application's Gemfile:
 
-    gem 'chrono_model', github: 'ifad/chronomodel'
+    gem 'chrono_model'
 
 And then execute:
 
@@ -147,6 +151,7 @@ change_table :your_table, :temporal => true, :copy_data => true, :validity => '1
 Please note that `change_table` requires you to use *old_style* `up` and
 `down` migrations. It cannot work with Rails 3-style `change` migrations.
 
+
 ## Selective Journaling
 
 By default UPDATEs only to the `updated_at` field are not recorded in the
@@ -159,8 +164,8 @@ options to `create_table`:
   * `:no_journal => %w( fld1 fld2 .. )` - do not record changes to the specified fields
   * `:full_journal => true`             - record changes to *all* fields, including `updated_at`.
 
-These options are stored as JSON in the [COMMENT][] area of the public view,
-alongside with the ChronoModel version that created them.
+These options are stored as JSON in the [COMMENT][pg-comment] area of the
+public view, alongside with the ChronoModel version that created them.
 
 This is visible in `psql` if you issue a `\d+`. Example after a test run:
 
@@ -246,12 +251,15 @@ SELECT "countries".* FROM (
 ) AS "compositions" ON compositions.country_id = countries.id
 ```
 
-More methods are provided, see the [TimeMachine][] source for more information.
+More methods are provided, see the [TimeMachine][cm-timemachine] source for
+more information.
+
 
 ## History manipulation
 
 History objects can be changed and `.save`d just like any other record.
 
+
 ## Running tests
 
 You need a running PostgreSQL >= 9.3 instance. Create `spec/config.yml` with the
@@ -263,20 +271,21 @@ You need to connect as  a database superuser, because specs need to create the
 Run `rake`. SQL queries are logged to `spec/debug.log`. If you want to see them
 in your output, use `rake VERBOSE=true`.
 
-## Usage with JSON columns
 
-[JSON][json-type] does not provide an [equality operator][json-func].
+## Usage with JSON (*not* JSONB) columns
+
+[JSON][pg-json-type] does not provide an [equality operator][pg-json-func].
 As both unnecessary update suppression and selective journaling require
 comparing the OLD and NEW rows fields, this fails by default.
 
 ChronoModel provides a naive JSON equality operator using a naive
-comparison of JSON objects [implemented in pl/python][json-opclass].
+comparison of JSON objects [implemented in pl/python][pg-json-opclass].
 
 To load the opclass you can use the `ChronoModel::Json.create`
 convenience method. If you don't use JSON don't bother doing this.
 
-If you are on Postgres 9.4, you are strongly encouraged to use JSONB,
-that has an equality operator built-in, it's faster and stricter, and
+If you are on Postgres 9.4, you are **strongly encouraged to use JSONB**,
+as it has an equality operator built-in, it's faster and stricter, and
 offers many more indexing abilities and better performance than JSON.
 
 ## Caveats
@@ -293,15 +302,13 @@ offers many more indexing abilities and better performance than JSON.
    `db:structure:load`.
    Two helper tasks are also added, `db:data:dump` and `db:data:load`.
 
- * `.includes` is quirky when using `.as_of`.
-
- * The choice of using subqueries instead of [Common Table Expressions][]
-   was dictated by the fact that CTEs [currently acts as an optimization
-   fence][cte-optimization-fence].
-   If it will be possible [to opt-out of the fence][cte-opt-out-fence] in
-   the future, they will be probably be used again as they were [in the
-   past][chronomodel-cte-impl], because the resulting queries were more
-   readable, and do not inhibit using `.from()` on the `AR::Relation`.
+ * The choice of using subqueries instead of [Common Table Expressions]
+   [pg-ctes] was dictated by the fact that CTEs [currently act as an
+   optimization fence][pg-cte-optimization-fence].
+   If it will be possible [to opt-out of the fence][pg-cte-opt-out-fence]
+   in the future, they will be probably be used again as they were [in the
+   past][cm-cte-impl], because the resulting queries were more readable,
+   and do not inhibit using `.from()` on the `AR::Relation`.
 
 
 ## Contributing
@@ -313,6 +320,19 @@ offers many more indexing abilities and better performance than JSON.
  5. Create new Pull Request
 
 
+## Special mention
+
+An special mention has to be made to [Paolo Zaccagnini][gh-pzac]
+for all his effort in highlighting the improvements and best decisions
+taken over the life cycle of the design and implementation of Chronomodel
+while using it in many important projects.
+
+
+## Denominazione d'Origine Controllata
+
+This software is Made in Italy :it: :smile:.
+
+
 [build-status]: https://travis-ci.org/ifad/chronomodel
 [build-status-badge]: https://travis-ci.org/ifad/chronomodel.svg
 [deps-status]: https://gemnasium.com/ifad/chronomodel
@@ -327,34 +347,34 @@ offers many more indexing abilities and better performance than JSON.
 [chronos-image]: http://i.imgur.com/8NObYiZl.jpg
 [rebelle-society]: http://www.rebellesociety.com/2012/10/11/the-writers-way-week-two-facing-procrastination/chronos_oeuvre_grand1/
 
-[updatable views]: http://www.postgresql.org/docs/9.4/static/sql-createview.html#SQL-CREATEVIEW-UPDATABLE-VIEWS
-[table inheritance]: http://www.postgresql.org/docs/9.4/static/ddl-inherit.html
-[INSTEAD OF triggers]: http://www.postgresql.org/docs/9.4/static/sql-createtrigger.html
 [wp-scd-2]: http://en.wikipedia.org/wiki/Slowly_changing_dimension#Type_2
 [wp-scd-4]: http://en.wikipedia.org/wiki/Slowly_changing_dimension#Type_4
-[triggers]: http://www.postgresql.org/docs/9.4/static/trigger-definition.html
-[schema]: http://www.postgresql.org/docs/9.4/static/ddl-schemas.html
-[inherits]: http://www.postgresql.org/docs/9.4/static/ddl-inherit.html
-[`current_timestamp`]: http://www.postgresql.org/docs/9.4/interactive/functions-datetime.html#FUNCTIONS-DATETIME-TABLE
-
-[Partitioning]: http://www.postgresql.org/docs/9.4/static/ddl-partitioning.html)
-[partitioning-excl-constraints]: http://www.postgresql.org/docs/9.4/static/ddl-partitioning.html#DDL-PARTITIONING-CONSTRAINT-EXCLUSION
-[README.sql]: https://github.com/ifad/chronomodel/blob/master/README.sql
-[GiST indexes]: http://www.postgresql.org/docs/9.4/static/gist.html
-[exclusion constraints]: http://www.postgresql.org/docs/9.4/static/sql-createtable.html#SQL-CREATETABLE-EXCLUDE
-[btree_gist]: http://www.postgresql.org/docs/9.4/static/btree-gist.html
-[COMMENT]: http://www.postgresql.org/docs/9.4/static/sql-comment.html
-[TimeMachine]: https://github.com/ifad/chronomodel/blob/master/lib/chrono_model/time_machine.rb
 
-[r4-tsrange-broken]: https://github.com/rails/rails/pull/13793#issuecomment-34608093
-[r4-tsrange-incomplete]: https://github.com/rails/rails/issues/14010)
+[pg-updatable-views]: http://www.postgresql.org/docs/9.4/static/sql-createview.html#SQL-CREATEVIEW-UPDATABLE-VIEWS
+[pg-table-inheritance]: http://www.postgresql.org/docs/9.4/static/ddl-inherit.html
+[pg-instead-of-triggers]: http://www.postgresql.org/docs/9.4/static/sql-createtrigger.html
+[pg-triggers]: http://www.postgresql.org/docs/9.4/static/trigger-definition.html
+[pg-schema]: http://www.postgresql.org/docs/9.4/static/ddl-schemas.html
+[pg-current-timestamp]: http://www.postgresql.org/docs/9.4/interactive/functions-datetime.html#FUNCTIONS-DATETIME-TABLE
+[pg-partitioning]: http://www.postgresql.org/docs/9.4/static/ddl-partitioning.html
+[pg-partitioning-excl-constraints]: http://www.postgresql.org/docs/9.4/static/ddl-partitioning.html#DDL-PARTITIONING-CONSTRAINT-EXCLUSION
+[pg-gist-indexes]: http://www.postgresql.org/docs/9.4/static/gist.html
+[pg-exclusion-constraints]: http://www.postgresql.org/docs/9.4/static/sql-createtable.html#SQL-CREATETABLE-EXCLUDE
+[pg-btree-gist]: http://www.postgresql.org/docs/9.4/static/btree-gist.html
+[pg-comment]: http://www.postgresql.org/docs/9.4/static/sql-comment.html
 [pg-tsrange-and-ruby]: https://bugs.ruby-lang.org/issues/6864
-[chronomodel-0.5]: https://github.com/ifad/chronomodel/tree/c2daa0f
-[Common Table Expressions]: http://www.postgresql.org/docs/9.4/static/queries-with.html
-[cte-optimization-fence]: http://archives.postgresql.org/pgsql-hackers/2012-09/msg00700.php
-[cte-opt-out-fence]: http://archives.postgresql.org/pgsql-hackers/2012-10/msg00024.php
-[chronomodel-cte-impl]: https://github.com/ifad/chronomodel/commit/18f4c4b
-
-[json-type]: http://www.postgresql.org/docs/9.4/static/datatype-json.html
-[json-func]: http://www.postgresql.org/docs/9.4/static/functions-json.html
-[json-opclass]: https://github.com/ifad/chronomodel/blob/master/sql/json_ops.sql
+[pg-ctes]: http://www.postgresql.org/docs/9.4/static/queries-with.html
+[pg-cte-optimization-fence]: http://archives.postgresql.org/pgsql-hackers/2012-09/msg00700.php
+[pg-cte-opt-out-fence]: http://archives.postgresql.org/pgsql-hackers/2012-10/msg00024.php
+[pg-json-type]: http://www.postgresql.org/docs/9.4/static/datatype-json.html
+[pg-json-func]: http://www.postgresql.org/docs/9.4/static/functions-json.html
+[pg-json-opclass]: https://github.com/ifad/chronomodel/blob/master/sql/json_ops.sql
+
+[r4-tsrange-broken]: https://github.com/rails/rails/pull/13793#issuecomment-34608093
+[r4-tsrange-incomplete]: https://github.com/rails/rails/issues/14010
+
+[cm-readme-sql]: https://github.com/ifad/chronomodel/blob/master/README.sql
+[cm-timemachine]: https://github.com/ifad/chronomodel/blob/master/lib/chrono_model/time_machine.rb
+[cm-cte-impl]: https://github.com/ifad/chronomodel/commit/18f4c4b
+
+[gh-pzac]: https://github.com/pzac

data/chrono_model.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = ChronoModel::VERSION
 
-  gem.add_dependency "activerecord", "~> 4.2.0"
+  gem.add_dependency 'activerecord', '>= 4.2.0', '< 5.1.0'
   gem.add_dependency "pg"
   gem.add_dependency "multi_json"
 
@@ -25,5 +25,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rake'
   gem.add_development_dependency 'fuubar'
+  gem.add_development_dependency 'simplecov'
   gem.add_development_dependency 'codeclimate-test-reporter'
-end
+end

data/gemfiles/rails_4.2.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 4.2.0"
+
+gemspec :path => "../"

data/gemfiles/rails_5.0.gemfile

@@ -0,0 +1,5 @@
+source "https://rubygems.org"
+
+gem "activerecord", "~> 5.0.0"
+
+gemspec :path => "../"

data/lib/active_record/connection_adapters/chronomodel_adapter.rb

@@ -17,7 +17,12 @@ module ActiveRecord
       conn_params[:dbname] = conn_params.delete(:database) if conn_params[:database]
 
       # Forward only valid config params to PGconn.connect.
-      conn_params.keep_if { |k, _| VALID_CONN_PARAMS.include?(k) }
+      valid_conn_param_keys = if ActiveRecord::VERSION::MAJOR == 4
+                                VALID_CONN_PARAMS
+                              else
+                                PGconn.conndefaults_hash.keys + [:requiressl]
+                              end
+      conn_params.slice!(*valid_conn_param_keys)
 
       # The postgres drivers don't allow the creation of an unconnected PGconn object,
       # so just pass a nil connection object for the time being.

data/lib/chrono_model/adapter.rb

@@ -71,9 +71,9 @@ module ChronoModel
           end
         end
 
-        # Rename indexes
+
+        # Rename indexes on history schema
         #
-        pkey = primary_key(new_name)
         _on_history_schema do
           standard_index_names = %w(
             inherit_pkey instance_history pkey
@@ -90,15 +90,31 @@ module ChronoModel
           end
         end
 
-        # Rename functions
+        # Rename indexes on temporal schema
+        #
+        _on_temporal_schema do
+          temporal_indexes =  indexes(new_name)
+          temporal_indexes.map(&:name).each do |old_idx_name|
+            if old_idx_name =~ /^index_#{name}_on_(?<columns>.+)/
+              new_idx_name = "index_#{new_name}_on_#{$~['columns']}"
+              execute "ALTER INDEX #{old_idx_name} RENAME TO #{new_idx_name}"
+            end
+          end
+        end
+
+        # Drop view
+        #
+        execute "DROP VIEW #{name}"
+
+        # Drop functions
         #
         %w( insert update delete ).each do |func|
-          execute "ALTER FUNCTION chronomodel_#{name}_#{func}() RENAME TO chronomodel_#{new_name}_#{func}"
+          execute "DROP FUNCTION chronomodel_#{name}_#{func}()"
         end
 
-        # Rename the public view
+        # Create view and functions
         #
-        execute "ALTER VIEW #{name} RENAME TO #{new_name}"
+        chrono_create_view_for(new_name)
 
         TableCache.del! name
         TableCache.add! new_name
@@ -447,8 +463,8 @@ module ChronoModel
     #
     def is_chrono?(table)
       TableCache.fetch(table) do
-        _on_temporal_schema { table_exists?(table) } &&
-        _on_history_schema { table_exists?(table) }
+        _on_temporal_schema { chrono_data_source_exists?(table) } &&
+        _on_history_schema { chrono_data_source_exists?(table) }
       end
 
     rescue ActiveRecord::StatementInvalid => e
@@ -630,7 +646,7 @@ module ChronoModel
       def chrono_metadata_for(table)
         comment = select_value(
           "SELECT obj_description(#{quote(table)}::regclass)",
-          "ChronoModel metadata for #{table}") if table_exists?(table)
+          "ChronoModel metadata for #{table}") if chrono_data_source_exists?(table)
 
         MultiJson.load(comment || '{}').with_indifferent_access
       end
@@ -693,7 +709,7 @@ module ChronoModel
 
         # SELECT - return only current data
         #
-        execute "DROP VIEW #{table}" if table_exists? table
+        execute "DROP VIEW #{table}" if chrono_data_source_exists? table
         execute "CREATE VIEW #{table} AS SELECT * FROM ONLY #{current}"
 
         # Set default values on the view (closes #12)
@@ -701,10 +717,19 @@ module ChronoModel
         chrono_metadata_set(table, options.merge(:chronomodel => VERSION))
 
         columns(table).each do |column|
-          default = column.default.nil? ? column.default_function : quote(column.default, column)
+          default = if column.default.nil?
+            column.default_function
+          else
+            if ActiveRecord::VERSION::MAJOR == 4
+              quote(column.default, column)
+            else # Rails 5 and beyond
+              quote(column.default)
+            end
+          end
+
           next if column.name == pk || default.nil?
 
-          execute "ALTER VIEW #{table} ALTER COLUMN #{column.name} SET DEFAULT #{default}"
+          execute "ALTER VIEW #{table} ALTER COLUMN #{quote_column_name(column.name)} SET DEFAULT #{default}"
         end
 
         columns = columns(table).map {|c| quote_column_name(c.name)}
@@ -889,6 +914,16 @@ module ChronoModel
         end
       end
 
+      def chrono_data_source_exists?(table_name)
+        if ActiveRecord::VERSION::MAJOR >= 5
+          data_source_exists?(table_name)
+        else
+          # On Rails 4, table_exists? has the same behaviour, checking if both
+          # a view or table exists
+          table_exists?(table_name)
+        end
+      end
+
       def _on_temporal_schema(nesting = true, &block)
         on_schema(TEMPORAL_SCHEMA, nesting, &block)
       end

data/lib/chrono_model/patches.rb

@@ -55,6 +55,52 @@ module ChronoModel
 
         end
       end
+
+      def build_preloader
+        ActiveRecord::Associations::Preloader.new(as_of_time: as_of_time)
+      end
+    end
+
+    # Patches ActiveRecord::Associations::Preloader to add support for
+    # temporal associations. This is tying itself to Rails internals
+    # and it is ugly :-(.
+    #
+    module Preloader
+      attr_reader :options
+
+      NULL_RELATION = ActiveRecord::Associations::Preloader::NULL_RELATION
+      AS_OF_PRELOAD_SCOPE = Struct.new(:as_of_time, *NULL_RELATION.members)
+
+      def initialize(options = {})
+        @options = options.freeze
+      end
+
+      def preload(records, associations, given_preload_scope = nil)
+        if (as_of_time = options[:as_of_time])
+          preload_scope = AS_OF_PRELOAD_SCOPE.new
+
+          preload_scope.as_of_time = as_of_time
+          given_preload_scope ||= NULL_RELATION
+
+          NULL_RELATION.members.each do |member|
+            preload_scope[member] = given_preload_scope[member]
+          end
+        end
+
+        super records, associations, preload_scope
+      end
+
+      module Association
+        def build_scope
+          scope = super
+
+          if preload_scope.respond_to?(:as_of_time)
+            scope = scope.as_of(preload_scope.as_of_time)
+          end
+
+          return scope
+        end
+      end
     end
 
     # Patches ActiveRecord::Associations::Association to add support for

data/lib/chrono_model/time_machine.rb

@@ -201,6 +201,16 @@ module ChronoModel
 
       # Define the History constant inside the subclass
       subclass.const_set :History, history
+
+      history.instance_eval do
+        # Monkey patch of ActiveRecord::Inheritance.
+        # STI fails when a Foo::History record has Foo as type in the
+        # inheritance column; AR expects the type to be an instance of the
+        # current class or a descendant (or self).
+        def find_sti_class(type_name)
+          super(type_name + "::History")
+        end
+      end
     end
 
     # Returns a read-only representation of this record as it was +time+ ago.
@@ -392,9 +402,8 @@ module ChronoModel
           if t == :now || t == :today
             now_for_column(column)
           else
-            [connection.quote(t, column),
-             primitive_type_for_column(column)
-            ].join('::')
+            quoted_t = connection.quote(connection.quoted_date(t))
+            [quoted_t, primitive_type_for_column(column)].join('::')
           end
         end
 

data/lib/chrono_model/utils.rb

@@ -3,12 +3,12 @@ module ChronoModel
   module Conversions
     extend self
 
-    ISO_DATETIME = /\A(\d{4})-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d)(\.\d+)?\z/
+    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
-        microsec = ($7.to_f * 1_000_000).to_i
-        Time.utc $1.to_i, $2.to_i, $3.to_i, $4.to_i, $5.to_i, $6.to_i, microsec
+        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
 
@@ -51,7 +51,8 @@ module ChronoModel
 
       connection.execute %[
         UPDATE #{quoted_table_name}
-           SET "validity" = tsrange(#{connection.quote(from)}, #{connection.quote(to)})
+           SET "validity" = tsrange(#{connection.quote(from)}, #{connection.quote(to)}),
+               "recorded_at" = #{connection.quote(from)}
          WHERE "hid" = #{hid.to_i}
       ]
     end

data/lib/chrono_model/version.rb

@@ -1,3 +1,3 @@
 module ChronoModel
-  VERSION = "0.9.2"
+  VERSION = "0.10.0"
 end

data/lib/chrono_model.rb

@@ -14,7 +14,6 @@ if defined?(Rails)
   require 'chrono_model/railtie'
 end
 
-
 ActiveRecord::Associations::Association.instance_eval do
   prepend ChronoModel::Patches::Association
 end
@@ -22,3 +21,11 @@ end
 ActiveRecord::Relation.instance_eval do
   prepend ChronoModel::Patches::Relation
 end
+
+ActiveRecord::Associations::Preloader.instance_eval do
+  prepend ChronoModel::Patches::Preloader
+end
+
+ActiveRecord::Associations::Preloader::Association.instance_eval do
+  prepend ChronoModel::Patches::Preloader::Association
+end

data/spec/adapter_spec.rb

@@ -93,12 +93,22 @@ describe ChronoModel::Adapter do
     context ':temporal => true' do
       before :all do
         adapter.create_table table, :temporal => true, &columns
+        adapter.add_index table, :test
+        adapter.add_index table, [:foo, :bar]
 
         adapter.rename_table table, renamed
       end
       after(:all) { adapter.drop_table(renamed) }
 
       it_should_behave_like 'temporal table'
+
+      it 'renames indexes' do
+        new_index_names = adapter.indexes(renamed).map(&:name)
+        expected_index_names = [[:test], [:foo, :bar]].map do |idx_cols|
+          "index_#{renamed}_on_#{idx_cols.join('_and_')}"
+        end
+        expect(new_index_names.to_set).to eq expected_index_names.to_set
+      end
     end
 
     context ':temporal => false' do

data/spec/json_ops_spec.rb

@@ -14,11 +14,11 @@ describe 'JSON equality operator' do
     ChronoModel::Json.drop
   end
 
-  it { expect(adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a":1}'::json ])).to eq 't' }
-  it { expect(adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a" : 1}'::json ])).to eq 't' }
-  it { expect(adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a":2}'::json ])).to eq 'f' }
-  it { expect(adapter.select_value(%[ SELECT '{"a":1,"b":2}'::json = '{"b":2,"a":1}'::json ])).to eq 't' }
-  it { expect(adapter.select_value(%[ SELECT '{"a":1,"b":2,"x":{"c":4,"d":5}}'::json = '{"b":2, "x": { "d": 5, "c": 4}, "a":1}'::json ])).to eq 't' }
+  it { expect(adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a":1}'::json ])).to eq AR_TRUE }
+  it { expect(adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a" : 1}'::json ])).to eq AR_TRUE }
+  it { expect(adapter.select_value(%[ SELECT '{"a":1}'::json = '{"a":2}'::json ])).to eq AR_FALSE }
+  it { expect(adapter.select_value(%[ SELECT '{"a":1,"b":2}'::json = '{"b":2,"a":1}'::json ])).to eq AR_TRUE }
+  it { expect(adapter.select_value(%[ SELECT '{"a":1,"b":2,"x":{"c":4,"d":5}}'::json = '{"b":2, "x": { "d": 5, "c": 4}, "a":1}'::json ])).to eq AR_TRUE }
 
   context 'on a temporal table' do
     before :all do

data/spec/spec_helper.rb

@@ -1,7 +1,7 @@
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
 #
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'chrono_model'
 
@@ -11,6 +11,9 @@ require 'support/matchers/table'
 require 'support/matchers/column'
 require 'support/matchers/index'
 
+# Rails 5 returns a True/FalseClass
+AR_TRUE, AR_FALSE  = ActiveRecord::VERSION::MAJOR == 4 ? ['t', 'f'] : [true, false]
+
 RSpec.configure do |config|
   config.include(ChronoTest::Matchers::Schema)
   config.include(ChronoTest::Matchers::Table)

data/spec/support/matchers/table.rb

@@ -12,7 +12,7 @@ module ChronoTest::Matchers
           schema = options[:in]
           kind   = options[:kind] == :view ? 'v' : 'r'
 
-          select_value(<<-SQL, [ table, schema ], 'Check table exists') == 't'
+          select_value(<<-SQL, [ table, schema ], 'Check table exists') == AR_TRUE
             SELECT EXISTS (
               SELECT 1
                 FROM pg_class c
@@ -129,7 +129,7 @@ module ChronoTest::Matchers
         def inherits_from_temporal?
           binds = ["#{history_schema}.#{table}", "#{temporal_schema}.#{table}"]
 
-          @inheritance = select_value(<<-SQL, binds, 'Check inheritance') == 't'
+          @inheritance = select_value(<<-SQL, binds, 'Check inheritance') == AR_TRUE
             SELECT EXISTS (
               SELECT 1 FROM pg_catalog.pg_inherits
                WHERE inhrelid  = ?::regclass::oid
@@ -172,7 +172,7 @@ module ChronoTest::Matchers
             attname:      connection.primary_key(table)
           }
 
-          @constraint = select_value(<<-SQL, binds, 'Check Consistency Constraint') == 't'
+          @constraint = select_value(<<-SQL, binds, 'Check Consistency Constraint') == AR_TRUE
             SELECT EXISTS (
               SELECT 1 FROM pg_catalog.pg_constraint
               WHERE conname = :conname

data/spec/time_machine_spec.rb

@@ -24,6 +24,8 @@ describe ChronoModel::TimeMachine do
   #
   baz = Baz.create :name => 'baz', :bar => bar
 
+  # Specs start here
+  #
   describe '.chrono?' do
     subject { model.chrono? }
 
@@ -69,8 +71,6 @@ describe ChronoModel::TimeMachine do
     it { is_expected.to include(Publication) }
   end
 
-  # Specs start here
-  #
   describe '.chrono_models' do
     subject { ChronoModel::TimeMachine.chrono_models }
 
@@ -134,6 +134,28 @@ describe ChronoModel::TimeMachine do
       it { expect(bar.as_of(bar.ts[3]).foo.name).to eq 'new foo' }
     end
 
+    describe 'supports historical queries with includes()' do
+      it { expect(Foo.as_of(foo.ts[0]).includes(:bars).first.bars).to eq [] }
+      it { expect(Foo.as_of(foo.ts[1]).includes(:bars).first.bars).to eq [] }
+      it { expect(Foo.as_of(foo.ts[2]).includes(:bars).first.bars).to eq [bar] }
+
+      it { expect(Foo.as_of(bar.ts[0]).includes(:bars).first.bars.first.name).to eq 'bar' }
+      it { expect(Foo.as_of(bar.ts[1]).includes(:bars).first.bars.first.name).to eq 'foo bar' }
+      it { expect(Foo.as_of(bar.ts[2]).includes(:bars).first.bars.first.name).to eq 'bar bar' }
+      it { expect(Foo.as_of(bar.ts[3]).includes(:bars).first.bars.first.name).to eq 'new bar' }
+
+
+      it { expect(Bar.as_of(bar.ts[0]).includes(:foo).first.foo).to eq foo }
+      it { expect(Bar.as_of(bar.ts[1]).includes(:foo).first.foo).to eq foo }
+      it { expect(Bar.as_of(bar.ts[2]).includes(:foo).first.foo).to eq foo }
+      it { expect(Bar.as_of(bar.ts[3]).includes(:foo).first.foo).to eq foo }
+
+      it { expect(Bar.as_of(bar.ts[0]).includes(:foo).first.foo.name).to eq 'foo bar' }
+      it { expect(Bar.as_of(bar.ts[1]).includes(:foo).first.foo.name).to eq 'foo bar' }
+      it { expect(Bar.as_of(bar.ts[2]).includes(:foo).first.foo.name).to eq 'new foo' }
+      it { expect(Bar.as_of(bar.ts[3]).includes(:foo).first.foo.name).to eq 'new foo' }
+    end
+
     it 'doesn\'t raise RecordNotFound when no history records are found' do
       expect { foo.as_of(1.minute.ago) }.to_not raise_error
       expect(foo.as_of(1.minute.ago)).to be(nil)

data/spec/utils_spec.rb

@@ -0,0 +1,43 @@
+require 'spec_helper'
+
+describe ChronoModel::Conversions do
+
+  describe 'string_to_utc_time' do
+    subject { described_class.string_to_utc_time(string) }
+
+    context 'given a valid UTC time string' do
+      let(:string) { '2017-02-06 09:46:31.129626' }
+
+      it { is_expected.to be_a(Time) }
+      it { expect(subject.year).to  eq 2017 }
+      it { expect(subject.month).to eq 2 }
+      it { expect(subject.day).to   eq 6 }
+      it { expect(subject.hour).to  eq 9 }
+      it { expect(subject.min).to   eq 46 }
+      it { expect(subject.sec).to   eq 31 }
+      it { expect(subject.usec).to  eq 129626 } # Ref Issue #32
+    end
+
+    context 'given a valid UTC string without least significant zeros' do
+      let(:string) { '2017-02-06 09:46:31.129' }
+
+      it { is_expected.to be_a(Time) }
+      it { expect(subject.usec).to eq 129000 } # Ref Issue #32
+    end
+
+    context 'given an invalid UTC time string' do
+      let(:string) { 'foobar' }
+
+      it { is_expected.to be(nil) }
+    end
+  end
+
+  describe 'time_to_utc_string' do
+    subject { described_class.time_to_utc_string(time) }
+
+    let(:time) { Time.utc(1981, 4, 11, 2, 42, 10, 123456) }
+
+    it { is_expected.to eq '1981-04-11 02:42:10.123456' }
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chrono_model
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.10.0
 platform: ruby
 authors:
 - Marcello Barnaba
@@ -9,22 +9,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-08 00:00:00.000000000 Z
+date: 2017-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -137,6 +143,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -169,6 +189,8 @@ files:
 - README.sql
 - Rakefile
 - chrono_model.gemspec
+- gemfiles/rails_4.2.gemfile
+- gemfiles/rails_5.0.gemfile
 - lib/active_record/connection_adapters/chronomodel_adapter.rb
 - lib/chrono_model.rb
 - lib/chrono_model/adapter.rb
@@ -194,6 +216,7 @@ files:
 - 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
@@ -215,7 +238,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Temporal extensions (SCD Type II) for Active Record
@@ -234,3 +257,4 @@ test_files:
 - spec/support/matchers/table.rb
 - spec/time_machine_spec.rb
 - spec/time_query_spec.rb
+- spec/utils_spec.rb