restrict permitted values for enum columns

h2/src/docsrc/textbase/_messages_en.prop

@@ -9,6 +9,7 @@
 22012=Division by zero: {0}
 22018=Data conversion error converting {0}
 22025=Error in LIKE ESCAPE: {0}
+22030=Value not permitted for column {0}: {1}
 23502=NULL not allowed for column {0}
 23503=Referential integrity constraint violation: {0}
 23505=Unique index or primary key violation: {0}

h2/src/main/org/h2/api/ErrorCode.java

@@ -159,6 +159,19 @@ public class ErrorCode {
      */
     public static final int LIKE_ESCAPE_ERROR_1 = 22025;
 
+    /**
+     * The error with code <code>22030</code> is thrown when
+     * an attempt is made to insert or update an ENUM value,
+     * but the target value is not one of the values permitted
+     * by the column.
+     * Example:
+     * <pre>
+     * CREATE TABLE TEST(ID INT, CASE ENUM('sensitive','insensitive'));
+     * INSERT INTO TEST VALUES(1, 'Hello');
+     * </pre>
+     */
+    public static final int VALUE_NOT_PERMITTED = 22030;
+
     // 23: constraint violation
 
     /**

h2/src/main/org/h2/command/Parser.java

@@ -4136,7 +4136,7 @@ public class Parser {
             if (readIf("(")) {
                 permittedValues.add(readString());
                 while(readIf(","))
-                    readString();
+                    permittedValues.add(readString());
                 read(")");
             }
         } else if (readIf("(")) {

h2/src/main/org/h2/res/_messages_en.prop

@@ -9,6 +9,7 @@
 22012=Division by zero: {0}
 22018=Data conversion error converting {0}
 22025=Error in LIKE ESCAPE: {0}
+22030=Value not permitted for column {0}: {1}
 23502=NULL not allowed for column {0}
 23503=Referential integrity constraint violation: {0}
 23505=Unique index or primary key violation: {0}

h2/src/main/org/h2/res/_messages_es.prop

@@ -9,6 +9,7 @@
 22012=División por cero: {0}
 22018=Conversión de datos fallida, convirtiendo {0}
 22025=Error en LIKE ESCAPE: {0}
+22030=Valor no permitido para la columna {0}: {1}
 23502=La columna {0} no permite valores nulos (NULL)
 23503=Violación de una restricción de Integridad Referencial: {0}
 23505=Violación de indice de Unicidad ó Clave primaria: {0}

h2/src/main/org/h2/table/Column.java

@@ -6,6 +6,7 @@
 package org.h2.table;
 
 import java.sql.ResultSetMetaData;
+import java.util.Iterator;
 import java.util.Set;
 import org.h2.api.ErrorCode;
 import org.h2.command.Parser;
@@ -356,6 +357,16 @@ public class Column {
                         getCreateSQL(), s + " (" + value.getPrecision() + ")");
             }
         }
+        if (permittedValues != null) {
+            if (!value.checkPermitted(permittedValues)) {
+                String s = value.getTraceSQL();
+                if (s.length() > 127) {
+                    s = s.substring(0, 128) + "...";
+                }
+                throw DbException.get(ErrorCode.VALUE_NOT_PERMITTED,
+                        getCreateSQL(), s + " (" + value.getString() + ")");
+            }
+        }
         updateSequenceIfRequired(session, value);
         return value;
     }
@@ -444,6 +455,15 @@ public class Column {
             case Value.DECIMAL:
                 buff.append('(').append(precision).append(", ").append(scale).append(')');
                 break;
+            case Value.ENUM:
+                buff.append('(');
+                Iterator<String> it = permittedValues.iterator();
+                while(it.hasNext()) {
+                    buff.append('\'').append(it.next()).append('\'');
+                    if(it.hasNext()) {
+                        buff.append(',');
+                    }
+                }
             case Value.BYTES:
             case Value.STRING:
             case Value.STRING_IGNORECASE:

h2/src/main/org/h2/value/Value.java

@@ -18,6 +18,7 @@ import java.sql.SQLException;
 import java.sql.Time;
 import java.sql.Timestamp;
 import java.sql.Types;
+import java.util.Set;
 import org.h2.api.ErrorCode;
 import org.h2.engine.Constants;
 import org.h2.engine.SysProperties;
@@ -1129,6 +1130,16 @@ public abstract class Value {
         // nothing to do
     }
 
+    /**
+     * Check to see if this value is one of the given permitted values.
+     *
+     * @param permittedValues the permitted values
+     * @return true if this value is one of the permitted values
+     */
+    public boolean checkPermitted(Set<String> permittedValues) {
+        return permittedValues.contains(getString());
+    }
+
     /**
      * Check if the precision is smaller or equal than the given precision.
      *