clickhouse-rails 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6df85b3e7c3c3a379067d3cb22e31afaa164f7277defa24362a06e71fea7b3
-  data.tar.gz: 57f2f1aa8cf5a3a125341944a3eb7d8a2765111a2a2a9bde15dc7766644fda1c
+  metadata.gz: 718aac003d13c2483b97702f3f9f3e03bd2e10416c6bec748c7571a189c630f1
+  data.tar.gz: 60761d44e0f1c8b2e235212812cf3aabdd36212a8ff99a2d47ba60688f162f06
 SHA512:
-  metadata.gz: 387f1a3dfd4822e1a83cad4994429b1a2f0d0716de68c623ddc52b5785b469c50a1e0f0bc602a234ef865bedd4e2c1d99979bb6ee05927522ce9e30ea9c2c5e6
-  data.tar.gz: 224d2b0a199ddf8ad88a948926c343fe6b66b9f2aa3013b7613259f4222187a3a8a07709bdcc5caccdd4c12423352f89d6426bb96706bf3d2a909ae638313262
+  metadata.gz: b29b6bd85c036c8daf286c994c2881c79e1a3765b0c742646f0fcc1e3a64bf84ff39777468d3c2c81ec342d26580867491ab821479f69cf9f13fe2c17ff2dd13
+  data.tar.gz: da05288e90ba6c12eeecb43ac196c48dcd711981b7e5c0cd46b600925c13f9ddbdc94a04158df98787e35be54de2d15737b8a61128c179a308d84bacc2e7d5b9

data/.rubocop.yml

@@ -1,3 +1,8 @@
+AllCops:
+  TargetRubyVersion: 2.5
+  Exclude:
+    - './tmp/**/*.rb'
+
 Metrics/BlockLength:
   Max: 25
   Exclude:
@@ -12,3 +17,6 @@ Style/Documentation:
 
 Metrics/LineLength:
   Max: 97
+
+Style/FrozenStringLiteralComment:
+  Enabled: false

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    clickhouse-rails (0.1.3)
+    clickhouse-rails (0.1.5)
       clickhouse
       railties
 
@@ -80,7 +80,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
     psych (3.1.0)
-    public_suffix (3.1.0)
+    public_suffix (3.1.1)
     rack (2.0.7)
     rack-protection (2.0.5)
       rack

data/lib/clickhouse/rails/migrations/base.rb

@@ -55,8 +55,15 @@ module Clickhouse
             drop_table(table_name)
           end
 
-          delegate :create_table, to: :connection
-          delegate :drop_table, to: :connection
+          def create_table(table_name, &block)
+            logger.info "# >======= Create #{table_name} ========"
+            connection.create_table(table_name, &block)
+          end
+
+          def drop_table(table_name, &block)
+            logger.info "# >======= Drop #{table_name} ========"
+            connection.drop_table(table_name, &block)
+          end
 
           def alter_table(table_name)
             @table_info = connection.describe_table(table_name)
@@ -73,7 +80,9 @@ module Clickhouse
             end
             type = type.gsub('Uint', 'UInt').delete('_')
 
-            connection.execute("ALTER TABLE #{@table_name} ADD COLUMN #{column} #{type}")
+            query = "ALTER TABLE #{@table_name} ADD COLUMN #{column} #{type}"
+            logger.info(query)
+            connection.execute(query)
           end
 
           def run_migration(migration)
@@ -92,7 +101,7 @@ module Clickhouse
           end
 
           def logger
-            ::Rails.logger
+            Logger.new(STDOUT)
           end
         end
       end

data/lib/clickhouse/rails/version.rb

@@ -1,5 +1,5 @@
 module Clickhouse
   module Rails
-    VERSION = '0.1.4'.freeze
+    VERSION = '0.1.5'.freeze
   end
 end

data/lib/clickhouse/table.rb

@@ -20,7 +20,7 @@ module Clickhouse
           [complete_row]
         end
       end
-      alias :create :insert_row
+      alias create insert_row
 
       def insert_rows(batch_rows)
         connection.insert_rows(table_name) do |table_rows|
@@ -64,14 +64,38 @@ module Clickhouse
       end
 
       def prepare_row(row)
-        return empty_row.merge(row.stringify_keys) if row.is_a?(Hash)
+        validate_row(row)
 
-        raise WrongTypeRowError, "#{row.inspect} has wrong type"
+        row.stringify_keys!
+        crop_row(row)
+
+        empty_row.merge(row)
       end
 
       def connection
         ::Clickhouse.connection
       end
+
+      def logger
+        ::Rails.logger
+      end
+
+      private
+
+      def validate_row(row)
+        return if row.is_a?(Hash)
+
+        raise WrongTypeRowError, "#{row.inspect} has wrong type"
+      end
+
+      def crop_row(row)
+        undefined_columns = row.keys - empty_row.keys
+
+        return if undefined_columns.empty?
+
+        logger.warn("Clickhouse: Undefined columns for #{table_name}: #{undefined_columns}")
+        row.except!(*undefined_columns)
+      end
     end
   end
 end

data/spec/table_spec.rb

@@ -45,16 +45,6 @@ describe Clickhouse::Table do
       end
     end
 
-    context 'when row is an array' do
-      # TODO: implement array logic
-      let(:rows) { [['a'], ['2']] }
-
-      it 'raises an error' do
-        expect { CustomTable.insert_rows(rows) }
-          .to raise_error(Clickhouse::Table::WrongTypeRowError)
-      end
-    end
-
     context 'when row has empty attributes' do
       let(:rows) { [{}] }
 
@@ -65,4 +55,25 @@ describe Clickhouse::Table do
       end
     end
   end
+
+  describe '#prepare_row' do
+    subject(:method) { CustomTable.prepare_row(row) }
+
+    context 'when row has wrong type' do
+      # TODO: implement array logic
+      let(:row) { ['a'] }
+
+      it 'raises an error' do
+        expect { method }.to raise_error(Clickhouse::Table::WrongTypeRowError)
+      end
+    end
+
+    context 'when row has extra fields' do
+      let(:row) { { 'field' => 'a', 'extra_field' => 'b' } }
+
+      it 'leaves only existing fields' do
+        is_expected.to eq('field' => 'a')
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-rails
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Vsevolod Avramov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-12 00:00:00.000000000 Z
+date: 2019-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clickhouse