clickhouse-activerecord 0.3.5 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7b2fb3282fdff192d0cec9cb19a68ba70d02d83
-  data.tar.gz: 50dea626b278f9ac8a33ea95d300a5d440fa229a
+  metadata.gz: 1d313720b1a43f19f51e6fa9e88ef40d136130e9
+  data.tar.gz: e82dbfb65bd38fa50df9304690bd116eef021a70
 SHA512:
-  metadata.gz: 06a3b3ae02ca8e2e60974109f1ead35743340b8e12beefa28134cadeeff4df753db044da60e25af007a5e14abda14695fc1725d5b86aa5432dce7f642d2004ab
-  data.tar.gz: 9d8215272de3a2b9c0bc2d4671cc22d769acdf1e3f8c32ea8d685c28a32be5838bb28dc7c77a8c4bbdaa7960df1537bf0aad7f8db7571c07793c85a64fbcb696
+  metadata.gz: 8fed861c69428580cddb00c79656ac7614bd26f5c47cdc0a6e4378b0578f4935aec86430b5523f599a97753be329482a8e766471b505d1fd04961ad98ac0415f
+  data.tar.gz: 581d95bdc952a7be4d5645ea0948011f7c67ca6b145c3607774a9770997382fa36279b6029b4128d43909948658b956db64d0d185351eee1f6f756cbaa36bd7c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### Version 0.3.6 (Sep 2, 2019)
+
+ * Support Rails 6.0
+ * Fix relation `last` method
+
 ### Version 0.3.4 (Jun 28, 2019)
 
  * Fix DateTime sql format without microseconds for Rails 5.2 

data/README.md

@@ -105,7 +105,7 @@ ActionView.maximum(:date)
 
 Donations to this project are going directly to [PNixx](https://github.com/PNixx), the original author of this project:
 
-* BTC address: `1Lx2gaJtzfF2dxGFxB65YtY5kNY9xUi6ia`
+* BTC address: `1H3rhpf7WEF5JmMZ3PVFMQc7Hm29THgUfN`
 * ETH address: `0x6F094365A70fe7836A633d2eE80A1FA9758234d5`
 * XMR address: `42gP71qLB5M43RuDnrQ3vSJFFxis9Kw9VMURhpx9NLQRRwNvaZRjm2TFojAMC8Fk1BQhZNKyWhoyJSn5Ak9kppgZPjE17Zh`
 

data/clickhouse-activerecord.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_runtime_dependency 'bundler', '~> 1.13', '>= 1.13.4'
-  spec.add_runtime_dependency 'activerecord', '~> 5.2'
+  spec.add_runtime_dependency 'bundler', '>= 1.13.4'
+  spec.add_runtime_dependency 'activerecord', '>= 5.2'
 
   spec.add_development_dependency 'bundler', '~> 1.15'
   spec.add_development_dependency 'rake', '~> 10.0'

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

@@ -130,7 +130,11 @@ module ActiveRecord
           default = field[3]
           default_value = extract_value_from_default(default)
           default_function = extract_default_function(default_value, default)
-          ClickhouseColumn.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), table_name, default_function)
+          if ActiveRecord::version >= Gem::Version.new('6')
+            ClickhouseColumn.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), default_function)
+          else
+            ClickhouseColumn.new(field[0], default_value, type_metadata, field[1].include?('Nullable'), table_name, default_function)
+          end
         end
 
         protected

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -2,7 +2,6 @@
 
 require 'clickhouse-activerecord/arel/visitors/to_sql'
 require 'clickhouse-activerecord/arel/table'
-require 'active_record/connection_adapters/abstract_adapter'
 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'
@@ -31,6 +30,21 @@ module ActiveRecord
     end
   end
 
+  class Relation
+
+    # Replace for only ClickhouseAdapter
+    def reverse_order!
+      orders = order_values.uniq
+      orders.reject!(&:blank?)
+      if self.connection.is_a?(ConnectionAdapters::ClickhouseAdapter) && orders.empty? && !primary_key
+        self.order_values = %w(date created_at).select {|c| column_names.include?(c) }.map{|c| arel_attribute(c).desc }
+      else
+        self.order_values = reverse_sql_order(orders)
+      end
+      self
+    end
+  end
+
   module TypeCaster
     class Map
       def is_view
@@ -84,7 +98,11 @@ module ActiveRecord
         @config = config
         @debug = debug
 
-        @prepared_statements = false
+        if ActiveRecord::version >= Gem::Version.new('6')
+          @prepared_statement_status = Concurrent::ThreadLocalVar.new(false)
+        else
+          @prepared_statements = false
+        end
 
         connect
       end
@@ -145,7 +163,11 @@ module ActiveRecord
       end
 
       def column_name_for_operation(operation, node) # :nodoc:
-        column_name_from_arel_node(node)
+        if ActiveRecord::version >= Gem::Version.new('6')
+          visitor.compile(node)
+        else
+          column_name_from_arel_node(node)
+        end
       end
 
       # Executes insert +sql+ statement in the context of this connection using

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.3.5'
+  VERSION = '0.3.8'
 end

metadata

@@ -1,22 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.8
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-07-01 00:00:00.000000000 Z
+date: 2019-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.13.4
@@ -24,9 +21,6 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.13.4
@@ -34,14 +28,14 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '5.2'
 - !ruby/object:Gem::Dependency