From aba688ed5c3d31cc6337a2c772ea30853fe89a90 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?=
 <rafaelmfranca@gmail.com>
Date: Sat, 9 Nov 2013 17:49:12 -0200
Subject: Avoid shot circuit return.

This will make the conditional and to code clear
---
 .../connection_adapters/postgresql/quoting.rb      | 28 +++++++++++++++-------
 1 file changed, 20 insertions(+), 8 deletions(-)

(limited to 'activerecord')

diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
index e9daa5d7ff..4ee9889dad 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql/quoting.rb
@@ -86,8 +86,11 @@ module ActiveRecord
 
           case value
           when Range
-            return super(value, column) unless /range$/ =~ column.sql_type
-            PostgreSQLColumn.range_to_string(value)
+            if /range$/ =~ column.sql_type
+              PostgreSQLColumn.range_to_string(value)
+            else
+              super(value, column)
+            end
           when NilClass
             if column.array && array_member
               'NULL'
@@ -101,12 +104,18 @@ module ActiveRecord
             when 'point' then PostgreSQLColumn.point_to_string(value)
             when 'json' then PostgreSQLColumn.json_to_string(value)
             else
-              return super(value, column) unless column.array
-              PostgreSQLColumn.array_to_string(value, column, self)
+              if column.array
+                PostgreSQLColumn.array_to_string(value, column, self)
+              else
+                super(value, column)
+              end
             end
           when String
-            return super(value, column) unless 'bytea' == column.sql_type
-            { :value => value, :format => 1 }
+            if 'bytea' == column.sql_type
+              { value: value, format: 1 }
+            else
+              super(value, column)
+            end
           when Hash
             case column.sql_type
             when 'hstore' then PostgreSQLColumn.hstore_to_string(value)
@@ -114,8 +123,11 @@ module ActiveRecord
             else super(value, column)
             end
           when IPAddr
-            return super(value, column) unless ['inet','cidr'].include? column.sql_type
-            PostgreSQLColumn.cidr_to_string(value)
+            if ['inet','cidr'].include? column.sql_type
+              PostgreSQLColumn.cidr_to_string(value)
+            else
+              super(value, column)
+            end
           else
             super(value, column)
           end
-- 
cgit v1.2.3