occams-record 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dc125a06b3fa732e1064483f13e5abbe2a7c64b4e6ac7f1b2d37337d8e233cb
-  data.tar.gz: 5c47a9a644b757463d5dd1961c1b86ed1de50cf247a286e8d1d0c3dd5daa99b8
+  metadata.gz: 846af974c8bc267fe8e901995d0aa3341b018d135eeb267c11d9add447cd0155
+  data.tar.gz: 763f8a038908cb9a990bcf305644661736dd9133e51a9d8fb8ece2b8ff018fd2
 SHA512:
-  metadata.gz: 7fb55ec18a98e4d2bb4b3fab8d3f609a378bee578d1b405d56a43b1f035f40d53149fc8dabc321bbaf17b180eb9e3b1dda282cc2fd8675a3e10c8bc59a9f7a59
-  data.tar.gz: f9f28ad1537cc297a0b5b1fe8a5209d4f4dfa4529148a603f715da884fa9d9f8188836aca84c8e5dcc36f674bb6abe7211de57c014e90a4539d892da0192c28d
+  metadata.gz: 24e1c5dfb09cb35b2b7116cb40aafcb1eb215ac96e3c8bab7ff6558598b31e8abb77b49c2b711392567862b182e1aed705888e939f8b66f15285f2ca352dbc89
+  data.tar.gz: 04f78d14765b6ae4d9ccee5f01633132ed1e39662071dfc39f6e33583e9cd3e6214841225eb35ce2f678472ce34bf45e27e23660114f28cede6a27cdb38613b0

data/README.md

@@ -284,7 +284,6 @@ The following ActiveRecord features are under consideration, but not high priori
 The following ActiveRecord features are not supported, and likely never will be. Pull requests are still welcome, though.
 
 * Eager loading `through` associations that involve a polymorphic association.
-* ActiveRecord enum types
 * ActiveRecord serialized types
 
 ---

data/lib/occams-record/pluck.rb

@@ -2,13 +2,54 @@ module OccamsRecord
   module Pluck
     private
 
-    def pluck_results(results, cols)
+    def pluck_results(results, cols, model: nil)
       if cols.size == 1
-        col = cols[0].to_s
+        pluck_results_single(results, cols[0].to_s, model: model)
+      else
+        pluck_results_multi(results, cols.map(&:to_s), model: model)
+      end
+    end
+
+    # returns an array of values
+    def pluck_results_single(results, col, model: nil)
+      enum = model&.defined_enums&.[](col)
+      inv_enum = enum&.invert
+      if enum
+        results.map { |r|
+          val = r[col]
+          enum.has_key?(val) ? val : inv_enum[val]
+        }
+      else
+        # micro-optimization for when there are no enums
         results.map { |r| r[col] }
+      end
+    end
+
+    # returns an array of arrays
+    def pluck_results_multi(results, cols, model: nil)
+      any_enums = false
+      cols_with_enums = cols.map { |col|
+        enum = model&.defined_enums&.[](col)
+        any_enums ||= !!enum
+        [col, enum, enum&.invert]
+      }
+
+      if any_enums
+        results.map { |row|
+          cols_with_enums.map { |(col, enum, inv_enum)|
+            if enum
+              val = row[col]
+              enum.has_key?(val) ? val : inv_enum[val]
+            else
+              row[col]
+            end
+          }
+        }
       else
-        cols = cols.map(&:to_s)
-        results.map { |r| r.values_at(*cols) }
+        # micro-optimization for when there are no enums
+        results.map { |row|
+          cols.map { |col| row[col] }
+        }
       end
     end
   end

data/lib/occams-record/query.rb

@@ -250,7 +250,7 @@ module OccamsRecord
                else
                  model.connection.exec_query sql
                end
-      pluck_results result, cols
+      pluck_results result, cols, model: @model
     end
   end
 end

data/lib/occams-record/raw_query.rb

@@ -229,7 +229,7 @@ module OccamsRecord
                else
                  conn.exec_query _escaped_sql
                end
-      pluck_results result, cols
+      pluck_results result, cols, model: @eager_loaders.model
     end
 
     private

data/lib/occams-record/results/results.rb

@@ -54,16 +54,41 @@ module OccamsRecord
           # * MySQL ?
           #
           type = column_types[col] || model_column_types&.[](col)
+
+          #
+          # NOTE is also some variation in when enum values are mapped in different AR versions.
+          # In >=5.0, <=7.0, ActiveRecord::Result objects contain the human-readable values. In 4.2 and
+          # pre-release versions of 7.1, they instead have the RAW values (e.g. integers) which we must map ourselves.
+          #
+          enum = model&.defined_enums&.[](col)
+          inv_enum = enum&.invert
+
           case type&.type
           when nil
-            define_method(col) { @raw_values[idx] }
+            if enum
+              define_method(col) {
+                val = @raw_values[idx]
+                enum.has_key?(val) ? val : inv_enum[val]
+              }
+            else
+              define_method(col) { @raw_values[idx] }
+            end
           when :datetime
             define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx])&.in_time_zone }
           when :boolean
             define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
             define_method("#{col}?") { !!send(col) }
           else
-            define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
+            if enum
+              define_method(col) {
+                @cast_values[idx] ||= (
+                  val = type.send(CASTER, @raw_values[idx])
+                  enum.has_key?(val) ? val : inv_enum[val]
+                )
+              }
+            else
+              define_method(col) { @cast_values[idx] ||= type.send(CASTER, @raw_values[idx]) }
+            end
           end
         end
       end

data/lib/occams-record/results/row.rb

@@ -40,7 +40,7 @@ module OccamsRecord
       #
       # Hash-like accessor for attributes and associations.
       #
-      # @param attr [String|Symbol\
+      # @param attr [String|Symbol]
       # @return [Object]
       #
       def [](attr)

data/lib/occams-record/version.rb

@@ -3,5 +3,5 @@
 #
 module OccamsRecord
   # @private
-  VERSION = "1.7.1".freeze
+  VERSION = "1.8.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: occams-record
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Jordan Hollinger
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-30 00:00:00.000000000 Z
+date: 2023-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord