clickhouse-activerecord 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33b7616478a348a6d6cb1566fbf48bf5e1bad4f0dbb72269eb9befd851416121
-  data.tar.gz: d6479be11b4f06096e7fdf24bb75742e1ac2381e671918088ca05f83960bd6a9
+  metadata.gz: 419c50a4b99b183f729939034e8f6b671bf899fb0ef93fc97f105798fa437aa1
+  data.tar.gz: 7508a2ed443d64565ca6b1f5af48bf076cf40d2eae91fd3c3187cae05371a864
 SHA512:
-  metadata.gz: dc19098e7e42c154e6255a90e6abf4e46d4546658c8db1b8ade27caa3e73e3fb29636e64c05c3160522a9bdd8c12f95b515300a637453e05a520a6d92746b248
-  data.tar.gz: 64c7023e7cc381696a6f97ae8fa3b5ed20cdf6d971bc7f852a8403895ce62d0274fddc3325978f6d733b086e322967c7b827e94bc10e09da364fc7fd040081fe
+  metadata.gz: 8e8607fa219f6e17e22a3029ba564e6d3d6d2bd39cf86f639d277a6e83fe2ffb1a47e93fceb8d20c4de6a7e9679f8a15b40ee744bfa445be14e6e0693dde4a0e
+  data.tar.gz: 5e58b79aab91a64387dc74821a75710c70738791227084a3a6ce29e72827a40e0458d48643a99c14b6d2dc6c94bbed8672d31051d7501084aa3a7e0bc27ef6a1

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### Version 1.1.2 (Aug 27, 2024)
+* 🎉 Support for rails 7.2 #156
+* Add method `views` for getting table `View` list in #152
+* Add support for Map datatype in #144
+* Add support window named functions
+* Fix schema dumper default values for number
+* Normalize table name in schema dump in #148
+* Noop savepoint functionality in #150
+* Fix `#find_by` in #153
+* Add RSpec configure
+* Fix detect model primary key
+
 ### Version 1.0.7 (Apr 27, 2024)
 
 * Support table indexes

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

@@ -6,11 +6,11 @@ module ActiveRecord
 
         module ClassMethods # :nodoc:
           def quote_column_name(name)
-            name
+            name.to_s.include?('.') ? "`#{name}`" : name.to_s
           end
 
           def quote_table_name(name)
-            name
+            name.to_s
           end
         end
       end

data/lib/active_record/connection_adapters/clickhouse_adapter.rb

@@ -47,7 +47,7 @@ module ActiveRecord
 
   module ModelSchema
     module ClassMethods
-      delegate :final, :final!, :settings, :settings!, to: :all
+      delegate :final, :final!, :settings, :settings!, :window, :window!, to: :all
 
       def is_view
         @is_view || false
@@ -142,6 +142,11 @@ module ActiveRecord
         connect
       end
 
+      # Return ClickHouse server version
+      def server_version
+        @server_version ||= do_system_execute('SELECT version()')['data'][0][0]
+      end
+
       # Savepoints are not supported, noop
       def create_savepoint(name)
       end
@@ -276,10 +281,15 @@ module ActiveRecord
 
       # SCHEMA STATEMENTS ========================================
 
-      def primary_key(table_name) #:nodoc:
+      def primary_keys(table_name)
+        if server_version.to_f >= 23.4
+          structure = do_system_execute("SHOW COLUMNS FROM `#{table_name}`")
+          return structure['data'].select {|m| m[3]&.include?('PRI') }.pluck(0)
+        end
+
         pk = table_structure(table_name).first
-        return 'id' if pk.present? && pk[0] == 'id'
-        false
+        return ['id'] if pk.present? && pk[0] == 'id'
+        []
       end
 
       def create_schema_dumper(options) # :nodoc:

data/lib/arel/visitors/clickhouse.rb

@@ -74,6 +74,14 @@ module Arel
         infix_value o, collector, op
       end
 
+      def visit_Arel_Nodes_Rows(o, collector)
+        if o.expr.is_a?(String)
+          collector << "ROWS #{o.expr}"
+        else
+          super
+        end
+      end
+
       def sanitize_as_setting_value(value)
         if value == :default
           'DEFAULT'

data/lib/clickhouse-activerecord/schema_dumper.rb

@@ -54,16 +54,11 @@ module ClickhouseActiverecord
             tbl.print ', materialized: true' if match && match[1].presence
           end
 
-          case pk
-          when String
-            tbl.print ", primary_key: #{pk.inspect}" unless pk == "id"
-            pkcol = columns.detect { |c| c.name == pk }
-            pkcolspec = column_spec_for_primary_key(pkcol)
-            if pkcolspec.present?
-              tbl.print ", #{format_colspec(pkcolspec)}"
+          if (id = columns.detect { |c| c.name == 'id' })
+            spec = column_spec_for_primary_key(id)
+            if spec.present?
+              tbl.print ", #{format_colspec(spec)}"
             end
-          when Array
-            tbl.print ", primary_key: #{pk.inspect}"
           else
             tbl.print ", id: false"
           end

data/lib/clickhouse-activerecord/version.rb

@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '1.1.1'
+  VERSION = '1.1.3'
 end

data/lib/core_extensions/active_record/relation.rb

@@ -64,6 +64,23 @@ module CoreExtensions
         self
       end
 
+      # Windows functions let you perform calculations across a set of rows that are related to the current row. For example:
+      #
+      #   users = User.window('x', order: 'date', partition: 'name', rows: 'UNBOUNDED PRECEDING').select('sum(value) OVER x')
+      #   # SELECT sum(value) OVER x FROM users WINDOW x AS (PARTITION BY name ORDER BY date ROWS UNBOUNDED PRECEDING)
+      #
+      # @param [String] name
+      # @param [Hash] opts
+      def window(name, **opts)
+        spawn.window!(name, **opts)
+      end
+
+      def window!(name, **opts)
+        @values[:windows] = [] unless @values[:windows]
+        @values[:windows] << [name, opts]
+        self
+      end
+
       private
 
       def check_command(cmd)
@@ -80,6 +97,7 @@ module CoreExtensions
         arel.final! if @values[:final].present?
         arel.settings(@values[:settings]) if @values[:settings].present?
         arel.using(@values[:using]) if @values[:using].present?
+        arel.windows(@values[:windows]) if @values[:windows].present?
 
         arel
       end

data/lib/core_extensions/arel/select_manager.rb

@@ -13,6 +13,18 @@ module CoreExtensions
         self
       end
 
+      # @param [Array] windows
+      def windows(windows)
+        @ctx.windows = windows.map do |name, opts|
+          # https://github.com/rails/rails/blob/main/activerecord/test/cases/arel/select_manager_test.rb#L790
+          window = ::Arel::Nodes::NamedWindow.new(name)
+          opts.each do |key, value|
+            window.send(key, value)
+          end
+          window
+        end
+      end
+
       def using(*exprs)
         @ctx.source.right.last.right = ::Arel::Nodes::Using.new(::Arel.sql(exprs.join(',')))
         self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: clickhouse-activerecord
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 platform: ruby
 authors:
 - Sergey Odintsov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-19 00:00:00.000000000 Z
+date: 2024-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler