clickhouse-activerecord 0.4.12 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad0ad1c7545498f275ff975d35ee9dde7d2f644516932ee33ab65796360426a0
-  data.tar.gz: 15b32b155c596c8cdd9e187681a128a4806ca7e2c457e0f833ffc66ba9c994af
+  metadata.gz: 41dd800df06e6269f91b1a39d3c9df2e1e903068b5f13913cd2aad863063685f
+  data.tar.gz: 50252db6e694467f48669a3c7c52c89e6b1633f08586714db300b8eee59ebbbc
 SHA512:
-  metadata.gz: 8f80ffc1c70dbbdd489ea59627e85a72f538276c80adc0fe5ee4319c222a61da2acd1680ea42bd8c4c4b713fb354f7498a3469cc3cfd17f9003c8dbd607719b2
-  data.tar.gz: 9c91108f18bb9b133708a682ee3dfec238cc54afac480fcada95e876bb051843a7269e3d81c6298299b1bbffbc5a8a47975add7919144d220845fd87c710122b
+  metadata.gz: 539e7dfb17998dd1bcc95ee2c15c6111229775ec29837d8f102291bf5da64db2dcf74ef0f01087443c8c1b1d9902cfdf4a586357508d3d8ed97fa099b1545770
+  data.tar.gz: f5f8acbf806f9bc8497dcd6aa29c6bfd18b651aae78c28cc0f9449effd4ddce965a1978027d91fa57a998fc1ba0bb0027d33917a3ef35379299185bfde06c784

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### Version 0.5.3 (Sep 22, 2021)
+ 
+ * Fix replica cluster for a new syntax MergeTree
+ * Fix support rails 5.2 on alter table
+ * Support array type of column
+ * Support Rails 6.1.0 [@bdevel](https://github.com/bdevel)
+
 ### Version 0.4.10 (Mar 10, 2021)
 
  * Support ClickHouse 20.9+

data/lib/active_record/connection_adapters/clickhouse/oid/array.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module ActiveRecord
+  module ConnectionAdapters
+    module Clickhouse
+      module OID # :nodoc:
+        class Array < Type::Value # :nodoc:
+
+          def initialize(sql_type)
+            @subtype = case sql_type
+                       when /U?Int\d+/
+                         :integer
+                       when /DateTime/
+                         :datetime
+                       when /Date/
+                         :date
+                       else
+                         :string
+            end
+          end
+
+          def type
+            @subtype
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/active_record/connection_adapters/clickhouse/schema_creation.rb

@@ -1,9 +1,16 @@
 # frozen_string_literal: true
+begin
+  require "active_record/connection_adapters/deduplicable"
+rescue LoadError => e
+  # Rails < 6.1 does not have this file in this location, ignore
+end
+
+require "active_record/connection_adapters/abstract/schema_creation"
 
 module ActiveRecord
   module ConnectionAdapters
     module Clickhouse
-      class SchemaCreation < AbstractAdapter::SchemaCreation# :nodoc:
+      class SchemaCreation < ConnectionAdapters::SchemaCreation# :nodoc:
 
         def visit_AddColumnDefinition(o)
           sql = +"ADD COLUMN #{accept(o.column)}"
@@ -15,14 +22,23 @@ module ActiveRecord
           if options[:null] || options[:null].nil?
             sql.gsub!(/\s+(.*)/, ' Nullable(\1)')
           end
+          if options[:array]
+            sql.gsub!(/\s+(.*)/, ' Array(\1)')
+          end
           sql.gsub!(/(\sString)\(\d+\)/, '\1')
           sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
           sql
         end
 
         def add_table_options!(create_sql, options)
-          if options[:options].present?
-            create_sql << " ENGINE = #{options[:options]}"
+          opts = options[:options]
+          if options.respond_to?(:options)
+            # rails 6.1
+            opts ||= options.options
+          end
+
+          if opts.present?
+            create_sql << " ENGINE = #{opts}"
           else
             create_sql << " ENGINE = Log()"
           end
@@ -37,11 +53,9 @@ module ActiveRecord
 
           statements = o.columns.map { |c| accept c }
           statements << accept(o.primary_keys) if o.primary_keys
-
           create_sql << "(#{statements.join(', ')})" if statements.present?
           # Attach options for only table or materialized view
-          add_table_options!(create_sql, table_options(o)) if !o.view || o.view && o.materialized
-
+          add_table_options!(create_sql, o)  if !o.view || o.view && o.materialized
           create_sql << " AS #{to_sql(o.as)}" if o.as
           create_sql
         end

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

@@ -23,6 +23,11 @@ module ActiveRecord
           raise ActiveRecord::ActiveRecordError, "Response: #{e.message}"
         end
 
+        def exec_insert_all(sql, name)
+          do_execute(sql, name, format: nil)
+          true
+        end
+
         def exec_update(_sql, _name = nil, _binds = [])
           raise ActiveRecord::ActiveRecordError, 'Clickhouse update is not supported'
         end
@@ -116,8 +121,8 @@ module ActiveRecord
           Clickhouse::SchemaCreation.new(self)
         end
 
-        def create_table_definition(*args)
-          Clickhouse::TableDefinition.new(self, *args)
+        def create_table_definition(table_name, **options)
+          Clickhouse::TableDefinition.new(self, table_name, **options)
         end
 
         def new_column_from_field(table_name, field)

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -3,6 +3,7 @@
 require 'clickhouse-activerecord/arel/visitors/to_sql'
 require 'clickhouse-activerecord/arel/table'
 require 'clickhouse-activerecord/migration'
+require 'active_record/connection_adapters/clickhouse/oid/array'
 require 'active_record/connection_adapters/clickhouse/oid/date'
 require 'active_record/connection_adapters/clickhouse/oid/date_time'
 require 'active_record/connection_adapters/clickhouse/oid/big_integer'
@@ -17,6 +18,7 @@ module ActiveRecord
       # Establishes a connection to the database that's used by all Active Record objects
       def clickhouse_connection(config)
         config = config.symbolize_keys
+
         if config[:connection]
           connection = {
             connection: config[:connection]
@@ -27,6 +29,9 @@ module ActiveRecord
             host: config[:host] || 'localhost',
             port: port,
             ssl: config[:ssl].present? ? config[:ssl] : port == 443,
+            sslca: config[:sslca],
+            read_timeout: config[:read_timeout],
+            write_timeout: config[:write_timeout],
           }
         end
 
@@ -59,7 +64,11 @@ module ActiveRecord
   module TypeCaster
     class Map
       def is_view
-        types.is_view
+        if @klass.respond_to?(:is_view)
+          @klass.is_view # rails 6.1
+        else
+          types.is_view # less than 6.1
+        end
       end
     end
   end
@@ -186,12 +195,16 @@ module ActiveRecord
         register_class_with_limit m, %r(Int128), Type::Integer
         register_class_with_limit m, %r(Int256), Type::Integer
 
-        register_class_with_limit m, %r(Uint8), Type::UnsignedInteger
+        register_class_with_limit m, %r(UInt8), Type::UnsignedInteger
         register_class_with_limit m, %r(UInt16), Type::UnsignedInteger
         register_class_with_limit m, %r(UInt32), Type::UnsignedInteger
         register_class_with_limit m, %r(UInt64), Type::UnsignedInteger
         #register_class_with_limit m, %r(UInt128), Type::UnsignedInteger #not implemnted in clickhouse
         register_class_with_limit m, %r(UInt256), Type::UnsignedInteger
+        # register_class_with_limit m, %r(Array), Clickhouse::OID::Array
+        m.register_type(%r(Array)) do |sql_type|
+          Clickhouse::OID::Array.new(sql_type)
+        end
       end
 
       # Quoting time without microseconds
@@ -319,6 +332,19 @@ module ActiveRecord
         cluster ? "#{sql} ON CLUSTER #{cluster}" : sql
       end
 
+      def supports_insert_on_duplicate_skip?
+        true
+      end
+
+      def supports_insert_on_duplicate_update?
+        true
+      end
+
+      def build_insert_sql(insert) # :nodoc:
+        sql = +"INSERT #{insert.into} #{insert.values_list}"
+        sql
+      end
+
       protected
 
       def last_inserted_id(result)
@@ -335,11 +361,17 @@ module ActiveRecord
 
       def connect
         @connection = @connection_parameters[:connection] || Net::HTTP.start(@connection_parameters[:host], @connection_parameters[:port], use_ssl: @connection_parameters[:ssl], verify_mode: OpenSSL::SSL::VERIFY_NONE)
+
+        @connection.ca_file = @connection_parameters[:ca_file] if @connection_parameters[:ca_file]
+        @connection.read_timeout = @connection_parameters[:read_timeout] if @connection_parameters[:read_timeout]
+        @connection.write_timeout = @connection_parameters[:write_timeout] if @connection_parameters[:write_timeout]
+
+        @connection
       end
 
       def apply_replica(table, options)
         if replica && cluster && options[:options]
-          match = options[:options].match(/^(.*?MergeTree)\(([^\)]*)\)(.*?)$/)
+          match = options[:options].match(/^(.*?MergeTree)(?:\(([^\)]*)\))?(.*?)$/)
           if match
             options[:options] = "Replicated#{match[1]}(#{([replica_path(table), replica].map{|v| "'#{v}'"} + [match[2].presence]).compact.join(', ')})#{match[3]}"
           end

