sunstone 6.0.0.5 → 6.1.3

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

@@ -31,7 +31,11 @@ module ActiveRecord
 
           version = Gem::Version.create(response['StandardAPI-Version'] || '5.0.0.4')
 
-          @definitions[table_name] = if (version >= Gem::Version.create('5.0.0.5'))
+          @definitions[table_name] = if (version >= Gem::Version.create('6.0.0.29'))
+            schema = JSON.parse(response.body)
+            schema['columns'] = schema.delete('attributes')
+            schema
+          elsif (version >= Gem::Version.create('5.0.0.5'))
             JSON.parse(response.body)
           else
             { 'columns' => JSON.parse(response.body), 'limit' => nil }
@@ -46,7 +50,9 @@ module ActiveRecord
         #  - format_type includes the column size constraint, e.g. varchar(50)
         #  - ::regclass is a function that gives the id for a table name
         def column_definitions(table_name) # :nodoc:
-          definition(table_name)['columns']
+          # First check for attributes and then for the deprecated columns field
+          # TODO: Remove after 0.3
+          definition(table_name)['attributes'] || definition(table_name)['columns']
         end
 
         # Returns the limit definition of the table (the maximum limit that can
@@ -58,28 +64,32 @@ module ActiveRecord
         def tables
           JSON.parse(@connection.get('/tables').body)
         end
-        
+
         def views
           []
         end
-        
+
         def new_column(name, options)
           sql_type_metadata = fetch_type_metadata(options)
           SunstoneColumn.new(name, sql_type_metadata, options)
         end
-        
+
+        def lookup_cast_type(options)
+          type_map.lookup(options['type'], options.symbolize_keys)
+        end
+
         def fetch_type_metadata(options)
-          cast_type = lookup_cast_type(options['type'])
+          cast_type = lookup_cast_type(options)
           simple_type = SqlTypeMetadata.new(
             sql_type: options['type'],
             type: cast_type.type,
             limit: cast_type.limit,
             precision: cast_type.precision,
-            scale: cast_type.scale,
+            scale: cast_type.scale
           )
           SunstoneSQLTypeMetadata.new(simple_type, options)
         end
-        
+
         def column_name_for_operation(operation, node) # :nodoc:
           visitor.accept(node, collector).first[operation.to_sym]
         end

data/lib/active_record/connection_adapters/sunstone/type/binary.rb

@@ -0,0 +1,34 @@
+require 'base64'
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Sunstone
+      module Type
+        class Binary < ActiveRecord::Type::Binary
+          
+          # Converts a value from database input to the appropriate ruby type. The
+          # return value of this method will be returned from
+          # ActiveRecord::AttributeMethods::Read#read_attribute. The default
+          # implementation just calls Value#cast.
+          #
+          # +value+ The raw input, as provided from the database.
+          def deserialize(value)
+            value.nil? ? nil : Base64.strict_decode64(value)            
+          end
+          
+          # Casts a value from the ruby type to a type that the database knows how
+          # to understand. The returned value from this method should be a
+          # +String+, +Numeric+, +Date+, +Time+, +Symbol+, +true+, +false+, or
+          # +nil+.
+          def serialize(value)
+            if limit && value.bytesize > limit
+              raise ActiveModel::RangeError, "value is out of range for #{self.class} with limit #{limit} bytes"
+            end
+            Base64.strict_encode64(value)
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/sunstone_adapter.rb

@@ -1,6 +1,7 @@
 require 'active_record/connection_adapters/abstract_adapter'
 
-#require 'active_record/connection_adapters/statement_pool'
+require 'arel/nodes/relation'
+require 'arel/visitors/to_sql_extensions'
 
 require 'active_record/connection_adapters/sunstone/database_statements'
 require 'active_record/connection_adapters/sunstone/schema_statements'
@@ -9,6 +10,7 @@ require 'active_record/connection_adapters/sunstone/column'
 
 require 'active_record/connection_adapters/sunstone/type/date_time'
 require 'active_record/connection_adapters/sunstone/type/array'
+require 'active_record/connection_adapters/sunstone/type/binary'
 require 'active_record/connection_adapters/sunstone/type/uuid'
 require 'active_record/connection_adapters/sunstone/type/json'
 
@@ -30,7 +32,7 @@ module ActiveRecord
         conn_params[:port]    ||= uri.port
         conn_params[:use_ssl] ||= (uri.scheme == 'https')
       end
-      
+
       # Forward only valid config params to Sunstone::Connection
       conn_params.slice!(*VALID_SUNSTONE_CONN_PARAMS)
 
@@ -78,9 +80,9 @@ module ActiveRecord
 
       # Initializes and connects a SunstoneAPI adapter.
       def initialize(connection, logger, connection_parameters, config)
-        super(connection, logger, config)
+        super(connection, logger, config.reverse_merge(prepared_statements: false))
 
-        @prepared_statements = false
+        @prepared_statement_status = Concurrent::ThreadLocalVar.new(false)
         @connection_parameters = connection_parameters
 
         # @type_map = Type::HashLookupTypeMap.new
@@ -95,12 +97,12 @@ module ActiveRecord
         super
         @connection.reconnect!
       end
-      
+
       def disconnect!
         super
         @connection.disconnect!
       end
-      
+
       # Executes the delete statement and returns the number of rows affected.
       def delete(arel, name = nil, binds = [])
         r = exec_delete(arel, name, binds)
@@ -122,27 +124,28 @@ module ActiveRecord
       def update_table_definition(table_name, base) #:nodoc:
         SunstoneAPI::Table.new(table_name, base)
       end
-      
+
       def arel_visitor
         Arel::Visitors::Sunstone.new
       end
-      
+
       def collector
         Arel::Collectors::Sunstone.new
       end
-      
+
       def server_config
         JSON.parse(@connection.get("/configuration").body)
       end
-      
+
       def lookup_cast_type_from_column(column) # :nodoc:
-        if column.array
-          Sunstone::Type::Array.new(type_map.lookup(column.sql_type))
-        else
-          type_map.lookup(column.sql_type)
-        end
+        cast_type = type_map.lookup(column.sql_type, {
+          limit: column.limit,
+          precision: column.precision,
+          scale: column.scale
+        })
+        column.array ? Sunstone::Type::Array.new(cast_type) : cast_type
       end
-      
+
       def transaction(requires_new: nil, isolation: nil, joinable: true)
         Thread.current[:sunstone_transaction_count] ||= 0
         Thread.current[:sunstone_request_sent] = nil if Thread.current[:sunstone_transaction_count] == 0
@@ -159,7 +162,7 @@ module ActiveRecord
       rescue ActiveRecord::Rollback
         # rollbacks are silently swallowed
       end
-      
+
       def supports_json?
         true
       end
@@ -176,33 +179,43 @@ module ActiveRecord
         exec_insert(arel, name, binds, pk, sequence_name)
       end
       alias create insert
-      
+
       # Should be the defuat insert, but rails escapes if for SQL so we'll just
       # catch the string "DEFATUL VALUES" in the visitor
       # def empty_insert_statement_value
       #   {}
       # end
-      
+
       private
 
       def initialize_type_map(m) # :nodoc:
         m.register_type 'boolean',    Type::Boolean.new
-        m.register_type 'string',     Type::String.new
-        m.register_type 'integer',    Type::Integer.new
-        m.register_type 'decimal',    Type::Decimal.new
+        m.register_type 'string' do |_, options|
+          Type::String.new(**options.slice(:limit))
+        end
+        m.register_type 'integer' do |_, options|
+          Type::Integer.new(**options.slice(:limit))
+        end
+        m.register_type 'decimal' do |_, options|
+          Type::Decimal.new(**options.slice(:precision, :scale))
+        end
+        m.register_type 'binary' do |_, options|
+          Sunstone::Type::Binary.new(**options.slice(:limit))
+        end
+
         m.register_type 'datetime',   Sunstone::Type::DateTime.new
         m.register_type 'json',       Sunstone::Type::Json.new
         m.register_type 'uuid',       Sunstone::Type::Uuid.new
-          
+
         if defined?(Sunstone::Type::EWKB)
           m.register_type 'ewkb',       Sunstone::Type::EWKB.new
         end
       end
 
-      def create_table_definition(name, temporary, options, as = nil) # :nodoc:
-        SunstoneAPI::TableDefinition.new native_database_types, name, temporary, options, as
+      def create_table_definition(name, **options)
+        SunstoneAPI::TableDefinition.new(self, name, **options)
       end
-        
+
       ActiveRecord::Type.add_modifier({ array: true }, Sunstone::Type::Array, adapter: :sunstone)
       # ActiveRecord::Type.add_modifier({ range: true }, OID::Range, adapter: :postgresql)
     end

data/lib/arel/visitors/sunstone.rb

@@ -1,19 +1,13 @@
 require 'arel/visitors/visitor'
-class Arel::Visitors::Dot
-  def visit_Arel_Nodes_Casted o
-    # collector << quoted(o.val, o.attribute).to_s
-    visit_String o.val
-  end
-end
 
 module Arel
   module Visitors
     class Sunstone < Arel::Visitors::Visitor
       
-      def compile node, &block
-        accept(node, Arel::Collectors::SQLString.new, &block).value
+      def compile(node, collector = Arel::Collectors::Sunstone.new)
+        accept(node, collector).value
       end
-
+      
       def preparable
         false
       end
@@ -233,7 +227,7 @@ module Arel
       #
       def visit_Arel_Nodes_Casted o, collector
         # collector << quoted(o.val, o.attribute).to_s
-        o.val
+        o.value
       end
 
       def visit_Arel_Nodes_Quoted o, collector
@@ -709,6 +703,7 @@ module Arel
           {key => value}
         end
       end
+      alias_method :visit_Arel_Nodes_HomogeneousIn, :visit_Arel_Nodes_In
       
       def visit_Arel_Nodes_NotIn o, collector
         key = visit(o.left, collector)
@@ -925,9 +920,12 @@ module Arel
         value = if o.relation.is_a?(Arel::Attributes::Relation)
           { o.name => visit_Arel_Attributes_Relation(o.relation, collector, false) }
         else
-          visit(o.relation, collector)
+          if o.relation.is_a?(Arel::Attributes::Attribute)
+            { o.name => o.relation.name }
+          else
+            visit(o.relation, collector)
+          end
         end
-        # value = value.to_s.split('.').last if !value.is_a?(Hash)
 
         if o.collection
           ary = []
@@ -950,9 +948,9 @@ module Arel
         end
       end
 
-      def visit_Arel_Attributes_EmptyRelation o, collector, top=true
-        o.for_write ? "#{o.name}_attributes" : o.name
-      end
+      # def visit_Arel_Attributes_EmptyRelation o, collector, top=true
+      #   o.for_write ? "#{o.name}_attributes" : o.name
+      # end
       
       def visit_Arel_Attributes_Attribute o, collector
         join_name = o.relation.table_alias || o.relation.name

data/lib/sunstone.rb

