sunstone 6.0.0.5 → 6.0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87a052085f5f1445d0e6cdea630054ba3a17aa742b679c539a87f03af8f018ee
-  data.tar.gz: 50007447eb6c02ce55c90aebd7973190913f43183151a783eb9e3914c95e7ffc
+  metadata.gz: 6c4334de568780ae0f1bfff51878a34df6efc921931b3b8369d4c3dbf0212fc3
+  data.tar.gz: 16ffa50224484c100d4161a77cb9618ac206ab56b9c11dbf5f78e5d4863b693b
 SHA512:
-  metadata.gz: aef51f99ea18ba631bdfe4dcfd95ac2133ad3e721ef97251ba53151fe7f9c3076fb942580cdf147f796fa9c6d75f59efabd1bfb0964f550c8fd484de5f267a4b
-  data.tar.gz: 41786cdf195c547c7ec704c7dcd5e92c65e1441732e32da3adf3f8f13398baece163f583a7f953b3ea5ab7d411519643acb0b8acc27ec2d6aabad197f844dd3a
+  metadata.gz: 1ae9e8e867434bdaa2df09eda49c69d80394b1a3f662a2d1fe7e01ea506379e03ad1092782ce87d9059ad64bc84cee590b7c5e0bd4000245c15a0a143279d1c1
+  data.tar.gz: ca3fc4d00c10174a3ec7d6255e04f957e69ecaa9f0d3e6d2c7019774b42922980cafa574f90afeace08f6b35cbd7b79e9e7b22cc64e6a5ea964ab2bd77bb0e61

data/.travis.yml

@@ -12,9 +12,9 @@ rvm:
 
 env:
   matrix:
-    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:mysql2
-    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:sqlite3
-    - RAILS_VERSION=v6.0.0.rc1 GEM=activerecord:postgresql
+    - RAILS_VERSION=v6.0.0 GEM=activerecord:mysql2
+    - RAILS_VERSION=v6.0.0 GEM=activerecord:sqlite3
+    - RAILS_VERSION=v6.0.0 GEM=activerecord:postgresql
 
 services:
   - mysql

data/ext/active_record/finder_methods.rb

@@ -1,15 +1,3 @@
-module Arel
-  module Visitors
-    class ToSql < Arel::Visitors::Visitor
-      
-      def visit_Arel_Attributes_Relation o, collector
-        visit(o.relation, collector)
-      end
-      
-    end
-  end
-end
-
 module ActiveRecord
   class PredicateBuilder # :nodoc:
 
@@ -202,7 +190,9 @@ module ActiveRecord
         relation = except(:includes, :eager_load, :preload)
         relation.arel.eager_load = Arel::Nodes::EagerLoad.new(eager_load_values)
       else
-        join_dependency = construct_join_dependency(eager_load_values + includes_values)
+        join_dependency = construct_join_dependency(
+          eager_load_values + includes_values, Arel::Nodes::OuterJoin
+        )
         relation = except(:includes, :eager_load, :preload).joins!(join_dependency)
       end
 

data/ext/active_record/statement_cache.rb

@@ -5,10 +5,9 @@ module ActiveRecord
       def initialize(values, sunstone=false)
         @values = values
         @indexes = if sunstone
-          
         else
-          values.each_with_index.find_all { |thing,i|
-            Arel::Nodes::BindParam === thing
+          values.each_with_index.find_all { |thing, i|
+            Substitute === thing
           }.map(&:last)
         end
       end

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

@@ -47,15 +47,15 @@ module ActiveRecord
         # can be used to query the database repeatedly.
         def cacheable_query(klass, arel) # :nodoc:
           if prepared_statements
-            sql, binds = visitor.accept(arel.ast, collector).value
+            sql, binds = visitor.compile(arel.ast, collector)
             query = klass.query(sql)
           elsif self.is_a?(ActiveRecord::ConnectionAdapters::SunstoneAPIAdapter)
             collector = SunstonePartialQueryCollector.new(self.collector)
-            parts, binds = visitor.accept(arel.ast, collector).value
+            parts, binds = visitor.compile(arel.ast, collector)
             query = StatementCache::PartialQuery.new(parts, true)
           else
-            collector = PartialQueryCollector.new
-            parts, binds = visitor.accept(arel.ast, collector).value
+            collector = klass.partial_query_collector
+            parts, binds = visitor.compile(arel.ast, collector)
             query = klass.partial_query(parts)
           end
           [query, binds]
@@ -142,7 +142,7 @@ module ActiveRecord
           
           if sars[0].instance_variable_defined?(:@sunstone_calculation) && sars[0].instance_variable_get(:@sunstone_calculation)
             # this is a count, min, max.... yea i know..
-            ActiveRecord::Result.new(['all'], [result], {:all => type_map.lookup('integer')})
+            ActiveRecord::Result.new(['all'], [result], {:all => type_map.lookup('integer', {})})
           elsif result.is_a?(Array)
             ActiveRecord::Result.new(result[0] ? result[0].keys : [], result.map{|r| r.values})
           else

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 }
@@ -58,28 +62,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,24 +179,34 @@ 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
@@ -202,7 +215,7 @@ module ActiveRecord
       def create_table_definition(name, temporary, options, as = nil) # :nodoc:
         SunstoneAPI::TableDefinition.new native_database_types, name, temporary, options, as
       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

@@ -10,10 +10,10 @@ 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
@@ -925,9 +925,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 = []

data/lib/sunstone.rb

@@ -35,7 +35,6 @@ 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'))

data/lib/sunstone/version.rb

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

data/sunstone.gemspec

@@ -30,10 +30,11 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rgeo'
   s.add_development_dependency 'simplecov'
   s.add_development_dependency 'byebug'
-  s.add_development_dependency 'activesupport', '>= 6.0.0.rc1'
+  s.add_development_dependency 'activesupport', '>= 6.0.0'
   
   # Runtime
   s.add_runtime_dependency 'msgpack'
   s.add_runtime_dependency 'cookie_store'
-  s.add_runtime_dependency 'activerecord', '>= 6.0.0.rc1'
+  s.add_runtime_dependency 'activerecord', '>= 6.0.0'
+  s.add_runtime_dependency 'arel-extensions', '>= 6.0.0.5'
 end

data/test/active_record/persistance_test.rb

@@ -11,7 +11,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     create_table "fleets" do |t|
       t.string   "name",                    limit: 255
     end
-    
+
     create_table "sailors" do |t|
       t.string   "name",                    limit: 255
     end
@@ -22,7 +22,7 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     end
 
   end
-  
+
   class Fleet < ActiveRecord::Base
     has_many :ships
   end
@@ -36,16 +36,19 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
   class Sailor < ActiveRecord::Base
     has_and_belongs_to_many :ships
   end
-  
+
   class TestModelA < ActiveRecord::Base
   end
-  
+
   class TestModelB < ActiveRecord::Base
     before_save do
       TestModelA.create
     end
   end
 
+  class TestModelC < ActiveRecord::Base
+  end
+
   test '#create with errors' do
     req_stub = webmock(:post, "/fleets").with(
       body: { fleet: {} }.to_json
@@ -85,6 +88,15 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
   end
 
   test '#save attempts another request while in transaction' do
+    webmock(:get, '/test_model_cs/schema').to_return(
+      body: {
+        attributes: {
+          id: {type: 'integer', primary_key: true, null: false, array: false},
+          name: {type: 'string', primary_key: false, null: true, array: false}
+        }
+      }.to_json,
+      headers: { 'StandardAPI-Version' => '6.0.0.29' }
+    )
     webmock(:get, '/test_model_bs/schema').to_return(
       body: {
         columns: {
@@ -156,4 +168,4 @@ class ActiveRecord::PersistanceTest < ActiveSupport::TestCase
     assert_requested req_stub
   end
 
-end
+end

data/test/schema_mock.rb

@@ -1,23 +1,23 @@
 class ActiveSupport::TestCase
   class Schema
-  
+
     class Table
-      
+
       class Column
-        
+
         def initialize(name, type, options={})
           @name = name
           @type = type
           @options = options
         end
-        
+
         def as_json
           {type: @type, primary_key: false, null: true, array: false}.merge(@options)
         end
       end
-      
+
       attr_accessor :name, :options, :columns
-      
+
       def initialize(name, options={}, &block)
         @name = name
         @options = options
@@ -30,7 +30,7 @@ class ActiveSupport::TestCase
 
         block.call(self)
       end
-    
+
       def string(name, options={})
         @columns[name] = Column.new(name, :string, options)
       end
@@ -38,28 +38,28 @@ class ActiveSupport::TestCase
       def datetime(name, options={})
         @columns[name] = Column.new(name, :datetime, options)
       end
-    
+
       def integer(name, options={})
         @columns[name] = Column.new(name, :integer, options)
       end
-    
+
       def to_json
         json = @options.slice(:limit)
-        json[:columns] = {}
+        json[:attributes] = {}
         @columns.each do |name, column|
-          json[:columns][name] = column.as_json
+          json[:attributes][name] = column.as_json
         end
         json.to_json
       end
-      
+
     end
-  
+
     attr_accessor :tables
-    
+
     def initialize
       @tables = {}
     end
-  
+
     def self.define(&block)
       i = new
       i.define(&block)
@@ -69,21 +69,21 @@ class ActiveSupport::TestCase
     def define(&block)
       instance_eval(&block)
     end
-  
+
     def create_table(name, options={}, &block)
       @tables[name] = Table.new(name, options, &block)
     end
-  
+
   end
-  
+
   def self.schema(&block)
     self.class_variable_set(:@@schema, Schema.define(&block))
   end
-  
+
   set_callback(:setup, :before) do
     if !instance_variable_defined?(:@suite_setup_run) && self.class.class_variable_defined?(:@@schema)
       ActiveRecord::Base.establish_connection(adapter: 'sunstone', url: 'http://example.com')
-      
+
       req_stub = stub_request(:get, /^http:\/\/example.com/).with do |req|
         case req.uri.path
         when '/tables'
@@ -94,24 +94,24 @@ class ActiveSupport::TestCase
           false
         end
       end
-      
+
       req_stub.to_return do |req|
         case req.uri.path
         when '/tables'
           {
             body: self.class.class_variable_get(:@@schema).tables.keys.to_json,
-            headers: { 'StandardAPI-Version' => '5.0.0.5' }
+            headers: { 'StandardAPI-Version' => '6.0.0.29' }
           }
         when /^\/(\w+)\/schema$/i
           {
             body: self.class.class_variable_get(:@@schema).tables[$1].to_json,
-            headers: { 'StandardAPI-Version' => '5.0.0.5' }
+            headers: { 'StandardAPI-Version' => '6.0.0.29' }
           }
         end
       end
-      
+
     end
     @suite_setup_run = true
   end
-  
-end
+
+end

data/test/sunstone/connection/column_definition_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+class Sunstone::Connection::ColumnDefinitionTest < ActiveSupport::TestCase
+
+  schema do
+    create_table "ships", limit: 100 do |t|
+      t.string   "name",          limit: 255
+      t.integer  "guns",          limit: 8
+      t.integer  "sailor_count"
+    end
+  end
+
+  class Ship < ActiveRecord::Base
+  end
+
+  test "default limit on column" do
+    assert_nil Ship.columns_hash['sailor_count'].limit
+  end
+
+  test "custom limit on column" do
+    assert_equal 8, Ship.columns_hash['guns'].limit
+  end
+
+  test "custom limit on string column" do
+    assert_equal 255, Ship.columns_hash['name'].limit
+  end
+  
+end
+
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sunstone
 version: !ruby/object:Gem::Version
-  version: 6.0.0.5
+  version: 6.0.0.8
 platform: ruby
 authors:
 - Jon Bracy
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-26 00:00:00.000000000 Z
+date: 2019-12-12 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.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
 - !ruby/object:Gem::Dependency
   name: msgpack
   requirement: !ruby/object:Gem::Requirement
@@ -226,14 +226,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 6.0.0.rc1
+        version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: arel-extensions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.0.5
 description: A library for interacting with REST APIs. Similar to ActiveResource
 email:
 - jonbracy@gmail.com
@@ -262,7 +276,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 +284,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
@@ -301,6 +315,7 @@ files:
 - test/active_record/query_test.rb
 - test/active_record/rpc_test.rb
 - test/schema_mock.rb
+- test/sunstone/connection/column_definition_test.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
 - test/sunstone/connection/request_helper_test.rb
@@ -346,6 +361,7 @@ test_files:
 - test/active_record/query_test.rb
 - test/active_record/rpc_test.rb
 - test/schema_mock.rb
+- test/sunstone/connection/column_definition_test.rb
 - test/sunstone/connection/configuration_test.rb
 - test/sunstone/connection/cookie_store_test.rb
 - test/sunstone/connection/request_helper_test.rb

data/ext/arel/attributes/relation.rb

@@ -1,31 +0,0 @@
-module Arel
-  module Attributes
-    class Relation < Attribute
-      
-      attr_accessor :collection, :for_write
-      
-      def initialize(relation, name, collection = false, for_write=false)
-        self[:relation] = relation
-        self[:name] = name
-        @collection = collection
-        @for_write = for_write
-      end
-      
-      def able_to_type_cast?
-        false
-      end
-      
-      def table_name
-        nil
-      end
-      
-      def eql? other
-        self.class == other.class &&
-          self.relation == other.relation &&
-          self.name == other.name &&
-          self.collection == other.collection
-      end
-      
-    end
-  end
-end