constant_table_saver 4.0.0 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 250b25d7f3fefffc880e4f1ed9bd349aaa9ed601
-  data.tar.gz: bc75e2890206f99c0b0bdd049921afca4a55b492
+  metadata.gz: 40e0df9904accfe6d49e57b9e3e034fecf0176d7
+  data.tar.gz: 05b44aebb7aa1789b8a91977dd7b3985a7c8fe32
 SHA512:
-  metadata.gz: 7d580056718eac74024e54d0cca28c0219551b9407e6d2540fa753117fd4c8e41d77c99180c009197c7a3e26432a2efaa05894c3a3d4c5de62a5717708be1237
-  data.tar.gz: baebaf8845f8ca7de92ea243bca01e5e69624d79f293b6b9415e80db9da39c2acbb54d9acf03baf700e2933a40bca563eabcf14de5f9eccd00f3c2aacf98a1a1
+  metadata.gz: d625dda9b46ec8a8d6aae3f90f6eb3dbf8815c370429aa57a593f0867203891e64a472fc80b697cb25fdb8affbf8fa247f2f37fa496cc25fbba20cbd47a2519a
+  data.tar.gz: 5b3ee90f3f1505c264605a2514cc6a53f68259f3968ad2422d7b55bc212ae9f84ac53563b6aa27203e862816ac789c7c1969b985144cc1adb7b0d710bedcaeeb

data/lib/constant_table_saver/version.rb

@@ -1,3 +1,3 @@
 module ConstantTableSaver
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 end

data/lib/constant_table_saver.rb

@@ -51,18 +51,16 @@ module ConstantTableSaver
 
   module ActiveRecord4ClassMethods
     def find_by_sql(sql, binds = [])
-      @find_by_sql ||= {}
-      @find_by_sql[:all]   ||= all.to_sql
-      @find_by_sql[:id]    ||= relation.where(relation.table[primary_key].eq(connection.substitute_at(columns_hash[primary_key], 1))).limit(1).to_sql
-      @find_by_sql[:oldid] ||= relation.where(relation.table[primary_key].eq(connection.substitute_at(columns_hash[primary_key], 1))).
-                                         order(relation.table[primary_key].asc).limit(1).to_sql # used by 4.0
-      @find_by_sql[:first] ||= relation.order(relation.table[primary_key].asc).limit(1).to_sql
-      @find_by_sql[:last]  ||= relation.order(relation.table[primary_key].desc).limit(1).to_sql
-
-      _sql = sanitize_sql(sql)
-      _sql = _sql.to_sql if sql.respond_to?(:to_sql)
+      @find_by_sql ||= {
+        :all   => all.to_sql,
+        :id    => relation.where(relation.table[primary_key].eq(connection.substitute_at(columns_hash[primary_key], 1))).limit(1),
+        :first => relation.order(relation.table[primary_key].asc).limit(1).to_sql,
+        :last  => relation.order(relation.table[primary_key].desc).limit(1).to_sql,
+      }
 
       if binds.empty?
+        _sql = _to_sql_with_binds(sql, binds)
+
         if _sql == @find_by_sql[:all]
           return @cached_records ||= super(relation.to_sql).each(&:freeze)
         elsif _sql == @find_by_sql[:first]
@@ -71,10 +69,10 @@ module ConstantTableSaver
           return [relation.to_a.last].compact
         end
 
-      elsif (_sql == @find_by_sql[:id] || _sql == @find_by_sql[:oldid]) &&
-            binds.length == 1 &&
+      elsif binds.length == 1 &&
             binds.first.first.is_a?(ActiveRecord::ConnectionAdapters::Column) &&
-            binds.first.first.name == primary_key
+            binds.first.first.name == primary_key &&
+            _to_sql_with_binds(sql, binds) == _to_sql_with_binds(@find_by_sql[:id], binds) # we have to late-render the find(id) SQL because mysql2 on 4.1 and later requires the bind variables to render the SQL, and errors out with a nil dereference otherwise
         @cached_records_by_id ||= relation.to_a.index_by {|record| record.id.to_param}
         return [@cached_records_by_id[binds.first.last.to_param]].compact
       end
@@ -82,6 +80,16 @@ module ConstantTableSaver
       super
     end
 
+    def _to_sql_with_binds(sql, binds)
+      if sql.respond_to?(:to_sql)
+        # an arel object
+        connection.to_sql(sql, binds)
+      else
+        # a plain string
+        sql
+      end
+    end
+
     def relation
       super.tap do |s|
         class << s

data/test/database.yml

@@ -1,3 +1,14 @@
-test:
+sqlite3:
   adapter: sqlite3
   database: test/constant_table_saver.db
+mysql:
+  adapter: mysql
+  database: constant_table_saver_test
+  username: root
+mysql2:
+  adapter: mysql2
+  database: constant_table_saver_test
+  username: root
+postgresql:
+  adapter: postgresql
+  database: constant_table_saver_test

data/test/test_helper.rb

@@ -11,7 +11,7 @@ require 'active_record'
 require 'active_record/fixtures'
 require 'byebug' rescue nil
 
-RAILS_ENV = ENV['RAILS_ENV'] ||= 'test'
+RAILS_ENV = ENV['RAILS_ENV'] ||= 'sqlite3'
 
 ActiveRecord::Base.configurations = YAML::load(IO.read(File.join(File.dirname(__FILE__), "database.yml")))
 ActiveRecord::Base.establish_connection ActiveRecord::Base.configurations[ENV['RAILS_ENV']]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: constant_table_saver
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.1.0
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-18 00:00:00.000000000 Z
+date: 2014-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord