clickhouse-activerecord 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b584e48174f94997dc9dd04d3ffde3ff7c4b24535117c565e580c646f2f2581c
-  data.tar.gz: 9e7c01a185d23ac6e5ac16da635b118a59e7a7c7cdf86ce1c28e92aebacd3baa
+  metadata.gz: 1cf76e043406ab83146104d257da665657dc9905b6517ea02956f9034ae52ebf
+  data.tar.gz: 21da146747adec65a6e61bd09dc1ded2be7fd025ecea23736d0985708bafa70b
 SHA512:
-  metadata.gz: 8b3132522dbc7abaffa180049e350d4ceea82863ab3c208611c4b3227e6ebece1f706262daebec562bd13822fdcd31d44e6321ec97083543484e238e3e07ed2f
-  data.tar.gz: 44f3c58ff30e78b4e83066fbf9609bd656bf9c3e64f56a6113713068b98393c680ec949b5d8832da533ea6cc12216584a9fcf7b34279efc8c499ec9ff376a166
+  metadata.gz: bee84efbe4e210107575a1121a4adc8df4da2f85349abfec2f27c964917a7655438b01cceed36d83fe49f2f70e8f0d8ba32f7e92bb26b5ac5beceddf5243e626
+  data.tar.gz: bb1576674cbec042f2f2d949a6e35e8ce4ce22615a0bb0aac2d0ee56b35e200cdb28d72a31010e1143c95b47d397821568e709aa6fdd3c0ee9f8f76605de356c

data/CHANGELOG.md

@@ -1,4 +1,4 @@
-### Version 0.4.0 (Sep 18, 2020)
+### Version 0.4.4 (Sep 23, 2020)
 
  * Full support migration and rollback database
  * Support cluster and replica. Auto inject to SQL queries.

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

@@ -6,15 +6,17 @@ module ActiveRecord
       class SchemaCreation < AbstractAdapter::SchemaCreation# :nodoc:
 
         def visit_AddColumnDefinition(o)
-          +"ADD COLUMN #{accept(o.column)}"
+          sql = +"ADD COLUMN #{accept(o.column)}"
+          sql << " AFTER " + quote_column_name(o.column.options[:after]) if o.column.options.key?(:after)
+          sql
         end
 
         def add_column_options!(sql, options)
-          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
           if options[:null] || options[:null].nil?
             sql.gsub!(/\s+(.*)/, ' Nullable(\1)')
           end
           sql.gsub!(/(\sString)\(\d+\)/, '\1')
+          sql << " DEFAULT #{quote_default_expression(options[:default], options[:column])}" if options_include_default?(options)
           sql
         end
 
@@ -47,6 +49,25 @@ module ActiveRecord
           " TEMPORARY" if o.temporary
           " MATERIALIZED" if o.materialized
         end
+
+        def visit_ChangeColumnDefinition(o)
+          column = o.column
+          column.sql_type = type_to_sql(column.type, column.options)
+          options = column_options(column)
+
+          quoted_column_name = quote_column_name(o.name)
+          type = column.sql_type
+          type = "Nullable(#{type})" if options[:null]
+          change_column_sql = +"MODIFY COLUMN #{quoted_column_name} #{type}"
+
+          if options.key?(:default)
+            quoted_default = quote_default_expression(options[:default], column)
+            change_column_sql << " DEFAULT #{quoted_default}"
+          end
+
+          change_column_sql
+        end
+
       end
     end
   end

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

@@ -28,7 +28,7 @@ module ActiveRecord
           @if_not_exists = if_not_exists
           @options = options
           @as = as
-          @name = @conn.apply_cluster(name)
+          @name = name
           @comment = comment
           @view = view || materialized
           @materialized = materialized

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -205,7 +205,7 @@ module ActiveRecord
       def create_database(name)
         sql = apply_cluster "CREATE DATABASE #{quote_table_name(name)}"
         log_with_debug(sql, adapter_name) do
-          res = @connection.post("/?#{@config.except(:database).to_param}", "CREATE DATABASE #{quote_table_name(name)}")
+          res = @connection.post("/?#{@config.except(:database).to_param}", sql)
           process_response(res)
         end
       end
@@ -213,7 +213,7 @@ module ActiveRecord
       def create_view(table_name, **options)
         options.merge!(view: true)
         options = apply_replica(table_name, options)
-        td = create_table_definition(table_name, options)
+        td = create_table_definition(apply_cluster(table_name), options)
         yield td if block_given?
 
         if options[:force]
@@ -225,7 +225,7 @@ module ActiveRecord
 
       def create_table(table_name, **options)
         options = apply_replica(table_name, options)
-        td = create_table_definition(table_name, options)
+        td = create_table_definition(apply_cluster(table_name), options)
         yield td if block_given?
 
         if options[:force]
@@ -252,6 +252,21 @@ module ActiveRecord
         do_execute apply_cluster "DROP TABLE#{' IF EXISTS' if options[:if_exists]} #{quote_table_name(table_name)}"
       end
 
+      def change_column(table_name, column_name, type, options = {})
+        result = do_execute "ALTER TABLE #{quote_table_name(table_name)} #{change_column_for_alter(table_name, column_name, type, options)}"
+        raise "Error parse json response: #{result}" if result.presence && !result.is_a?(Hash)
+      end
+
+      def change_column_null(table_name, column_name, null, default = nil)
+        structure = table_structure(table_name).select{|v| v[0] == column_name.to_s}.first
+        raise "Column #{column_name} not found in table #{table_name}" if structure.nil?
+        change_column table_name, column_name, structure[1].gsub(/(Nullable\()?(.*?)\)?/, '\2'), {null: null, default: default}.compact
+      end
+
+      def change_column_default(table_name, column_name, default)
+        change_column table_name, column_name, nil, {default: default}.compact
+      end
+
       def cluster
         @full_config[:cluster_name]
       end
@@ -274,6 +289,12 @@ module ActiveRecord
         result
       end
 
+      def change_column_for_alter(table_name, column_name, type, options = {})
+        td = create_table_definition(table_name)
+        cd = td.new_column_definition(column_name, type, options)
+        schema_creation.accept(ChangeColumnDefinition.new(cd, column_name))
+      end
+
       private
 
       def connect

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -118,7 +118,7 @@ HEADER
 
     def format_colspec(colspec)
       if simple
-        super.gsub(/CAST\(([^,]+),.*?\)/, "\\1")
+        super.gsub(/CAST\('?([^,']*)'?,\s?'.*?'\)/, "\\1")
       else
         super
       end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.4.3'
+  VERSION = '0.4.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-22 00:00:00.000000000 Z
+date: 2020-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler