Author: steve.ebersole(a)jboss.com Date: 2009-06-01 11:24:20 -0400 (Mon, 01 Jun 2009) New Revision: 16647 Modified: core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java Log: HHH-3401 - H2 Database Dialect Fixes (formatting) Modified: core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java =================================================================== --- core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java 2009-06-01 15:23:20 UTC (rev 16646) +++ core/trunk/core/src/main/java/org/hibernate/dialect/H2Dialect.java 2009-06-01 15:24:20 UTC (rev 16647) @@ -37,15 +37,15 @@ /** * A dialect compatible with the H2 database. - * + * * @author Thomas Mueller */ public class H2Dialect extends Dialect { - private String querySequenceString; + private String querySequenceString; - public H2Dialect() { - super(); + public H2Dialect() { + super(); querySequenceString = "select sequence_name from information_schema.sequences"; try { @@ -61,218 +61,218 @@ // ignore (probably H2 not in the classpath) } - registerColumnType(Types.BOOLEAN, "boolean"); - registerColumnType(Types.BIGINT, "bigint"); - registerColumnType(Types.BINARY, "binary"); - registerColumnType(Types.BIT, "boolean"); - registerColumnType(Types.CHAR, "char($l)"); - registerColumnType(Types.DATE, "date"); - registerColumnType(Types.DECIMAL, "decimal($p,$s)"); - registerColumnType(Types.DOUBLE, "double"); - registerColumnType(Types.FLOAT, "float"); - registerColumnType(Types.INTEGER, "integer"); - registerColumnType(Types.LONGVARBINARY, "longvarbinary"); - registerColumnType(Types.LONGVARCHAR, "longvarchar"); - registerColumnType(Types.REAL, "real"); - registerColumnType(Types.SMALLINT, "smallint"); - registerColumnType(Types.TINYINT, "tinyint"); - registerColumnType(Types.TIME, "time"); - registerColumnType(Types.TIMESTAMP, "timestamp"); - registerColumnType(Types.VARCHAR, "varchar($l)"); - registerColumnType(Types.VARBINARY, "binary($l)"); - registerColumnType(Types.NUMERIC, "numeric"); - registerColumnType(Types.BLOB, "blob"); - registerColumnType(Types.CLOB, "clob"); - - // select topic, syntax from information_schema.help - // where section like 'Function%' order by section, topic + registerColumnType( Types.BOOLEAN, "boolean" ); + registerColumnType( Types.BIGINT, "bigint" ); + registerColumnType( Types.BINARY, "binary" ); + registerColumnType( Types.BIT, "boolean" ); + registerColumnType( Types.CHAR, "char($l)" ); + registerColumnType( Types.DATE, "date" ); + registerColumnType( Types.DECIMAL, "decimal($p,$s)" ); + registerColumnType( Types.DOUBLE, "double" ); + registerColumnType( Types.FLOAT, "float" ); + registerColumnType( Types.INTEGER, "integer" ); + registerColumnType( Types.LONGVARBINARY, "longvarbinary" ); + registerColumnType( Types.LONGVARCHAR, "longvarchar" ); + registerColumnType( Types.REAL, "real" ); + registerColumnType( Types.SMALLINT, "smallint" ); + registerColumnType( Types.TINYINT, "tinyint" ); + registerColumnType( Types.TIME, "time" ); + registerColumnType( Types.TIMESTAMP, "timestamp" ); + registerColumnType( Types.VARCHAR, "varchar($l)" ); + registerColumnType( Types.VARBINARY, "binary($l)" ); + registerColumnType( Types.NUMERIC, "numeric" ); + registerColumnType( Types.BLOB, "blob" ); + registerColumnType( Types.CLOB, "clob" ); + // select topic, syntax from information_schema.help + // where section like 'Function%' order by section, topic + // registerFunction("abs", new StandardSQLFunction("abs")); - registerFunction("acos", new StandardSQLFunction("acos", Hibernate.DOUBLE)); - registerFunction("asin", new StandardSQLFunction("asin", Hibernate.DOUBLE)); - registerFunction("atan", new StandardSQLFunction("atan", Hibernate.DOUBLE)); - registerFunction("atan2", new StandardSQLFunction("atan2", Hibernate.DOUBLE)); - registerFunction("bitand", new StandardSQLFunction("bitand", Hibernate.INTEGER)); - registerFunction("bitor", new StandardSQLFunction("bitor", Hibernate.INTEGER)); - registerFunction("bitxor", new StandardSQLFunction("bitxor", Hibernate.INTEGER)); - registerFunction("ceiling", new StandardSQLFunction("ceiling", Hibernate.DOUBLE)); - registerFunction("cos", new StandardSQLFunction("cos", Hibernate.DOUBLE)); - registerFunction("cot", new StandardSQLFunction("cot", Hibernate.DOUBLE)); - registerFunction("degrees", new StandardSQLFunction("degrees", Hibernate.DOUBLE)); - registerFunction("exp", new StandardSQLFunction("exp", Hibernate.DOUBLE)); - registerFunction("floor", new StandardSQLFunction("floor", Hibernate.DOUBLE)); - registerFunction("log", new StandardSQLFunction("log", Hibernate.DOUBLE)); - registerFunction("log10", new StandardSQLFunction("log10", Hibernate.DOUBLE)); + registerFunction( "acos", new StandardSQLFunction( "acos", Hibernate.DOUBLE ) ); + registerFunction( "asin", new StandardSQLFunction( "asin", Hibernate.DOUBLE ) ); + registerFunction( "atan", new StandardSQLFunction( "atan", Hibernate.DOUBLE ) ); + registerFunction( "atan2", new StandardSQLFunction( "atan2", Hibernate.DOUBLE ) ); + registerFunction( "bitand", new StandardSQLFunction( "bitand", Hibernate.INTEGER ) ); + registerFunction( "bitor", new StandardSQLFunction( "bitor", Hibernate.INTEGER ) ); + registerFunction( "bitxor", new StandardSQLFunction( "bitxor", Hibernate.INTEGER ) ); + registerFunction( "ceiling", new StandardSQLFunction( "ceiling", Hibernate.DOUBLE ) ); + registerFunction( "cos", new StandardSQLFunction( "cos", Hibernate.DOUBLE ) ); + registerFunction( "cot", new StandardSQLFunction( "cot", Hibernate.DOUBLE ) ); + registerFunction( "degrees", new StandardSQLFunction( "degrees", Hibernate.DOUBLE ) ); + registerFunction( "exp", new StandardSQLFunction( "exp", Hibernate.DOUBLE ) ); + registerFunction( "floor", new StandardSQLFunction( "floor", Hibernate.DOUBLE ) ); + registerFunction( "log", new StandardSQLFunction( "log", Hibernate.DOUBLE ) ); + registerFunction( "log10", new StandardSQLFunction( "log10", Hibernate.DOUBLE ) ); // registerFunction("mod", new StandardSQLFunction("mod", Hibernate.INTEGER)); - registerFunction("pi", new NoArgSQLFunction("pi", Hibernate.DOUBLE)); - registerFunction("power", new StandardSQLFunction("power", Hibernate.DOUBLE)); - registerFunction("radians", new StandardSQLFunction("radians", Hibernate.DOUBLE)); - registerFunction("rand", new NoArgSQLFunction("rand", Hibernate.DOUBLE)); - registerFunction("round", new StandardSQLFunction("round", Hibernate.DOUBLE)); - registerFunction("roundmagic", new StandardSQLFunction("roundmagic", Hibernate.DOUBLE)); - registerFunction("sign", new StandardSQLFunction("sign", Hibernate.INTEGER)); - registerFunction("sin", new StandardSQLFunction("sin", Hibernate.DOUBLE)); + registerFunction( "pi", new NoArgSQLFunction( "pi", Hibernate.DOUBLE ) ); + registerFunction( "power", new StandardSQLFunction( "power", Hibernate.DOUBLE ) ); + registerFunction( "radians", new StandardSQLFunction( "radians", Hibernate.DOUBLE ) ); + registerFunction( "rand", new NoArgSQLFunction( "rand", Hibernate.DOUBLE ) ); + registerFunction( "round", new StandardSQLFunction( "round", Hibernate.DOUBLE ) ); + registerFunction( "roundmagic", new StandardSQLFunction( "roundmagic", Hibernate.DOUBLE ) ); + registerFunction( "sign", new StandardSQLFunction( "sign", Hibernate.INTEGER ) ); + registerFunction( "sin", new StandardSQLFunction( "sin", Hibernate.DOUBLE ) ); // registerFunction("sqrt", new StandardSQLFunction("sqrt", Hibernate.DOUBLE)); - registerFunction("tan", new StandardSQLFunction("tan", Hibernate.DOUBLE)); - registerFunction("truncate", new StandardSQLFunction("truncate", Hibernate.DOUBLE)); + registerFunction( "tan", new StandardSQLFunction( "tan", Hibernate.DOUBLE ) ); + registerFunction( "truncate", new StandardSQLFunction( "truncate", Hibernate.DOUBLE ) ); - registerFunction("compress", new StandardSQLFunction("compress", Hibernate.BINARY)); - registerFunction("expand", new StandardSQLFunction("compress", Hibernate.BINARY)); - registerFunction("decrypt", new StandardSQLFunction("decrypt", Hibernate.BINARY)); - registerFunction("encrypt", new StandardSQLFunction("encrypt", Hibernate.BINARY)); - registerFunction("hash", new StandardSQLFunction("hash", Hibernate.BINARY)); + registerFunction( "compress", new StandardSQLFunction( "compress", Hibernate.BINARY ) ); + registerFunction( "expand", new StandardSQLFunction( "compress", Hibernate.BINARY ) ); + registerFunction( "decrypt", new StandardSQLFunction( "decrypt", Hibernate.BINARY ) ); + registerFunction( "encrypt", new StandardSQLFunction( "encrypt", Hibernate.BINARY ) ); + registerFunction( "hash", new StandardSQLFunction( "hash", Hibernate.BINARY ) ); - registerFunction("ascii", new StandardSQLFunction("ascii", Hibernate.INTEGER)); + registerFunction( "ascii", new StandardSQLFunction( "ascii", Hibernate.INTEGER ) ); // registerFunction("bit_length", new StandardSQLFunction("bit_length", Hibernate.INTEGER)); - registerFunction("char", new StandardSQLFunction("char", Hibernate.CHARACTER)); - registerFunction("concat", new VarArgsSQLFunction(Hibernate.STRING, "(", "||", ")")); - registerFunction("difference", new StandardSQLFunction("difference", Hibernate.INTEGER)); - registerFunction("hextoraw", new StandardSQLFunction("hextoraw", Hibernate.STRING)); - registerFunction("lower", new StandardSQLFunction("lower", Hibernate.STRING)); - registerFunction("insert", new StandardSQLFunction("lower", Hibernate.STRING)); - registerFunction("left", new StandardSQLFunction("left", Hibernate.STRING)); + registerFunction( "char", new StandardSQLFunction( "char", Hibernate.CHARACTER ) ); + registerFunction( "concat", new VarArgsSQLFunction( Hibernate.STRING, "(", "||", ")" ) ); + registerFunction( "difference", new StandardSQLFunction( "difference", Hibernate.INTEGER ) ); + registerFunction( "hextoraw", new StandardSQLFunction( "hextoraw", Hibernate.STRING ) ); + registerFunction( "lower", new StandardSQLFunction( "lower", Hibernate.STRING ) ); + registerFunction( "insert", new StandardSQLFunction( "lower", Hibernate.STRING ) ); + registerFunction( "left", new StandardSQLFunction( "left", Hibernate.STRING ) ); // registerFunction("length", new StandardSQLFunction("length", Hibernate.INTEGER)); // registerFunction("locate", new StandardSQLFunction("locate", Hibernate.INTEGER)); // registerFunction("lower", new StandardSQLFunction("lower", Hibernate.STRING)); - registerFunction("lcase", new StandardSQLFunction("lcase", Hibernate.STRING)); - registerFunction("ltrim", new StandardSQLFunction("ltrim", Hibernate.STRING)); - registerFunction("octet_length", new StandardSQLFunction("octet_length", Hibernate.INTEGER)); - registerFunction("position", new StandardSQLFunction("position", Hibernate.INTEGER)); - registerFunction("rawtohex", new StandardSQLFunction("rawtohex", Hibernate.STRING)); - registerFunction("repeat", new StandardSQLFunction("repeat", Hibernate.STRING)); - registerFunction("replace", new StandardSQLFunction("replace", Hibernate.STRING)); - registerFunction("right", new StandardSQLFunction("right", Hibernate.STRING)); - registerFunction("rtrim", new StandardSQLFunction("rtrim", Hibernate.STRING)); - registerFunction("soundex", new StandardSQLFunction("soundex", Hibernate.STRING)); - registerFunction("space", new StandardSQLFunction("space", Hibernate.STRING)); - registerFunction("stringencode", new StandardSQLFunction("stringencode", Hibernate.STRING)); - registerFunction("stringdecode", new StandardSQLFunction("stringdecode", Hibernate.STRING)); + registerFunction( "lcase", new StandardSQLFunction( "lcase", Hibernate.STRING ) ); + registerFunction( "ltrim", new StandardSQLFunction( "ltrim", Hibernate.STRING ) ); + registerFunction( "octet_length", new StandardSQLFunction( "octet_length", Hibernate.INTEGER ) ); + registerFunction( "position", new StandardSQLFunction( "position", Hibernate.INTEGER ) ); + registerFunction( "rawtohex", new StandardSQLFunction( "rawtohex", Hibernate.STRING ) ); + registerFunction( "repeat", new StandardSQLFunction( "repeat", Hibernate.STRING ) ); + registerFunction( "replace", new StandardSQLFunction( "replace", Hibernate.STRING ) ); + registerFunction( "right", new StandardSQLFunction( "right", Hibernate.STRING ) ); + registerFunction( "rtrim", new StandardSQLFunction( "rtrim", Hibernate.STRING ) ); + registerFunction( "soundex", new StandardSQLFunction( "soundex", Hibernate.STRING ) ); + registerFunction( "space", new StandardSQLFunction( "space", Hibernate.STRING ) ); + registerFunction( "stringencode", new StandardSQLFunction( "stringencode", Hibernate.STRING ) ); + registerFunction( "stringdecode", new StandardSQLFunction( "stringdecode", Hibernate.STRING ) ); // registerFunction("substring", new StandardSQLFunction("substring", Hibernate.STRING)); // registerFunction("upper", new StandardSQLFunction("upper", Hibernate.STRING)); - registerFunction("ucase", new StandardSQLFunction("ucase", Hibernate.STRING)); + registerFunction( "ucase", new StandardSQLFunction( "ucase", Hibernate.STRING ) ); - registerFunction("stringtoutf8", new StandardSQLFunction("stringtoutf8", Hibernate.BINARY)); - registerFunction("utf8tostring", new StandardSQLFunction("utf8tostring", Hibernate.STRING)); + registerFunction( "stringtoutf8", new StandardSQLFunction( "stringtoutf8", Hibernate.BINARY ) ); + registerFunction( "utf8tostring", new StandardSQLFunction( "utf8tostring", Hibernate.STRING ) ); - registerFunction("current_date", new NoArgSQLFunction("current_date", Hibernate.DATE)); - registerFunction("current_time", new NoArgSQLFunction("current_time", Hibernate.TIME)); - registerFunction("current_timestamp", new NoArgSQLFunction("current_timestamp", Hibernate.TIMESTAMP)); - registerFunction("datediff", new StandardSQLFunction("datediff", Hibernate.INTEGER)); - registerFunction("dayname", new StandardSQLFunction("dayname", Hibernate.STRING)); - registerFunction("dayofmonth", new StandardSQLFunction("dayofmonth", Hibernate.INTEGER)); - registerFunction("dayofweek", new StandardSQLFunction("dayofweek", Hibernate.INTEGER)); - registerFunction("dayofyear", new StandardSQLFunction("dayofyear", Hibernate.INTEGER)); + registerFunction( "current_date", new NoArgSQLFunction( "current_date", Hibernate.DATE ) ); + registerFunction( "current_time", new NoArgSQLFunction( "current_time", Hibernate.TIME ) ); + registerFunction( "current_timestamp", new NoArgSQLFunction( "current_timestamp", Hibernate.TIMESTAMP ) ); + registerFunction( "datediff", new StandardSQLFunction( "datediff", Hibernate.INTEGER ) ); + registerFunction( "dayname", new StandardSQLFunction( "dayname", Hibernate.STRING ) ); + registerFunction( "dayofmonth", new StandardSQLFunction( "dayofmonth", Hibernate.INTEGER ) ); + registerFunction( "dayofweek", new StandardSQLFunction( "dayofweek", Hibernate.INTEGER ) ); + registerFunction( "dayofyear", new StandardSQLFunction( "dayofyear", Hibernate.INTEGER ) ); // registerFunction("hour", new StandardSQLFunction("hour", Hibernate.INTEGER)); // registerFunction("minute", new StandardSQLFunction("minute", Hibernate.INTEGER)); // registerFunction("month", new StandardSQLFunction("month", Hibernate.INTEGER)); - registerFunction("monthname", new StandardSQLFunction("monthname", Hibernate.STRING)); - registerFunction("quarter", new StandardSQLFunction("quarter", Hibernate.INTEGER)); + registerFunction( "monthname", new StandardSQLFunction( "monthname", Hibernate.STRING ) ); + registerFunction( "quarter", new StandardSQLFunction( "quarter", Hibernate.INTEGER ) ); // registerFunction("second", new StandardSQLFunction("second", Hibernate.INTEGER)); - registerFunction("week", new StandardSQLFunction("week", Hibernate.INTEGER)); + registerFunction( "week", new StandardSQLFunction( "week", Hibernate.INTEGER ) ); // registerFunction("year", new StandardSQLFunction("year", Hibernate.INTEGER)); - registerFunction("curdate", new NoArgSQLFunction("curdate", Hibernate.DATE)); - registerFunction("curtime", new NoArgSQLFunction("curtime", Hibernate.TIME)); - registerFunction("curtimestamp", new NoArgSQLFunction("curtimestamp", Hibernate.TIME)); - registerFunction("now", new NoArgSQLFunction("now", Hibernate.TIMESTAMP)); + registerFunction( "curdate", new NoArgSQLFunction( "curdate", Hibernate.DATE ) ); + registerFunction( "curtime", new NoArgSQLFunction( "curtime", Hibernate.TIME ) ); + registerFunction( "curtimestamp", new NoArgSQLFunction( "curtimestamp", Hibernate.TIME ) ); + registerFunction( "now", new NoArgSQLFunction( "now", Hibernate.TIMESTAMP ) ); - registerFunction("database", new NoArgSQLFunction("database", Hibernate.STRING)); - registerFunction("user", new NoArgSQLFunction("user", Hibernate.STRING)); + registerFunction( "database", new NoArgSQLFunction( "database", Hibernate.STRING ) ); + registerFunction( "user", new NoArgSQLFunction( "user", Hibernate.STRING ) ); - getDefaultProperties().setProperty(Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE); - } + getDefaultProperties().setProperty( Environment.STATEMENT_BATCH_SIZE, DEFAULT_BATCH_SIZE ); + } - public String getAddColumnString() { - return "add column"; - } + public String getAddColumnString() { + return "add column"; + } - public boolean supportsIdentityColumns() { - return true; - } + public boolean supportsIdentityColumns() { + return true; + } - public String getIdentityColumnString() { - return "generated by default as identity"; // not null is implicit - } + public String getIdentityColumnString() { + return "generated by default as identity"; // not null is implicit + } - public String getIdentitySelectString() { - return "call identity()"; - } + public String getIdentitySelectString() { + return "call identity()"; + } - public String getIdentityInsertString() { - return "null"; - } + public String getIdentityInsertString() { + return "null"; + } - public String getForUpdateString() { - return " for update"; - } + public String getForUpdateString() { + return " for update"; + } - public boolean supportsUnique() { - return true; - } + public boolean supportsUnique() { + return true; + } - public boolean supportsLimit() { - return true; - } + public boolean supportsLimit() { + return true; + } - public String getLimitString(String sql, boolean hasOffset) { + public String getLimitString(String sql, boolean hasOffset) { return new StringBuffer( sql.length() + 20 ) .append( sql ) .append( hasOffset ? " limit ? offset ?" : " limit ?" ) .toString(); } - - public boolean bindLimitParametersInReverseOrder() { - return true; - } - public boolean bindLimitParametersFirst() { - return false; - } + public boolean bindLimitParametersInReverseOrder() { + return true; + } - public boolean supportsIfExistsAfterTableName() { - return true; - } + public boolean bindLimitParametersFirst() { + return false; + } - public boolean supportsSequences() { - return true; - } + public boolean supportsIfExistsAfterTableName() { + return true; + } + public boolean supportsSequences() { + return true; + } + public boolean supportsPooledSequences() { return true; } - public String getCreateSequenceString(String sequenceName) { - return "create sequence " + sequenceName; - } + public String getCreateSequenceString(String sequenceName) { + return "create sequence " + sequenceName; + } - public String getDropSequenceString(String sequenceName) { - return "drop sequence " + sequenceName; - } + public String getDropSequenceString(String sequenceName) { + return "drop sequence " + sequenceName; + } - public String getSelectSequenceNextValString(String sequenceName) { - return "next value for " + sequenceName; - } + public String getSelectSequenceNextValString(String sequenceName) { + return "next value for " + sequenceName; + } - public String getSequenceNextValString(String sequenceName) { - return "call next value for " + sequenceName; - } + public String getSequenceNextValString(String sequenceName) { + return "call next value for " + sequenceName; + } - public String getQuerySequencesString() { - return querySequenceString; - } + public String getQuerySequencesString() { + return querySequenceString; + } public ViolatedConstraintNameExtracter getViolatedConstraintNameExtracter() { - return EXTRACTER; - } + return EXTRACTER; + } - private static ViolatedConstraintNameExtracter EXTRACTER = new TemplatedViolatedConstraintNameExtracter() { - /** - * Extract the name of the violated constraint from the given SQLException. - * - * @param sqle The exception that was the result of the constraint violation. - * @return The extracted constraint name. - */ - public String extractConstraintName(SQLException sqle) { + private static ViolatedConstraintNameExtracter EXTRACTER = new TemplatedViolatedConstraintNameExtracter() { + /** + * Extract the name of the violated constraint from the given SQLException. + * + * @param sqle The exception that was the result of the constraint violation. + * @return The extracted constraint name. + */ + public String extractConstraintName(SQLException sqle) { String constraintName = null; // 23000: Check constraint violation: {0} // 23001: Unique index or primary key violation: {0} @@ -284,34 +284,34 @@ } } return constraintName; - } - }; + } + }; - public boolean supportsTemporaryTables() { - return true; - } - - public String getCreateTemporaryTableString() { - return "create temporary table if not exists"; - } + public boolean supportsTemporaryTables() { + return true; + } - public boolean supportsCurrentTimestampSelection() { - return true; - } - - public boolean isCurrentTimestampSelectStringCallable() { - return false; - } - - public String getCurrentTimestampSelectString() { - return "call current_timestamp()"; - } - - public boolean supportsUnionAll() { - return true; - } + public String getCreateTemporaryTableString() { + return "create temporary table if not exists"; + } + public boolean supportsCurrentTimestampSelection() { + return true; + } + public boolean isCurrentTimestampSelectStringCallable() { + return false; + } + + public String getCurrentTimestampSelectString() { + return "call current_timestamp()"; + } + + public boolean supportsUnionAll() { + return true; + } + + // Overridden informational metadata ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ public boolean supportsLobValueChangePropogation() {