Skip to content

H
h2database
Unverified 提交 65092a1d authored 作者: Noel Grandin's avatar Noel Grandin 提交者： GitHub
浏览文件
操作

Merge pull request #915 from katzyn/information_schema 

Implement INFORMATION_SCHEMA.KEY_COLUMN_USAGE from SQL standard
上级 681b718a 2b055037
master version-1.4.198 version-1.4.197
无相关合并请求
隐藏空白字符变更
内嵌 并排
正在显示 包含 148 行增加 和 35 行删除
h2/src/main/org/h2/table/MetaTable.java
浏览文件 @ 65092a1d
...@@ -110,7 +110,8 @@ public class MetaTable extends Table { ...@@ -110,7 +110,8 @@ public class MetaTable extends Table {
private static final int SESSION_STATE = 27; private static final int SESSION_STATE = 27;
private static final int QUERY_STATISTICS = 28; private static final int QUERY_STATISTICS = 28;
private static final int SYNONYMS = 29; private static final int SYNONYMS = 29;
private static final int META_TABLE_TYPE_COUNT = SYNONYMS + 1; private static final int KEY_COLUMN_USAGE = 30;
private static final int META_TABLE_TYPE_COUNT = KEY_COLUMN_USAGE + 1;
private final int type; private final int type;
private final int indexColumn; private final int indexColumn;
...@@ -542,20 +543,36 @@ public class MetaTable extends Table { ...@@ -542,20 +543,36 @@ public class MetaTable extends Table {
break; break;
} }
case SYNONYMS: { case SYNONYMS: {
setObjectName("SYNONYMS"); setObjectName("SYNONYMS");
cols = createColumns( cols = createColumns(
"SYNONYM_CATALOG", "SYNONYM_CATALOG",
"SYNONYM_SCHEMA", "SYNONYM_SCHEMA",
"SYNONYM_NAME", "SYNONYM_NAME",
"SYNONYM_FOR", "SYNONYM_FOR",
"SYNONYM_FOR_SCHEMA", "SYNONYM_FOR_SCHEMA",
"TYPE_NAME", "TYPE_NAME",
"STATUS", "STATUS",
"REMARKS", "REMARKS",
"ID INT" "ID INT"
); );
indexColumnName = "SYNONYM_NAME"; indexColumnName = "SYNONYM_NAME";
break; break;
}
case KEY_COLUMN_USAGE: {
setObjectName("KEY_COLUMN_USAGE");
cols = createColumns(
"CONSTRAINT_CATALOG",
"CONSTRAINT_SCHEMA",
"CONSTRAINT_NAME",
"TABLE_CATALOG",
"TABLE_SCHEMA",
"TABLE_NAME",
"COLUMN_NAME",
"ORDINAL_POSITION",
"POSITION_IN_UNIQUE_CONSTRAINT"
);
indexColumnName = "TABLE_NAME";
break;
} }
default: default:
throw DbException.throwInternalError("type="+type); throw DbException.throwInternalError("type="+type);
...@@ -1883,30 +1900,80 @@ public class MetaTable extends Table { ...@@ -1883,30 +1900,80 @@ public class MetaTable extends Table {
break; break;
} }
case SYNONYMS: { case SYNONYMS: {
for (TableSynonym synonym : database.getAllSynonyms()) { for (TableSynonym synonym : database.getAllSynonyms()) {
add(rows,
// SYNONYM_CATALOG
catalog,
// SYNONYM_SCHEMA
identifier(synonym.getSchema().getName()),
// SYNONYM_NAME
identifier(synonym.getName()),
// SYNONYM_FOR
synonym.getSynonymForName(),
// SYNONYM_FOR_SCHEMA
synonym.getSynonymForSchema().getName(),
// TYPE NAME
"SYNONYM",
// STATUS
"VALID",
// REMARKS
replaceNullWithEmpty(synonym.getComment()),
// ID
"" + synonym.getId()
);
}
break;
}
case KEY_COLUMN_USAGE: {
for (SchemaObject obj : database.getAllSchemaObjects(
DbObject.CONSTRAINT)) {
Constraint constraint = (Constraint) obj;
Constraint.Type constraintType = constraint.getConstraintType();
IndexColumn[] indexColumns = null;
Table table = constraint.getTable();
if (hideTable(table, session)) {
continue;
}
String tableName = identifier(table.getName());
if (!checkIndex(session, tableName, indexFrom, indexTo)) {
continue;
}
if (constraintType == Constraint.Type.UNIQUE ||
constraintType == Constraint.Type.PRIMARY_KEY) {
indexColumns = ((ConstraintUnique) constraint).getColumns();
} else if (constraintType == Constraint.Type.REFERENTIAL) {
indexColumns = ((ConstraintReferential) constraint).getColumns();
}
if (indexColumns == null) {
continue;
}
for (int i = 0; i < indexColumns.length; i++) {
IndexColumn indexColumn = indexColumns[i];
String ordinalPosition = Integer.toString(i + 1);
add(rows, add(rows,
// SYNONYM_CATALOG // CONSTRAINT_CATALOG
catalog, catalog,
// SYNONYM_SCHEMA // CONSTRAINT_SCHEMA
identifier(synonym.getSchema().getName()), identifier(constraint.getSchema().getName()),
// SYNONYM_NAME // CONSTRAINT_NAME
identifier(synonym.getName()), identifier(constraint.getName()),
// SYNONYM_FOR // TABLE_CATALOG
synonym.getSynonymForName(), catalog,
// SYNONYM_FOR_SCHEMA // TABLE_SCHEMA
synonym.getSynonymForSchema().getName(), identifier(table.getSchema().getName()),
// TYPE NAME // TABLE_NAME
"SYNONYM", tableName,
// STATUS // COLUMN_NAME
"VALID", indexColumn.columnName,
// REMARKS // ORDINAL_POSITION
replaceNullWithEmpty(synonym.getComment()), ordinalPosition,
// ID // POSITION_IN_UNIQUE_CONSTRAINT
"" + synonym.getId() (constraintType == Constraint.Type.REFERENTIAL ? ordinalPosition : null)
); );
} }
break;
} }
break;
}
default: default:
DbException.throwInternalError("type="+type); DbException.throwInternalError("type="+type);
} }
......
h2/src/test/org/h2/test/jdbc/TestMetaData.java
浏览文件 @ 65092a1d
...@@ -1084,6 +1084,8 @@ public class TestMetaData extends TestBase { ...@@ -1084,6 +1084,8 @@ public class TestMetaData extends TestBase {
rs.next(); rs.next();
assertEquals("IN_DOUBT", rs.getString("TABLE_NAME")); assertEquals("IN_DOUBT", rs.getString("TABLE_NAME"));
rs.next(); rs.next();
assertEquals("KEY_COLUMN_USAGE", rs.getString("TABLE_NAME"));
rs.next();
assertEquals("LOCKS", rs.getString("TABLE_NAME")); assertEquals("LOCKS", rs.getString("TABLE_NAME"));
rs.next(); rs.next();
assertEquals("QUERY_STATISTICS", rs.getString("TABLE_NAME")); assertEquals("QUERY_STATISTICS", rs.getString("TABLE_NAME"));
......
h2/src/test/org/h2/test/scripts/TestScript.java
浏览文件 @ 65092a1d
...@@ -83,6 +83,7 @@ public class TestScript extends TestBase { ...@@ -83,6 +83,7 @@ public class TestScript extends TestBase {
testScript("testScript.sql"); testScript("testScript.sql");
testScript("derived-column-names.sql"); testScript("derived-column-names.sql");
testScript("information_schema.sql");
testScript("joins.sql"); testScript("joins.sql");
testScript("altertable-index-reuse.sql"); testScript("altertable-index-reuse.sql");
testScript("query-optimisations.sql"); testScript("query-optimisations.sql");
......
h2/src/test/org/h2/test/scripts/information_schema.sql 0 → 100644
浏览文件 @ 65092a1d
-- Copyright 2004-2018 H2 Group. Multiple-Licensed under the MPL 2.0,
-- and the EPL 1.0 (http://h2database.com/html/license.html).
-- Initial Developer: H2 Group
--
CREATE TABLE T1(C1 INT NOT NULL, C2 INT NOT NULL, C3 INT, C4 INT);
> ok
ALTER TABLE T1 ADD CONSTRAINT PK_1 PRIMARY KEY(C1, C2);
> ok
ALTER TABLE T1 ADD CONSTRAINT U_1 UNIQUE(C3, C4);
> ok
CREATE TABLE T2(C1 INT, C2 INT, C3 INT, C4 INT);
> ok
ALTER TABLE T2 ADD CONSTRAINT FK_1 FOREIGN KEY (C3, C4) REFERENCES T1(C1, C3);
> ok
SELECT * FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE LIMIT 0;
> CONSTRAINT_CATALOG CONSTRAINT_SCHEMA CONSTRAINT_NAME TABLE_CATALOG TABLE_SCHEMA TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT
> ------------------ ----------------- --------------- ------------- ------------ ---------- ----------- ---------------- -----------------------------
> rows: 0
SELECT CONSTRAINT_NAME, TABLE_NAME, COLUMN_NAME, ORDINAL_POSITION, POSITION_IN_UNIQUE_CONSTRAINT FROM INFORMATION_SCHEMA.KEY_COLUMN_USAGE
WHERE CONSTRAINT_CATALOG = DATABASE() AND CONSTRAINT_SCHEMA = SCHEMA() AND TABLE_CATALOG = DATABASE() AND TABLE_SCHEMA = SCHEMA()
ORDER BY TABLE_NAME, CONSTRAINT_NAME, ORDINAL_POSITION;
> CONSTRAINT_NAME TABLE_NAME COLUMN_NAME ORDINAL_POSITION POSITION_IN_UNIQUE_CONSTRAINT
> --------------- ---------- ----------- ---------------- -----------------------------
> PK_1 T1 C1 1 null
> PK_1 T1 C2 2 null
> U_1 T1 C3 1 null
> U_1 T1 C4 2 null
> FK_1 T2 C3 1 1
> FK_1 T2 C4 2 2
> rows (ordered): 6
DROP TABLE T2;
> ok
DROP TABLE T1;
> ok
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论