relation_to_struct 1.5.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b36da83b17102b8a6f19d1bd7b55ba8486d2bd9b
-  data.tar.gz: 3693bc1c95c15877d4e58a66b5700210e4861ff6
+SHA256:
+  metadata.gz: f11031515a2afe3d55c8cfb98a664eb984079514c727233c74f341be071a825d
+  data.tar.gz: 4b97b2856f8529291ea4db5a97bc95b6b58ce5d4b4fbb3eaba066b54a3b317bf
 SHA512:
-  metadata.gz: a1a43b34975434afd52f51ddd8ab1f3ba135e976248865a67ffc4ddc7fcfb6d9423c25168f4228c538b6c617d9d5a85559ebeebc99ff460f3a3df368cf973c8b
-  data.tar.gz: 7ea17f61be34643cadeaa7377b0ca481ef574d32c2327a8986bf915a4b6d5e0bdae260477547d51f0ee49c197032f1471d8f28d5e25a386fea0906ffa7f27081
+  metadata.gz: 48ab91406c6acb33100fc8849b2f7ded38ca7a32b199f090d4bd388219b22a615c89f0853d211fa64b2f9b57ba83cf17de4499dc114f2a70578f449c3f389029
+  data.tar.gz: 9f004fded83df12de47eb94047e0245989f700edd63256af1ee9049b7657126603a0460d49ff54ee1ea67267f4ecfac8b0b7843ee28b8ae33af384ae46b0b53a

data/Appraisals

@@ -1,5 +1,10 @@
-%w(5.0 5.1 5.2).each do |version|
+%w(5.0 5.1 5.2 6.0 6.1 7.0).each do |version|
   appraise "rails-#{version.gsub(/\./, "-")}" do
     gem "rails", "~> #{version}.0"
+    if Gem::Version.new(version) >= Gem::Version.new("6.0.0")
+      gem "sqlite3", "~> 1.4.0"
+    else
+      gem "sqlite3", "~> 1.3.0"
+    end
   end
 end

data/README.md

@@ -36,6 +36,8 @@ relation.to_structs(UserPostsSummary) # => array of structs
 
 ### From raw SQL
 
