sunstone 7.1.0.1 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3956ea045dce2994b10bcac8535462bdf08597b85d7e15fc325110149a576aa6
-  data.tar.gz: 02be730df372f32557112e9fb618befb5aafd7a8ef15ce1e12a866f8c18c2ed7
+  metadata.gz: d280487f58777eebd36b07eb69f9492b77370ea3def7b05321bb2d4fd8e55626
+  data.tar.gz: a34f616483aca20b1207f12538e08fafb19b16ac01db6c19977b902cd1cd1537
 SHA512:
-  metadata.gz: c978ff5919d301007ccd326a632ed915cce129584e0ff9c25c199bddb9a65e517361f95a7d3a8af4ea70546acd1bb16fbc1118ff050a0c209f4168f9ec71feb9
-  data.tar.gz: 3a24f347b5ca8ccf2816e8d50a28ca3effedea79a897ab3692801b5cd8095d9fc324f37f792ffba621a9669eb7ea92f58be762b62d2a1e9096a9306fc1d46be9
+  metadata.gz: 0211de6c05fded268d04e00af2e0f16e9f4ee0650307288ea890c343e1b20f0a2fcf924631e2c0c3e72b602af7e964c8663a6df51f22cce9bd85798b26d12604
+  data.tar.gz: 62e9b986925a43ca27c172499bca956ea20e6b8ca237d94dbcb1b07f52772ad1ffc9d5a0fe68d9ef6560e9a3df5ccc7bc27a8a78b56aad4fcccc44604f2a9060

data/ext/active_record/associations/collection_association.rb

@@ -6,7 +6,7 @@ module ActiveRecord
 
       def replace(other_array)
         other_array.each { |val| raise_on_type_mismatch!(val) }
-        original_target = load_target.dup
+        original_target = skip_strict_loading { load_target }.dup
 
         if owner.new_record?
           replace_records(other_array, original_target)
@@ -52,7 +52,6 @@ module ActiveRecord
         end
       end
 
-
     end
 
     class HasManyThroughAssociation

data/ext/active_record/associations.rb

