Documentation.

h2/src/docsrc/html/faq.html

@@ -206,7 +206,7 @@ and not the alias name. If you need the alias name, use
 <a href="http://java.sun.com/javase/6/docs/api/java/sql/ResultSetMetaData.html#getColumnLabel(int)"><code>ResultSetMetaData.getColumnLabel()</code></a>.
 Some other database don't work like this yet (they don't follow the JDBC specification).
 If you need compatibility with those databases, use the <a href="features.html#compatibility">Compatibility Mode</a>,
-or set the system property <a href="../javadoc/org/h2/constant/SysProperties.html#h2.aliasColumnName"><code>h2.aliasColumnName</code></a>.
+or append <a href="../javadoc/org/h2/constant/DbSettings.html#ALIAS_COLUMN_NAME"><code>;ALIAS_COLUMN_NAME=TRUE</code></a> to the database URL.
 </p>
 <p>
 This also applies to DatabaseMetaData calls that return a result set.

h2/src/docsrc/html/roadmap.html

@@ -35,7 +35,6 @@ See also <a href="build.html#providing_patches">Providing Patches</a>.
     Later, change undo log file format (fillAligned no longer required; var int).
 </li><li>Enable NESTED_JOINS (nested joins and right outer joins).
 </li><li>Enable OPTIMIZE_OR (convert OR conditions to IN(..) if possible).
-</li><li>Disable DATABASE_TO_UPPER (database short names are converted to uppercase).
 </li><li>Enable DROP_RESTRICT (default action for DROP is RESTRICT).
     Change documentation.
 </li><li>Set MAX_MEMORY_ROWS_DISTINCT to a lower value.

h2/src/main/org/h2/command/ddl/CreateView.java

@@ -108,7 +108,6 @@ public class CreateView extends SchemaCommand {
             if (params != null && params.size() > 0) {
                 throw DbException.get(ErrorCode.FEATURE_NOT_SUPPORTED_1, "parameters in views");
             }
-//            querySQL = TraceObject.toString(select.getSQL(), select.getParameters());
             querySQL = TraceObject.toString(select.getPlanSQL(), select.getParameters());
         }
         Session sysSession = db.getSystemSession();

h2/src/main/org/h2/constant/DbSettings.java

@@ -13,8 +13,8 @@ import org.h2.engine.SettingsBase;
 /**
  * This class contains various database-level settings. To override the
  * documented default value for a database, append the setting in the database
- * URL: "jdbc:h2:test;ALIAS_COLUMN_NAME=TRUE" when opening the first connection to
- * the database. The settings can not be changed once the database is open.
+ * URL: "jdbc:h2:test;ALIAS_COLUMN_NAME=TRUE" when opening the first connection
+ * to the database. The settings can not be changed once the database is open.
  * <p>
  * Some settings are a last resort and temporary solution to work around a
  * problem in the application or database engine. Also, there are system
@@ -62,12 +62,12 @@ public class DbSettings extends SettingsBase {
      * function, and in the CATALOG column of all database meta data methods.
      * Setting this to "false" is experimental.
      */
-//    public final boolean databaseToUpper = get("DATABASE_TO_UPPER", Constants.VERSION_MINOR < 3);
     public final boolean databaseToUpper = get("DATABASE_TO_UPPER", true);
 
     /**
      * Database setting <code>DB_CLOSE_ON_EXIT</code> (default: true).<br />
-     * Close the database when the virtual machine exits normally, using a shutdown hook.
+     * Close the database when the virtual machine exits normally, using a
+     * shutdown hook.
      */
     public final boolean dbCloseOnExit = get("DB_CLOSE_ON_EXIT", Constants.VERSION_MINOR < 3);
 
@@ -228,7 +228,8 @@ public class DbSettings extends SettingsBase {
     public final boolean optimizeUpdate = get("OPTIMIZE_UPDATE", true);
 
     /**
-     * Database setting <code>PAGE_STORE_INTERNAL_COUNT</code> (default: false).<br />
+     * Database setting <code>PAGE_STORE_INTERNAL_COUNT</code>
+     * (default: false).<br />
      * Update the row counts on a node level.
      */
     public final boolean pageStoreInternalCount = get("PAGE_STORE_INTERNAL_COUNT", false);
@@ -265,8 +266,10 @@ public class DbSettings extends SettingsBase {
     public final int reconnectCheckDelay = get("RECONNECT_CHECK_DELAY", 200);
 
     /**
-     * Database setting <code>SELECT_FOR_UPDATE_MVCC</code> (default: false).<br />
-     * If set, SELECT .. FOR UPDATE queries lock only the selected rows when using MVCC.
+     * Database setting <code>SELECT_FOR_UPDATE_MVCC</code>
+     * (default: false).<br />
+     * If set, SELECT .. FOR UPDATE queries lock only the selected rows when
+     * using MVCC.
      */
     public final boolean selectForUpdateMvcc = get("SELECT_FOR_UPDATE_MVCC", Constants.VERSION_MINOR >= 3);
 

h2/src/test/org/h2/test/synth/TestNestedJoins.java

@@ -245,7 +245,8 @@ public class TestNestedJoins extends TestBase {
         /*
         create table test(id int primary key);
         insert into test values(1);
-        select b.id from test a left outer join test b on a.id = b.id and not exists (select * from test c where c.id = b.id);
+        select b.id from test a left outer join test b on a.id = b.id
+        and not exists (select * from test c where c.id = b.id);
         -- expected: null
          */
         stat.execute("create table test(id int primary key)");