columns_on_demand 4.1.0 → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0959f01a0d8c87999c526ccdafd93755595d0fd
-  data.tar.gz: 397908ac37b04fa81afe558d14bfedbd5d4df1ca
+  metadata.gz: c360d877be5435f7217a91ab76ba418c519d9585
+  data.tar.gz: 968eb4b78136d091e6a60de3f6277e8ca6d41607
 SHA512:
-  metadata.gz: ac93a58ae02e8b298c6652af9f82c123d6fe826fe4058903941b67010e0a77851dfe7096fc12648eade0de1bd3ca735825fa98c0b21c5fe86c62d6b000752b0a
-  data.tar.gz: cdc82b4b4e56b64bba76aebf01dffb9461b2caacc202360cbe2c60662daf0145f2dd959ebdb0d12b7b87577ea394b10aa3d3b5478ac103b7a10c33ea8aed1924
+  metadata.gz: 01a5390f5cd9a6ccfd8ee59bf5113b66c7babe1b03bbc5ea937ec027b210e6c45a2e7e00ba87a7646b469ea549688df36e40a2f0646e0e8cf73aac196b16fcc1
+  data.tar.gz: 94c39a5b6e1e2f64665d1e41f7092283efa4720b0ed324cd27ee9f6be4a98704e772eec835ce941b0953cc51871fc9534db0ebbabfc5c72a83640efc33e9f6fb

data/lib/columns_on_demand.rb

@@ -84,6 +84,13 @@ module ColumnsOnDemand
         @attributes[attr_name] = row[i]
 
         if coder = self.class.serialized_attributes[attr_name]
+          # for some database adapters, @column_types_override gets populated with type data from query used to load the record originally.
+          # this is fine, but unfortunately some special-case "decorate_columns" code in ActiveRecord will wrap those types in serialization
+          # objects, and it does this for each column listed in @serialized_column_names *even if they are not present in the query results*.
+          # as a result it unfortunately overrides the normal @column_type with a @column_type_override with a nil @column, which explodes
+          # when it tries to run the typecast.  make it use the normal @column_type value, since we know that we've loading the regular column.
+          @column_types_override.delete(attr_name) if @column_types_override
+
           if ActiveRecord.const_defined?(:AttributeMethods) &&
              ActiveRecord::AttributeMethods::const_defined?(:Serialization) &&
              ActiveRecord::AttributeMethods::Serialization::Attribute

data/lib/columns_on_demand/version.rb

@@ -1,3 +1,3 @@
 module ColumnsOnDemand
-  VERSION = '4.1.0'
+  VERSION = '4.1.1'
 end

data/test/columns_on_demand_test.rb

@@ -109,7 +109,12 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
   
   test "it loads the column when accessed using read_attribute_before_type_cast" do
     record = Implicit.first
-    assert_equal "This is the file data!", record.read_attribute_before_type_cast("file_data")
+    if Implicit.connection.class.name =~ /PostgreSQL/ && ActiveRecord::VERSION::MAJOR >= 4
+      # newer versions of activerecord show the encoded binary format used for blob columns in postgresql in the before_type_cast output, whereas older ones had already decoded that
+      assert_equal "\\x54686973206973207468652066696c65206461746121", record.read_attribute_before_type_cast("file_data")
+    else
+      assert_equal "This is the file data!", record.read_attribute_before_type_cast("file_data")
+    end
     assert_equal "Processed 0 entries OK", record.read_attribute_before_type_cast("results")
     # read_attribute_before_type_cast doesn't tolerate symbol arguments as read_attribute does
   end
@@ -159,7 +164,7 @@ class ColumnsOnDemandTest < ActiveSupport::TestCase
     assert_raise klass do
       record.processed_at # explicitly not loaded, overriding default
     end
-    assert_equal "This is the file data!", record.instance_variable_get("@attributes")["file_data"] # already loaded, overriding default
+    assert_loaded record, :file_data
   end
   
   test "it raises normal ActiveRecord::RecordNotFound if the record is deleted before the column load" do

data/test/test_helper.rb

@@ -6,6 +6,7 @@ else
 end
 
 puts "Rails: #{ENV['RAILS_VERSION'] || 'default'}"
+puts "Env: #{ENV['RAILS_ENV'] || 'not set'}"
 gem 'activesupport', ENV['RAILS_VERSION']
 gem 'activerecord',  ENV['RAILS_VERSION']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: columns_on_demand
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.1.1
 platform: ruby
 authors:
 - Will Bryant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord