activerecord-virtual_attributes 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fe283d7922a8073591f5c00728e976c3c7ed2ec9dbe51972224b35f55095498
-  data.tar.gz: ec6c34d345f4ecf01a48d53f266f13b0b91b2a8e87d72c5b5cffffcda6101c36
+  metadata.gz: d35dc5f3ef872b957e24553488667ea6e1f948e56d741d6f5dbf5a7612dc1208
+  data.tar.gz: 8980c2297bb237b520aafd79177e727c29628b3e807349df8ec153e259f3ccb6
 SHA512:
-  metadata.gz: 96bfd6336c293999b0aa436b9d63067a7fb50effb8ac8c4bf17a151b80233765dbff782507546053e62e10e5dd49fa64a70d92cb6a47e0acd0cef2c0ff7c5991
-  data.tar.gz: c0bbca8dc201efcb927e35e2dc45b39c626a3e81842366b89500b5ca7007a49caa5dee922efd394b987da2f04cd638af03d9573a2fd3df792e8d27f462239770
+  metadata.gz: a42caa72fee1075051551c5c12c14b71696be135ed27eaf755936bde51b63a4953a51458ad22dd7fd40808c2aae9c661b93b0aee5e6a3d684acd85a21461f788
+  data.tar.gz: 7ca0eb7fde02046e0921a81d84735be127cd068ee554550fd4dc903da2b105f025064ab3e8a728fb9e26d2586dbd892a569eb8a6cac6557d19770a9fc28945c0

data/CHANGELOG.md

@@ -5,6 +5,10 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [Unreleased]
 
+## Version [1.3.1] <small>2019-06-06</small>
+
+* quote column aliases
+
 ## Version [1.3.0] <small>2019-05-24</small>
 
 * Rails 5.2 support
@@ -34,7 +38,8 @@ a nice looking [Changelog](http://keepachangelog.com).
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.1...HEAD
+[1.3.1]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.0...v1.3.1
 [1.3.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.0.0...v1.1.0

data/Gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.7"
-gem "sqlite3", "~> 1.3.6"
-gem "pg"
 gem "mysql2", '~> 0.4.0'
+gem "pg"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec

data/gemfiles/virtual_attributes_50.gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.0.7"
-gem "sqlite3", "~> 1.3.6"
-gem "pg"
 gem "mysql2"
+gem "pg"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/virtual_attributes_51.gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.1.6"
-gem "sqlite3", "~> 1.3.6"
-gem "pg"
 gem "mysql2"
+gem "pg"
+gem "sqlite3", "~> 1.3.6"
 
 gemspec path: "../"

data/gemfiles/virtual_attributes_52.gemfile

@@ -3,8 +3,8 @@
 source "https://rubygems.org"
 
 gem "activerecord", "~> 5.2.0"
-gem "sqlite3"
-gem "pg"
 gem "mysql2"
+gem "pg"
+gem "sqlite3"
 
 gemspec path: "../"

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "1.3.0"
+    VERSION = "1.3.1"
   end
 end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -39,25 +39,29 @@ module ActiveRecord
           when Array
             associations.collect { |association| replace_virtual_fields(association) }.compact
           when Hash
-            associations.each_with_object({}) do |(parent, child), h|
-              if virtual_field?(parent) # form virtual_attribute => {}
-                case (new_includes = replace_virtual_fields(virtual_includes(parent)))
-                when String, Symbol
-                  h[new_includes] = {}
-                when Array
-                  new_includes.each { |association| h[association] = {} }
-                when Hash
-                  h.deep_merge!(new_includes)
-                end
-              else
-                reflection = reflect_on_association(parent.to_sym)
-                h[parent] = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.replace_virtual_fields(child) || {}
-              end
-            end
+            replace_virtual_field_hash(associations)
           else
             associations
           end
         end
+
+        def replace_virtual_field_hash(associations)
+          associations.each_with_object({}) do |(parent, child), h|
+            if virtual_field?(parent) # form virtual_attribute => {}
+              case (new_includes = replace_virtual_fields(virtual_includes(parent)))
+              when String, Symbol
+                h[new_includes] = {}
+              when Array
+                new_includes.each { |association| h[association] = {} }
+              when Hash
+                h.deep_merge!(new_includes)
+              end
+            else
+              reflection = reflect_on_association(parent.to_sym)
+              h[parent] = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.replace_virtual_fields(child) || {}
+            end
+          end
+        end
       end
     end
   end
@@ -208,7 +212,7 @@ module ActiveRecord
         fields.flatten!
         fields.map! do |field|
           if virtual_attribute?(field) && (arel = klass.arel_attribute(field)) && arel.respond_to?(:as)
-            arel.as(field.to_s)
+            arel.as(connection.quote_column_name(field.to_s))
           else
             field
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-24 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord