Update to ActiveRecord 7 and crate_ruby 0.2

Author: amotl

.gitignore

@@ -21,3 +21,5 @@ tmp
 crate_test_server*
 *.log
 log/*
+crate-*.tar.gz
+parts/

activerecord-crate-adapter.gemspec

@@ -44,11 +44,11 @@ Gem::Specification.new do |spec|
     "source_code_uri" => "https://github.com/crate/activerecord-crate-adapter"
   }
 
-  spec.add_development_dependency "bundler", "~> 1.5"
+  spec.add_development_dependency "bundler"
+  spec.add_development_dependency "os"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec", "~> 2.14"
 
-  spec.add_dependency('activerecord', '~> 4.1.0')
-  spec.add_dependency('arel', '>= 5.0.0')
-  spec.add_dependency('crate_ruby', '~> 0.0.7')
+  spec.add_dependency('activerecord', '~> 7')
+  spec.add_dependency('crate_ruby', '~> 0.2')
 end

history.txt

@@ -2,6 +2,8 @@
 
 === unreleased
 
+  * Updated to ActiveRecord 7 and crate_ruby 0.2
+
 === 0.0.4
 
   * Updated crate version to 0.45.7

lib/active_record/connection_adapters/crate/schema_statements.rb

@@ -22,7 +22,7 @@
 module ActiveRecord
   module ConnectionAdapters
     module Crate
-      class SchemaCreation < AbstractAdapter::SchemaCreation
+      class SchemaCreation < ActiveRecord::SchemaMigration
 
         private
 

lib/active_record/connection_adapters/crate_adapter.rb

@@ -23,7 +23,7 @@
 require 'active_record/base'
 require 'active_record/base'
 require 'arel/arel_crate'
-require 'arel/visitors/bind_visitor'
+require 'arel/visitors/visitor'
 require 'active_support/dependencies/autoload'
 require 'active_support/callbacks'
 require 'active_support/core_ext/string'
@@ -45,7 +45,7 @@ module ActiveRecord
   class Base
     def self.crate_connection(config) #:nodoc:
       config = config.symbolize_keys
-      ConnectionAdapters::CrateAdapter.new(nil, logger, nil, config)
+      ConnectionAdapters::CrateAdapter.new(nil, logger, config)
     end
   end
 
@@ -60,9 +60,10 @@ class ColumnDefinition < ActiveRecord::ConnectionAdapters::ColumnDefinition
 
       ADAPTER_NAME = 'Crate'.freeze
 
-      def schema_creation # :nodoc:
-        Crate::SchemaCreation.new self
-      end
+      # TODO: Croaks with `NotImplementedError`.
+      # def schema_creation # :nodoc:
+      #   Crate::SchemaCreation.new self
+      # end
 
       NATIVE_DATABASE_TYPES = {
           boolean: {name: "boolean"},
@@ -77,13 +78,13 @@ def schema_creation # :nodoc:
       }
 
       class BindSubstitution < Arel::Visitors::Crate # :nodoc:
-        include Arel::Visitors::BindVisitor
+        include Arel::Visitors
       end
 
-      def initialize(connection, logger, pool, config)
+      def initialize(connection, logger, config)
         @port = config[:port]
         @host = config[:host]
-        super(connection, logger, pool)
+        super(connection, logger, config)
         @schema_cache = SchemaCache.new self
         @visitor = Arel::Visitors::Crate.new self
         @quoted_column_names = {}
@@ -127,11 +128,20 @@ def supports_migrations?
 
       def connect
         @connection = CrateRuby::Client.new(["#{@host}:#{@port}"])
+
+        # Monkeypatch to make the client instance provide `supports_datetime_with_precision`.
+        # FIXME: Implement within `CrateRuby::Client`.
+        def @connection.supports_datetime_with_precision?
+          # TODO: Should it be `true` instead?
+          return false
+        end
+
       end
 
       def columns(table_name) #:nodoc:
         cols = @connection.table_structure(table_name).map do |field|
-          name = dotted_name(field[2])
+          # TODO: Review. What if the table structure changes again?
+          name = dotted_name(field[12])
           CrateColumn.new(name, nil, field[4], nil)
         end
         cols
@@ -172,10 +182,10 @@ class TableDefinition < ActiveRecord::ConnectionAdapters::TableDefinition
         # +SecureRandom.uuid+ method and a +before_save+ callback, for instance.
         def primary_key(name, type = :primary_key, options = {})
           options[:primary_key] = true
-          column name, "STRING PRIMARY KEY", options
+          column name, "STRING PRIMARY KEY"
         end
 
-        def column(name, type = nil, options = {})
+        def column(name, type = nil, **options)
           super
           column = self[name]
           column.array = options[:array]
@@ -189,19 +199,19 @@ def object(name, options = {})
           schema = options.delete(:object_schema)
           type = "#{type} as (#{object_schema_to_string(schema)})" if schema
 
-          column name, type, options.merge(object: true)
+          column name, type, **options.merge(object: true)
         end
 
         def array(name, options = {})
           array_type = options.delete(:array_type)
           raise "Array columns must specify an :array_type (e.g. array_type: :string)" unless array_type.present?
-          column name, "array(#{array_type})", options.merge(array: true)
+          column name, "array(#{array_type})", **options.merge(array: true)
         end
 
         private
 
-        def create_column_definition(name, type)
-          ColumnDefinition.new name, type
+        def create_column_definition(name, type, options)
+          ColumnDefinition.new(name, type, options)
         end
 
         def object_schema_to_string(s)
@@ -220,8 +230,8 @@ def object_schema_to_string(s)
 
       end
 
-      def create_table_definition(name, temporary, options, as = nil)
-        TableDefinition.new native_database_types, name, temporary, options, as
+      def create_table_definition(name)
+        TableDefinition.new @connection, name
       end
 
       def native_database_types

lib/arel/arel_crate.rb

@@ -21,4 +21,4 @@
 
 require 'arel'
 require 'arel/visitors/crate'
-require 'arel/visitors/bind_visitor'
+require 'arel/visitors/visitor'

lib/arel/visitors/crate.rb

@@ -27,5 +27,3 @@ class Crate < Arel::Visitors::ToSql
     end
   end
 end
-
-Arel::Visitors::VISITORS['crate'] = Arel::Visitors::Crate

spec/activerecord/connection_adapters/crate/table_definition_spec.rb

@@ -26,7 +26,7 @@
 
   describe '#object_schema_to_string' do
 
-    let(:td) { ActiveRecord::ConnectionAdapters::CrateAdapter::TableDefinition.new(nil, nil, nil, nil) }
+    let(:td) { ActiveRecord::ConnectionAdapters::CrateAdapter::TableDefinition.new(nil, nil) }
 
     it 'should simply set the key and values' do
       s = {street: :string, city: :string}

spec/models/post_spec.rb

@@ -116,7 +116,7 @@
   describe 'sql input sanitization' do
 
     before do
-      @post = Post.create!(params)
+      @post = Post.create!(**params)
     end
 
     after do

spec/spec_helper.rb

@@ -69,6 +69,8 @@ def refresh_posts
 # Wait till all table is synced to all shards
 # this should be used after each create_table to prevent flaky tests
 def ensure_status(expected_status)
+  # TODO: Did the health endpoint move elsewhere?
+  return
   req = Net::HTTP::Get.new("/_cluster/health?wait_for_status=#{expected_status}&timeout=10s")
   resp = Net::HTTP.new(HOST, PORT)
   response = resp.start { |http| http.request(req) }