3:17 a.m.
Author: shawkins
Date: 2010-10-19 21:17:11 -0400 (Tue, 19 Oct 2010)
New Revision: 2664
Modified:
branches/7.1.x/metadata/src/main/resources/System.vdb
branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected
branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
Log:
TEIID-1310 updating vdbresources to be a system table
Modified: branches/7.1.x/metadata/src/main/resources/System.vdb
===================================================================
(Binary files differ)
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestCase3473/testGetTables.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -12,6 +12,7 @@
test SYS
Tables
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
test SYS
VirtualDatabases
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
test SYSADMIN
MatViews
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
+test SYSADMIN
VDBResources
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
test pg_catalog
pg_am
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
test pg_catalog
pg_attrdef
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
test pg_catalog
pg_attribute
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
@@ -23,7 +24,6 @@
test pg_catalog
pg_trigger
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
test pg_catalog
pg_type
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
test pg_catalog
pg_user
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
-test SYSADMIN
VDBResources
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
test test
all_databases
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
test test
all_models
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
test test
all_tables
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -30,6 +30,7 @@
QT_Ora9DS SYS
Tables
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS SYS
VirtualDatabases
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS SYSADMIN
MatViews
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
+QT_Ora9DS SYSADMIN
VDBResources
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS pg_catalog
pg_am
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS pg_catalog
pg_attrdef
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS pg_catalog
pg_attribute
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
@@ -57,7 +58,6 @@
QT_Ora9DS BQT2
MediumB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallA
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
-QT_Ora9DS SYSADMIN
VDBResources
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS VQT
Base.Agg1
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg2
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg3
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_allTables.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -30,6 +30,7 @@
QT_Ora9DS SYS
Tables
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS SYS
VirtualDatabases
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS SYSADMIN
MatViews
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
+QT_Ora9DS SYSADMIN
VDBResources
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS pg_catalog
pg_am
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS pg_catalog
pg_attrdef
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS pg_catalog
pg_attribute
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
@@ -57,7 +58,6 @@
QT_Ora9DS BQT2
MediumB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallA
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
-QT_Ora9DS SYSADMIN
VDBResources
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS VQT
Base.Agg1
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg2
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg3
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableMultipleTypes.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -16,7 +16,6 @@
QT_Ora9DS BQT2
MediumB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallA
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
-QT_Ora9DS SYSADMIN
VDBResources
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS VQT
Base.Agg1
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg2
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg3
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
@@ -50,7 +49,7 @@
QT_Ora9DS VQT
Union.U9
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS XQT
xqtData
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS XQT
xqtFullData
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
-Row Count : 50
+Row Count : 49
getColumnName getColumnType getCatalogName getColumnClassName
getColumnLabel getColumnTypeName getSchemaName getTableName
getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency
isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT
string SYS Tables 255 255
0 false true false true 1
false true true true
TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM
string SYS Tables 255 255
0 false true false true 1
false true true true
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTables_specificTableTypes.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -16,7 +16,6 @@
QT_Ora9DS BQT2
MediumB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallA
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS BQT2
SmallB
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
-QT_Ora9DS SYSADMIN
VDBResources
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
QT_Ora9DS VQT
Base.Agg1
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg2
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS VQT
Base.Agg3
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
@@ -50,7 +49,7 @@
QT_Ora9DS VQT
Union.U9
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS XQT
xqtData
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
QT_Ora9DS XQT
xqtFullData
TABLE
<null> <null>
<null>
<null>
<null>
<null> false
-Row Count : 50
+Row Count : 49
getColumnName getColumnType getCatalogName getColumnClassName
getColumnLabel getColumnTypeName getSchemaName getTableName
getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency
isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
TABLE_CAT 12 QT_Ora9DS java.lang.String TABLE_CAT
string SYS Tables 255 255
0 false true false true 1
false true true true
TABLE_SCHEM 12 QT_Ora9DS java.lang.String TABLE_SCHEM
string SYS Tables 255 255
0 false true false true 1
false true true true
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTables.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -12,6 +12,7 @@
PartsSupplier SYS
Tables
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
PartsSupplier SYS
VirtualDatabases
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
PartsSupplier SYSADMIN
MatViews
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
+PartsSupplier SYSADMIN
VDBResources
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> true
PartsSupplier pg_catalog
pg_am
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
PartsSupplier pg_catalog
pg_attrdef
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
PartsSupplier pg_catalog
pg_attribute
SYSTEM TABLE
<null> <null>
<null>
<null>
<null>
<null> false
@@ -28,7 +29,6 @@
PartsSupplier PartsSupplier
PARTSSUPPLIER.STATUS
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
PartsSupplier PartsSupplier
PARTSSUPPLIER.SUPPLIER
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
PartsSupplier PartsSupplier
PARTSSUPPLIER.SUPPLIER_PARTS
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
-PartsSupplier SYSADMIN
VDBResources
TABLE
<null> <null>
<null>
<null>
<null>
<null> true
Row Count : 29
getColumnName getColumnType getCatalogName getColumnClassName
getColumnLabel getColumnTypeName getSchemaName getTableName
getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency
isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable
TABLE_CAT 12 PartsSupplier java.lang.String TABLE_CAT
string SYS Tables 255 255
0 false true false true 1
false true true true
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -1,7 +1,7 @@
string string
string
string
integer string string
integer integer boolean
boolean boolean boolean boolean boolean boolean
string string string
string string
string
string integer
integer integer string !
string integer
VDBName SchemaName
TableName
Name
Position NameInSource DataType
Scale Length
IsLengthFixed SupportsSelect SupportsUpdates IsCaseSensitive IsSigned IsCurrency
IsAutoIncremented NullType MinRange
MaxRange SearchType Format
DefaultValue
JavaClass
Precision CharOctetLength Radix UID
!
Description OID
PartsSupplier SYS
DataTypes
BaseType 17
<null> string
0 64 true
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
64 64 10
mmuuid:03beb57c-968b-4821-a6ae-cb1154cfadee !
<null> 73
-PartsSupplier SYSADMIN
MatViews
Cardinality 9
<null> integer
0 10 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:abe699b0-b6bc-4413-9172-0a21ca9664d2 !
<null> 25
+PartsSupplier SYSADMIN
MatViews
Cardinality 9
<null> integer
0 10 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:abe699b0-b6bc-4413-9172-0a21ca9664d2 !
<null> 25
PartsSupplier SYS
Tables
Cardinality 9
<null> integer
0 10 false
true false true true false false
No Nulls <null>
<null> All Except Like
<null> <null>
java.lang.Integer
10 10 10
mmuuid:24cdad3a-e8f7-4376-bb32-79f8bc8eeed2 !
<null> 154
PartsSupplier SYS
Columns
CharOctetLength 25
<null> integer
0 10 true
true false false false false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:de5def94-2804-4c91-91ed-26d630ce8afe !
<null> 52
PartsSupplier SYS
ReferenceKeyColumns
DEFERRABILITY 14
<null> integer
0 10 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:88380f55-2cbd-4325-b9a3-9dcaa88a690e !
<null> 138
@@ -43,10 +43,10 @@
PartsSupplier SYS
KeyColumns
KeyName 5
<null> string
0 255 true
true false false false false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:da4bef58-83f4-4b88-8bb0-2dc8990be539 !
<null> 80
PartsSupplier SYS
KeyColumns
KeyType 6
<null> string
0 20 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
20 20 10
mmuuid:df9e15e6-ab77-486d-bfe0-0adc378aa99d !
<null> 81
PartsSupplier SYS
Columns
Length 9
<null> integer
0 10 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:b36ea0f6-cbff-4049-bc9c-8ec9928be048 !
<null> 36
-PartsSupplier SYSADMIN
MatViews
LoadState 7
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:c67365c3-f252-40f4-aae6-8971d3b1b153 !
<null> 23
+PartsSupplier SYSADMIN
MatViews
LoadState 7
<null> string
0 255 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:c67365c3-f252-40f4-aae6-8971d3b1b153 !
<null> 23
PartsSupplier SYS
Columns
MaxRange 19
<null> string
0 50 true
true false false false false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
50 50 10
mmuuid:0b0df4a5-7de5-4315-94f7-22c84958302e !
<null> 46
PartsSupplier SYS
Columns
MinRange 18
<null> string
0 50 true
true false false false false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
50 50 10
mmuuid:dba0f97d-fab5-45f6-a1eb-3459ab3fcc74 !
<null> 45
-PartsSupplier SYSADMIN
MatViews
Name 3
<null> string
0 255 false
true true true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:0f56d35c-e450-4b4f-86b0-bdb4f1015c57 !
<null> 19
+PartsSupplier SYSADMIN
MatViews
Name 3
<null> string
0 255 false
true false true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:0f56d35c-e450-4b4f-86b0-bdb4f1015c57 !
<null> 19
PartsSupplier SYS
Columns
Name 4
<null> string
0 255 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:d1f44a6d-3e39-4251-b873-1280c2b035b3 !
<null> 31
PartsSupplier SYS
DataTypes
Name 1
<null> string
0 100 true
true false true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
100 100 10
mmuuid:17f7de33-e6f0-4b9c-b55e-a87f6b7bb9b3 !
<null> 57
PartsSupplier SYS
KeyColumns
Name 4
<null> string
0 255 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:08bda0c7-5f66-4fed-8285-d74b63eeb0e2 !
<null> 79
@@ -114,7 +114,7 @@
PartsSupplier SYS
Columns
Scale 8
<null> integer
0 10 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:cc6c6113-8d70-40c8-84c0-94e17c14e22e !
<null> 35
PartsSupplier SYS
DataTypes
Scale 6
<null> integer
0 10 true
true false false false false false
Nullable <null>
<null> Searchable
<null> (0)
java.lang.Integer
10 10 10
mmuuid:e8655204-e97a-45cd-909b-1e37731e9546 !
<null> 62
PartsSupplier SYS
ProcedureParams
Scale 11
<null> integer
0 10 true
true true false false false false
No Nulls <null>
<null> Searchable
<null> (0)
java.lang.Integer
10 10 10
mmuuid:360c8b1d-4b3d-42fd-952c-bf5763cad69e !
<null> 107
-PartsSupplier SYSADMIN
MatViews
SchemaName 2
<null> string
0 255 false
true true true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:2738c484-d24d-4c40-b0b7-e734afb03450 !
<null> 18
+PartsSupplier SYSADMIN
MatViews
SchemaName 2
<null> string
0 255 false
true false true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:2738c484-d24d-4c40-b0b7-e734afb03450 !
<null> 18
PartsSupplier SYS
Columns
SchemaName 2
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:859288c9-cd78-4407-90fc-61b5d310e2ab !
<null> 29
PartsSupplier SYS
KeyColumns
SchemaName 2
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:787be966-cf12-4956-907f-a8e6dc1009dc !
<null> 77
PartsSupplier SYS
Keys
SchemaName 2
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:4a7fc059-208e-4f98-b6ef-cb7c6102a327 !
<null> 87
@@ -129,8 +129,8 @@
PartsSupplier SYS
Columns
TableName 3
<null> string
0 255 true
true false true false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:2c09c9d1-2f25-45de-81cf-eeb2a5157d34 !
<null> 30
PartsSupplier SYS
KeyColumns
TableName 3
<null> string
0 2048 true
true false true false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
2048 2048 10
mmuuid:c24fad72-0c0d-4260-96ae-f188ad77b137 !
<null> 78
PartsSupplier SYS
Keys
TableName 3
<null> string
0 2048 true
true false true false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
2048 2048 10
mmuuid:7d9540bd-b51f-4206-8c33-b39c5ba8bb8b !
<null> 88
-PartsSupplier SYSADMIN
MatViews
TargetName 5
<null> string
0 4000 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 4000 10
mmuuid:d2831595-d6f5-4cca-aa5d-2ff2530d0ab1 !
<null> 21
-PartsSupplier SYSADMIN
MatViews
TargetSchemaName 4
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:a95dba1c-283e-4f48-9671-34cecdb7d0e3 !
<null> 20
+PartsSupplier SYSADMIN
MatViews
TargetName 5
<null> string
0 4000 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 4000 10
mmuuid:d2831595-d6f5-4cca-aa5d-2ff2530d0ab1 !
<null> 21
+PartsSupplier SYSADMIN
MatViews
TargetSchemaName 4
<null> string
0 255 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:a95dba1c-283e-4f48-9671-34cecdb7d0e3 !
<null> 20
PartsSupplier SYS
Keys
Type 7
<null> string
0 20 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
20 20 10
mmuuid:29e73c18-afec-43a9-81ab-7378d6daf20b !
<null> 92
PartsSupplier SYS
ProcedureParams
Type 7
<null> string
0 100 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
100 100 10
mmuuid:76a1981b-1226-4a55-9acf-82a061cc8642 !
<null> 103
PartsSupplier SYS
Tables
Type 4
<null> string
0 20 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
20 20 10
mmuuid:4814a0af-4e8f-4f55-9b25-3148d90d3d9b !
<null> 149
@@ -147,8 +147,8 @@
PartsSupplier SYS
Schemas
UID 4
<null> string
0 50 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
50 50 10
mmuuid:ad232e4d-9c01-4d0c-bc57-0459d9db918a !
<null> 142
PartsSupplier SYS
Tables
UID 8
<null> string
0 50 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
50 50 10
mmuuid:6afe3737-26f9-43a8-88db-86531b5dc66c !
<null> 153
PartsSupplier SYS
ReferenceKeyColumns
UPDATE_RULE 10
<null> integer
0 10 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Integer
10 10 10
mmuuid:30d5ae74-b19e-4186-97e1-aeff5801e44f !
<null> 134
-PartsSupplier SYSADMIN
MatViews
Updated 8
<null>
timestamp 0 0
false true true true true false
false Nullable <null>
<null> Searchable
<null> <null>
java.sql.Timestamp
0 0 10
mmuuid:33970a66-7ad4-411f-a6c4-545746747fe6 !
<null> 24
-PartsSupplier SYSADMIN
MatViews
VDBName 1
<null> string
0 255 false
true true true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:c1ce9841-e272-4839-8c78-777a5f68d241 !
<null> 17
+PartsSupplier SYSADMIN
MatViews
Updated 8
<null>
timestamp 0 0
false true false true true false
false Nullable <null>
<null> Searchable
<null> <null>
java.sql.Timestamp
0 0 10
mmuuid:33970a66-7ad4-411f-a6c4-545746747fe6 !
<null> 24
+PartsSupplier SYSADMIN
MatViews
VDBName 1
<null> string
0 255 false
true false true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:c1ce9841-e272-4839-8c78-777a5f68d241 !
<null> 17
PartsSupplier SYS
Columns
VDBName 1
<null> string
0 255 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:83f19a81-1243-4751-8c99-daddbf37b1d7 !
<null> 28
PartsSupplier SYS
KeyColumns
VDBName 1
<null> string
0 255 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:f062eb9c-4854-47fb-b7bd-a4e23c782b62 !
<null> 76
PartsSupplier SYS
Keys
VDBName 1
<null> string
0 255 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:5785b523-7da3-42c1-8920-66daa1f7fa1d !
<null> 86
@@ -156,7 +156,7 @@
PartsSupplier SYS
Procedures
VDBName 1
<null> string
0 255 true
true false false false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:1d664747-4a95-4605-8b28-381bed3121f1 !
<null> 113
PartsSupplier SYS
Schemas
VDBName 1
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:73dbf95b-a283-4f0a-81b9-9b98e09c2906 !
<null> 139
PartsSupplier SYS
Tables
VDBName 1
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:58de905f-9d64-4831-a985-da6d082ff709 !
<null> 146
-PartsSupplier SYSADMIN
MatViews
Valid 6
<null> boolean
0 0 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Boolean
0 0 10
mmuuid:13098912-bce2-4842-9ea9-b162fcd7383e !
<null> 22
+PartsSupplier SYSADMIN
MatViews
Valid 6
<null> boolean
0 0 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.Boolean
0 0 10
mmuuid:13098912-bce2-4842-9ea9-b162fcd7383e !
<null> 22
PartsSupplier SYS
Properties
Value 2
<null> string
0 255 true
true false true true false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
255 255 10
mmuuid:c917257d-06b7-41dd-a6cb-44c0ff0f897e !
<null> 122
PartsSupplier SYS
VirtualDatabases
Version 2
<null> string
0 50 true
true false true false false false
No Nulls <null>
<null> Searchable
<null> <null>
java.lang.String
50 50 10
mmuuid:c876d749-a512-4810-9910-3034ca524c45 !
<null> 160
PartsSupplier pg_catalog
pg_attrdef
adnum 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:e22c521a-e208-4181-9dbd-89f5de7014b9 !
<null> 222
@@ -172,7 +172,7 @@
PartsSupplier pg_catalog
pg_attribute
attrelid 2
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:3be6b5de-2287-4279-93f3-4f5064799118 !
<null> 173
PartsSupplier pg_catalog
pg_attribute
atttypid 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:99782493-1cce-4e14-9c1b-4de7ce50e2c8 !
<null> 175
PartsSupplier pg_catalog
pg_attribute
atttypmod 7
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:2e2bae3c-ab93-49f5-b96c-7a7b9d66782d !
<null> 178
-PartsSupplier SYSADMIN
VDBResources
contents 2
<null> blob
0 0 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
org.teiid.core.types.BlobType
0 0 10
mmuuid:f9421669-3564-451d-9293-96c1e5e72c4f !
<null> 27
+PartsSupplier SYSADMIN
VDBResources
contents 2
<null> blob
0 0 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
org.teiid.core.types.BlobType
0 0 10
mmuuid:f9421669-3564-451d-9293-96c1e5e72c4f !
<null> 27
PartsSupplier pg_catalog
pg_database
datacl 7
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Object
0 0 0
mmuid:4b5beb14-03a0-4652-9d6f-5f8cc74d470c !
<null> 229
PartsSupplier pg_catalog
pg_database
datallowconn 5
<null> char
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Character
0 0 0
mmuid:c2bdf40c-ec58-439c-a403-7adf604ceadd !
<null> 227
PartsSupplier pg_catalog
pg_database
datconfig 6
<null> object
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Object
0 0 0
mmuid:5c9d54b2-433f-443a-85ce-821f42ed109e !
<null> 228
@@ -217,7 +217,7 @@
PartsSupplier pg_catalog
pg_class
relnamespace 3
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:4591ef08-bff8-4f3b-9de7-420f9c7f9d2b !
<null> 165
PartsSupplier pg_catalog
pg_class
relpages 7
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:44dee7d6-b6ae-44c7-85f2-e87364d8d059 !
<null> 169
PartsSupplier pg_catalog
pg_class
reltuples 6
<null> float
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Float
0 0 0
mmuid:b9ed4b49-5a7b-4ba4-863a-37fd95b2a34c !
<null> 168
-PartsSupplier SYSADMIN
VDBResources
resourcePath 1
<null> string
0 255 false
true true true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:b1bc5150-3dcc-452e-9e75-4a506997f612 !
<null> 26
+PartsSupplier SYSADMIN
VDBResources
resourcePath 1
<null> string
0 255 false
true false true true false false
Nullable <null>
<null> Searchable
<null> <null>
java.lang.String
0 255 10
mmuuid:b1bc5150-3dcc-452e-9e75-4a506997f612 !
<null> 26
PartsSupplier pg_catalog
pg_trigger
tgargs 4
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:250d7c06-728a-4b2a-b557-91f2a69bb184 !
<null> 213
PartsSupplier pg_catalog
pg_trigger
tgconstrname 8
<null> string
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.String
0 0 0
mmuid:da4b59ca-ebff-45a8-ad68-9777bc587813 !
<null> 217
PartsSupplier pg_catalog
pg_trigger
tgconstrrelid 2
<null> integer
0 0 false
true false false false false false
Unknown <null>
<null> Searchable
<null> <null>
java.lang.Integer
0 0 0
mmuid:635b6634-632c-43c9-8cc7-bcaa016133e8 !
<null> 211
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTableIsSystem.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -5,7 +5,6 @@
PARTSSUPPLIER.STATUS
PARTSSUPPLIER.SUPPLIER
PARTSSUPPLIER.SUPPLIER_PARTS
-VDBResources
-Row Count : 6
+Row Count : 5
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
Name 12 PartsSupplier java.lang.String Name string
SYS Tables 255 255 0
false true false false 0 true
true false false
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -4,7 +4,7 @@
PartsSupplier SYS
DataTypes
Table <null>
true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0 <null>
true false 8
PartsSupplier SYS
KeyColumns
Table <null>
true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0 <null>
true false 9
PartsSupplier SYS
Keys
Table <null>
true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0 <null>
true false 10
-PartsSupplier SYSADMIN
MatViews
Table <null>
true true
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0 <null>
true false 5
+PartsSupplier SYSADMIN
MatViews
Table <null>
true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0 <null>
true false 5
PartsSupplier PartsSupplier
PARTSSUPPLIER.PARTS
Table PARTS
true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590
16 <null>
false false 0
PartsSupplier PartsSupplier
PARTSSUPPLIER.SHIP_VIA
Table SHIP_VIA
true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590
4 <null>
false false 1
PartsSupplier PartsSupplier
PARTSSUPPLIER.STATUS
Table STATUS
true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590
3 <null>
false false 2
@@ -16,7 +16,7 @@
PartsSupplier SYS
ReferenceKeyColumns
Table <null>
true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0 <null>
true false 14
PartsSupplier SYS
Schemas
Table <null>
true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0 <null>
true false 15
PartsSupplier SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0 <null>
true false 16
-PartsSupplier SYSADMIN
VDBResources
Table <null>
true true
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0 <null>
false false 6
+PartsSupplier SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0 <null>
true false 6
PartsSupplier SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0 <null>
true false 17
PartsSupplier pg_catalog
pg_am
Table <null>
false false
mmuid:1462b28e-0bab-436f-9654-013821506337 0 <null>
true false 23
PartsSupplier pg_catalog
pg_attrdef
Table <null>
false false
mmuid:71091853-c65e-46a9-9947-aa024f806e2d 0 <null>
true false 26
Modified:
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected
===================================================================
---
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected 2010-10-19
20:10:47 UTC (rev 2663)
+++
branches/7.1.x/test-integration/common/src/test/resources/TestSystemVirtualModel/testVDBResources.expected 2010-10-20
01:17:11 UTC (rev 2664)
@@ -22,5 +22,5 @@
/runtime-inf/VDBS.INDEX Blob[24924]
Row Count : 20
getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel
getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision
getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable
isReadOnly isSearchable isSigned isWritable
-resourcePath 12 PartsSupplier java.lang.String resourcePath string
SYSADMIN VDBResources 255 255 0
false true false true 1 false
true true true
-contents 2004 PartsSupplier java.sql.Blob contents blob
SYSADMIN VDBResources 2147483647 2147483647 0
false true false true 1 false
true true true
+resourcePath 12 PartsSupplier java.lang.String resourcePath string
SYSADMIN VDBResources 255 255 0
false true false false 1 true
true true false
+contents 2004 PartsSupplier java.sql.Blob contents blob
SYSADMIN VDBResources 2147483647 2147483647 0
false true false false 1 true
true true false