Merge pull request #67 from JuzerShakir/active_record_union

Remove `active_record_union` dependency
JuzerShakir · Dec 19, 2024 · 3c4ed71 · 3c4ed71
2 parents 786b832 + 5bd2935
commit 3c4ed71
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -5,7 +5,6 @@ ruby "~> 3.3.6"
 
 gem "rails", "~> 8.0.1"
 
-gem "active_record_union", github: "brianhempel/active_record_union", branch: "master"
 gem "bcrypt", "~> 3.1.20"
 gem "bootsnap", require: false
 gem "cancancan", "~> 3.6.1"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,11 +1,3 @@
-GIT
-  remote: https://github.com/brianhempel/active_record_union.git
-  revision: 8ebe558709aabe039abd24e3e7dd4d4354a6de88
-  branch: master
-  specs:
-    active_record_union (1.3.0)
-      activerecord (>= 6.0)
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -401,7 +393,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  active_record_union!
   bcrypt (~> 3.1.20)
   bootsnap
   brakeman

diff --git a/app/models/concerns/active_record_relation_extensions.rb b/app/models/concerns/active_record_relation_extensions.rb
@@ -0,0 +1,8 @@
+module ActiveRecordRelationExtensions
+  refine ActiveRecord::Relation do
+    def union(q)
+      union_query = Arel::Nodes::Union.new(arel, q.arel).as(klass.table_name)
+      klass.from(union_query)
+    end
+  end
+end
diff --git a/app/models/sabeel.rb b/app/models/sabeel.rb
@@ -27,6 +27,7 @@ def sluggables = [its]
   include ITSValidation
   include NameValidation
 
+  using ActiveRecordRelationExtensions
   using ArrayExtensions
 
   # * Enums

diff --git a/app/models/thaali.rb b/app/models/thaali.rb
@@ -23,6 +23,7 @@ class Thaali < ApplicationRecord
 
   def sluggables = [year, number]
 
+  using ActiveRecordRelationExtensions
   using ArrayExtensions
 
   # * Enums