data/lib/clickhouse-activerecord/migration.rb

@@ -1,3 +1,5 @@
+require 'active_record/migration'
+
 module ClickhouseActiverecord
 
   class SchemaMigration < ::ActiveRecord::SchemaMigration
@@ -8,7 +10,7 @@ module ClickhouseActiverecord
           version_options = connection.internal_string_options_for_primary_key
 
           connection.create_table(table_name, id: false, options: 'ReplacingMergeTree(ver) PARTITION BY version ORDER BY (version)', if_not_exists: true) do |t|
-            t.string :version, version_options
+            t.string :version, **version_options
             t.column :active, 'Int8', null: false, default: '1'
             t.datetime :ver, null: false, default: -> { 'now()' }
           end

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -144,9 +144,14 @@ HEADER
       (column.sql_type =~ /(Nullable)?\(?UInt\d+\)?/).nil? ? false : nil
     end
 
+    def schema_array(column)
+      (column.sql_type =~ /Array?\(/).nil? ? nil : true
+    end
+
     def prepare_column_options(column)
       spec = {}
       spec[:unsigned] = schema_unsigned(column)
+      spec[:array] = schema_array(column)
       spec.merge(super).compact
     end
   end

data/lib/clickhouse-activerecord/tasks.rb

@@ -6,7 +6,7 @@ module ClickhouseActiverecord
     delegate :connection, :establish_connection, :clear_active_connections!, to: ActiveRecord::Base
 
     def initialize(configuration)
-      @configuration = configuration
+      @configuration = configuration.with_indifferent_access
     end
 
     def create

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.4.12'
+  VERSION = '0.5.3'
 end

data/lib/generators/clickhouse_migration_generator.rb

@@ -13,7 +13,7 @@ class ClickhouseMigrationGenerator < ActiveRecord::Generators::MigrationGenerato
 
   def db_migrate_path
     if defined?(Rails.application) && Rails.application && respond_to?(:configured_migrate_path, true)
-      configured_migrate_path
+      configured_migrate_path || default_migrate_path
     else
       default_migrate_path
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.12
+  version: 0.5.3
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-02 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -112,6 +112,7 @@ files:
 - bin/console
 - bin/setup
 - clickhouse-activerecord.gemspec
+- lib/active_record/connection_adapters/clickhouse/oid/array.rb
 - lib/active_record/connection_adapters/clickhouse/oid/big_integer.rb
 - lib/active_record/connection_adapters/clickhouse/oid/date.rb
 - lib/active_record/connection_adapters/clickhouse/oid/date_time.rb