From ce8058743b8252b1df2258121b06e69a0b4f29e4 Mon Sep 17 00:00:00 2001
From: Carlos Silva <me@carlosfsilva.com>
Date: Mon, 14 Oct 2024 12:54:13 -0300
Subject: [PATCH] Fix #96 (Array Quoting) by using correct arel accessor (v2)
 (#98)

---
 lib/torque/postgresql/arel/visitors.rb | 2 +-
 lib/torque/postgresql/version.rb       | 2 +-
 spec/schema.rb                         | 3 ++-
 spec/tests/arel_spec.rb                | 6 ++++++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/lib/torque/postgresql/arel/visitors.rb b/lib/torque/postgresql/arel/visitors.rb
index fdf4e10..b591c3c 100644
--- a/lib/torque/postgresql/arel/visitors.rb
+++ b/lib/torque/postgresql/arel/visitors.rb
@@ -25,7 +25,7 @@ def visit_Arel_Nodes_Quoted(o, collector)
 
         # Allow quoted arrays to get here
         def visit_Arel_Nodes_Casted(o, collector)
-          value = o.respond_to?(:val) ? o.val : o.value
+          value = PostgreSQL::AR610 ? o.value_for_database : o.val
           return super unless value.is_a?(::Enumerable)
           quote_array(value, collector)
         end
diff --git a/lib/torque/postgresql/version.rb b/lib/torque/postgresql/version.rb
index 309f276..e732a03 100644
--- a/lib/torque/postgresql/version.rb
+++ b/lib/torque/postgresql/version.rb
@@ -2,6 +2,6 @@
 
 module Torque
   module PostgreSQL
-    VERSION = '2.4.4'
+    VERSION = '2.4.5'
   end
 end
diff --git a/spec/schema.rb b/spec/schema.rb
index d1b390b..e8f8d19 100644
--- a/spec/schema.rb
+++ b/spec/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-version = 3
+version = 4
 
 return if ActiveRecord::Migrator.current_version == version
 ActiveRecord::Schema.define(version: version) do
@@ -59,6 +59,7 @@
     t.string   "url"
     t.enum     "type", enum_type: :types
     t.enum     "conflicts", enum_type: :conflicts, array: true
+    t.jsonb    "metadata"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
diff --git a/spec/tests/arel_spec.rb b/spec/tests/arel_spec.rb
index 13d7840..fb45dc8 100644
--- a/spec/tests/arel_spec.rb
+++ b/spec/tests/arel_spec.rb
@@ -64,6 +64,12 @@
     it 'does not break jsonb' do
       expect { connection.add_column(:authors, :profile, :jsonb, default: []) }.not_to raise_error
       expect(Author.columns_hash['profile'].default).to eq('[]')
+
+      condition = Author.arel_table['profile'].is_distinct_from([])
+      result = Torque::PostgreSQL::AR610 ? "'[]'" : "ARRAY[]"
+      expect(Author.where(condition).to_sql).to eq(<<~SQL.squish)
+        SELECT "authors".* FROM "authors" WHERE "authors"."profile" IS DISTINCT FROM #{result}
+      SQL
     end
 
     it 'works properly when column is an array' do