constant_table_saver 6.0.0 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e78104699209fe095295ffd69d23cebca7de8c886dca5240813ee6c905e3bc2
-  data.tar.gz: 4e012a091a754f8808088396d02c5af246dcf2374bd2c0863b2022fd721e6554
+  metadata.gz: 3439491d2c0407e721feb9f068213d83278391d6fca8c93c29ca3fc147902c37
+  data.tar.gz: 2fa2009f42c977f20eedf9fa3e11e841249250afc388f49e23d1f172b75a0d11
 SHA512:
-  metadata.gz: 5cc34704747611b3fe9b01397d1e2796c658bfb50e79b032e6544e57256111d7a71349f87a7537dcd877df607cfc8e3efcc9bc45d971ea06f4453af013ecd713
-  data.tar.gz: 166283c4290fd6c55e7fd884231b595b0616ac3606609de00fa09b3fa8c815210503172c3d81eda9b7f46643e33eb7a7606092f6d6183955069d3d47c20858cb
+  metadata.gz: 62723639d7273610e9210e411be9be75a1a50c52e995d54ed4d4a8933e127d29ce9ed30f3521a9ae4d97dc7f6b68b1ca0535a33c64afae9d4d36c1523f90da5f
+  data.tar.gz: 3f3a6ae939f87669cc844e83d586d5dd224356344bc5f7a5c9a19b7c00be76468d65c146d13c6614defa9b79001b6481331e2f22b37bd7cc8c2f222bc6abf108

data/.travis.yml

@@ -0,0 +1,14 @@
+---
+sudo: false
+language: ruby
+cache: bundler
+dist: bionic
+rvm:
+  - 2.6
+services:
+  - postgresql
+  - mysql
+before_script:
+  - createdb -U postgres columns_on_demand_test
+  - mysqladmin -u root create columns_on_demand_test
+script: ./test_all.sh

data/Gemfile

@@ -13,8 +13,6 @@ gemspec
 gem 'rails', ENV['RAILS_VERSION']
 
 # see notes in the gemspec
-if ENV['RAILS_VERSION'] =~ /^[45]/
-  gem "mysql2",  "~> 0.4.10"
-  gem "pg",      "~> 0.21.0"
+if ENV['RAILS_VERSION'] =~ /^5\.0/
   gem "sqlite3", "~> 1.3.6"
 end

data/README.md

@@ -11,9 +11,7 @@ named after the name field you specify.
 Compatibility
 =============
 
-Currently tested against Rails 5.2 (up to 5.2.1 and 5.2.2rc1), 5.1 (up to 5.1.6), 5.0 (up to 5.0.6), and 4.2 (up to 4.2.10).
-
-For earlier versions of Rails, use an older version of the gem.
+Currently tested against Rails 6.1.0.rc1, 6.0.3.4, 5.2.4.4, 5.1.7, and 5.0.7.2, with older gem versions compatible with earlier Rails versions.
 
 
 Example

data/constant_table_saver.gemspec

@@ -11,14 +11,6 @@ cached (and frozen) records for all find calls.
 
 Optionally, creates class-level methods you can use to grab the records,
 named after the name field you specify.
-
-
-Compatibility
-=============
-
-Currently tested against Rails 5.2 (up to 5.2.1), 5.1 (up to 5.1.6) and 5.0 (up to 5.0.6) and 4.2 (up to 4.2.10).
-
-For earlier versions of Rails, use an older version of the gem.
 EOF
   gem.author       = "Will Bryant"
   gem.email        = "will.bryant@gmail.com"

data/lib/constant_table_saver.rb

@@ -73,20 +73,22 @@ module ConstantTableSaver
     def find_by_sql(sql, binds = [], preparable: nil, &block)
       @cached_records ||= super(relation.to_sql, &nil).each(&:freeze).freeze
 
+      # to_sql_and_binds returns [sql, binds] prior to 6.1, and [sql, binds, preparable] on 6.1. we take the [0..1] slice
+      # to ignore the preparable flag, which is useful metadata for adapters but not required for us to match statements.
       @cached_results ||= @cached_records.each_with_object({
         # matches .all queries:
-        to_sql_and_binds(relation) => @cached_records,
+        to_sql_and_binds(relation)[0..1] => @cached_records,
 
         # matches .first queries:
-        to_sql_and_binds(relation.order(relation.table[primary_key].asc).limit(1).arel) => [@cached_records.first].compact,
+        to_sql_and_binds(relation.order(relation.table[primary_key].asc).limit(1).arel)[0..1] => [@cached_records.first].compact,
 
         # matches .last queries:
-        to_sql_and_binds(relation.order(relation.table[primary_key].desc).limit(1).arel) => [@cached_records.last].compact,
+        to_sql_and_binds(relation.order(relation.table[primary_key].desc).limit(1).arel)[0..1] => [@cached_records.last].compact,
       }) do |record, results|
-        results[to_sql_and_binds(relation.where(relation.table[primary_key].eq(relation.predicate_builder.build_bind_attribute(primary_key, record.id))).limit(1).arel)] = [record]
+        results[to_sql_and_binds(relation.where(relation.table[primary_key].eq(relation.predicate_builder.build_bind_attribute(primary_key, record.id))).limit(1).arel)[0..1]] = [record]
       end.freeze
 
-      sql_and_binds = to_sql_and_binds(sql, binds)
+      sql_and_binds = to_sql_and_binds(sql, binds)[0..1]
       sql_and_binds = [sql_and_binds.first, []] unless connection.prepared_statements
 
       if results = @cached_results[sql_and_binds]

data/lib/constant_table_saver/version.rb

@@ -1,3 +1,3 @@
 module ConstantTableSaver
-  VERSION = '6.0.0'
+  VERSION = '6.1.0'
 end

data/test_all.rb

@@ -2,7 +2,7 @@
 
 require 'yaml'
 
-rails_versions = ["6.0.0", "5.2.0".."5.2.3", "5.1.1".."5.1.6", "5.0.2".."5.0.6", "4.2.10"].flat_map {|spec| Array(spec).collect {|v| v.gsub /.0(\d)/, '.\\1'}}
+rails_versions = ["6.1.0.rc1", "6.0.3.4 ", "5.2.4.4", "5.1.7", "5.0.7.2"].flat_map {|spec| Array(spec).collect {|v| v.gsub /.0(\d)/, '.\\1'}}
 rails_envs = YAML.load(File.read("test/database.yml")).keys
 
 rails_versions.each do |version|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constant_table_saver
 version: !ruby/object:Gem::Version
-  version: 6.0.0
+  version: 6.1.0
 platform: ruby
 authors:
 - Will Bryant
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-08-19 00:00:00.000000000 Z
+date: 2020-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -100,20 +100,13 @@ description: |
 
   Optionally, creates class-level methods you can use to grab the records,
   named after the name field you specify.
-
-
-  Compatibility
-  =============
-
-  Currently tested against Rails 5.2 (up to 5.2.1), 5.1 (up to 5.1.6) and 5.0 (up to 5.0.6) and 4.2 (up to 4.2.10).
-
-  For earlier versions of Rails, use an older version of the gem.
 email: will.bryant@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Dockerfile
 - Gemfile
 - MIT-LICENSE
@@ -135,7 +128,7 @@ homepage: http://github.com/willbryant/constant_table_saver
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Caches the records from fixed tables, and provides convenience methods to
   get them.