Revert "Fix enum support" (#1645)

* Revert "Fix enum support (#1559)"

This reverts commit e06a27d.

* Patch specs

Author: scarroll32

lib/ransack/nodes/condition.rb

@@ -226,7 +226,7 @@ def validated_values
       end
 
       def casted_values_for_attribute(attr)
-        validated_values.map(&:cast_array)
+        validated_values.map { |v| v.cast(predicate.type || attr.type) }
       end
 
       def formatted_values_for_attribute(attr)

lib/ransack/nodes/value.rb

@@ -43,14 +43,6 @@ def cast(type)
         end
       end
 
-      def cast_array
-        if value.is_a?(Array)
-          cast_to_date(value)
-        else
-          value
-        end
-      end
-
       def cast_to_date(val)
         if val.respond_to?(:to_date)
           val.to_date rescue nil

spec/ransack/search_spec.rb

@@ -450,9 +450,6 @@ module Ransack
       let(:people_name_field) {
         "#{quote_table_name("people")}.#{quote_column_name("name")}"
       }
-      let(:people_temperament_field) {
-        "#{quote_table_name("people")}.#{quote_column_name("temperament")}"
-      }
       let(:children_people_name_field) {
         "#{quote_table_name("children_people")}.#{quote_column_name("name")}"
       }
@@ -467,36 +464,6 @@ module Ransack
           children_people_name_field} = 'Ernie'/
       end
 
-      context 'when evaluating enums' do
-        before do
-          Person.take.update_attribute(:temperament, 'choleric')
-        end
-
-        it 'evaluates enum key correctly' do
-          s = Search.new(Person, temperament_eq: 'choleric')
-
-          expect(s.result.to_sql).not_to match /#{
-          people_temperament_field} = 0/
-
-          expect(s.result.to_sql).to match /#{
-          people_temperament_field} = #{Person.temperaments[:choleric]}/
-
-          expect(s.result).not_to be_empty
-        end
-
-        it 'evaluates enum value correctly' do
-          s = Search.new(Person, temperament_eq: Person.temperaments[:choleric])
-
-          expect(s.result.to_sql).not_to match /#{
-          people_temperament_field} = 0/
-
-          expect(s.result.to_sql).to match /#{
-          people_temperament_field} = #{Person.temperaments[:choleric]}/
-
-          expect(s.result).not_to be_empty
-        end
-      end
-
       it 'use appropriate table alias' do
         s = Search.new(Person, {
           name_eq: "person_name_query",

spec/support/schema.rb

@@ -81,8 +81,6 @@ class Person < ApplicationRecord
   scope :sort_by_reverse_name_asc, lambda { order(Arel.sql("REVERSE(name) ASC")) }
   scope :sort_by_reverse_name_desc, lambda { order("REVERSE(name) DESC") }
 
-  enum :temperament, { sanguine: 1, choleric: 2, melancholic: 3, phlegmatic: 4 }
-
   alias_attribute :full_name, :name
 
   ransack_alias :term, :name_or_email
@@ -118,7 +116,7 @@ class Person < ApplicationRecord
       )
   end
 
-  ransacker :sql_literal_id do
+  ransacker :sql_literal_id, type: :integer do
     Arel.sql('people.id')
   end
 
@@ -302,7 +300,6 @@ def self.create
         t.string   :new_start
         t.string   :stop_end
         t.integer  :salary
-        t.integer  :temperament
         t.date     :life_start
         t.boolean  :awesome, default: false
         t.boolean  :terms_and_conditions, default: false