+Note: In order to provide a consistent user experience regardless of the abstraction level used by your code, all of the following methods are available on both `ActiveRecord::Base` and `ActiveRecord::Base.connection`.
+
 ```
 UserPostsSummary = Struct.new(:user_name, :post_count)
 sql = <<-eos
@@ -99,7 +101,13 @@ For this reason, **all methods added to `ActiveRecord::Base` explicitly disable
 
 1. Fork it ( https://github.com/jcoleman/relation_to_struct/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
-3. Test your changes (`bundle install && appraisal install && rake`)
+3. Test your changes (`bundle install && bundle exec appraisal install && bundle exec rake`)
 4. Commit your changes (`git commit -am 'Add some feature'`)
 5. Push to the branch (`git push origin my-new-feature`)
 6. Create a new Pull Request
+
+## Releasing
+
+1. Bump version in `lib/relation_to_struct/version.rb` and commit.
+2. Run `rake build` to build the `*.gem` file.
+3. Run `rake release` to publish the gem to Rubygems.

data/gemfiles/rails_5_0.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.0"
+gem "rails", "~> 5.0.0"
+gem "sqlite3", "~> 1.3.0"
 
 gemspec path: "../"

data/gemfiles/rails_5_1.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.1"
+gem "rails", "~> 5.1.0"
+gem "sqlite3", "~> 1.3.0"
 
 gemspec path: "../"

data/gemfiles/rails_5_2.gemfile

@@ -2,6 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "rails", "~> 5.2"
+gem "rails", "~> 5.2.0"
+gem "sqlite3", "~> 1.3.0"
 
 gemspec path: "../"

data/gemfiles/rails_6_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.0.0"
+gem "sqlite3", "~> 1.4.0"
+
+gemspec path: "../"

data/gemfiles/rails_6_1.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 6.1.0"
+gem "sqlite3", "~> 1.4.0"
+
+gemspec path: "../"

data/gemfiles/rails_7_0.gemfile

@@ -0,0 +1,8 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rails", "~> 7.0.0"
+gem "sqlite3", "~> 1.4.0"
+
+gemspec path: "../"

data/lib/relation_to_struct/active_record_base_extension.rb

@@ -1,88 +1,18 @@
 module RelationToStruct::ActiveRecordBaseExtension
-  extend ::ActiveSupport::Concern
-
   module ClassMethods
     def _sanitize_sql_for_relation_to_struct(sql)
       sanitized_sql = ActiveRecord::VERSION::MAJOR >= 5 ? sanitize_sql(sql) : sanitize_sql(sql, nil)
     end
 
-    def structs_from_sql(struct_class, sql, binds=[])
-      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
-      result = ActiveRecord::Base.uncached do
-        connection.select_all(sanitized_sql, "Structs SQL Load", binds)
-      end
-
-      if result.columns.size != result.columns.uniq.size
-        raise ArgumentError, 'Expected column names to be unique'
-      end
-
-      if result.columns != struct_class.members.collect(&:to_s)
-        raise ArgumentError, 'Expected column names (and their order) to match struct attribute names'
-      end
-
-      if result.columns.size == 1
-        result.cast_values().map do |tuple|
-          struct_class.new(tuple)
-        end
-      else
-        result.cast_values().map do |tuple|
-          struct_class.new(*tuple)
-        end
-      end
-    end
-
-    def pluck_from_sql(sql, binds=[])
-      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
-      result = ActiveRecord::Base.uncached do
-        connection.select_all(sanitized_sql, "Pluck SQL Load", binds)
-      end
-      result.cast_values()
-    end
-
-    def value_from_sql(sql, binds=[])
-      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
-      result = ActiveRecord::Base.uncached do
-        connection.select_all(sanitized_sql, "Value SQL Load", binds)
-      end
-      raise ArgumentError, 'Expected exactly one column to be selected' unless result.columns.size == 1
-
-      values = result.cast_values()
-      case values.size
-      when 0
-        nil
-      when 1
-        values[0]
-      else
-        raise ArgumentError, 'Expected only a single result to be returned'
-      end
-    end
-
-    def tuple_from_sql(sql, binds=[])
-      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
-      result = ActiveRecord::Base.uncached do
-        connection.select_all(sanitized_sql, "Value SQL Load", binds)
-      end
-      values = result.cast_values()
-
-      case values.size
-      when 0
-        nil
-      when 1
-        result.columns.size == 1 ? values : values[0]
-      else
-        raise ArgumentError, 'Expected only a single result to be returned'
-      end
-    end
-
-    def run_sql(sql, binds=[])
-      sanitized_sql = _sanitize_sql_for_relation_to_struct(sql)
-      # We don't need to build a result set unnecessarily; using
-      # interface this also ensures we're clearing the result set
-      # for manually memory managed object (e.g., when using the
-      # PostgreSQL adaptor).
-      connection.exec_update(sanitized_sql, "Run SQL", binds)
-    end
+    delegate(
+      :structs_from_sql,
+      :pluck_from_sql,
+      :value_from_sql,
+      :tuple_from_sql,
+      :run_sql,
+      :to => :connection
+    )
   end
 end
 
-::ActiveRecord::Base.send(:include, RelationToStruct::ActiveRecordBaseExtension)
+::ActiveRecord::Base.singleton_class.send(:prepend, RelationToStruct::ActiveRecordBaseExtension::ClassMethods)

data/lib/relation_to_struct/active_record_connection_adapter_extension.rb

@@ -0,0 +1,80 @@
+module RelationToStruct::ActiveRecordConnectionAdapterExtension
+  def structs_from_sql(struct_class, sql, binds=[])
+    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    result = ActiveRecord::Base.uncached do
+      select_all(sanitized_sql, "Structs SQL Load", binds)
+    end
+
+    if result.columns.size != result.columns.uniq.size
+      raise ArgumentError, 'Expected column names to be unique'
+    end
+
+    if result.columns != struct_class.members.collect(&:to_s)
+      raise ArgumentError, 'Expected column names (and their order) to match struct attribute names'
+    end
+
+    if result.columns.size == 1
+      result.cast_values().map do |tuple|
+        struct_class.new(tuple)
+      end
+    else
+      result.cast_values().map do |tuple|
+        struct_class.new(*tuple)
+      end
+    end
+  end
+
+  def pluck_from_sql(sql, binds=[])
+    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    result = ActiveRecord::Base.uncached do
+      select_all(sanitized_sql, "Pluck SQL Load", binds)
+    end
+    result.cast_values()
+  end
+
+  def value_from_sql(sql, binds=[])
+    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    result = ActiveRecord::Base.uncached do
+      select_all(sanitized_sql, "Value SQL Load", binds)
+    end
+    raise ArgumentError, 'Expected exactly one column to be selected' unless result.columns.size == 1
+
+    values = result.cast_values()
+    case values.size
+    when 0
+      nil
+    when 1
+      values[0]
+    else
+      raise ArgumentError, 'Expected only a single result to be returned'
+    end
+  end
+
+  def tuple_from_sql(sql, binds=[])
+    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    result = ActiveRecord::Base.uncached do
+      select_all(sanitized_sql, "Value SQL Load", binds)
+    end
+    values = result.cast_values()
+
+    case values.size
+    when 0
+      nil
+    when 1
+      result.columns.size == 1 ? values : values[0]
+    else
+      raise ArgumentError, 'Expected only a single result to be returned'
+    end
+  end
+
+  def run_sql(sql, binds=[])
+    sanitized_sql = ActiveRecord::Base._sanitize_sql_for_relation_to_struct(sql)
+    # We don't need to build a result set unnecessarily; using
+    # interface this also ensures we're clearing the result set
+    # for manually memory managed object (e.g., when using the
+    # PostgreSQL adaptor).
+    exec_update(sanitized_sql, "Run SQL", binds)
+  end
+end
+
+::ActiveRecord::ConnectionAdapters::AbstractAdapter.send(:prepend, RelationToStruct::ActiveRecordConnectionAdapterExtension)

data/lib/relation_to_struct/active_record_relation_extension.rb

@@ -1,6 +1,4 @@
 module RelationToStruct::ActiveRecordRelationExtension
-  extend ::ActiveSupport::Concern
-
   def to_structs(struct_class)
     raise ArgumentError, 'Expected select_values to be present' unless self.select_values.present?
 
@@ -37,4 +35,4 @@ module RelationToStruct::ActiveRecordRelationExtension
   end
 end
 
-::ActiveRecord::Relation.send(:include, RelationToStruct::ActiveRecordRelationExtension)
+::ActiveRecord::Relation.send(:prepend, RelationToStruct::ActiveRecordRelationExtension)

data/lib/relation_to_struct/version.rb

@@ -1,3 +1,3 @@
 module RelationToStruct
-  VERSION = "1.5.0"
+  VERSION = "1.7.0"
 end

data/lib/relation_to_struct.rb

@@ -1,4 +1,5 @@
 require "relation_to_struct/version"
+require "relation_to_struct/active_record_connection_adapter_extension"
 require "relation_to_struct/active_record_base_extension"
 require "relation_to_struct/active_record_relation_extension"
 

data/relation_to_struct.gemspec

@@ -18,14 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "appraisal", "~> 2.1"
-  spec.add_development_dependency "bundler", "~> 1.7"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "sqlite3", "~> 1.3"
-  spec.add_development_dependency "rspec", "~> 3.2"
+  spec.add_development_dependency "appraisal", ">= 2.1"
+  spec.add_development_dependency "bundler", ">= 1.7"
+  spec.add_development_dependency "rake", ">= 10.0"
+  spec.add_development_dependency "sqlite3", ">= 1.3"
+  spec.add_development_dependency "rspec", ">= 3.2"
   spec.add_development_dependency "pry-byebug"
   spec.add_development_dependency "pg"
 
-  spec.add_dependency "activerecord", ">= 5.0", "< 5.3"
-  spec.add_dependency "activesupport", ">= 5.0", "< 5.3"
+  spec.add_dependency "activerecord", ">= 5.0", "< 7.1"
+  spec.add_dependency "activesupport", ">= 5.0", "< 7.1"
 end

data/spec/active_record_connection_adapter_spec.rb

@@ -0,0 +1,270 @@
+require 'spec_helper'
+
+describe ActiveRecord::ConnectionAdapters::AbstractAdapter do
+  before(:each) do
+    Economist.delete_all
+    EconomicSchool.delete_all
+  end
+
+  let(:connection) { ActiveRecord::Base.connection }
+
+  describe "#pluck_from_sql" do
+    it 'allows plucking with SQL directly' do
+      sql = "SELECT 1 * 23"
+      expect(connection.pluck_from_sql(sql)).to eq([23])
+    end
+
+    it 'allows plucking multiple columns with SQL directly' do
+      sql = "SELECT 1 * 23, 25"
+      expect(connection.pluck_from_sql(sql)).to eq([[23, 25]])
+    end
+
+    it 'bypasses the statement cache' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      # Simulate a standard web request in Rails, since
+      # Rails enabled caching by default.
+      ActiveRecord::Base.cache do
+        value_1 = connection.pluck_from_sql(sql)
+        value_2 = connection.pluck_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+  end
+
+  describe "#value_from_sql" do
+    it 'allows selecting a value with SQL directly' do
+      sql = "SELECT 1 * 23"
+      expect(connection.value_from_sql(sql)).to eq(23)
+    end
+
+    it 'raises an error when multiple rows are selected' do
+      expect do
+        sql = "SELECT * FROM (VALUES (1), (2)) t"
+        connection.value_from_sql(sql)
+      end.to raise_error(ArgumentError, 'Expected only a single result to be returned')
+    end
+
+    it 'raises an error when multiple columns are selected' do
+      expect do
+        sql = "SELECT 1, 2"
+        connection.value_from_sql(sql)
+      end.to raise_error(ArgumentError, 'Expected exactly one column to be selected')
+    end
+
+    it 'supports binds' do
+      sql = ["SELECT 1 * ?", 5]
+      expect(connection.value_from_sql(sql)).to eq(5)
+    end
+
+    it 'supports arrays' do
+      if active_record_supports_arrays?
+        Economist.create!(name: 'F.A. Hayek')
+        Economist.create!(name: 'Ludwig von Mises')
+
+        result = connection.value_from_sql('SELECT ARRAY_AGG(name ORDER BY id) AS names FROM economists')
+        expect(result).to eq(['F.A. Hayek', 'Ludwig von Mises'])
+      else
+        skip "DB selection doesn't support ARRAY[]"
+      end
+    end
+
+    it 'bypasses the statement cache' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      # Simulate a standard web request in Rails, since
+      # Rails enabled caching by default.
+      ActiveRecord::Base.cache do
+        value_1 = connection.value_from_sql(sql)
+        value_2 = connection.value_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+  end
+
+  describe "#tuple_from_sql" do
+    it 'allows selecting one value with SQL directly' do
+      sql = "SELECT 1"
+      expect(connection.tuple_from_sql(sql)).to eq([1])
+    end
+
+    it 'allows selecting multiple values with SQL directly' do
+      sql = "SELECT 1, 23"
+      expect(connection.tuple_from_sql(sql)).to eq([1, 23])
+    end
+
+    it 'raises an error when multiple rows are selected' do
+      expect do
+        sql = "SELECT * FROM (VALUES (1, 3), (2, 4)) t"
+        connection.tuple_from_sql(sql)
+      end.to raise_error(ArgumentError, 'Expected only a single result to be returned')
+    end
+
+    it 'supports binds' do
+      sql = ["SELECT ?, ?", 5, 6]
+      expect(connection.tuple_from_sql(sql)).to eq([5, 6])
+    end
+
+    it 'supports a single array' do
+      if active_record_supports_arrays?
+        Economist.create!(name: 'F.A. Hayek')
+        Economist.create!(name: 'Ludwig von Mises')
+
+        result = connection.tuple_from_sql(<<-SQL)
+          SELECT ARRAY_AGG(name ORDER BY id) AS names
+          FROM economists
+        SQL
+        expected_names = ['F.A. Hayek', 'Ludwig von Mises']
+        expect(result).to eq([expected_names])
+      else
+        skip "DB selection doesn't support ARRAY[]"
+      end
+    end
+
+    it 'supports multiple arrays' do
+      if active_record_supports_arrays?
+        Economist.create!(name: 'F.A. Hayek')
+        Economist.create!(name: 'Ludwig von Mises')
+
+        result = connection.tuple_from_sql(<<-SQL)
+          SELECT
+            ARRAY_AGG(name ORDER BY id) AS names,
+            ARRAY_AGG(CHAR_LENGTH(name) ORDER BY id) AS lengths
+          FROM economists
+        SQL
+        expected_names = ['F.A. Hayek', 'Ludwig von Mises']
+        expect(result).to eq([expected_names, expected_names.map(&:size)])
+      else
+        skip "DB selection doesn't support ARRAY[]"
+      end
+    end
+
+    it 'bypasses the statement cache' do
+      sql = "SELECT random()"
+      value_1 = value_2 = nil
+
+      # Simulate a standard web request in Rails, since
+      # Rails enabled caching by default.
+      ActiveRecord::Base.cache do
+        value_1 = connection.tuple_from_sql(sql)
+        value_2 = connection.tuple_from_sql(sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+  end
+
+  describe "#structs_from_sql" do
+    it 'ActiveRecord::Base should respond to :structs_from_sql' do
+      expect(connection.respond_to?(:structs_from_sql)).to eq(true)
+    end
+
+    it 'allows querying with SQL directly' do
+      test_struct = Struct.new(:number)
+      sql = "SELECT 1 * 23 AS number"
+      expect(connection.structs_from_sql(test_struct, sql)).to eq([test_struct.new(23)])
+    end
+
+    it 'properly casts a single array column' do
+      if active_record_supports_arrays?
+        Economist.create!(name: 'F.A. Hayek')
+        Economist.create!(name: 'Ludwig von Mises')
+
+        test_struct = Struct.new(:names)
+        structs_results = connection.structs_from_sql(test_struct, 'SELECT ARRAY_AGG(name ORDER BY id) AS names FROM economists')
+        expect(structs_results.first.names).to eq(['F.A. Hayek', 'Ludwig von Mises'])
+      else
+        skip "DB selection doesn't support ARRAY[]"
+      end
+    end
+
+    it 'raises an error when column count does not match struct size' do
+      expect do
+        test_struct = Struct.new(:id, :name, :extra_field)
+        connection.structs_from_sql(test_struct, 'SELECT id, name FROM economists')
+      end.to raise_error(ArgumentError, 'Expected column names (and their order) to match struct attribute names')
+    end
+
+    it 'raises an error when column names are not unique' do
+      expect do
+        test_struct = Struct.new(:id, :id2)
+        connection.structs_from_sql(test_struct, 'SELECT id, id FROM economists')
+      end.to raise_error(ArgumentError, 'Expected column names to be unique')
+    end
+
+    it 'raises an error when the column names do not match the struct attribute names' do
+      Economist.create!(name: 'F.A. Hayek')
+      expect do
+        test_struct = Struct.new(:value_a, :value_b)
+        connection.structs_from_sql(test_struct, 'SELECT 1 AS value_a, 2 AS value_b FROM economists')
+      end.not_to raise_error
+
+      expect do
+        test_struct = Struct.new(:value_a, :value_b)
+        connection.structs_from_sql(test_struct, 'SELECT 1 AS value_b, 2 AS value_a FROM economists')
+      end.to raise_error(ArgumentError, 'Expected column names (and their order) to match struct attribute names')
+
+      expect do
+        test_struct = Struct.new(:value_a, :value_b)
+        connection.structs_from_sql(test_struct, 'SELECT 1 AS value_a, 2 AS value_c FROM economists')
+      end.to raise_error(ArgumentError, 'Expected column names (and their order) to match struct attribute names')
+    end
+
+    it 'bypasses the statement cache' do
+      test_struct = Struct.new(:r)
+      sql = "SELECT random() AS r"
+      value_1 = value_2 = nil
+
+      # Simulate a standard web request in Rails, since
+      # Rails enabled caching by default.
+      ActiveRecord::Base.cache do
+        value_1 = connection.structs_from_sql(test_struct, sql)
+        value_2 = connection.structs_from_sql(test_struct, sql)
+      end
+
+      expect(value_1).not_to eq(value_2)
+    end
+  end
+
+  describe "#run_sql" do
+    it 'executes the provided SQL' do
+      sql = "INSERT INTO economic_schools(name) VALUES ('Chicago')"
+      expect do
+        ActiveRecord::Base.run_sql(sql)
+      end.to change { connection.value_from_sql("SELECT COUNT(*) FROM economic_schools") }.by(1)
+    end
+
+    it 'supports binds' do
+      sql = ["INSERT INTO economic_schools(name) VALUES (?)", "Chicago"]
+      expect do
+        ActiveRecord::Base.run_sql(sql)
+      end.to change { connection.value_from_sql("SELECT COUNT(*) FROM economic_schools") }.by(1)
+    end
+
+    it 'uses the exec_update API to avoid turning things in an ActiveRecord::Result' do
+      expect(ActiveRecord::Base.connection).to receive(:exec_update).exactly(:once)
+      sql = "SELECT 1"
+      connection.run_sql(sql)
+    end
+
+    it 'returns the number of rows modified for an INSERT' do
+      sql = "INSERT INTO economic_schools(name) VALUES ('Chicago'), ('Distributism')"
+      expect(connection.run_sql(sql)).to eq(2)
+    end
+
+    it 'bypasses the statement cache' do
+      # Simulate a standard web request in Rails, since
+      # Rails enabled caching by default.
+      ActiveRecord::Base.cache do
+        expect do
+          connection.run_sql("INSERT INTO economic_schools(name) VALUES ('Chicago')")
+          connection.run_sql("INSERT INTO economic_schools(name) VALUES ('Distributism')")
+        end.to change { connection.value_from_sql("SELECT COUNT(*) FROM economic_schools") }.by(2)
+      end
+    end
+  end
+end

data/spec/active_record_helper/setup.rb

@@ -14,7 +14,12 @@ ActiveRecord::Base.configurations = {
 }
 
 env = ENV['DATABASE'] ||= 'sqlite'
-config = ActiveRecord::Base.configurations[env]
+config =
+  if ActiveRecord::VERSION::MAJOR < 7
+    ActiveRecord::Base.configurations[env]
+  else
+    ActiveRecord::Base.configurations.configs_for(env_name: env).first
+  end
 
 case env
 when 'postgresql'

data/spec/active_record_relation_spec.rb

@@ -57,7 +57,7 @@ describe ActiveRecord::Relation do
     it 'properly casts values from arbitrary calculated columns' do
       hayek = Economist.create!(name: 'F.A. Hayek')
       scope = Economist.all
-      pluck_results = scope.pluck("date('now')")
+      pluck_results = scope.pluck(Arel.sql("date('now')"))
       pluck_column_klass = pluck_results.first.class
 
       date_struct = Struct.new(:date)

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ def active_record_supports_arrays?
       Economist.create!(name: 'F.A. Hayek')
       Economist.create!(name: 'Ludwig von Mises')
 
-      pluck_results = Economist.select('name').order('id').limit(1).pluck('array[name]') rescue nil
+      pluck_results = Economist.select('name').order('id').limit(1).pluck(Arel.sql('array[name]'))  rescue nil
       if pluck_results
         raise StandardError, "Unexpected array query results" unless pluck_results == [['F.A. Hayek']] # Verify ActiveRecord interface.
         supports_arrays = true

metadata

@@ -1,83 +1,83 @@
 --- !ruby/object:Gem::Specification
 name: relation_to_struct
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.7.0
 platform: ruby
 authors:
 - James Coleman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-01 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.2'
 - !ruby/object:Gem::Dependency
@@ -117,7 +117,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -127,7 +127,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -137,7 +137,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -147,7 +147,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '7.1'
 description: ''
 email:
 - jtc331@gmail.com
@@ -165,12 +165,17 @@ files:
 - gemfiles/rails_5_0.gemfile
 - gemfiles/rails_5_1.gemfile
 - gemfiles/rails_5_2.gemfile
+- gemfiles/rails_6_0.gemfile
+- gemfiles/rails_6_1.gemfile
+- gemfiles/rails_7_0.gemfile
 - lib/relation_to_struct.rb
 - lib/relation_to_struct/active_record_base_extension.rb
+- lib/relation_to_struct/active_record_connection_adapter_extension.rb
 - lib/relation_to_struct/active_record_relation_extension.rb
 - lib/relation_to_struct/version.rb
 - relation_to_struct.gemspec
 - spec/active_record_base_spec.rb
+- spec/active_record_connection_adapter_spec.rb
 - spec/active_record_helper/economic_school.rb
 - spec/active_record_helper/economist.rb
 - spec/active_record_helper/schema.rb
@@ -182,7 +187,7 @@ homepage: ''
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -197,13 +202,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Return struct results from ActiveRecord relation queries
 test_files:
 - spec/active_record_base_spec.rb
+- spec/active_record_connection_adapter_spec.rb
 - spec/active_record_helper/economic_school.rb
 - spec/active_record_helper/economist.rb
 - spec/active_record_helper/schema.rb