Skip to content

H
h2database
Unverified 提交 6178c2ed authored 作者: Evgenij Ryazanov's avatar Evgenij Ryazanov 提交者： GitHub
浏览文件
操作

Merge pull request #1776 from katzyn/lower 

Improve DATABASE_TO_LOWER handling
上级 c9c2f97b 8609b224
隐藏空白字符变更
内嵌 并排
正在显示 包含 215 行增加 和 134 行删除
h2/src/docsrc/html/features.html
浏览文件 @ 6178c2ed
......@@ -338,7 +338,7 @@ This is achieved using different database URLs. Settings in the URLs are not cas
<td><a href="#compatibility">Compatibility mode</a></td>
<td class="notranslate">
jdbc:h2:&lt;url&gt;;MODE=&lt;databaseType&gt;<br />
jdbc:h2:~/test;MODE=MYSQL
jdbc:h2:~/test;MODE=MYSQL;DATABASE_TO_LOWER=TRUE
</td>
</tr>
<tr>
......@@ -894,8 +894,9 @@ or the SQL statement <code>SET MODE MSSQLServer</code>.
<h3>MySQL Compatibility Mode</h3>
<p>
To use the MySQL mode, use the database URL <code>jdbc:h2:~/test;MODE=MySQL</code>
or the SQL statement <code>SET MODE MySQL</code>. Use this mode for compatibility with MariaDB too.
To use the MySQL mode, use the database URL <code>jdbc:h2:~/test;MODE=MySQL;DATABASE_TO_LOWER=TRUE</code>.
Use this mode for compatibility with MariaDB too.
When case-insensitive identifiers are needed append <code>;CASE_INSENSITIVE_IDENTIFIERS=TRUE</code> to URL.
</p>
<ul><li>When inserting data, if a column is defined to be <code>NOT NULL</code>
and <code>NULL</code> is inserted,
......@@ -904,7 +905,6 @@ or the SQL statement <code>SET MODE MySQL</code>. Use this mode for compatibilit
</li><li>Creating indexes in the <code>CREATE TABLE</code> statement is allowed using
<code>INDEX(..)</code> or <code>KEY(..)</code>.
Example: <code>create table test(id int primary key, name varchar(255), key idx_name(name));</code>
</li><li>Meta data calls return identifiers in lower case.
</li><li>When converting a floating point number to an integer, the fractional
digits are not truncated, but the value is rounded.
</li><li>Concatenating <code>NULL</code> with another value
......@@ -944,8 +944,7 @@ or the SQL statement <code>SET MODE Oracle</code>.
<h3>PostgreSQL Compatibility Mode</h3>
<p>
To use the PostgreSQL mode, use the database URL <code>jdbc:h2:~/test;MODE=PostgreSQL</code>
or the SQL statement <code>SET MODE PostgreSQL</code>.
To use the PostgreSQL mode, use the database URL <code>jdbc:h2:~/test;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE</code>.
</p>
<ul><li>For aliased columns, <code>ResultSetMetaData.getColumnName()</code>
returns the alias name and <code>getTableName()</code> returns
......
h2/src/main/org/h2/engine/Database.java
浏览文件 @ 6178c2ed
......@@ -1275,7 +1275,7 @@ public class Database implements DataHandler {
* @return the role or null
*/
public Role findRole(String roleName) {
return roles.get(roleName);
return roles.get(StringUtils.toUpperEnglish(roleName));
}
/**
......@@ -1309,7 +1309,7 @@ public class Database implements DataHandler {
* @return the user or null
*/
public User findUser(String name) {
return users.get(name);
return users.get(StringUtils.toUpperEnglish(name));
}
/**
......
h2/src/main/org/h2/engine/DbSettings.java
浏览文件 @ 6178c2ed
......@@ -357,6 +357,9 @@ public class DbSettings extends SettingsBase {
}
databaseToLower = lower;
databaseToUpper = upper;
HashMap<String, String> settings = getSettings();
settings.put("DATABASE_TO_LOWER", Boolean.toString(lower));
settings.put("DATABASE_TO_UPPER", Boolean.toString(upper));
}
/**
......
h2/src/main/org/h2/engine/RightOwner.java
浏览文件 @ 6178c2ed
......@@ -11,6 +11,7 @@ import java.util.List;
import java.util.Map.Entry;
import org.h2.table.Table;
import org.h2.util.StringUtils;
/**
* A right owner (sometimes called principal).
......@@ -27,9 +28,13 @@ public abstract class RightOwner extends DbObjectBase {
*/
private HashMap<DbObject, Right> grantedRights;
protected RightOwner(Database database, int id, String name,
int traceModuleId) {
super(database, id, name, traceModuleId);
protected RightOwner(Database database, int id, String name, int traceModuleId) {
super(database, id, StringUtils.toUpperEnglish(name), traceModuleId);
}
@Override
public void rename(String newName) {
super.rename(StringUtils.toUpperEnglish(newName));
}
/**
......
h2/src/main/org/h2/jdbc/JdbcConnection.java
浏览文件 @ 6178c2ed
......@@ -66,8 +66,53 @@ import org.h2.value.ValueString;
* used in one thread at any time.
* </p>
*/
public class JdbcConnection extends TraceObject
implements Connection, JdbcConnectionBackwardsCompat {
public class JdbcConnection extends TraceObject implements Connection, JdbcConnectionBackwardsCompat {
/**
* Database settings.
*/
static final class Settings {
/**
* The database mode.
*/
final Mode mode;
/**
* Whether unquoted identifiers are converted to upper case.
*/
final boolean databaseToUpper;
/**
* Whether unquoted identifiers are converted to lower case.
*/
final boolean databaseToLower;
/**
* Whether all identifiers are case insensitive.
*/
final boolean caseInsensitiveIdentifiers;
/**
* Creates new instance of database settings.
*
* @param mode
* the database mode
* @param databaseToUpper
* whether unquoted identifiers are converted to upper case
* @param databaseToLower
* whether unquoted identifiers are converted to lower case
* @param caseInsensitiveIdentifiers
* whether all identifiers are case insensitive
*/
Settings(Mode mode, boolean databaseToUpper, boolean databaseToLower, boolean caseInsensitiveIdentifiers) {
this.mode = mode;
this.databaseToUpper = databaseToUpper;
this.databaseToLower = databaseToLower;
this.caseInsensitiveIdentifiers = caseInsensitiveIdentifiers;
}
}
private static final String NUM_SERVERS = "numServers";
private static final String PREFIX_SERVER = "server";
......@@ -93,7 +138,7 @@ public class JdbcConnection extends TraceObject
private int queryTimeoutCache = -1;
private Map<String, String> clientInfo;
private volatile Mode mode;
private volatile Settings settings;
private final boolean scopeGeneratedKeys;
/**
......@@ -2088,31 +2133,58 @@ public class JdbcConnection extends TraceObject
}
Mode getMode() throws SQLException {
Mode mode = this.mode;
if (mode == null) {
String name;
return getSettings().mode;
}
Settings getSettings() throws SQLException {
Settings settings = this.settings;
if (settings == null) {
String modeName = ModeEnum.REGULAR.name();
boolean databaseToUpper = true, databaseToLower = false, caseInsensitiveIdentifiers = false;
try (PreparedStatement prep = prepareStatement(
"SELECT VALUE FROM INFORMATION_SCHEMA.SETTINGS WHERE NAME=?")) {
"SELECT NAME, VALUE FROM INFORMATION_SCHEMA.SETTINGS WHERE NAME IN (?, ?, ?, ?)")) {
prep.setString(1, "MODE");
prep.setString(2, "DATABASE_TO_UPPER");
prep.setString(3, "DATABASE_TO_LOWER");
prep.setString(4, "CASE_INSENSITIVE_IDENTIFIERS");
ResultSet rs = prep.executeQuery();
rs.next();
name = rs.getString(1);
while (rs.next()) {
String value = rs.getString(2);
switch (rs.getString(1)) {
case "MODE":
modeName = value;
break;
case "DATABASE_TO_UPPER":
databaseToUpper = Boolean.valueOf(value);
break;
case "DATABASE_TO_LOWER":
databaseToLower = Boolean.valueOf(value);
break;
case "CASE_INSENSITIVE_IDENTIFIERS":
caseInsensitiveIdentifiers = Boolean.valueOf(value);
}
}
}
mode = Mode.getInstance(name);
Mode mode = Mode.getInstance(modeName);
if (mode == null) {
mode = Mode.getRegular();
}
this.mode = mode;
if (session instanceof SessionRemote
&& ((SessionRemote) session).getClientVersion() < Constants.TCP_PROTOCOL_VERSION_18) {
caseInsensitiveIdentifiers = !databaseToUpper;
}
settings = new Settings(mode, databaseToUpper, databaseToLower, caseInsensitiveIdentifiers);
this.settings = settings;
}
return mode;
return settings;
}
/**
* INTERNAL
*/
public boolean isRegularMode() throws SQLException {
// Clear cached mode if any (required by tests)
mode = null;
// Clear cached settings if any (required by tests)
settings = null;
return getMode().getEnum() == ModeEnum.REGULAR;
}
}
h2/src/main/org/h2/jdbc/JdbcDatabaseMetaData.java
浏览文件 @ 6178c2ed
......@@ -16,7 +16,6 @@ import java.util.Map.Entry;
import java.util.Properties;
import org.h2.engine.Constants;
import org.h2.engine.Mode.ModeEnum;
import org.h2.engine.SessionInterface;
import org.h2.engine.SessionRemote;
import org.h2.engine.SysProperties;
......@@ -1539,7 +1538,7 @@ public class JdbcDatabaseMetaData extends TraceObject implements
/**
* Gets the comma-separated list of all SQL keywords that are not supported as
* table/column/index name, in addition to the SQL-2003 keywords. The list
* table/column/index name, in addition to the SQL:2003 keywords. The list
* returned is:
* <pre>
* IF,ILIKE,INTERSECTS,
......@@ -1551,7 +1550,7 @@ public class JdbcDatabaseMetaData extends TraceObject implements
* SYSDATE,SYSTIME,SYSTIMESTAMP,
* TODAY,TOP
* </pre>
* The complete list of keywords (including SQL-2003 keywords) is:
* The complete list of keywords (including SQL:2003 keywords) is:
* <pre>
* ALL, AND, ARRAY, AS,
* BETWEEN,
......@@ -2594,98 +2593,100 @@ public class JdbcDatabaseMetaData extends TraceObject implements
/**
* Checks if for CREATE TABLE Test(ID INT), getTables returns Test as the
* table name.
* table name and identifiers are case sensitive.
*
* @return false
* @return true is so, false otherwise
*/
@Override
public boolean supportsMixedCaseIdentifiers() {
public boolean supportsMixedCaseIdentifiers() throws SQLException{
debugCodeCall("supportsMixedCaseIdentifiers");
return false;
}
/**
* Checks if a table created with CREATE TABLE "Test"(ID INT) is a different
* table than a table created with CREATE TABLE TEST(ID INT).
*
* @return true usually, and false in MySQL mode
*/
@Override
public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
debugCodeCall("supportsMixedCaseQuotedIdentifiers");
return conn.getMode().getEnum() != ModeEnum.MySQL;
JdbcConnection.Settings settings = conn.getSettings();
return !settings.databaseToUpper && !settings.databaseToLower && !settings.caseInsensitiveIdentifiers;
}
/**
* Checks if for CREATE TABLE Test(ID INT), getTables returns TEST as the
* table name.
*
* @return true usually, and false in MySQL mode
* @return true is so, false otherwise
*/
@Override
public boolean storesUpperCaseIdentifiers() throws SQLException {
debugCodeCall("storesUpperCaseIdentifiers");
return conn.getMode().getEnum() != ModeEnum.MySQL;
return conn.getSettings().databaseToUpper;
}
/**
* Checks if for CREATE TABLE Test(ID INT), getTables returns test as the
* table name.
*
* @return false usually, and true in MySQL mode
* @return true is so, false otherwise
*/
@Override
public boolean storesLowerCaseIdentifiers() throws SQLException {
debugCodeCall("storesLowerCaseIdentifiers");
return conn.getMode().getEnum() == ModeEnum.MySQL;
return conn.getSettings().databaseToLower;
}
/**
* Checks if for CREATE TABLE Test(ID INT), getTables returns Test as the
* table name.
* table name and identifiers are not case sensitive.
*
* @return false
* @return true is so, false otherwise
*/
@Override
public boolean storesMixedCaseIdentifiers() {
public boolean storesMixedCaseIdentifiers() throws SQLException {
debugCodeCall("storesMixedCaseIdentifiers");
return false;
JdbcConnection.Settings settings = conn.getSettings();
return !settings.databaseToUpper && !settings.databaseToLower && settings.caseInsensitiveIdentifiers;
}
/**
* Checks if a table created with CREATE TABLE "Test"(ID INT) is a different
* table than a table created with CREATE TABLE "TEST"(ID INT).
*
* @return true is so, false otherwise
*/
@Override
public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
debugCodeCall("supportsMixedCaseQuotedIdentifiers");
return !conn.getSettings().caseInsensitiveIdentifiers;
}
/**
* Checks if for CREATE TABLE "Test"(ID INT), getTables returns TEST as the
* table name.
*
* @return false usually, and true in MySQL mode
* @return false
*/
@Override
public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
debugCodeCall("storesUpperCaseQuotedIdentifiers");
return conn.getMode().getEnum() == ModeEnum.MySQL;
return false;
}
/**
* Checks if for CREATE TABLE "Test"(ID INT), getTables returns test as the
* table name.
*
* @return false usually, and true in MySQL mode
* @return false
*/
@Override
public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
debugCodeCall("storesLowerCaseQuotedIdentifiers");
return conn.getMode().getEnum() == ModeEnum.MySQL;
return false;
}
/**
* Checks if for CREATE TABLE "Test"(ID INT), getTables returns Test as the
* table name.
* table name and identifiers are case insensitive.
*
* @return true usually, and false in MySQL mode
* @return true is so, false otherwise
*/
@Override
public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
debugCodeCall("storesMixedCaseQuotedIdentifiers");
return conn.getMode().getEnum() != ModeEnum.MySQL;
return conn.getSettings().caseInsensitiveIdentifiers;
}
/**
......
h2/src/main/org/h2/table/MetaTable.java
浏览文件 @ 6178c2ed
......@@ -705,9 +705,6 @@ public class MetaTable extends Table {
}
private ArrayList<Table> getTablesByName(Session session, String tableName) {
if (database.getMode().lowerCaseIdentifiers) {
tableName = StringUtils.toUpperEnglish(tableName);
}
ArrayList<Table> tables = database.getTableOrViewByName(tableName);
for (Table temp : session.getLocalTempTables()) {
if (temp.getName().equals(tableName)) {
......@@ -769,12 +766,12 @@ public class MetaTable extends Table {
}
ArrayList<Row> rows = Utils.newSmallArrayList();
String catalog = identifier(database.getShortName());
String catalog = database.getShortName();
boolean admin = session.getUser().isAdmin();
switch (type) {
case TABLES: {
for (Table table : getAllTables(session)) {
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -803,7 +800,7 @@ public class MetaTable extends Table {
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// TABLE_TYPE
......@@ -833,7 +830,7 @@ public class MetaTable extends Table {
// 10x faster
final ArrayList<Table> tablesToList;
if (indexFrom != null && indexFrom.equals(indexTo)) {
String tableName = identifier(indexFrom.getString());
String tableName = indexFrom.getString();
if (tableName == null) {
break;
}
......@@ -842,7 +839,7 @@ public class MetaTable extends Table {
tablesToList = getAllTables(session);
}
for (Table table : tablesToList) {
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -880,11 +877,11 @@ public class MetaTable extends Table {
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// COLUMN_NAME
identifier(c.getName()),
c.getName(),
// ORDINAL_POSITION
ValueInt.get(j + 1),
// DOMAIN_CATALOG
......@@ -953,7 +950,7 @@ public class MetaTable extends Table {
// 10x faster
final ArrayList<Table> tablesToList;
if (indexFrom != null && indexFrom.equals(indexTo)) {
String tableName = identifier(indexFrom.getString());
String tableName = indexFrom.getString();
if (tableName == null) {
break;
}
......@@ -962,7 +959,7 @@ public class MetaTable extends Table {
tablesToList = getAllTables(session);
}
for (Table table : tablesToList) {
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -998,17 +995,17 @@ public class MetaTable extends Table {
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// NON_UNIQUE
ValueBoolean.get(!index.getIndexType().isUnique()),
// INDEX_NAME
identifier(index.getName()),
index.getName(),
// ORDINAL_POSITION
ValueShort.get((short) (k + 1)),
// COLUMN_NAME
identifier(column.getName()),
column.getName(),
// CARDINALITY
ValueInt.get(0),
// PRIMARY_KEY
......@@ -1220,9 +1217,9 @@ public class MetaTable extends Table {
// SEQUENCE_CATALOG
catalog,
// SEQUENCE_SCHEMA
identifier(s.getSchema().getName()),
s.getSchema().getName(),
// SEQUENCE_NAME
identifier(s.getName()),
s.getName(),
// CURRENT_VALUE
ValueLong.get(s.getCurrentValue()),
// INCREMENT
......@@ -1295,8 +1292,8 @@ public class MetaTable extends Table {
schema = table.getSchema();
}
}
String tableName = (table != null) ? identifier(table.getName()) : "";
String schemaName = (schema != null) ? identifier(schema.getName()) : "";
String tableName = (table != null) ? table.getName() : "";
String schemaName = (schema != null) ? schema.getName() : "";
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -1355,7 +1352,7 @@ public class MetaTable extends Table {
// ALIAS_SCHEMA
alias.getSchema().getName(),
// ALIAS_NAME
identifier(alias.getName()),
alias.getName(),
// JAVA_CLASS
alias.getJavaClassName(),
// JAVA_METHOD
......@@ -1387,7 +1384,7 @@ public class MetaTable extends Table {
// ALIAS_SCHEMA
database.getMainSchema().getName(),
// ALIAS_NAME
identifier(agg.getName()),
agg.getName(),
// JAVA_CLASS
agg.getJavaClassName(),
// JAVA_METHOD
......@@ -1431,7 +1428,7 @@ public class MetaTable extends Table {
// ALIAS_SCHEMA
alias.getSchema().getName(),
// ALIAS_NAME
identifier(alias.getName()),
alias.getName(),
// JAVA_CLASS
alias.getJavaClassName(),
// JAVA_METHOD
......@@ -1476,7 +1473,7 @@ public class MetaTable extends Table {
// ALIAS_SCHEMA
alias.getSchema().getName(),
// ALIAS_NAME
identifier(alias.getName()),
alias.getName(),
// JAVA_CLASS
alias.getJavaClassName(),
// JAVA_METHOD
......@@ -1520,7 +1517,7 @@ public class MetaTable extends Table {
// CATALOG_NAME
catalog,
// SCHEMA_NAME
identifier(schema.getName()),
schema.getName(),
// SCHEMA_OWNER
identifier(schema.getOwner().getName()),
// DEFAULT_CHARACTER_SET_NAME
......@@ -1547,7 +1544,7 @@ public class MetaTable extends Table {
if (hideTable(table, session)) {
continue;
}
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -1566,7 +1563,7 @@ public class MetaTable extends Table {
if (hideTable(table, session)) {
continue;
}
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -1595,7 +1592,7 @@ public class MetaTable extends Table {
if (table.getTableType() != TableType.VIEW) {
continue;
}
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -1604,7 +1601,7 @@ public class MetaTable extends Table {
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// VIEW_DEFINITION
......@@ -1649,7 +1646,7 @@ public class MetaTable extends Table {
IndexColumn[] refCols = ref.getRefColumns();
Table tab = ref.getTable();
Table refTab = ref.getRefTable();
String tableName = identifier(refTab.getName());
String tableName = refTab.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -1660,19 +1657,19 @@ public class MetaTable extends Table {
// PKTABLE_CATALOG
catalog,
// PKTABLE_SCHEMA
identifier(refTab.getSchema().getName()),
refTab.getSchema().getName(),
// PKTABLE_NAME
identifier(refTab.getName()),
refTab.getName(),
// PKCOLUMN_NAME
identifier(refCols[j].column.getName()),
refCols[j].column.getName(),
// FKTABLE_CATALOG
catalog,
// FKTABLE_SCHEMA
identifier(tab.getSchema().getName()),
tab.getSchema().getName(),
// FKTABLE_NAME
identifier(tab.getName()),
tab.getName(),
// FKCOLUMN_NAME
identifier(cols[j].column.getName()),
cols[j].column.getName(),
// ORDINAL_POSITION
ValueShort.get((short) (j + 1)),
// UPDATE_RULE
......@@ -1680,9 +1677,9 @@ public class MetaTable extends Table {
// DELETE_RULE
delete,
// FK_NAME
identifier(ref.getName()),
ref.getName(),
// PK_NAME
identifier(ref.getUniqueIndex().getName()),
ref.getUniqueIndex().getName(),
// DEFERRABILITY
ValueShort.get((short) DatabaseMetaData.importedKeyNotDeferrable)
);
......@@ -1706,7 +1703,7 @@ public class MetaTable extends Table {
if (index != null) {
uniqueIndexName = index.getName();
}
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -1731,16 +1728,16 @@ public class MetaTable extends Table {
// CONSTRAINT_CATALOG
catalog,
// CONSTRAINT_SCHEMA
identifier(constraint.getSchema().getName()),
constraint.getSchema().getName(),
// CONSTRAINT_NAME
identifier(constraint.getName()),
constraint.getName(),
// CONSTRAINT_TYPE
constraintType == Constraint.Type.PRIMARY_KEY ?
constraintType.getSqlName() : constraintType.name(),
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// UNIQUE_INDEX_NAME
......@@ -1768,9 +1765,9 @@ public class MetaTable extends Table {
// CONSTANT_CATALOG
catalog,
// CONSTANT_SCHEMA
identifier(constant.getSchema().getName()),
constant.getSchema().getName(),
// CONSTANT_NAME
identifier(constant.getName()),
constant.getName(),
// DATA_TYPE
ValueInt.get(DataType.convertTypeToSQLType(expr.getType().getValueType())),
// REMARKS
......@@ -1792,7 +1789,7 @@ public class MetaTable extends Table {
// DOMAIN_SCHEMA
database.getMainSchema().getName(),
// DOMAIN_NAME
identifier(dt.getName()),
dt.getName(),
// COLUMN_DEFAULT
col.getDefaultSQL(),
// IS_NULLABLE
......@@ -1828,17 +1825,17 @@ public class MetaTable extends Table {
// TRIGGER_CATALOG
catalog,
// TRIGGER_SCHEMA
identifier(trigger.getSchema().getName()),
trigger.getSchema().getName(),
// TRIGGER_NAME
identifier(trigger.getName()),
trigger.getName(),
// TRIGGER_TYPE
trigger.getTypeNameList(),
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
identifier(table.getName()),
table.getName(),
// BEFORE
ValueBoolean.get(trigger.isBefore()),
// JAVA_CLASS
......@@ -1989,9 +1986,9 @@ public class MetaTable extends Table {
// SYNONYM_CATALOG
catalog,
// SYNONYM_SCHEMA
identifier(synonym.getSchema().getName()),
synonym.getSchema().getName(),
// SYNONYM_NAME
identifier(synonym.getName()),
synonym.getName(),
// SYNONYM_FOR
synonym.getSynonymForName(),
// SYNONYM_FOR_SCHEMA
......@@ -2016,7 +2013,7 @@ public class MetaTable extends Table {
if (hideTable(table, session)) {
continue;
}
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -2024,15 +2021,15 @@ public class MetaTable extends Table {
// CONSTRAINT_CATALOG
catalog,
// CONSTRAINT_SCHEMA
identifier(constraint.getSchema().getName()),
constraint.getSchema().getName(),
// CONSTRAINT_NAME
identifier(constraint.getName()),
constraint.getName(),
// CONSTRAINT_TYPE
constraintType.getSqlName(),
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// IS_DEFERRABLE
......@@ -2052,7 +2049,7 @@ public class MetaTable extends Table {
if (hideTable(table, session)) {
continue;
}
String tableName = identifier(table.getName());
String tableName = table.getName();
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
......@@ -2094,13 +2091,13 @@ public class MetaTable extends Table {
// CONSTRAINT_CATALOG
catalog,
// CONSTRAINT_SCHEMA
identifier(constraint.getSchema().getName()),
constraint.getSchema().getName(),
// CONSTRAINT_NAME
identifier(constraint.getName()),
constraint.getName(),
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
tableName,
// COLUMN_NAME
......@@ -2135,13 +2132,13 @@ public class MetaTable extends Table {
// CONSTRAINT_CATALOG
catalog,
// CONSTRAINT_SCHEMA
identifier(constraint.getSchema().getName()),
constraint.getSchema().getName(),
// CONSTRAINT_NAME
identifier(constraint.getName()),
constraint.getName(),
// UNIQUE_CONSTRAINT_CATALOG
catalog,
// UNIQUE_CONSTRAINT_SCHEMA
identifier(unique.getSchema().getName()),
unique.getSchema().getName(),
// UNIQUE_CONSTRAINT_NAME
unique.getName(),
// MATCH_OPTION
......@@ -2248,9 +2245,9 @@ public class MetaTable extends Table {
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
identifier(table.getName()),
table.getName(),
// PRIVILEGE_TYPE
right,
// IS_GRANTABLE
......@@ -2265,11 +2262,11 @@ public class MetaTable extends Table {
// TABLE_CATALOG
catalog,
// TABLE_SCHEMA
identifier(table.getSchema().getName()),
table.getSchema().getName(),
// TABLE_NAME
identifier(table.getName()),
table.getName(),
// COLUMN_NAME
identifier(column),
column,
// PRIVILEGE_TYPE
right,
// IS_GRANTABLE
......
h2/src/test/org/h2/test/db/TestCompatibility.java
浏览文件 @ 6178c2ed
......@@ -315,13 +315,15 @@ public class TestCompatibility extends TestDb {
}
private void testMySQL() throws SQLException {
// need to reconnect to change DATABASE_TO_LOWER
conn.close();
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
Statement stat = conn.createStatement();
stat.execute("set mode mysql");
stat.execute("create schema test_schema");
stat.execute("use test_schema");
assertResult("TEST_SCHEMA", stat, "select schema()");
assertResult("test_schema", stat, "select schema()");
stat.execute("use public");
assertResult("PUBLIC", stat, "select schema()");
assertResult("public", stat, "select schema()");
stat.execute("SELECT 1");
stat.execute("DROP TABLE IF EXISTS TEST");
......@@ -372,17 +374,17 @@ public class TestCompatibility extends TestDb {
}
// need to reconnect, because meta data tables may be initialized
conn.close();
conn = getConnection("compatibility;MODE=MYSQL");
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
stat = conn.createStatement();
testLog(Math.log(10), stat);
DatabaseMetaData meta = conn.getMetaData();
assertTrue(meta.storesLowerCaseIdentifiers());
assertTrue(meta.storesLowerCaseQuotedIdentifiers());
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
assertFalse(meta.storesMixedCaseIdentifiers());
assertFalse(meta.storesMixedCaseQuotedIdentifiers());
assertFalse(meta.storesUpperCaseIdentifiers());
assertTrue(meta.storesUpperCaseQuotedIdentifiers());
assertFalse(meta.storesUpperCaseQuotedIdentifiers());
stat = conn.createStatement(ResultSet.TYPE_SCROLL_INSENSITIVE,
ResultSet.CONCUR_UPDATABLE);
......@@ -422,7 +424,7 @@ public class TestCompatibility extends TestDb {
// Check if mysql comments are supported, ensure clean connection
conn.close();
conn = getConnection("compatibility;MODE=MYSQL");
conn = getConnection("compatibility;MODE=MYSQL;DATABASE_TO_LOWER=TRUE");
stat = conn.createStatement();
stat.execute("DROP TABLE IF EXISTS TEST_NO_COMMENT");
stat.execute("CREATE table TEST_NO_COMMENT " +
......@@ -450,6 +452,8 @@ public class TestCompatibility extends TestDb {
stat.execute("CREATE INDEX IDX_ATTACHMENT_ID ON TEST_COMMENT_ENGINE (ATTACHMENT_ID)");
stat.execute("DROP INDEX IDX_ATTACHMENT_ID ON TEST_COMMENT_ENGINE");
stat.execute("DROP ALL OBJECTS");
conn.close();
conn = getConnection("compatibility");
}
......
h2/src/test/org/h2/test/jdbc/TestMetaData.java
浏览文件 @ 6178c2ed
......@@ -527,7 +527,7 @@ public class TestMetaData extends TestDb {
assertFalse(meta.storesLowerCaseIdentifiers());
assertFalse(meta.storesLowerCaseQuotedIdentifiers());
assertFalse(meta.storesMixedCaseIdentifiers());
assertTrue(meta.storesMixedCaseQuotedIdentifiers());
assertFalse(meta.storesMixedCaseQuotedIdentifiers());
assertTrue(meta.storesUpperCaseIdentifiers());
assertFalse(meta.storesUpperCaseQuotedIdentifiers());
assertTrue(meta.supportsAlterTableWithAddColumn());
......
h2/src/test/org/h2/test/unit/TestBnf.java
浏览文件 @ 6178c2ed
......@@ -39,7 +39,7 @@ public class TestBnf extends TestDb {
testModes(conn);
testProcedures(conn, false);
}
try (Connection conn = getConnection("bnf;mode=mysql")) {
try (Connection conn = getConnection("bnf;mode=mysql;database_to_lower=true")) {
testProcedures(conn, true);
}
}
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论