From 3aab77b96e09c57c8fbdb676c2fd165ed67d692e Mon Sep 17 00:00:00 2001
From: nixx <nixx.dj@gmail.com>
Date: Wed, 22 Sep 2021 11:06:53 +0300
Subject: [PATCH] published 0.5.3 - fix replica cluster for a new syntax
 MergeTree

---
 CHANGELOG.md                                               | 7 +++++++
 .../connection_adapters/clickhouse_adapter.rb              | 2 +-
 lib/clickhouse-activerecord/version.rb                     | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10a48ee3..3f519b7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+### Version 0.5.3 (Sep 22, 2021)
+ 
+ * Fix replica cluster for a new syntax MergeTree
+ * Fix support rails 5.2 on alter table
+ * Support array type of column
+ * Support Rails 6.1.0 [@bdevel](https://github.com/bdevel)
+
 ### Version 0.4.10 (Mar 10, 2021)
 
  * Support ClickHouse 20.9+
diff --git a/lib/active_record/connection_adapters/clickhouse_adapter.rb b/lib/active_record/connection_adapters/clickhouse_adapter.rb
index cd8e9e3c..7c5d114f 100644
--- a/lib/active_record/connection_adapters/clickhouse_adapter.rb
+++ b/lib/active_record/connection_adapters/clickhouse_adapter.rb
@@ -371,7 +371,7 @@ def connect
 
       def apply_replica(table, options)
         if replica && cluster && options[:options]
-          match = options[:options].match(/^(.*?MergeTree)\(([^\)]*)\)(.*?)$/)
+          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]}"
           end
diff --git a/lib/clickhouse-activerecord/version.rb b/lib/clickhouse-activerecord/version.rb
index 2d54a79f..151cd158 100644
--- a/lib/clickhouse-activerecord/version.rb
+++ b/lib/clickhouse-activerecord/version.rb
@@ -1,3 +1,3 @@
 module ClickhouseActiverecord
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end