Skip to content

Commit

Permalink
TEIID-5012 adding a description column
Browse files Browse the repository at this point in the history
  • Loading branch information
@shawkins
shawkins committed Oct 5, 2017
1 parent 25f4bb7 commit 70e6e1a
Show file tree
Hide file tree
Showing 16 changed files with 633 additions and 624 deletions.
1 change: 1 addition & 0 deletions engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
View file
Expand Up @@ -479,6 +479,7 @@ public void fillRow(List<Object> row, VDBMetaData record,
VDBKey key = new VDBKey(record.getName(), 0);
row.add(key.getName());
row.add(record.getVersion());
row.add(record.getDescription());
}
});
name = SystemTables.PROCEDUREPARAMS.name();
Expand Down
1 change: 1 addition & 0 deletions engine/src/main/resources/org/teiid/metadata/SYS.sql
View file
Expand Up @@ -237,6 +237,7 @@ CREATE FOREIGN TABLE Tables (
CREATE FOREIGN TABLE VirtualDatabases (
Name string(255) NOT NULL,
Version string(50) NOT NULL,
Description string(4000),
PRIMARY KEY (Name, Version)
);

Expand Down
1 change: 1 addition & 0 deletions ...ly-integration-feature-pack/src/main/resources/content/docs/teiid/teiid-releasenotes.html
View file
Expand Up @@ -49,6 +49,7 @@ <h4>from 9.3</h4>
<li><a href="https://issues.jboss.org/browse/TEIID-4894">TEIID-4894</a> The XML document model feature has been removed. You must use OData or SQL/XML to create XML documents.</li>
<li><a href="https://issues.jboss.org/browse/TEIID-4924">TEIID-4924</a> Maven coordinates for Teiid artifacts have changed. They will now be pushed directly to Maven Central and will use the org.teiid group instead of org.jboss.teiid.</li>
<li><a href="https://issues.jboss.org/browse/TEIID-5026">TEIID-5026</a> The FROM_UNIXTIME function now returns a string rather than a timestamp value and no longer is rewritten to the timestampadd function. The functionality now matches that of HIVE/IMPALA. See also the to_millis and from_millis functions.</li>
<li><a href="https://issues.jboss.org/browse/TEIID-5012">TEIID-5012</a> A Description column was added to SYS.VirtualDatabases. </li>
</ul>

<h4>from 9.2</h4>
Expand Down
2 changes: 1 addition & 1 deletion test-integration/common/src/test/java/org/teiid/systemmodel/TestSystemVirtualModel.java
View file
Expand Up @@ -130,7 +130,7 @@ protected void checkResult(String testName, String query) throws Exception {

@Test public void testVirtualDatabase() throws Exception {

String[] expected = { "Name[string] Version[string] ", "PartsSupplier 1", //$NON-NLS-1$ //$NON-NLS-2$
String[] expected = { "Name[string] Version[string] Description[string] ", "PartsSupplier 1 null", //$NON-NLS-1$ //$NON-NLS-2$

};
executeAndAssertResults("select* from SYS.VirtualDatabases", //$NON-NLS-1$
Expand Down
3 changes: 2 additions & 1 deletion test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
View file
Expand Up @@ -762,6 +762,7 @@ QT_Ora9DS SYSADMIN
QT_Ora9DS SYSADMIN Views UID 12 string 50 <null> 0 0 0 <null> <null> <null> <null> 0 5 NO <null> <null> <null> <null> NO <null>
QT_Ora9DS SYS VirtualDatabases Name 12 string 255 <null> 0 0 0 <null> <null> <null> <null> 0 1 NO <null> <null> <null> <null> NO <null>
QT_Ora9DS SYS VirtualDatabases Version 12 string 50 <null> 0 0 0 <null> <null> <null> <null> 0 2 NO <null> <null> <null> <null> NO <null>
QT_Ora9DS SYS VirtualDatabases Description 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> <null> NO <null>
QT_Ora9DS XQTDoc choiceTestDocument choiceTest 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 YES <null> <null> <null> <null> NO <null>
QT_Ora9DS XQTDoc choiceTestDocument choiceTest.data3 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 YES <null> <null> <null> <null> NO <null>
QT_Ora9DS XQTDoc choiceTestDocument choiceTest.data3.wrapper3 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 0 YES <null> <null> <null> <null> NO <null>
Expand Down Expand Up @@ -1193,7 +1194,7 @@ QT_Ora9DS XQT
QT_Ora9DS XQT xqtFullData BigIntegerValue 2 biginteger 19 <null> 0 10 1 <null> <null> <null> <null> 28 15 YES <null> <null> <null> <null> NO <null>
QT_Ora9DS XQT xqtFullData BigDecimalValue 2 bigdecimal 32767 <null> 16383 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> <null> NO <null>
QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> <null> NO <null>
Row Count : 1193
Row Count : 1194
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
VDBName 12 QT_Ora9DS java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false
SchemaName 12 QT_Ora9DS java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false
Expand Down

0 comments on commit 70e6e1a

Please sign in to comment.