clickhouse-activerecord 0.4.0 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8020d332d2b7b707fa2776a37fbb8d2c217ec50703962d06938be53eaae22796
-  data.tar.gz: 6979255cb79396c6574e4b58c0e82ae39a42612fe1068b1308d98a1222c58b64
+  metadata.gz: b584e48174f94997dc9dd04d3ffde3ff7c4b24535117c565e580c646f2f2581c
+  data.tar.gz: 9e7c01a185d23ac6e5ac16da635b118a59e7a7c7cdf86ce1c28e92aebacd3baa
 SHA512:
-  metadata.gz: 3aa6d799adf1fc66d49c3dff6d02c5ad0349e467fb1067a1453de8bfcb3316abb46681367b7dfd3ebd8f82f13460cb658c4f167ff23398bba8b9cc459c5b6df1
-  data.tar.gz: a1c8e252279678efb2fe1f8c36a8a7e1c5bfda24896438245921deee5862e94c047dced14b85408b5e1343606ec7055100b813af399568f5ee405a255c268777
+  metadata.gz: 8b3132522dbc7abaffa180049e350d4ceea82863ab3c208611c4b3227e6ebece1f706262daebec562bd13822fdcd31d44e6321ec97083543484e238e3e07ed2f
+  data.tar.gz: 44f3c58ff30e78b4e83066fbf9609bd656bf9c3e64f56a6113713068b98393c680ec949b5d8832da533ea6cc12216584a9fcf7b34279efc8c499ec9ff376a166

data/CHANGELOG.md

@@ -3,6 +3,7 @@
  * Full support migration and rollback database
  * Support cluster and replica. Auto inject to SQL queries.
  * Fix schema dump/load
+ * Can dump schema for using PostgreSQL
 
 ### Version 0.3.10 (Dec 20, 2019)
 

data/README.md

@@ -125,7 +125,11 @@ Schema load from `db/clickhouse_schema.rb` file:
 
     $ rake clickhouse:schema:load
 
-We use schema for emulate development or tests environment on PostgreSQL adapter.
+For export schema to PostgreSQL, you need use:
+
+    $ rake clickhouse:schema:dump -- --simple
+
+Schema will be dump to `db/clickhouse_schema_simple.rb`. If default file exists, it will be auto update after migration.
     
 Structure dump to `db/clickhouse_structure.sql` file:
 

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -244,6 +244,10 @@ module ActiveRecord
         end
       end
 
+      def rename_table(table_name, new_name)
+        do_execute apply_cluster "RENAME TABLE #{quote_table_name(table_name)} TO #{quote_table_name(new_name)}"
+      end
+
       def drop_table(table_name, options = {}) # :nodoc:
         do_execute apply_cluster "DROP TABLE#{' IF EXISTS' if options[:if_exists]} #{quote_table_name(table_name)}"
       end
@@ -277,7 +281,7 @@ module ActiveRecord
       end
 
       def apply_replica(table, options)
-        if replica && cluster
+        if replica && cluster && options[:options]
           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]}"

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -1,6 +1,19 @@
 module ClickhouseActiverecord
   class SchemaDumper < ::ActiveRecord::ConnectionAdapters::SchemaDumper
 
+    attr_accessor :simple
+
+    class << self
+      def dump(connection = ActiveRecord::Base.connection, stream = STDOUT, config = ActiveRecord::Base, default = false)
+        dumper = connection.create_schema_dumper(generate_options(config))
+        dumper.simple = default
+        dumper.dump(stream)
+        stream
+      end
+    end
+
+    private
+
     def header(stream)
       stream.puts <<HEADER
 # This file is auto-generated from the current state of the database. Instead
@@ -8,27 +21,29 @@ module ClickhouseActiverecord
 # incrementally modify your database, and then regenerate this schema definition.
 #
 # This file is the source Rails uses to define your schema when running `rails
-# clickhouse:schema:load`. When creating a new database, `rails clickhouse:schema:load` tends to
+# #{simple ? 'db' : 'clickhouse'}:schema:load`. When creating a new database, `rails #{simple ? 'db' : 'clickhouse'}:schema:load` tends to
 # be faster and is potentially less error prone than running all of your
 # migrations from scratch. Old migrations may fail to apply correctly if those
 # migrations use external dependencies or application code.
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ClickhouseActiverecord::Schema.define(#{define_params}) do
+#{simple ? 'ActiveRecord' : 'ClickhouseActiverecord'}::Schema.define(#{define_params}) do
 
 HEADER
     end
 
     def table(table, stream)
       if table.match(/^\.inner\./).nil?
-        stream.puts "  # TABLE: #{table}"
-        sql = @connection.do_system_execute("SHOW CREATE TABLE `#{table.gsub(/^\.inner\./, '')}`")['data'].try(:first).try(:first)
-        stream.puts "  # SQL: #{sql.gsub(/ENGINE = Replicated(.*?)\('[^']+',\s*'[^']+',?\s?([^\)]*)?\)/, "ENGINE = \\1(\\2)")}" if sql
-        # super(table.gsub(/^\.inner\./, ''), stream)
-
-        # detect view table
-        match = sql.match(/^CREATE\s+(MATERIALIZED)\s+VIEW/)
+        unless simple
+          stream.puts "  # TABLE: #{table}"
+          sql = @connection.do_system_execute("SHOW CREATE TABLE `#{table.gsub(/^\.inner\./, '')}`")['data'].try(:first).try(:first)
+          stream.puts "  # SQL: #{sql.gsub(/ENGINE = Replicated(.*?)\('[^']+',\s*'[^']+',?\s?([^\)]*)?\)/, "ENGINE = \\1(\\2)")}" if sql
+          # super(table.gsub(/^\.inner\./, ''), stream)
+
+          # detect view table
+          match = sql.match(/^CREATE\s+(MATERIALIZED)\s+VIEW/)
+        end
 
         # Copy from original dumper
         columns = @connection.columns(table)
@@ -40,9 +55,11 @@ HEADER
 
           tbl.print "  create_table #{remove_prefix_and_suffix(table).inspect}"
 
-          # Add materialize flag
-          tbl.print ', view: true' if match
-          tbl.print ', materialized: true' if match && match[1].presence
+          unless simple
+            # Add materialize flag
+            tbl.print ', view: true' if match
+            tbl.print ', materialized: true' if match && match[1].presence
+          end
 
           case pk
           when String
@@ -58,9 +75,11 @@ HEADER
             tbl.print ", id: false"
           end
 
-          table_options = @connection.table_options(table)
-          if table_options.present?
-            tbl.print ", #{format_options(table_options)}"
+          unless simple
+            table_options = @connection.table_options(table)
+            if table_options.present?
+              tbl.print ", #{format_options(table_options)}"
+            end
           end
 
           tbl.puts ", force: :cascade do |t|"
@@ -96,5 +115,13 @@ HEADER
       end
       super
     end
+
+    def format_colspec(colspec)
+      if simple
+        super.gsub(/CAST\(([^,]+),.*?\)/, "\\1")
+      else
+        super
+      end
+    end
   end
 end

data/lib/clickhouse-activerecord/version.rb

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

data/lib/tasks/clickhouse.rake

@@ -3,11 +3,11 @@
 namespace :clickhouse do
 
   task prepare_schema_migration_table: :environment do
-    ClickhouseActiverecord::SchemaMigration.create_table
+    ClickhouseActiverecord::SchemaMigration.create_table unless ENV['simple'] || ARGV.map{|a| a.include?('--simple') ? true : nil}.compact.any?
   end
 
   task prepare_internal_metadata_table: :environment do
-    ClickhouseActiverecord::InternalMetadata.create_table
+    ClickhouseActiverecord::InternalMetadata.create_table unless ENV['simple'] || ARGV.map{|a| a.include?('--simple') ? true : nil}.compact.any?
   end
 
   task load_config: :environment do
@@ -20,16 +20,18 @@ namespace :clickhouse do
 
     # todo not testing
     desc 'Load database schema'
-    task load: [:load_config, :prepare_schema_migration_table, :prepare_internal_metadata_table] do
-      load("#{Rails.root}/db/clickhouse_schema.rb")
+    task load: [:load_config, :prepare_schema_migration_table, :prepare_internal_metadata_table] do |t, args|
+      simple = ENV['simple'] || ARGV.map{|a| a.include?('--simple') ? true : nil}.compact.any? ? '_simple' : nil
+      load("#{Rails.root}/db/clickhouse_schema#{simple}.rb")
     end
 
     desc 'Dump database schema'
-    task dump: :environment do
-      filename = "#{Rails.root}/db/clickhouse_schema.rb"
+    task dump: :environment do |t, args|
+      simple = ENV['simple'] || args[:simple] || ARGV.map{|a| a.include?('--simple') ? true : nil}.compact.any? ? '_simple' : nil
+      filename = "#{Rails.root}/db/clickhouse_schema#{simple}.rb"
       File.open(filename, 'w:utf-8') do |file|
         ActiveRecord::Base.establish_connection(:"#{Rails.env}_clickhouse")
-        ClickhouseActiverecord::SchemaDumper.dump(ActiveRecord::Base.connection, file)
+        ClickhouseActiverecord::SchemaDumper.dump(ActiveRecord::Base.connection, file, ActiveRecord::Base, !!simple)
       end
     end
 
@@ -71,6 +73,9 @@ namespace :clickhouse do
   desc 'Migrate the clickhouse database'
   task migrate: [:load_config, :prepare_schema_migration_table, :prepare_internal_metadata_table] do
     Rake::Task['db:migrate'].execute
+    if File.exists? "#{Rails.root}/db/clickhouse_schema_simple.rb"
+      Rake::Task['clickhouse:schema:dump'].execute(simple: true)
+    end
   end
 
   desc 'Rollback the clickhouse database'

metadata

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