clickhouse-activerecord 0.3.9 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 69358e69c13cdf1d70ec417e4ef9e4374578eb63144bc713bdd3e934702d8118
-  data.tar.gz: 2a52857c0080ad2959c8d34b52a43185f911ff215ac52c1584dacc52e3047f1e
+  metadata.gz: 03776772df850312a0cb6994a9797aee37fdf537eb8839d53e358fe78924b844
+  data.tar.gz: b97fce3acd8c2f8b06cc50bd262c96db6d7355ff1317d4cab5e6271999f38098
 SHA512:
-  metadata.gz: b7a6c0845166b79e719e1fff667de0dfb38e132154a6acdf862d50cb82d7281dbecd53f4c4e756b5bc5e30ad3b6b3aa710eebb8220f0f496991fd4e01513238f
-  data.tar.gz: f3987a2a0a77233a37ecb1805b6e4bd0dce76ce2bf2c18fc58e62ee62bb9a573ac8851cf06f56d0b1bf80e8fe3a14eda1105fdd3f472c4f54694fd0811fd2bcd
+  metadata.gz: '0580fd619a922e91c09173d86c9a207a334d66e88d3876da2838f6ea7e3db92925b289591f8b15cb624ff7f7e5098aa9790c26f7a6ff475b537f2efd27b79fb7'
+  data.tar.gz: 6dc95a06b6b0a079985b9863d41a5f1611ad479dd922449d7a612ec757b513b568d570c9272b80428398934aa958b5eecfb5c43ee4432667d5b938b5338e0319

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### Version 0.3.10 (Dec 20, 2019)
+
+ * Support structure dump/load [@StoneGod](https://github.com/StoneGod)
+
 ### Version 0.3.6 (Sep 2, 2019)
 
  * Support Rails 6.0
@@ -5,18 +9,18 @@
 
 ### Version 0.3.4 (Jun 28, 2019)
 
- * Fix DateTime sql format without microseconds for Rails 5.2 
+ * Fix DateTime sql format without microseconds for Rails 5.2
  * Support ssl connection
  * Migration support
  * Rake tasks for create / drop database
- 
+
 ### Version 0.3.0 (Nov 27, 2018)
 
  * Support materialized view
  * Aggregated functions for view
  * Schema dumper with SQL create table
  * Added migrations support [@Bugagazavr](https://github.com/Bugagazavr)
- 
+
 ### Version 0.2.0 (Oct 3, 2017)
 
  * Support Rails 5.0
@@ -24,7 +28,7 @@
 ### Version 0.1.2 (Sep 27, 2017)
 
  * Fix Big Int type
- 
+
 ### Version 0.1.0 (Aug 31, 2017)
 
  * Initial release

data/README.md

@@ -107,6 +107,10 @@ Migration:
     
 Rollback migration not supported!
 
+### Dump / Load for multiple using databases
+
+If you using multiple databases, for example: PostgreSQL, Clickhouse.
+
 Schema dump to `db/clickhouse_schema.rb` file:
 
     $ rake clickhouse:schema:dump
@@ -114,9 +118,24 @@ Schema dump to `db/clickhouse_schema.rb` file:
 Schema load from `db/clickhouse_schema.rb` file:
 
     $ rake clickhouse:schema:load
-    
+
 We use schema for emulate development or tests environment on PostgreSQL adapter.
     
+Structure dump to `db/clickhouse_structure.sql` file:
+
+    $ rake clickhouse:structure:dump
+    
+Structure load from `db/clickhouse_structure.sql` file:
+
+    $ rake clickhouse:structure:load
+
+### Dump / Load for only Clickhouse database using
+
+    $ rake db:schema:dump  
+    $ rake db:schema:load  
+    $ rake db:structure:dump  
+    $ rake db:structure:load  
+    
 ### Insert and select data
 
 ```ruby

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

@@ -8,6 +8,7 @@ module ActiveRecord
 
           def serialize(value)
             value = super
+            return unless value
             return value.strftime('%Y-%m-%d %H:%M:%S') unless value.acts_like?(:time)
 
             value.to_time.strftime('%Y-%m-%d %H:%M:%S')

data/lib/clickhouse-activerecord/tasks.rb

@@ -31,13 +31,27 @@ module ClickhouseActiverecord
       create
     end
 
+    def structure_dump(*args)
+      tables = connection.execute("SHOW TABLES FROM #{@configuration['database']}")['data'].flatten
+
+      File.open(args.first, 'w:utf-8') do |file|
+        tables.each do |table|
+          next if table.match(/\.inner/)
+          file.puts connection.execute("SHOW CREATE TABLE #{table}")['data'].try(:first).try(:first).gsub("#{@configuration['database']}.", '') + ";\n\n"
+        end
+      end
+    end
+
+    def structure_load(*args)
+      File.read(args.first).split(";\n\n").each { |sql| connection.execute(sql) }
+    end
+
     def migrate
       check_target_version
 
       verbose = ENV["VERBOSE"] ? ENV["VERBOSE"] != "false" : true
       scope = ENV["SCOPE"]
       verbose_was, ActiveRecord::Migration.verbose = ActiveRecord::Migration.verbose, verbose
-      binding.pry
       connection.migration_context.migrate(target_version) do |migration|
         scope.blank? || scope == migration.scope
       end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.3.9'
+  VERSION = '0.3.11'
 end

data/lib/tasks/clickhouse.rake

@@ -27,6 +27,18 @@ namespace :clickhouse do
 
   end
 
+  namespace :structure do
+    desc 'Load database structure'
+    task load: [:load_config, 'db:check_protected_environments'] do
+      ClickhouseActiverecord::Tasks.new(ActiveRecord::Base.configurations["#{Rails.env}_clickhouse"]).structure_load("#{Rails.root}/db/clickhouse_structure.sql")
+    end
+
+    desc 'Dump database structure'
+    task dump: [:load_config, 'db:check_protected_environments'] do
+      ClickhouseActiverecord::Tasks.new(ActiveRecord::Base.configurations["#{Rails.env}_clickhouse"]).structure_dump("#{Rails.root}/db/clickhouse_structure.sql")
+    end
+  end
+
   desc 'Creates the database from DATABASE_URL or config/database.yml'
   task create: [:load_config] do
     ActiveRecord::Tasks::DatabaseTasks.create(ActiveRecord::Base.configurations["#{Rails.env}_clickhouse"])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.3.11
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-17 00:00:00.000000000 Z
+date: 2020-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler