Merge branch 'master' of https://github.com/h2database/h2database

h2/src/docsrc/html/changelog.html

@@ -24,6 +24,8 @@ Change Log
 <li>For compatibility with other databases, support for (double and float)
     -0.0 has been removed. 0.0 is used instead.
 </li>
+<li>Fix for #134, Column name with a # character. Patch by bradmesserle.
+</li>
 <li>In version 1.4.186, "order by" was broken in some cases
     due to the change "Make the planner use indexes for sorting when doing a GROUP BY".
     The change was reverted.

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

@@ -14,7 +14,6 @@ import java.nio.charset.Charset;
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.HashSet;
-
 import org.h2.api.ErrorCode;
 import org.h2.api.Trigger;
 import org.h2.command.ddl.AlterIndexRename;
@@ -3573,6 +3572,11 @@ public class Parser {
             case '_':
                 type = CHAR_NAME;
                 break;
+            case '#':
+                if (database.getMode().supportPoundSymbolForColumnNames) {
+                    type = CHAR_NAME;
+                    break;
+                }
             default:
                 if (c >= 'a' && c <= 'z') {
                     if (identifiersToUpper) {

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

@@ -382,42 +382,42 @@ public class ConnectionInfo implements Cloneable {
      * @return the database name
      */
     public String getName() {
-        if (persistent) {
-            if (nameNormalized == null) {
-                if (!SysProperties.IMPLICIT_RELATIVE_PATH) {
-                    if (!FileUtils.isAbsolute(name)) {
-                        if (name.indexOf("./") < 0 &&
-                                name.indexOf(".\\") < 0 &&
-                                name.indexOf(":/") < 0 &&
-                                name.indexOf(":\\") < 0) {
-                            // the name could start with "./", or
-                            // it could start with a prefix such as "nio:./"
-                            // for Windows, the path "\test" is not considered
-                            // absolute as the drive letter is missing,
-                            // but we consider it absolute
-                            throw DbException.get(
-                                    ErrorCode.URL_RELATIVE_TO_CWD,
-                                    originalURL);
-                        }
+        if (!persistent) {
+        	return name;
+        }
+        if (nameNormalized == null) {
+            if (!SysProperties.IMPLICIT_RELATIVE_PATH) {
+                if (!FileUtils.isAbsolute(name)) {
+                    if (name.indexOf("./") < 0 &&
+                            name.indexOf(".\\") < 0 &&
+                            name.indexOf(":/") < 0 &&
+                            name.indexOf(":\\") < 0) {
+                        // the name could start with "./", or
+                        // it could start with a prefix such as "nio:./"
+                        // for Windows, the path "\test" is not considered
+                        // absolute as the drive letter is missing,
+                        // but we consider it absolute
+                        throw DbException.get(
+                                ErrorCode.URL_RELATIVE_TO_CWD,
+                                originalURL);
                     }
                 }
-                String suffix = Constants.SUFFIX_PAGE_FILE;
-                String n;
-                if (FileUtils.exists(name + suffix)) {
-                    n = FileUtils.toRealPath(name + suffix);
-                } else {
-                    suffix = Constants.SUFFIX_MV_FILE;
-                    n = FileUtils.toRealPath(name + suffix);
-                }
-                String fileName = FileUtils.getName(n);
-                if (fileName.length() < suffix.length() + 1) {
-                    throw DbException.get(ErrorCode.INVALID_DATABASE_NAME_1, name);
-                }
-                nameNormalized = n.substring(0, n.length() - suffix.length());
             }
-            return nameNormalized;
+            String suffix = Constants.SUFFIX_PAGE_FILE;
+            String n;
+            if (FileUtils.exists(name + suffix)) {
+                n = FileUtils.toRealPath(name + suffix);
+            } else {
+                suffix = Constants.SUFFIX_MV_FILE;
+                n = FileUtils.toRealPath(name + suffix);
+            }
+            String fileName = FileUtils.getName(n);
+            if (fileName.length() < suffix.length() + 1) {
+                throw DbException.get(ErrorCode.INVALID_DATABASE_NAME_1, name);
+            }
+            nameNormalized = n.substring(0, n.length() - suffix.length());
         }
-        return name;
+        return nameNormalized;
     }
 
     /**

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

@@ -137,6 +137,11 @@ public class Mode {
      */
     public boolean onDuplicateKeyUpdate;
 
+    /**
+     * Support the # for column names
+     */
+    public boolean supportPoundSymbolForColumnNames;
+
     private final String name;
 
     static {
@@ -173,6 +178,7 @@ public class Mode {
         mode.uniqueIndexSingleNull = true;
         mode.allowPlusForStringConcat = true;
         mode.swapConvertFunctionParameters = true;
+        mode.supportPoundSymbolForColumnNames = true;
         add(mode);
 
         mode = new Mode("MySQL");
@@ -187,6 +193,7 @@ public class Mode {
         mode.convertOnlyToSmallerScale = true;
         mode.uniqueIndexSingleNullExceptAllColumnsAreNull = true;
         mode.treatEmptyStringsAsNull = true;
+        mode.supportPoundSymbolForColumnNames = true;
         add(mode);
 
         mode = new Mode("PostgreSQL");

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

@@ -34,6 +34,7 @@ public class TestCompatibilityOracle extends TestBase {
     public void test() throws Exception {
         testTreatEmptyStringsAsNull();
         testDecimalScale();
+        testPoundSymbolInColumnName();
     }
 
     private void testTreatEmptyStringsAsNull() throws SQLException {
@@ -121,6 +122,22 @@ public class TestCompatibilityOracle extends TestBase {
         conn.close();
     }
 
+    /**
+     * Test the # in a column name for oracle compatibility
+     */
+    private void testPoundSymbolInColumnName() throws SQLException {
+        deleteDb("oracle");
+        Connection conn = getConnection("oracle;MODE=Oracle");
+        Statement stat = conn.createStatement();
+
+        stat.execute("CREATE TABLE TEST(ID INT PRIMARY KEY, U##NAME VARCHAR(255))");
+        stat.execute("INSERT INTO TEST VALUES(1, 'Hello'), (2, 'HelloWorld'), (3, 'HelloWorldWorld')");
+
+        assertResult("1", stat, "SELECT ID FROM TEST where U##NAME ='Hello'");
+
+        conn.close();
+    }
+
     private void assertResult(Object[][] expectedRowsOfValues, Statement stat,
             String sql) throws SQLException {
         assertResult(newSimpleResultSet(expectedRowsOfValues), stat, sql);