Merge pull request #1519 from katzyn/enum

Fix ValueEnumBase.getSQL()

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #1518: ENUM and VIEW with filtering on enum column
+</li>
 <li>Issue #1516: Array element reference array[index] should be 1-based
 </li>
 <li>Issue #1512: TestMVTableEngine.testLowRetentionTime(): NPE in VersionedValue.Type

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

@@ -9,6 +9,7 @@ import java.sql.PreparedStatement;
 import java.sql.SQLException;
 
 import org.h2.engine.Mode;
+import org.h2.util.StringUtils;
 
 /**
  * Base implementation of the ENUM data type.
@@ -94,7 +95,7 @@ public class ValueEnumBase extends Value {
 
     @Override
     public String getSQL() {
-        return getString();
+        return StringUtils.quoteStringSQL(label);
     }
 
     @Override

h2/src/test/org/h2/test/scripts/datatypes/enum.sql

@@ -277,3 +277,12 @@ DROP TABLE TEST;
 
 SELECT CAST (2 AS ENUM('a', 'b', 'c', 'd'));
 >> c
+
+CREATE TABLE TEST(E ENUM('a', 'b'));
+> ok
+
+EXPLAIN SELECT * FROM TEST WHERE E = 'a';
+>> SELECT TEST.E FROM PUBLIC.TEST /* PUBLIC.TEST.tableScan */ WHERE E = 'a'
+
+DROP TABLE TEST;
+> ok