Auto validate underlying enum value in pg_auto_validate_enums

Otherwise, if the column method is overridden to return an
invalid enum value, there can be a false positive when saving.

Author: jeremyevans

lib/sequel/plugins/pg_auto_validate_enums.rb

@@ -29,16 +29,17 @@ def self.apply(model, opts=OPTS)
 
       # Load the pg_enum extension into the database, and reload the schema
       # if it is already loaded. The opts given are used for the validates_includes
-      # validations (with allow_nil: true enabled by default, to avoid issues with
-      # nullable enum columns).
+      # validations (with allow_nil: true and from: :values enabled by default,
+      # to avoid issues with nullable enum columns and cases where the column
+      # method has been overridden.
       def self.configure(model, opts=OPTS)
         model.instance_exec do
           db.extension(:pg_enum) unless @db.instance_variable_get(:@enum_labels)
           if @db_schema
             get_db_schema(true)
             _get_pg_pg_auto_validate_enums_metadata
           end
-          @pg_auto_validate_enums_opts = {allow_nil: true}.merge!(opts).freeze
+          @pg_auto_validate_enums_opts = {allow_nil: true, from: :values}.merge!(opts).freeze
         end
       end
 

spec/extensions/pg_auto_validate_enums_spec.rb

@@ -24,6 +24,12 @@ def @db.schema(table, *)
     @o.errors.must_equal({:c => ['is not in range or set: ["a", "b", "test"]']})
   end
 
+  it "validates underlying enum value, not method return value" do
+    @o.c = "a"
+    def @o.c; "invalid" end
+    @o.valid?.must_equal true
+  end
+
   it "treats plugin options as validates_includes options for validations" do
     @c.plugin :pg_auto_validate_enums, :message=>"is not valid"
     @o.c = "c"
@@ -61,8 +67,8 @@ def @db.schema(table, *)
   end
 
   it "exposes options in .pg_auto_validate_enums_opts" do
-    @c.pg_auto_validate_enums_opts.must_equal(:allow_nil => true)
+    @c.pg_auto_validate_enums_opts.must_equal(:allow_nil => true, :from => :values)
     @c.plugin :pg_auto_validate_enums, :message=>"is not valid"
-    @c.pg_auto_validate_enums_opts.must_equal(:allow_nil => true, :message => "is not valid")
+    @c.pg_auto_validate_enums_opts.must_equal(:allow_nil => true, :message => "is not valid", :from => :values)
   end
 end