Improved MS SQL Server compatibility: support string concatenation using "+".…

Improved MS SQL Server compatibility: support string concatenation using "+". Thanks to Stepan for the patch!

h2/src/docsrc/html/changelog.html

@@ -18,7 +18,9 @@ Change Log
 <h1>Change Log</h1>
 
 <h2>Next Version (unreleased)</h2>
-<ul><li>When using the multi-threaded mode, running ANALYZE concurrently in multiple
+<ul><li>Improved MS SQL Server compatibility: support string concatenation using "+".
+    Thanks to Stepan for the patch!
+</li><li>When using the multi-threaded mode, running ANALYZE concurrently in multiple
     connections could throw an exception.
 </li><li>The MERGE statement is now about 30% faster when using a PreparedStatement.
 </li><li>Multi-column indexes where the second or later column was descending did not always

h2/src/docsrc/html/features.html

@@ -1036,6 +1036,7 @@ or the SQL statement <code>SET MODE HSQLDB</code>.
     smaller than the current scale. Usually, the scale is converted and 0s are added if required.
 </li><li>For unique indexes, <code>NULL</code> is distinct.
     That means only one row with <code>NULL</code> in one of the columns is allowed.
+</li><li>Text can be concatenated using '+'.
 </li></ul>
 
 <h3>MS SQL Server Compatibility Mode</h3>
@@ -1051,6 +1052,7 @@ or the SQL statement <code>SET MODE MSSQLServer</code>.
     That means only one row with <code>NULL</code> in one of the columns is allowed.
 </li><li>Concatenating <code>NULL</code> with another value
     results in the other value.
+</li><li>Text can be concatenated using '+'.
 </li></ul>
 
 <h3>MySQL Compatibility Mode</h3>

h2/src/docsrc/html/roadmap.html

@@ -36,6 +36,7 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>MVCC: select for update should only lock the selected rows.
 </li><li>Option to shutdown all the running servers (on the same VM).
 </li><li>Full outer joins.
+</li><li>Support nested outer joins (see todo.txt).
 </li><li>Automatic collection of statistics (auto ANALYZE; AUTOVACUUM). See http://www.postgresql.org/docs/current/static/routine-vacuuming.html#AUTOVACUUM
 </li><li>Support mixed clustering mode (one embedded, others in server mode).
 </li><li>PostgreSQL catalog: use BEFORE SELECT triggers instead of views over metadata tables.
@@ -54,7 +55,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Rebuild index functionality to shrink index size and improve performance.
 </li><li>Don't use deleteOnExit (bug 4513817: File.deleteOnExit consumes memory).
 </li><li>Console: add accesskey to most important commands (A, AREA, BUTTON, INPUT, LABEL, LEGEND, TEXTAREA).
-</li><li>Support nested outer joins (see todo.txt).
 </li><li>Test performance again with SQL Server, Oracle, DB2.
 </li><li>Test with dbmonster: http://dbmonster.kernelpanic.pl
 </li><li>Test with dbcopy: http://dbcopyplugin.sourceforge.net
@@ -127,7 +127,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Default date format for input and output (local date constants).
 </li><li>Support custom Collators.
 </li><li>Document ROWNUM usage for reports: SELECT ROWNUM, * FROM (subquery).
-</li><li>MS SQL Server compatibility: support string concatenation using +: 1+'2'=3, '1'+'2'='12'
 </li><li>Clustering: when a database is back alive, automatically synchronize with the master.
 </li><li>File system that writes to two file systems (replication, replicating file system).
 </li><li>Standalone tool to get relevant system properties and add it to the trace output.
@@ -477,6 +476,8 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
 </li><li>Optimizer: WHERE X=? AND Y IN(?), it always uses the index on Y. Should be cost based.
 </li><li>Support ALTER SCHEMA name RENAME TO newName (rename schema).
 </li><li>Make the cache scan resistant (currently a small cache is faster than a large cache for large table scans).
+</li><li>Issue 178: Optimizer: index usage when both ascending and descending indexes are available 
+</li><li>Issue 179: Related subqueries in HAVING clause
 </li></ul>
 
 <h2>Not Planned</h2>

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

@@ -103,6 +103,11 @@ public class Mode {
      */
     public boolean uniqueIndexSingleNullExceptAllColumnsAreNull;
 
+    /**
+     * Text can be concatenated using '+'.
+     */
+    public boolean allowPlusForStringConcat;
+
     private String name;
 
     static {
@@ -126,12 +131,14 @@ public class Mode {
         mode.convertOnlyToSmallerScale = true;
         mode.nullConcatIsNull = true;
         mode.uniqueIndexSingleNull = true;
+        mode.allowPlusForStringConcat = true;
         add(mode);
 
         mode = new Mode("MSSQLServer");
         mode.aliasColumnName = true;
         mode.squareBracketQuotedNames = true;
         mode.uniqueIndexSingleNull = true;
+        mode.allowPlusForStringConcat = true;
         add(mode);
 
         mode = new Mode("MySQL");

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

@@ -12,6 +12,7 @@ import org.h2.message.DbException;
 import org.h2.table.ColumnResolver;
 import org.h2.table.TableFilter;
 import org.h2.util.MathUtils;
+import org.h2.value.DataType;
 import org.h2.value.Value;
 import org.h2.value.ValueNull;
 import org.h2.value.ValueString;
@@ -171,9 +172,14 @@ public class Operation extends Expression {
             int l = left.getType();
             int r = right.getType();
             if ((l == Value.NULL && r == Value.NULL) || (l == Value.UNKNOWN && r == Value.UNKNOWN)) {
-                // example: (? + ?) - the most safe data type is probably
-                // decimal
-                dataType = Value.DECIMAL;
+                // (? + ?) - use decimal by default (the most safe data type) or
+                // string when text concatenation with + is enabled
+                if (opType == PLUS && session.getDatabase().getMode().allowPlusForStringConcat) {
+                    dataType = Value.STRING;
+                    opType = CONCAT;
+                } else {
+                    dataType = Value.DECIMAL;
+                }
             } else if (l == Value.DATE || l == Value.TIMESTAMP) {
                 if (r == Value.INT && (opType == PLUS || opType == MINUS)) {
                     // Oracle date add
@@ -198,6 +204,9 @@ public class Operation extends Expression {
                 }
             } else {
                 dataType = Value.getHigherOrder(l, r);
+                if (DataType.isStringType(dataType) && session.getDatabase().getMode().allowPlusForStringConcat) {
+                    opType = CONCAT;
+                }
             }
             break;
         default:
@@ -223,10 +232,10 @@ public class Operation extends Expression {
     public long getPrecision() {
         if (right != null) {
             switch (opType) {
-                case CONCAT:
-                    return left.getPrecision() + right.getPrecision();
-                default:
-                    return Math.max(left.getPrecision(), right.getPrecision());
+            case CONCAT:
+                return left.getPrecision() + right.getPrecision();
+            default:
+                return Math.max(left.getPrecision(), right.getPrecision());
             }
         }
         return left.getPrecision();
@@ -235,10 +244,10 @@ public class Operation extends Expression {
     public int getDisplaySize() {
         if (right != null) {
             switch (opType) {
-                case CONCAT:
-                    return MathUtils.convertLongToInt((long) left.getDisplaySize() + (long) right.getDisplaySize());
-                default:
-                    return Math.max(left.getDisplaySize(), right.getDisplaySize());
+            case CONCAT:
+                return MathUtils.convertLongToInt((long) left.getDisplaySize() + (long) right.getDisplaySize());
+            default:
+                return Math.max(left.getDisplaySize(), right.getDisplaySize());
             }
         }
         return left.getDisplaySize();

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

@@ -925,6 +925,19 @@ public class DataType {
         return false;
     }
 
+    /**
+     * Check if the given value type is a String (VARCHAR,...).
+     *
+     * @param type the value type
+     * @return true if the value type is a String type
+     */
+    public static boolean isStringType(int type) {
+        if (type == Value.STRING || type == Value.STRING_FIXED || type == Value.STRING_IGNORECASE) {
+            return true;
+        }
+        return false;
+    }
+
     /**
      * Check if the given value type supports the add operation.
      *

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

@@ -40,6 +40,7 @@ public class TestCompatibility extends TestBase {
         testUniqueIndexOracle();
         testHsqlDb();
         testMySQL();
+        testPlusSignAsConcatOperator();
 
         conn.close();
         deleteDb("compatibility");
@@ -162,4 +163,49 @@ public class TestCompatibility extends TestBase {
 
     }
 
+    private void testPlusSignAsConcatOperator() throws SQLException {
+        Statement stat = conn.createStatement();
+        stat.execute("SET MODE MSSQLServer");
+        stat.execute("DROP TABLE IF EXISTS TEST");
+        stat.execute("CREATE TABLE TEST(NAME VARCHAR(50), SURNAME VARCHAR(50))");
+        stat.execute("INSERT INTO TEST VALUES('John', 'Doe')");
+        stat.execute("INSERT INTO TEST VALUES('Jack', 'Sullivan')");
+
+        assertResult("abcd123", stat, "SELECT 'abc' + 'd123'");
+
+        assertResult("Doe, John", stat,
+                "SELECT surname + ', ' + name FROM test WHERE SUBSTRING(NAME,1,1)+SUBSTRING(SURNAME,1,1) = 'JD'");
+
+        stat.execute("ALTER TABLE TEST ADD COLUMN full_name VARCHAR(100)");
+        stat.execute("UPDATE TEST SET full_name = name + ', ' + surname");
+        assertResult("John, Doe", stat, "SELECT full_name FROM TEST where name='John'");
+
+        PreparedStatement prep = conn.prepareStatement("INSERT INTO TEST VALUES(?, ?, ? + ', ' + ?)");
+        int ca = 1;
+        prep.setString(ca++, "Paul");
+        prep.setString(ca++, "Frank");
+        prep.setString(ca++, "Paul");
+        prep.setString(ca++, "Frank");
+        prep.executeUpdate();
+        prep.close();
+
+        assertResult("Paul, Frank", stat, "SELECT full_name FROM test WHERE name = 'Paul'");
+
+        prep = conn.prepareStatement("SELECT ? + ?");
+        int cb = 1;
+        prep.setString(cb++, "abcd123");
+        prep.setString(cb++, "d123");
+        prep.executeQuery();
+        prep.close();
+
+        prep = conn.prepareStatement("SELECT full_name FROM test WHERE (SUBSTRING(name, 1, 1) + SUBSTRING(surname, 2, 3)) = ?");
+        prep.setString(1, "Joe");
+        ResultSet res = prep.executeQuery();
+        assertTrue("Result cannot be empty", res.next());
+        assertEquals("John, Doe", res.getString(1));
+        res.close();
+        prep.close();
+
+    }
+
 }

h2/src/tools/org/h2/build/doc/dictionary.txt

@@ -639,4 +639,4 @@ census genealogy scapegoat gov compacted migrating dies typtypmod latch await
 counting dtest fallback infix places formal extern destination stdout memmove
 stdio printf jchar sizeof stdlib jbyte jint uint ujlong typedef jdouble stdint
 jfloat wchar hotspot jvoid std ujint jlong vars jboolean calloc argc strlen
-equivalent synchronizes
\ No newline at end of file
+equivalent synchronizes sullivan surname doe stepan
\ No newline at end of file