@@ -35,7 +35,21 @@ require File.expand_path(File.join(__FILE__, '../../ext/active_support/core_ext/
 
 require File.expand_path(File.join(__FILE__, '../../ext/arel/select_manager'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/eager_load'))
-require File.expand_path(File.join(__FILE__, '../../ext/arel/attributes/relation'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/attributes/empty_relation'))
 require File.expand_path(File.join(__FILE__, '../../ext/arel/nodes/select_statement'))
-require File.expand_path(File.join(__FILE__, '../../ext/active_record/finder_methods'))
+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

data/lib/sunstone/connection.rb

@@ -348,7 +348,7 @@ module Sunstone
       headers = Thread.current[:sunstone_headers]&.clone || {}
       headers['Accept'] = 'application/json'
       headers['User-Agent'] = user_agent
-      headers['Api-Version'] = '0.1.0'
+      headers['Api-Version'] = '0.2.0'
       headers['Connection'] = 'keep-alive'
       
       request_api_key = Thread.current[:sunstone_api_key] || api_key

data/lib/sunstone/version.rb

@@ -1,3 +1,3 @@
 module Sunstone
-  VERSION = '6.0.0.5'
+  VERSION = '6.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 6.0.0.5
+  version: 6.1.3
 platform: ruby
 authors:
 - Jon Bracy
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2021-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -184,14 +184,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.1.3
+- !ruby/object:Gem::Dependency
+  name: arel-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+- !ruby/object:Gem::Dependency
+  name: activerecord-filter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.1.0
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -241,14 +269,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".tm_properties"
-- ".travis.yml"
-- Gemfile
 - LICENSE
-- README.md
-- Rakefile
-- TODO.md
 - ext/active_record/associations.rb
 - ext/active_record/associations/collection_association.rb
 - ext/active_record/attribute_methods.rb
@@ -262,7 +283,6 @@ files:
 - ext/active_record/transactions.rb
 - ext/active_support/core_ext/object/to_query.rb
 - ext/arel/attributes/empty_relation.rb
-- ext/arel/attributes/relation.rb
 - ext/arel/nodes/eager_load.rb
 - ext/arel/nodes/select_statement.rb
 - ext/arel/select_manager.rb
@@ -271,6 +291,7 @@ files:
 - 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
+- lib/active_record/connection_adapters/sunstone/type/binary.rb
 - lib/active_record/connection_adapters/sunstone/type/date_time.rb
 - lib/active_record/connection_adapters/sunstone/type/ewkb.rb
 - lib/active_record/connection_adapters/sunstone/type/json.rb
@@ -284,33 +305,10 @@ files:
 - lib/sunstone/exception.rb
 - lib/sunstone/gis.rb
 - lib/sunstone/version.rb
-- sunstone.gemspec
-- test/active_record/associations/belongs_to_test.rb
-- test/active_record/associations/has_and_belongs_to_many_test.rb
-- test/active_record/associations/has_many_test.rb
-- test/active_record/eager_loading_test.rb
-- test/active_record/persistance_test.rb
-- test/active_record/preload_test.rb
-- test/active_record/query/all_test.rb
-- test/active_record/query/count_test.rb
-- test/active_record/query/distinct_test.rb
-- test/active_record/query/find_test.rb
-- test/active_record/query/limit_test.rb
-- test/active_record/query/order_test.rb
-- test/active_record/query/where_test.rb
-- test/active_record/query_test.rb
-- test/active_record/rpc_test.rb
-- test/schema_mock.rb
-- test/sunstone/connection/configuration_test.rb
-- test/sunstone/connection/cookie_store_test.rb
-- test/sunstone/connection/request_helper_test.rb
-- test/sunstone/connection/send_request_test.rb
-- test/sunstone/connection_test.rb
-- test/test_helper.rb
 homepage: http://sunstonerb.com
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -325,30 +323,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: A library for interacting with REST APIs
-test_files:
-- test/active_record/associations/belongs_to_test.rb
-- test/active_record/associations/has_and_belongs_to_many_test.rb
-- test/active_record/associations/has_many_test.rb
-- test/active_record/eager_loading_test.rb
-- test/active_record/persistance_test.rb
-- test/active_record/preload_test.rb
-- test/active_record/query/all_test.rb
-- test/active_record/query/count_test.rb
-- test/active_record/query/distinct_test.rb
-- test/active_record/query/find_test.rb
-- test/active_record/query/limit_test.rb
-- test/active_record/query/order_test.rb
-- test/active_record/query/where_test.rb
-- test/active_record/query_test.rb
-- test/active_record/rpc_test.rb
-- test/schema_mock.rb
-- test/sunstone/connection/configuration_test.rb
-- test/sunstone/connection/cookie_store_test.rb
-- test/sunstone/connection/request_helper_test.rb
-- test/sunstone/connection/send_request_test.rb
-- test/sunstone/connection_test.rb
-- test/test_helper.rb
+test_files: []