rubocop

Author: jamiemccarthy

.rubocop.yml

@@ -25,6 +25,7 @@ Metrics/BlockLength:
   Max: 40
   Exclude:
     - spec/execute_queries_spec.rb
+    - spec/model_select_distinct_spec.rb
     - spec/model_update_arel_10_spec.rb
     - spec/textual_order_raw_spec.rb
 

lib/unreliable/build_order.rb

@@ -11,7 +11,7 @@ def build_order(arel)
 
       adapter_name = Arel::Table.engine.connection.adapter_name
       return unless Unreliable::Config.enabled?
-      return if is_distinct_on_postgres?(arel, adapter_name)
+      return if distinct_on_postgres?(adapter_name)
       return if from_only_internal_metadata?(arel)
       return if from_one_table_with_ordered_pk?(arel)
 
@@ -31,7 +31,7 @@ def build_order(arel)
       end
     end
 
-    def is_distinct_on_postgres?(arel, adapter_name)
+    def distinct_on_postgres?(adapter_name)
       distinct_value && adapter_name == "PostgreSQL"
     end
 

spec/model_select_distinct_spec.rb

@@ -3,19 +3,34 @@
 RSpec.describe Cat do
   it "randomly selects distinctly except on postgres" do
     expect(Cat.distinct.all.to_sql).to end_with(
-      UnreliableTest.find_adapter == "postgresql" ? ' FROM "cats"' : adapter_text("ORDER BY RANDOM()")
+      case UnreliableTest.find_adapter
+      when "postgresql"
+        ' FROM "cats"'
+      else
+        adapter_text("ORDER BY RANDOM()")
+      end
     )
   end
 
   it "randomly selects distinctly from some" do
     expect(Cat.where(name: "foo").distinct.to_sql).to end_with(
-      UnreliableTest.find_adapter == "postgresql" ? %q{ "cats"."name" = 'foo'} : adapter_text("ORDER BY RANDOM()")
+      case UnreliableTest.find_adapter
+      when "postgresql"
+        %q( "cats"."name" = 'foo')
+      else
+        adapter_text("ORDER BY RANDOM()")
+      end
     )
   end
 
   it "adds randomness to existing distinct order" do
     expect(Cat.order(:name).distinct.to_sql).to end_with(
-      UnreliableTest.find_adapter == "postgresql" ? ' ORDER BY "cats"."name" ASC' : adapter_text('ORDER BY "cats"."name" ASC, RANDOM()')
+      case UnreliableTest.find_adapter
+      when "postgresql"
+        ' ORDER BY "cats"."name" ASC'
+      else
+        adapter_text('ORDER BY "cats"."name" ASC, RANDOM()')
+      end
     )
   end