DatabaseInformationFull.java (hsqldb-2.6.0) | : | DatabaseInformationFull.java (hsqldb-2.6.1) | ||
---|---|---|---|---|
skipping to change at line 114 | skipping to change at line 114 | |||
* Provides definitions for most of the SQL Standard Schemata views that are | * Provides definitions for most of the SQL Standard Schemata views that are | |||
* supported by HSQLDB.<p> | * supported by HSQLDB.<p> | |||
* | * | |||
* Provides definitions for some of HSQLDB's additional system vies. | * Provides definitions for some of HSQLDB's additional system vies. | |||
* | * | |||
* The definitions for the rest of system vies are provided by | * The definitions for the rest of system vies are provided by | |||
* DatabaseInformationMain, which this class extends. <p> | * DatabaseInformationMain, which this class extends. <p> | |||
* | * | |||
* @author Campbell Burnet (campbell-burnet@users dot sourceforge.net) | * @author Campbell Burnet (campbell-burnet@users dot sourceforge.net) | |||
* @author Fred Toussi (fredt@users dot sourceforge.net) | * @author Fred Toussi (fredt@users dot sourceforge.net) | |||
* @version 2.6.0 | * @version 2.6.1 | |||
* @since 1.7.2 | * @since 1.7.2 | |||
*/ | */ | |||
final class DatabaseInformationFull | final class DatabaseInformationFull | |||
extends org.hsqldb.dbinfo.DatabaseInformationMain { | extends org.hsqldb.dbinfo.DatabaseInformationMain { | |||
static final String resourceFileName = | static final String resourceFileName = | |||
"/org/hsqldb/resources/information-schema.sql"; | "/org/hsqldb/resources/information-schema.sql"; | |||
static final OrderedHashMap statementMap = | static final OrderedHashMap statementMap = | |||
LineGroupReader.getStatementMap(resourceFileName); | LineGroupReader.getStatementMap(resourceFileName); | |||
skipping to change at line 1737 | skipping to change at line 1737 | |||
// JDBC | // JDBC | |||
addColumn(t, "TABLE_CATALOG", SQL_IDENTIFIER); | addColumn(t, "TABLE_CATALOG", SQL_IDENTIFIER); | |||
addColumn(t, "TABLE_SCHEMA", SQL_IDENTIFIER); | addColumn(t, "TABLE_SCHEMA", SQL_IDENTIFIER); | |||
addColumn(t, "TABLE_NAME", SQL_IDENTIFIER); // NOT NULL | addColumn(t, "TABLE_NAME", SQL_IDENTIFIER); // NOT NULL | |||
addColumn(t, "TABLE_TYPE", SQL_IDENTIFIER); // NOT NULL | addColumn(t, "TABLE_TYPE", SQL_IDENTIFIER); // NOT NULL | |||
addColumn(t, "INDEX_NAME", SQL_IDENTIFIER); | addColumn(t, "INDEX_NAME", SQL_IDENTIFIER); | |||
addColumn(t, "ORDINAL_POSITION", CARDINAL_NUMBER); | addColumn(t, "ORDINAL_POSITION", CARDINAL_NUMBER); | |||
addColumn(t, "CARDINALITY", CARDINAL_NUMBER); | addColumn(t, "CARDINALITY", CARDINAL_NUMBER); | |||
addColumn(t, "ALLOCATED_ROWS", CARDINAL_NUMBER); | addColumn(t, "ALLOCATED_ROWS", CARDINAL_NUMBER); | |||
addColumn(t, "USED_SPACE", CARDINAL_NUMBER); | ||||
addColumn(t, "ALLOCATED_SPACE", CARDINAL_NUMBER); | addColumn(t, "ALLOCATED_SPACE", CARDINAL_NUMBER); | |||
addColumn(t, "SPACE_ID", CARDINAL_NUMBER); | addColumn(t, "SPACE_ID", CARDINAL_NUMBER); | |||
addColumn(t, "BASE_SPACE", CARDINAL_NUMBER); | addColumn(t, "BASE_SPACE", CARDINAL_NUMBER); | |||
// order: NON_UNIQUE, TYPE, INDEX_NAME, and ORDINAL_POSITION. | // order: NON_UNIQUE, TYPE, INDEX_NAME, and ORDINAL_POSITION. | |||
// added for unique: INDEX_QUALIFIER, TABLE_NAME | // added for unique: INDEX_QUALIFIER, TABLE_NAME | |||
// false PK, as INDEX_QUALIFIER may be null | // false PK, as INDEX_QUALIFIER may be null | |||
HsqlName name = HsqlNameManager.newInfoSchemaObjectName( | HsqlName name = HsqlNameManager.newInfoSchemaObjectName( | |||
sysTableHsqlNames[SYSTEM_INDEXSTATS].name, false, | sysTableHsqlNames[SYSTEM_INDEXSTATS].name, false, | |||
SchemaObject.INDEX); | SchemaObject.INDEX); | |||
t.createPrimaryKeyConstraint(name, new int[] { | t.createPrimaryKeyConstraint(name, new int[] { | |||
0, 1, 2, 4 | 0, 1, 2, 5 | |||
}, false); | }, false); | |||
return t; | return t; | |||
} | } | |||
// calculated column values | // calculated column values | |||
String tableCatalog; | String tableCatalog; | |||
String tableSchema; | String tableSchema; | |||
String tableName; | String tableName; | |||
String tableType; | String tableType; | |||
End of changes. 3 change blocks. | ||||
3 lines changed or deleted | 2 lines changed or added |