@@ -25,13 +25,13 @@ module ActiveRecord
 
         include Module.new {
           class_eval <<-RUBY, __FILE__, __LINE__ + 1
-          def destroy_associations
-            if !self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
-              association(:#{middle_reflection.name}).delete_all(:delete_all)
-              association(:#{name}).reset
+            def destroy_associations
+              if !self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
+                association(:#{middle_reflection.name}).delete_all(:delete_all)
+                association(:#{name}).reset
+              end
+              super
             end
-            super
-          end
           RUBY
         }
 
@@ -44,7 +44,7 @@ module ActiveRecord
         end
 
         has_many name, scope, **hm_options, &extension
-        _reflections[name.to_s].parent_reflection = habtm_reflection
+        _reflections[name].parent_reflection = habtm_reflection
       end
     end
   end

data/ext/active_record/persistence.rb

@@ -104,18 +104,22 @@ module ActiveRecord
     def _create_record(attribute_names = self.attribute_names)
       attribute_names = attributes_for_create(attribute_names)
       attribute_values = attributes_with_values(attribute_names)
-
-      returning_columns = self.class._returning_columns_for_insert
-
-      returning_values = self.class._insert_record(
-        attribute_values,
-        returning_columns
-      )
-
-      if !self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
-        returning_columns.zip(returning_values).each do |column, value|
-          _write_attribute(column, value) if !_read_attribute(column)
-        end if returning_values
+      returning_values = nil
+      
+      self.class.with_connection do |connection|
+        returning_columns = self.class._returning_columns_for_insert(connection)
+
+        returning_values = self.class._insert_record(
+          connection,
+          attribute_values,
+          returning_columns
+        )
+
+        if !self.class.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
+          returning_columns.zip(returning_values).each do |column, value|
+            _write_attribute(column, value) if !_read_attribute(column)
+          end if returning_values
+        end
       end
 
       @new_record = false

data/ext/active_record/relation/calculations.rb

@@ -5,10 +5,23 @@ module ActiveRecord
   module Calculations
 
     def pluck(*column_names)
+      if @none
+        if @async
+          return Promise::Complete.new([])
+        else
+          return []
+        end
+      end
+
       if loaded? && all_attributes?(column_names)
-        return records.pluck(*column_names)
+        result = records.pluck(*column_names)
+        if @async
+          return Promise::Complete.new(result)
+        else
+          return result
+        end
       end
-      
+
       if has_include?(column_names.first)
         relation = apply_join_dependency
         relation.pluck(*column_names)
@@ -16,18 +29,22 @@ module ActiveRecord
         load
         return records.pluck(*column_names.map{|n| n.to_s.sub(/^#{klass.table_name}\./, "")})
       else
-        klass.disallow_raw_sql!(column_names)
+        klass.disallow_raw_sql!(flattened_args(column_names))
         columns = arel_columns(column_names)
         relation = spawn
         relation.select_values = columns
         result = skip_query_cache_if_necessary do
           if where_clause.contradiction?
-            ActiveRecord::Result.empty
+            ActiveRecord::Result.empty(async: @async)
           else
-            klass.connection.select_all(relation.arel, "#{klass.name} Pluck")
+            klass.with_connection do |c|
+              c.select_all(relation.arel, "#{klass.name} Pluck", async: @async)
+            end
           end
         end
-        type_cast_pluck_values(result, columns)
+        result.then do |result|
+          type_cast_pluck_values(result, columns)
+        end
       end
     end
 

data/ext/active_record/relation/query_methods.rb

@@ -1,9 +1,11 @@
 module ActiveRecord
   module QueryMethods
     private
-      def assert_mutability!
-        raise ImmutableRelation if @loaded
-        raise ImmutableRelation if defined?(@arel) && @arel && !klass.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
-      end
+
+    def assert_modifiable!
+      raise UnmodifiableRelation if @loaded
+      raise UnmodifiableRelation if @arel && !klass.connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
+    end
+
   end
 end

data/ext/active_record/transactions.rb

@@ -34,23 +34,25 @@ module ActiveRecord
     # end
 
     def with_transaction_returning_status
-      status = nil
-      connection = self.class.connection
-
-      if connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && instance_variable_defined?(:@sunstone_updating) && @sunstone_updating
-        status = yield
-      else
-        ensure_finalize = !connection.transaction_open?
-        connection.transaction do
-          add_to_transaction(ensure_finalize || has_transactional_callbacks?)
-          remember_transaction_record_state
+      self.class.with_connection do |connection|
+        status = nil
+        # connection = self.class.connection
 
+        if connection.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter) && instance_variable_defined?(:@sunstone_updating) && @sunstone_updating
           status = yield
-          raise ActiveRecord::Rollback unless status
+        else
+          ensure_finalize = !connection.transaction_open?
+          connection.transaction do
+            add_to_transaction(ensure_finalize || has_transactional_callbacks?)
+            remember_transaction_record_state
+
+            status = yield
+            raise ActiveRecord::Rollback unless status
+          end
         end
-      end
       
-      status
+        status
+      end
     end
 
 

data/lib/active_record/connection_adapters/sunstone/database_statements.rb

@@ -29,8 +29,7 @@ module ActiveRecord
           sar.compile(binds)
         end
         
-        def to_sar_and_binds(arel_or_sar_string, binds = [], preparable = nil) # :nodoc:
-          # Arel::TreeManager -> Arel::Node
+        def to_sar_and_binds(arel_or_sar_string, binds = [], preparable = nil, allow_retry = false)
           if arel_or_sar_string.respond_to?(:ast)
             arel_or_sar_string = arel_or_sar_string.ast
           end
@@ -42,9 +41,9 @@ module ActiveRecord
             end
             
             sar = visitor.accept(arel_or_sar_string, collector)
-            [sar.freeze, sar.binds, false]
+            [sar.freeze, sar.binds, false, allow_retry]
           else
-            [arel_or_sar_string.dup.freeze, binds, false]
+            [arel_or_sar_string.dup.freeze, binds, false, allow_retry]
           end
         end
         
@@ -90,11 +89,15 @@ module ActiveRecord
         end
 
         # Returns an ActiveRecord::Result instance.
-        def select_all(arel, name = nil, binds = [], preparable: nil, async: false)
+        def select_all(arel, name = nil, binds = [], preparable: nil, async: false, allow_retry: false)
           arel = arel_from_relation(arel)
-          sar, binds, preparable = to_sar_and_binds(arel, binds, preparable)
+          sar, binds, preparable, allow_retry = to_sar_and_binds(arel, binds, preparable, allow_retry)
 
-          select(sar, name, binds, prepare: prepared_statements && preparable, async: async && FutureResult::SelectAll)
+          select(sar, name, binds,
+            prepare: prepared_statements && preparable,
+            async: async && FutureResult::SelectAll,
+            allow_retry: allow_retry
+          )
         rescue ::RangeError
           ActiveRecord::Result.empty(async: async)
         end
@@ -112,7 +115,7 @@ module ActiveRecord
           internal_exec_query(sar, name, binds)
         end
 
-        def internal_exec_query(arel, name = 'SAR', binds = [], prepare: false, async: false, allow_retry: false, materialize_transactions: true)
+        def internal_exec_query(arel, name = 'SAR', binds = [], prepare: false, async: false, allow_retry: false)
           sars = []
           multiple_requests = arel.is_a?(Arel::Collectors::Sunstone)
           type_casted_binds = binds#type_casted_binds(binds)
@@ -179,9 +182,9 @@ module ActiveRecord
           end
         end
         
-        def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [])
+        def insert(arel, name = nil, pk = nil, id_value = nil, sequence_name = nil, binds = [], returning: nil)
           sar, binds = to_sar_and_binds(arel, binds)
-          value = exec_insert(sar, name, binds, pk, sequence_name)
+          value = exec_insert(sar, name, binds, pk, sequence_name, returning: returning)
 
           return returning_column_values(value) unless returning.nil?
 

data/lib/active_record/connection_adapters/sunstone/quoting.rb

@@ -0,0 +1,19 @@
+module ActiveRecord
+  module ConnectionAdapters
+    module Sunstone
+      module Quoting
+        extend ActiveSupport::Concern
+
+        module ClassMethods # :nodoc:
+
+          # Quotes column names for use in SQL queries.
+          def quote_column_name(name) # :nodoc:
+            name
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -3,6 +3,7 @@ require 'active_record/connection_adapters/abstract_adapter'
 require 'arel/nodes/relation'
 require 'arel/visitors/to_sql_extensions'
 
+require 'active_record/connection_adapters/sunstone/quoting'
 require 'active_record/connection_adapters/sunstone/database_statements'
 require 'active_record/connection_adapters/sunstone/schema_statements'
 require 'active_record/connection_adapters/sunstone/schema_dumper'
@@ -15,19 +16,6 @@ require 'active_record/connection_adapters/sunstone/type/uuid'
 require 'active_record/connection_adapters/sunstone/type/json'
 
 module ActiveRecord
-  module ConnectionHandling # :nodoc:
-
-    def sunstone_adapter_class
-      ConnectionAdapters::SunstoneAPIAdapter
-    end
-    
-    # Establishes a connection to the database that's used by all Active Record
-    # objects
-    def sunstone_connection(config)
-      sunstone_adapter_class.new(config)
-    end
-  end
-
   module ConnectionAdapters
     # The SunstoneAPI adapter.
     #
@@ -56,7 +44,7 @@ module ActiveRecord
         end
       end
 
-      # include PostgreSQL::Quoting
+      include Sunstone::Quoting
       # include PostgreSQL::ReferentialIntegrity
       include Sunstone::SchemaStatements
       include Sunstone::DatabaseStatements
@@ -106,11 +94,6 @@ module ActiveRecord
       def active?
         @raw_connection&.active?
       end
-
-      def load_type_map
-        @type_map = Type::HashLookupTypeMap.new
-        initialize_type_map(@type_map)
-      end
       
       def reconnect
         super
@@ -169,6 +152,7 @@ module ActiveRecord
       end
 
       def lookup_cast_type_from_column(column) # :nodoc:
+        verify! if type_map.nil?
         cast_type = @type_map.lookup(column.sql_type, {
           limit: column.limit,
           precision: column.precision,
@@ -219,6 +203,8 @@ module ActiveRecord
       # Configures the encoding, verbosity, schema search path, and time zone of the connection.
       # This is called by #connect and should not be called manually.
       def configure_connection
+        super
+        
         reload_type_map
       end
 
@@ -233,7 +219,9 @@ module ActiveRecord
       end
 
       private
-      
+
+      attr_reader :type_map
+
       def initialize_type_map(m = nil)
         self.class.initialize_type_map(m || @type_map)
       end

data/lib/sunstone/connection.rb

@@ -203,7 +203,7 @@ module Sunstone
         close_connection = false
         @connection.request(request) do |response|
           if response['Deprecation-Notice']
-            ActiveSupport::Deprecation.warn(response['Deprecation-Notice'])
+            ::ActiveRecord.deprecator.warn(response['Deprecation-Notice'])
           end
 
           validate_response_code(response)

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '7.1.0.1'
+  VERSION = '7.2.0'
 end

data/lib/sunstone.rb

@@ -39,17 +39,5 @@ require File.expand_path(File.join(__FILE__, '../../ext/arel/attributes/empty_re
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/select_statement'))
 require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))
 
-if ActiveRecord::VERSION::MAJOR == 6 && ActiveRecord::VERSION::MINOR == 1
-  # Patch to allow Rails 6.1 pass url to adapter, all other versions work
-  require 'active_record/database_configurations'
-  class ActiveRecord::DatabaseConfigurations::UrlConfig
-    private
-    def build_url_hash
-      if url.nil? || %w(jdbc: http: https:).any? { |protocol| url.start_with?(protocol) }
-        { url: url }
-      else
-        ConnectionUrlResolver.new(url).to_hash
-      end
-    end
-  end
-end
+
+ActiveRecord::ConnectionAdapters.register("sunstone", "ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter", "active_record/connection_adapters/sunstone_adapter")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 7.1.0.1
+  version: 7.2.0
 platform: ruby
 authors:
 - Jon Bracy
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 2024-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 6.5.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.0
+        version: 7.2.0
 - !ruby/object:Gem::Dependency
   name: arel-extensions
   requirement: !ruby/object:Gem::Requirement
@@ -288,6 +288,7 @@ files:
 - ext/arel/select_manager.rb
 - lib/active_record/connection_adapters/sunstone/column.rb
 - lib/active_record/connection_adapters/sunstone/database_statements.rb
+- lib/active_record/connection_adapters/sunstone/quoting.rb
 - lib/active_record/connection_adapters/sunstone/schema_dumper.rb
 - lib/active_record/connection_adapters/sunstone/schema_statements.rb
 - lib/active_record/connection_adapters/sunstone/type/array.rb
@@ -323,7 +324,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs