Merge pull request #1202 from katzyn/compatibility

Use MySQL-compatible conversion between CHAR and BINARY in MySQL mode (part 2)

h2/src/main/org/h2/command/dml/SelectUnion.java

@@ -10,6 +10,7 @@ import java.util.HashSet;
 
 import org.h2.api.ErrorCode;
 import org.h2.command.CommandInterface;
+import org.h2.engine.Mode;
 import org.h2.engine.Session;
 import org.h2.engine.SysProperties;
 import org.h2.expression.Expression;
@@ -140,9 +141,10 @@ public class SelectUnion extends Query {
             // for the value hash set
             newValues = new Value[columnCount];
         }
+        Mode mode = session.getDatabase().getMode();
         for (int i = 0; i < columnCount; i++) {
             Expression e = expressions.get(i);
-            newValues[i] = values[i].convertTo(e.getType());
+            newValues[i] = values[i].convertTo(e.getType(), -1, mode);
         }
         return newValues;
     }

h2/src/main/org/h2/engine/FunctionAlias.java

@@ -410,8 +410,9 @@ public class FunctionAlias extends SchemaObjectBase {
                             paramClass.getComponentType(), array.length);
                     int componentType = DataType.getTypeFromClass(
                             paramClass.getComponentType());
+                    Mode mode = session.getDatabase().getMode();
                     for (int i = 0; i < objArray.length; i++) {
-                        objArray[i] = array[i].convertTo(componentType).getObject();
+                        objArray[i] = array[i].convertTo(componentType, -1, mode).getObject();
                     }
                     o = objArray;
                 } else {

h2/src/main/org/h2/expression/Comparison.java

@@ -9,6 +9,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import org.h2.api.ErrorCode;
 import org.h2.engine.Database;
+import org.h2.engine.Mode;
 import org.h2.engine.Session;
 import org.h2.engine.SysProperties;
 import org.h2.index.IndexCondition;
@@ -276,8 +277,9 @@ public class Comparison extends Condition {
             l = l.convertToEnum(enumerators);
             r = r.convertToEnum(enumerators);
         } else {
-            l = l.convertTo(dataType);
-            r = r.convertTo(dataType);
+            Mode mode = database.getMode();
+            l = l.convertTo(dataType, -1, mode);
+            r = r.convertTo(dataType, -1, mode);
         }
         boolean result = compareNotNull(database, l, r, compareType);
         return ValueBoolean.get(result);

h2/src/main/org/h2/expression/ConditionIn.java

@@ -53,7 +53,7 @@ public class ConditionIn extends Condition {
             if (r == ValueNull.INSTANCE) {
                 hasNull = true;
             } else {
-                r = r.convertTo(l.getType());
+                r = r.convertTo(l.getType(), -1, database.getMode());
                 result = Comparison.compareNotNull(database, l, r, Comparison.EQUAL);
                 if (result) {
                     break;

h2/src/main/org/h2/expression/ConditionInConstantSet.java

@@ -7,6 +7,9 @@ package org.h2.expression;
 
 import java.util.ArrayList;
 import java.util.TreeSet;
+
+import org.h2.engine.Database;
+import org.h2.engine.Mode;
 import org.h2.engine.Session;
 import org.h2.index.IndexCondition;
 import org.h2.message.DbException;
@@ -42,10 +45,12 @@ public class ConditionInConstantSet extends Condition {
             ArrayList<Expression> valueList) {
         this.left = left;
         this.valueList = valueList;
-        this.valueSet = new TreeSet<>(session.getDatabase().getCompareMode());
+        Database database = session.getDatabase();
+        this.valueSet = new TreeSet<>(database.getCompareMode());
         int type = left.getType();
+        Mode mode = database.getMode();
         for (Expression expression : valueList) {
-            valueSet.add(expression.getValue(session).convertTo(type));
+            valueSet.add(expression.getValue(session).convertTo(type, -1, mode));
         }
     }
 
@@ -153,7 +158,7 @@ public class ConditionInConstantSet extends Condition {
         if (add != null) {
             if (add.isConstant()) {
                 valueList.add(add);
-                valueSet.add(add.getValue(session).convertTo(left.getType()));
+                valueSet.add(add.getValue(session).convertTo(left.getType(), -1, session.getDatabase().getMode()));
                 return this;
             }
         }

h2/src/main/org/h2/expression/ConditionInParameter.java

@@ -89,7 +89,7 @@ public class ConditionInParameter extends Condition {
                 if (r == ValueNull.INSTANCE) {
                     hasNull = true;
                 } else {
-                    r = r.convertTo(l.getType());
+                    r = r.convertTo(l.getType(), -1, database.getMode());
                     result = Comparison.compareNotNull(database, l, r, Comparison.EQUAL);
                     if (result) {
                         break;
@@ -100,7 +100,7 @@ public class ConditionInParameter extends Condition {
             if (value == ValueNull.INSTANCE) {
                 hasNull = true;
             } else {
-                value = value.convertTo(l.getType());
+                value = value.convertTo(l.getType(), -1, database.getMode());
                 result = Comparison.compareNotNull(database, l, value, Comparison.EQUAL);
             }
         }

h2/src/main/org/h2/expression/ConditionInSelect.java

@@ -53,7 +53,7 @@ public class ConditionInSelect extends Condition {
         } else if (l == ValueNull.INSTANCE) {
             return l;
         }
-        if (!session.getDatabase().getSettings().optimizeInSelect) {
+        if (!database.getSettings().optimizeInSelect) {
             return getValueSlow(rows, l);
         }
         if (all || (compareType != Comparison.EQUAL &&
@@ -64,7 +64,7 @@ public class ConditionInSelect extends Condition {
         if (dataType == Value.NULL) {
             return ValueBoolean.FALSE;
         }
-        l = l.convertTo(dataType);
+        l = l.convertTo(dataType, -1, database.getMode());
         if (rows.containsDistinct(new Value[] { l })) {
             return ValueBoolean.TRUE;
         }

h2/src/main/org/h2/expression/Function.java

@@ -882,8 +882,8 @@ public class Function extends Expression implements FunctionCall {
             break;
         case CAST:
         case CONVERT: {
-            v0 = v0.convertTo(dataType);
             Mode mode = database.getMode();
+            v0 = v0.convertTo(dataType, -1, mode);
             v0 = v0.convertScale(mode.convertOnlyToSmallerScale, scale);
             v0 = v0.convertPrecision(getPrecision(), false);
             result = v0;
@@ -1078,7 +1078,7 @@ public class Function extends Expression implements FunctionCall {
     }
 
     private Value convertResult(Value v) {
-        return v.convertTo(dataType);
+        return v.convertTo(dataType, -1, database.getMode());
     }
 
     private static boolean cancelStatement(Session session, int targetSessionId) {

h2/src/main/org/h2/expression/Operation.java

@@ -109,21 +109,21 @@ public class Operation extends Expression {
 
     @Override
     public Value getValue(Session session) {
-        Value l = left.getValue(session).convertTo(dataType);
+        Mode mode = session.getDatabase().getMode();
+        Value l = left.getValue(session).convertTo(dataType, -1, mode);
         Value r;
         if (right == null) {
             r = null;
         } else {
             r = right.getValue(session);
             if (convertRight) {
-                r = r.convertTo(dataType);
+                r = r.convertTo(dataType, -1, mode);
             }
         }
         switch (opType) {
         case NEGATE:
             return l == ValueNull.INSTANCE ? l : l.negate();
         case CONCAT: {
-            Mode mode = session.getDatabase().getMode();
             if (l == ValueNull.INSTANCE) {
                 if (mode.nullConcatIsNull) {
                     return ValueNull.INSTANCE;

h2/src/main/org/h2/index/HashIndex.java

@@ -77,7 +77,7 @@ public class HashIndex extends BaseIndex {
          * case we need to convert, otherwise the ValueHashMap will not find the
          * result.
          */
-        v = v.convertTo(tableData.getColumn(indexColumn).getType());
+        v = v.convertTo(tableData.getColumn(indexColumn).getType(), -1, database.getMode());
         Row result;
         Long pos = rows.get(v);
         if (pos == null) {

h2/src/main/org/h2/index/NonUniqueHashIndex.java

@@ -101,7 +101,7 @@ public class NonUniqueHashIndex extends BaseIndex {
          * case we need to convert, otherwise the ValueHashMap will not find the
          * result.
          */
-        v = v.convertTo(tableData.getColumn(indexColumn).getType());
+        v = v.convertTo(tableData.getColumn(indexColumn).getType(), -1, database.getMode());
         ArrayList<Long> positions = rows.get(v);
         return new NonUniqueHashCursor(session, tableData, positions);
     }

h2/src/main/org/h2/jdbc/JdbcPreparedStatement.java

@@ -562,7 +562,7 @@ public class JdbcPreparedStatement extends JdbcStatement implements
                 setParameter(parameterIndex, ValueNull.INSTANCE);
             } else {
                 Value v = DataType.convertToValue(conn.getSession(), x, type);
-                setParameter(parameterIndex, v.convertTo(type));
+                setParameter(parameterIndex, v.convertTo(type, -1, conn.getMode()));
             }
         } catch (Exception e) {
             throw logAndConvert(e);

h2/src/main/org/h2/mvstore/db/MVSecondaryIndex.java

@@ -322,7 +322,7 @@ public final class MVSecondaryIndex extends BaseIndex implements MVIndex {
             int idx = c.getColumnId();
             Value v = r.getValue(idx);
             if (v != null) {
-                array[i] = v.convertTo(c.getType(), -1, null, null, c.getEnumerators());
+                array[i] = v.convertTo(c.getType(), -1, null, database.getMode(), c.getEnumerators());
             }
         }
         array[keyColumns - 1] = ValueLong.get(r.getKey());

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

@@ -18,6 +18,7 @@ import org.h2.command.dml.AllColumnsForPlan;
 import org.h2.constraint.Constraint;
 import org.h2.engine.Constants;
 import org.h2.engine.DbObject;
+import org.h2.engine.Mode;
 import org.h2.engine.Right;
 import org.h2.engine.Session;
 import org.h2.engine.UndoLogRecord;
@@ -1214,8 +1215,9 @@ public abstract class Table extends SchemaObjectBase {
             a = a.convertToEnum(enumerators);
             b = b.convertToEnum(enumerators);
         } else {
-            a = a.convertTo(dataType);
-            b = b.convertTo(dataType);
+            Mode mode = database.getMode();
+            a = a.convertTo(dataType, -1, mode);
+            b = b.convertTo(dataType, -1, mode);
         }
         return a.compareTypeSafe(b, compareMode);
     }

h2/src/test/org/h2/test/db/TestCompatibility.java

@@ -325,6 +325,13 @@ public class TestCompatibility extends TestBase {
         prep.setBytes(1, bytes);
         assertEquals(1, prep.executeUpdate());
         testMySQLBytesCheck(stat, string, bytes);
+        prep = conn.prepareStatement("SELECT C FROM TEST2 WHERE C = ?");
+        prep.setBytes(1, bytes);
+        testMySQLBytesCheck(prep.executeQuery(), string, bytes);
+        stat.execute("CREATE INDEX TEST2_C ON TEST2(C)");
+        prep = conn.prepareStatement("SELECT C FROM TEST2 WHERE C = ?");
+        prep.setBytes(1, bytes);
+        testMySQLBytesCheck(prep.executeQuery(), string, bytes);
         stat.execute("DROP TABLE TEST2");
 
         if (config.memory) {
@@ -415,8 +422,10 @@ public class TestCompatibility extends TestBase {
     }
 
     private void testMySQLBytesCheck(Statement stat, String string, byte[] bytes) throws SQLException {
-        ResultSet rs;
-        rs = stat.executeQuery("SELECT C FROM TEST2");
+        testMySQLBytesCheck(stat.executeQuery("SELECT C FROM TEST2"), string, bytes);
+    }
+
+    private void testMySQLBytesCheck(ResultSet rs, String string, byte[] bytes) throws SQLException {
         assertTrue(rs.next());
         assertEquals(string, rs.getString(1));
         assertEquals(bytes, rs.getBytes(1));