Author: shawkins Date: 2012-08-31 15:27:33 -0400 (Fri, 31 Aug 2012) New Revision: 4389 Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected Log: TEIID-2166 TEIID-247 adding additional array support for internal consistency and pg emulation Modified: trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -18,19 +18,19 @@ parts SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false 15 parts SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false 18 parts SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false 16 -parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000068 -1 <null> true true 19 -parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005e -1 <null> true true 20 -parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000031 -1 <null> true false 21 -parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004a -1 <null> true false 22 +parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000069 -1 <null> true true 19 +parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true 20 +parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false 21 +parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false 22 parts pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true 23 parts pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true 24 -parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-0000004f -1 <null> true false 25 +parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false 25 parts pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true 26 parts pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false 27 -parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000034 -1 <null> true true 28 -parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000040 -1 <null> true false 29 -parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true false 30 -parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-00000059 -1 <null> true false 31 +parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true 28 +parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false 29 +parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true 30 +parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false 31 Row Count : 31 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 parts java.lang.String VDBName string SYS Tables 255 255 0 false true false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -826,11 +826,12 @@ QT_Ora9DS pg_catalog pg_index oid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS pg_catalog pg_index indexrelid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO QT_Ora9DS pg_catalog pg_index indrelid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> ! <null> NO -QT_Ora9DS pg_catalog pg_index indisclustered -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO -QT_Ora9DS pg_catalog pg_index indisunique -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO -QT_Ora9DS pg_catalog pg_index indisprimary -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO -QT_Ora9DS pg_catalog pg_index indexprs 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO -QT_Ora9DS pg_catalog pg_index indkey 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS pg_catalog pg_index indnatts 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO +QT_Ora9DS pg_catalog pg_index indisclustered -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +QT_Ora9DS pg_catalog pg_index indisunique -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO +QT_Ora9DS pg_catalog pg_index indisprimary -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO +QT_Ora9DS pg_catalog pg_index indexprs 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO +QT_Ora9DS pg_catalog pg_index indkey 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 9 YES <null> <null> <null> ! <null> NO QT_Ora9DS pg_catalog pg_namespace oid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO QT_Ora9DS pg_catalog pg_namespace nspname 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO QT_Ora9DS pg_catalog pg_proc oid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO @@ -1086,7 +1087,7 @@ QT_Ora9DS XQT xqtFullData BigIntegerValue 2 biginteger 19 <null> 0 10 1 <null> <null> <null> <null> 28 15 YES <null> <null> <null> ! <null> NO QT_Ora9DS XQT xqtFullData BigDecimalValue 2 bigdecimal 20 <null> 0 10 1 <null> <null> <null> <null> 126 16 YES <null> <null> <null> ! <null> NO QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 <null> 0 10 1 <null> <null> <null> <null> 2048 17 YES <null> <null> <null> ! <null> NO -Row Count : 1086 +Row Count : 1087 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 Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -218,6 +218,7 @@ 26 6 <null> <null> 26 7 <null> <null> 26 8 <null> <null> +26 9 <null> <null> 27 1 <null> <null> 27 2 <null> <null> 28 1 <null> <null> @@ -254,7 +255,7 @@ 31 2 <null> <null> 31 3 <null> <null> 31 4 <null> <null> -Row Count : 254 +Row Count : 255 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable adrelid 4 PartsSupplier java.lang.Integer adrelid integer pg_catalog pg_attrdef 11 10 0 false false false false 1 true true true false adnum 5 PartsSupplier java.lang.Short adnum short pg_catalog pg_attrdef 6 5 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -213,48 +213,49 @@ 211 26 oid 23 4 1 8 false false false 212 26 indexrelid 23 4 2 8 false false false 213 26 indrelid 23 4 3 8 false false false -214 26 indisclustered 16 1 4 5 false false false -215 26 indisunique 16 1 5 5 false false false -216 26 indisprimary 16 1 6 5 false false false -217 26 indexprs 1043 -1 7 4004 false false false -218 26 indkey 1043 -1 8 4004 false false false -219 27 oid 23 4 1 8 false false false -220 27 nspname 1043 -1 2 4004 false false false -221 28 oid 23 4 1 8 false false false -222 28 proname 1043 -1 2 4004 false false false -223 28 proretset 16 1 3 5 false false false -224 28 prorettype 23 4 4 8 false false false -225 28 pronargs 21 2 5 6 false false false -226 28 proargtypes 705 -2 6 -2147483645 false false false -227 28 proargnames 705 -2 7 -2147483645 false false false -228 28 proargmodes 705 -2 8 -2147483645 false false false -229 28 proallargtypes 705 -2 9 -2147483645 false false false -230 28 pronamespace 23 4 10 8 false false false -231 29 oid 23 4 1 8 false false false -232 29 tgconstrrelid 23 4 2 8 false false false -233 29 tgfoid 23 4 3 8 false false false -234 29 tgargs 23 4 4 8 false false false -235 29 tgnargs 23 4 5 8 false false false -236 29 tgdeferrable 16 1 6 5 false false false -237 29 tginitdeferred 16 1 7 5 false false false -238 29 tgconstrname 1043 -1 8 4004 false false false -239 29 tgrelid 23 4 9 8 false false false -240 30 oid 23 4 1 8 false false false -241 30 typname 1043 -1 2 4004 false false false -242 30 typnamespace 23 4 3 8 false false false -243 30 typlen 21 2 4 6 false false false -244 30 typtype 1042 1 5 5 false false false -245 30 typnotnull 16 1 6 5 false false false -246 30 typbasetype 23 4 7 8 false false false -247 30 typtypmod 23 4 8 8 false false false -248 30 typdelim 1042 1 9 5 false false false -249 30 typrelid 23 4 10 8 false false false -250 30 typelem 23 4 11 8 false false false -251 31 oid 23 4 1 8 false false false -252 31 usename 1043 -1 2 4004 false false false -253 31 usecreatedb 16 1 3 5 false false false -254 31 usesuper 16 1 4 5 false false false -Row Count : 254 +214 26 indnatts 21 2 4 6 false false false +215 26 indisclustered 16 1 5 5 false false false +216 26 indisunique 16 1 6 5 false false false +217 26 indisprimary 16 1 7 5 false false false +218 26 indexprs 1043 -1 8 4004 false false false +219 26 indkey 1043 -1 9 4004 false false false +220 27 oid 23 4 1 8 false false false +221 27 nspname 1043 -1 2 4004 false false false +222 28 oid 23 4 1 8 false false false +223 28 proname 1043 -1 2 4004 false false false +224 28 proretset 16 1 3 5 false false false +225 28 prorettype 23 4 4 8 false false false +226 28 pronargs 21 2 5 6 false false false +227 28 proargtypes 705 -2 6 -2147483645 false false false +228 28 proargnames 705 -2 7 -2147483645 false false false +229 28 proargmodes 705 -2 8 -2147483645 false false false +230 28 proallargtypes 705 -2 9 -2147483645 false false false +231 28 pronamespace 23 4 10 8 false false false +232 29 oid 23 4 1 8 false false false +233 29 tgconstrrelid 23 4 2 8 false false false +234 29 tgfoid 23 4 3 8 false false false +235 29 tgargs 23 4 4 8 false false false +236 29 tgnargs 23 4 5 8 false false false +237 29 tgdeferrable 16 1 6 5 false false false +238 29 tginitdeferred 16 1 7 5 false false false +239 29 tgconstrname 1043 -1 8 4004 false false false +240 29 tgrelid 23 4 9 8 false false false +241 30 oid 23 4 1 8 false false false +242 30 typname 1043 -1 2 4004 false false false +243 30 typnamespace 23 4 3 8 false false false +244 30 typlen 21 2 4 6 false false false +245 30 typtype 1042 1 5 5 false false false +246 30 typnotnull 16 1 6 5 false false false +247 30 typbasetype 23 4 7 8 false false false +248 30 typtypmod 23 4 8 8 false false false +249 30 typdelim 1042 1 9 5 false false false +250 30 typrelid 23 4 10 8 false false false +251 30 typelem 23 4 11 8 false false false +252 31 oid 23 4 1 8 false false false +253 31 usename 1043 -1 2 4004 false false false +254 31 usecreatedb 16 1 3 5 false false false +255 31 usesuper 16 1 4 5 false false false +Row Count : 255 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable oid 4 PartsSupplier java.lang.Integer oid integer pg_catalog pg_attribute 11 10 0 false false false false 1 true true true false attrelid 4 PartsSupplier java.lang.Integer attrelid integer pg_catalog pg_attribute 11 10 0 false false false false 1 true true true false Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -36,7 +36,8 @@ 1183 _time 2 -1 b false 0 -1 , 0 1083 2287 _record 2 -1 b false 0 -1 , 0 2249 2283 anyelement 2 4 p false 0 -1 , 0 0 -Row Count : 36 +22 int2vector 2 -1 b false 0 -1 , 0 0 +Row Count : 37 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable oid 4 PartsSupplier java.lang.Integer oid integer pg_catalog pg_type 11 10 0 false false false false 1 true true true false typname 12 PartsSupplier java.lang.String typname string pg_catalog pg_type 4000 4000 0 false true false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -18,19 +18,19 @@ parts SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false 15 parts SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false 18 parts SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false 16 -parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000068 -1 <null> true true 19 -parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005e -1 <null> true true 20 -parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000031 -1 <null> true false 21 -parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004a -1 <null> true false 22 +parts pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000069 -1 <null> true true 19 +parts pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true 20 +parts pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false 21 +parts pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false 22 parts pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true 23 parts pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true 24 -parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-0000004f -1 <null> true false 25 +parts pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false 25 parts pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true 26 parts pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false 27 -parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000034 -1 <null> true true 28 -parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000040 -1 <null> true false 29 -parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true false 30 -parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-00000059 -1 <null> true false 31 +parts pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true 28 +parts pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false 29 +parts pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true 30 +parts pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false 31 Row Count : 31 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable vdbname 12 java.lang.String vdbname varchar 255 255 0 false true false false 1 false true false true Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -213,11 +213,12 @@ PartsSupplier pg_catalog pg_index oid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_index indexrelid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_index indrelid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> ! <null> NO -PartsSupplier pg_catalog pg_index indisclustered -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO -PartsSupplier pg_catalog pg_index indisunique -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO -PartsSupplier pg_catalog pg_index indisprimary -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO -PartsSupplier pg_catalog pg_index indexprs 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO -PartsSupplier pg_catalog pg_index indkey 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO +PartsSupplier pg_catalog pg_index indnatts 5 short 5 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO +PartsSupplier pg_catalog pg_index indisclustered -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 5 YES <null> <null> <null> ! <null> NO +PartsSupplier pg_catalog pg_index indisunique -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 6 YES <null> <null> <null> ! <null> NO +PartsSupplier pg_catalog pg_index indisprimary -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 7 YES <null> <null> <null> ! <null> NO +PartsSupplier pg_catalog pg_index indexprs 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 8 YES <null> <null> <null> ! <null> NO +PartsSupplier pg_catalog pg_index indkey 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 9 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_namespace oid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_namespace nspname 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_proc oid 4 integer 10 <null> 0 10 1 <null> <null> <null> <null> 0 1 YES <null> <null> <null> ! <null> NO @@ -254,7 +255,7 @@ PartsSupplier pg_catalog pg_user usename 12 string 4000 <null> 0 0 1 <null> <null> <null> <null> 0 2 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_user usecreatedb -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 3 YES <null> <null> <null> ! <null> NO PartsSupplier pg_catalog pg_user usesuper -7 boolean 1 <null> 0 10 1 <null> <null> <null> <null> 0 4 YES <null> <null> <null> ! <null> NO -Row Count : 254 +Row Count : 255 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String TABLE_CAT string SYS Columns 255 255 0 false true false false 0 true true false false SchemaName 12 PartsSupplier java.lang.String TABLE_SCHEM string SYS Columns 255 255 0 false true false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -162,99 +162,100 @@ PartsSupplier SYSADMIN MatViews Valid 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:60b87e792634-db64! 21d6-00000007 <null> 159 PartsSupplier SYS Properties Value 2 <null> string 0 255 false true false true false false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:2cb59cfd55db-0fb9! 2c5d-00000068 <null> 114 PartsSupplier SYS VirtualDatabases Version 2 <null> string 0 50 false true false true false false false No Nulls <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:2cb59cfd55db-27fe! e087-00000093 <null> 153 -PartsSupplier pg_catalog pg_attrdef adbin 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-b094! 89b6-0000004d <null> 181 -PartsSupplier pg_catalog pg_attrdef adnum 2 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-b094! b835-0000004c <null> 180 -PartsSupplier pg_catalog pg_attrdef adrelid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-6765! c4e3-0000004b <null> 179 -PartsSupplier pg_catalog pg_attrdef adsrc 4 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-b094! ca93-0000004e <null> 182 -PartsSupplier pg_catalog pg_am amname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-a44d! 26e2-00000033 <null> 178 +PartsSupplier pg_catalog pg_attrdef adbin 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-b094! 89d5-0000004e <null> 181 +PartsSupplier pg_catalog pg_attrdef adnum 2 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-b094! b854-0000004d <null> 180 +PartsSupplier pg_catalog pg_attrdef adrelid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-6765! c502-0000004c <null> 179 +PartsSupplier pg_catalog pg_attrdef adsrc 4 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-b094! cab2-0000004f <null> 182 +PartsSupplier pg_catalog pg_am amname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-a44d! 2701-00000034 <null> 178 PartsSupplier pg_catalog pg_attribute atthasdef 10 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-8b55! 8751-00000019 <null> 192 PartsSupplier pg_catalog pg_attribute attisdropped 9 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-9c40! 981a-00000018 <null> 191 PartsSupplier pg_catalog pg_attribute attlen 5 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-4826! ae19-00000014 <null> 187 -PartsSupplier pg_catalog matpg_relatt attname 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-81f4! e333-00000061 <null> 172 +PartsSupplier pg_catalog matpg_relatt attname 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-81f4! e352-00000062 <null> 172 PartsSupplier pg_catalog pg_attribute attname 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-73cc! 52f1-00000012 <null> 185 PartsSupplier pg_catalog pg_attribute attnotnull 8 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-ebd3! e35e-00000017 <null> 190 -PartsSupplier pg_catalog matpg_relatt attnum 2 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-564f! 47cc-00000060 <null> 171 +PartsSupplier pg_catalog matpg_relatt attnum 2 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-564f! 47eb-00000061 <null> 171 PartsSupplier pg_catalog pg_attribute attnum 6 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-4826! b78a-00000015 <null> 188 -PartsSupplier pg_catalog matpg_relatt attrelid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-cb3d! 2bfa-0000005f <null> 170 +PartsSupplier pg_catalog matpg_relatt attrelid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-cb3d! 2c19-00000060 <null> 170 PartsSupplier pg_catalog pg_attribute attrelid 2 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-bd14! 9bb8-00000011 <null> 184 PartsSupplier pg_catalog pg_attribute atttypid 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-bd39! f12a-00000013 <null> 186 PartsSupplier pg_catalog pg_attribute atttypmod 7 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-a120! a8bd-00000016 <null> 189 -PartsSupplier pg_catalog matpg_relatt autoinc 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-83aa! 4e56-00000064 <null> 175 +PartsSupplier pg_catalog matpg_relatt autoinc 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-83aa! 4e75-00000065 <null> 175 PartsSupplier SYSADMIN VDBResources contents 2 <null> blob 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> org.teiid.core.types.BlobType 0 0 0 tid:60b87e792634-2c5e! 89f3-0000000d <null> 164 -PartsSupplier pg_catalog pg_database datacl 7 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-dad6! 37f3-00000056 <null> 208 -PartsSupplier pg_catalog pg_database datallowconn 5 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-5e2b! 9a9e-00000054 <null> 206 -PartsSupplier pg_catalog pg_database datconfig 6 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-1944! 37f9-00000055 <null> 207 -PartsSupplier pg_catalog pg_database datdba 8 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-dad6! 430c-00000057 <null> 209 -PartsSupplier pg_catalog pg_database datlastsysoid 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-6243! db2a-00000053 <null> 205 -PartsSupplier pg_catalog pg_database datname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-80af! d902-00000051 <null> 203 -PartsSupplier pg_catalog pg_database dattablespace 9 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-5f2f! 972f-00000058 <null> 210 -PartsSupplier pg_catalog pg_database encoding 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-90a3! abb3-00000052 <null> 204 -PartsSupplier pg_catalog pg_index indexprs 7 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-3c90! 62a5-0000002e <null> 217 +PartsSupplier pg_catalog pg_database datacl 7 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-dad6! 352a-00000057 <null> 208 +PartsSupplier pg_catalog pg_database datallowconn 5 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-5e2b! 97d5-00000055 <null> 206 +PartsSupplier pg_catalog pg_database datconfig 6 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-1944! 3530-00000056 <null> 207 +PartsSupplier pg_catalog pg_database datdba 8 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-dad6! 4043-00000058 <null> 209 +PartsSupplier pg_catalog pg_database datlastsysoid 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-6243! d861-00000054 <null> 205 +PartsSupplier pg_catalog pg_database datname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-80af! d639-00000052 <null> 203 +PartsSupplier pg_catalog pg_database dattablespace 9 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-5f2f! 9466-00000059 <null> 210 +PartsSupplier pg_catalog pg_database encoding 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-90a3! a8ea-00000053 <null> 204 +PartsSupplier pg_catalog pg_index indexprs 8 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-3c90! 62a5-0000002f <null> 218 PartsSupplier pg_catalog pg_index indexrelid 2 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-6368! efe8-00000029 <null> 212 -PartsSupplier pg_catalog pg_index indisclustered 4 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-47ce! 22f6-0000002b <null> 214 -PartsSupplier pg_catalog pg_index indisprimary 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-2c22! f29f-0000002d <null> 216 -PartsSupplier pg_catalog pg_index indisunique 5 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-56a1! 3c60-0000002c <null> 215 -PartsSupplier pg_catalog pg_index indkey 8 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-ef45! 6826-0000002f <null> 218 +PartsSupplier pg_catalog pg_index indisclustered 5 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-47ce! 22f6-0000002c <null> 215 +PartsSupplier pg_catalog pg_index indisprimary 7 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-2c22! f29f-0000002e <null> 217 +PartsSupplier pg_catalog pg_index indisunique 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-56a1! 3c60-0000002d <null> 216 +PartsSupplier pg_catalog pg_index indkey 9 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-ef45! 6826-00000030 <null> 219 +PartsSupplier pg_catalog pg_index indnatts 4 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-3d04! d0e7-0000002b <null> 214 PartsSupplier pg_catalog pg_index indrelid 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-3d3e! e0fb-0000002a <null> 213 -PartsSupplier pg_catalog matpg_datatype name 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-9edf! 60b7-0000006b <null> 167 -PartsSupplier pg_catalog matpg_relatt nspname 5 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-2fb8! aedd-00000063 <null> 174 -PartsSupplier pg_catalog pg_namespace nspname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-e055! 7576-00000003 <null> 220 -PartsSupplier pg_catalog matpg_datatype oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9ead! 93f6-00000069 <null> 165 -PartsSupplier pg_catalog pg_am oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-f895! 43f5-00000032 <null> 177 +PartsSupplier pg_catalog matpg_datatype name 3 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-9edf! 60d6-0000006c <null> 167 +PartsSupplier pg_catalog matpg_relatt nspname 5 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-2fb8! aefc-00000064 <null> 174 +PartsSupplier pg_catalog pg_namespace nspname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-e055! 7576-00000003 <null> 221 +PartsSupplier pg_catalog matpg_datatype oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9ead! 9415-0000006a <null> 165 +PartsSupplier pg_catalog pg_am oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-f895! 4414-00000033 <null> 177 PartsSupplier pg_catalog pg_attribute oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9c09! 440f-00000010 <null> 183 PartsSupplier pg_catalog pg_class oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-7f51! b3be-00000005 <null> 193 -PartsSupplier pg_catalog pg_database oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-2aa6! 2c2a-00000050 <null> 202 +PartsSupplier pg_catalog pg_database oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-2aa6! 2961-00000051 <null> 202 PartsSupplier pg_catalog pg_index oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-35dd! 0fd0-00000028 <null> 211 -PartsSupplier pg_catalog pg_namespace oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-5ace! 9aea-00000002 <null> 219 -PartsSupplier pg_catalog pg_proc oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-eef9! add1-00000035 <null> 221 -PartsSupplier pg_catalog pg_trigger oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-d272! 8add-00000041 <null> 231 -PartsSupplier pg_catalog pg_type oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-b1cd! f706-0000001c <null> 240 -PartsSupplier pg_catalog pg_user oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-a354! 8e04-0000005a <null> 251 -PartsSupplier pg_catalog pg_proc proallargtypes 9 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-f418! fbbe-0000003d <null> 229 -PartsSupplier pg_catalog pg_proc proargmodes 8 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-c636! 3c4e-0000003c <null> 228 -PartsSupplier pg_catalog pg_proc proargnames 7 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-c63e! 1866-0000003b <null> 227 -PartsSupplier pg_catalog pg_proc proargtypes 6 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-c69d! 9997-0000003a <null> 226 -PartsSupplier pg_catalog pg_proc proname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-dc8a! 0ebf-00000036 <null> 222 -PartsSupplier pg_catalog pg_proc pronamespace 10 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-d103! 5555-0000003e <null> 230 -PartsSupplier pg_catalog pg_proc pronargs 5 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-b3a7! dbc5-00000039 <null> 225 -PartsSupplier pg_catalog pg_proc proretset 3 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-c750! 7115-00000037 <null> 223 -PartsSupplier pg_catalog pg_proc prorettype 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-21ae! 7015-00000038 <null> 224 +PartsSupplier pg_catalog pg_namespace oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-5ace! 9aea-00000002 <null> 220 +PartsSupplier pg_catalog pg_proc oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-eef9! adf0-00000036 <null> 222 +PartsSupplier pg_catalog pg_trigger oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-d272! 8afc-00000042 <null> 232 +PartsSupplier pg_catalog pg_type oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-b1cd! f706-0000001c <null> 241 +PartsSupplier pg_catalog pg_user oid 1 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-a354! 92dc-0000005b <null> 252 +PartsSupplier pg_catalog pg_proc proallargtypes 9 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-f418! fbdd-0000003e <null> 230 +PartsSupplier pg_catalog pg_proc proargmodes 8 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-c636! 3c6d-0000003d <null> 229 +PartsSupplier pg_catalog pg_proc proargnames 7 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-c63e! 1885-0000003c <null> 228 +PartsSupplier pg_catalog pg_proc proargtypes 6 <null> object 0 2147483647 false true false false false false false Nullable <null> <null> -1 -1 Unsearchable <null> <null> java.lang.Object 0 0 0 tid:7ff2755e9621-c69d! 99b6-0000003b <null> 227 +PartsSupplier pg_catalog pg_proc proname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-dc8a! 0ede-00000037 <null> 223 +PartsSupplier pg_catalog pg_proc pronamespace 10 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-d103! 5574-0000003f <null> 231 +PartsSupplier pg_catalog pg_proc pronargs 5 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-b3a7! dbe4-0000003a <null> 226 +PartsSupplier pg_catalog pg_proc proretset 3 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-c750! 7134-00000038 <null> 224 +PartsSupplier pg_catalog pg_proc prorettype 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-21ae! 7034-00000039 <null> 225 PartsSupplier pg_catalog pg_class relam 5 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-85c6! 0879-00000009 <null> 197 PartsSupplier pg_catalog pg_class relhasoids 9 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-c399! e0be-0000000d <null> 201 PartsSupplier pg_catalog pg_class relhasrules 8 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-c471! 5c2a-0000000c <null> 200 PartsSupplier pg_catalog pg_class relkind 4 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-c054! 05a1-00000008 <null> 196 -PartsSupplier pg_catalog matpg_relatt relname 4 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-eb35! 652b-00000062 <null> 173 +PartsSupplier pg_catalog matpg_relatt relname 4 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-eb35! 654a-00000063 <null> 173 PartsSupplier pg_catalog pg_class relname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-c055! 4498-00000006 <null> 194 PartsSupplier pg_catalog pg_class relnamespace 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-0445! 3ed6-00000007 <null> 195 PartsSupplier pg_catalog pg_class relpages 7 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-5f0e! b4bf-0000000b <null> 199 PartsSupplier pg_catalog pg_class reltuples 6 <null> float 3 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Float 7 0 10 tid:7ff2755e9621-9f58! 9978-0000000a <null> 198 PartsSupplier SYSADMIN VDBResources resourcePath 1 <null> string 0 255 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:60b87e792634-3744! 142c-0000000c <null> 163 -PartsSupplier pg_catalog pg_trigger tgargs 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3c! 4ae3-00000044 <null> 234 -PartsSupplier pg_catalog pg_trigger tgconstrname 8 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-2ba0! 9840-00000048 <null> 238 -PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9f72! b425-00000042 <null> 232 -PartsSupplier pg_catalog pg_trigger tgdeferrable 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-2e2d! 7860-00000046 <null> 236 -PartsSupplier pg_catalog pg_trigger tgfoid 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3e! 85aa-00000043 <null> 233 -PartsSupplier pg_catalog pg_trigger tginitdeferred 7 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-cb89! 33f5-00000047 <null> 237 -PartsSupplier pg_catalog pg_trigger tgnargs 5 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-80c2! c8cb-00000045 <null> 235 -PartsSupplier pg_catalog pg_trigger tgrelid 9 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-80fc! e1f4-00000049 <null> 239 -PartsSupplier pg_catalog pg_type typbasetype 7 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-1787! 1652-00000022 <null> 246 -PartsSupplier pg_catalog pg_type typdelim 9 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-8976! 2000-00000024 <null> 248 -PartsSupplier pg_catalog pg_type typelem 11 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-7ef3! 59d6-00000026 <null> 250 -PartsSupplier pg_catalog matpg_datatype typlen 5 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-6b7b! b5d6-0000006d <null> 169 -PartsSupplier pg_catalog pg_type typlen 4 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-7e9c! 18e6-0000001f <null> 243 -PartsSupplier pg_catalog matpg_datatype typname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-6bd6! e5c2-0000006a <null> 166 -PartsSupplier pg_catalog pg_type typname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-7ef7! 48d2-0000001d <null> 241 -PartsSupplier pg_catalog pg_type typnamespace 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-b928! 886c-0000001e <null> 242 -PartsSupplier pg_catalog pg_type typnotnull 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-68dd! 732b-00000021 <null> 245 -PartsSupplier pg_catalog matpg_relatt typoid 7 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-7700! 01e6-00000065 <null> 176 -PartsSupplier pg_catalog pg_type typrelid 10 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-8a3b! 6905-00000025 <null> 249 -PartsSupplier pg_catalog pg_type typtype 5 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-7efa! 5d81-00000020 <null> 244 -PartsSupplier pg_catalog pg_type typtypmod 8 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-ebc6! 8c1e-00000023 <null> 247 -PartsSupplier pg_catalog matpg_datatype uid 4 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-9ead! aa7c-0000006c <null> 168 -PartsSupplier pg_catalog pg_user usecreatedb 3 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-5857! 8d3b-0000005c <null> 253 -PartsSupplier pg_catalog pg_user usename 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-9a8c! 04cc-0000005b <null> 252 -PartsSupplier pg_catalog pg_user usesuper 4 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-938d! e68e-0000005d <null> 254 -Row Count : 254 +PartsSupplier pg_catalog pg_trigger tgargs 4 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3c! 4b02-00000045 <null> 235 +PartsSupplier pg_catalog pg_trigger tgconstrname 8 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-2ba0! 985f-00000049 <null> 239 +PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9f72! b444-00000043 <null> 233 +PartsSupplier pg_catalog pg_trigger tgdeferrable 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-2e2d! 787f-00000047 <null> 237 +PartsSupplier pg_catalog pg_trigger tgfoid 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3e! 85c9-00000044 <null> 234 +PartsSupplier pg_catalog pg_trigger tginitdeferred 7 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-cb89! 3414-00000048 <null> 238 +PartsSupplier pg_catalog pg_trigger tgnargs 5 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-80c2! c8ea-00000046 <null> 236 +PartsSupplier pg_catalog pg_trigger tgrelid 9 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-80fc! e213-0000004a <null> 240 +PartsSupplier pg_catalog pg_type typbasetype 7 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-1787! 1652-00000022 <null> 247 +PartsSupplier pg_catalog pg_type typdelim 9 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-8976! 2000-00000024 <null> 249 +PartsSupplier pg_catalog pg_type typelem 11 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-7ef3! 59d6-00000026 <null> 251 +PartsSupplier pg_catalog matpg_datatype typlen 5 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-6b7b! b5f5-0000006e <null> 169 +PartsSupplier pg_catalog pg_type typlen 4 <null> short 0 2 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Short 5 0 10 tid:7ff2755e9621-7e9c! 18e6-0000001f <null> 244 +PartsSupplier pg_catalog matpg_datatype typname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-6bd6! e5e1-0000006b <null> 166 +PartsSupplier pg_catalog pg_type typname 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-7ef7! 48d2-0000001d <null> 242 +PartsSupplier pg_catalog pg_type typnamespace 3 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-b928! 886c-0000001e <null> 243 +PartsSupplier pg_catalog pg_type typnotnull 6 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-68dd! 732b-00000021 <null> 246 +PartsSupplier pg_catalog matpg_relatt typoid 7 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-7700! 0205-00000066 <null> 176 +PartsSupplier pg_catalog pg_type typrelid 10 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-8a3b! 6905-00000025 <null> 250 +PartsSupplier pg_catalog pg_type typtype 5 <null> char 0 1 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 tid:7ff2755e9621-7efa! 5d81-00000020 <null> 245 +PartsSupplier pg_catalog pg_type typtypmod 8 <null> integer 0 4 false true false false true false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 10 0 10 tid:7ff2755e9621-ebc6! 8c1e-00000023 <null> 248 +PartsSupplier pg_catalog matpg_datatype uid 4 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-9ead! aa9b-0000006d <null> 168 +PartsSupplier pg_catalog pg_user usecreatedb 3 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-5857! 9213-0000005d <null> 254 +PartsSupplier pg_catalog pg_user usename 2 <null> string 0 4000 false true false true false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 tid:7ff2755e9621-9a8c! 09a4-0000005c <null> 253 +PartsSupplier pg_catalog pg_user usesuper 4 <null> boolean 0 1 false true false false false false false Nullable <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 1 0 10 tid:7ff2755e9621-938d! eb66-0000005e <null> 255 +Row Count : 255 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String VDBName string SYS Columns 255 255 0 false true false false 0 true true false false SchemaName 12 PartsSupplier java.lang.String SchemaName string SYS Columns 255 255 0 false true false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -9,19 +9,19 @@ PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_ID PK_SUPPLIER Primary <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 1 4 PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS SUPPLIER_ID PK_SUPPLIER_PARTS Primary <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 1 6 PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER SUPPLIER_STATUS FK_SPLIER_STATS Foreign mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 mmuuid:5ac43c00-73ff-1edc-a81c-ecf397b10590 1 5 -PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abee4-00000066 1 14 -PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649312-00000067 2 18 -PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649312-00000067 1 17 -PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5941-0000006e 2 11 -PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abee4-00000066 3 16 -PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa7f1-0000006f 2 13 -PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5941-0000006e 1 10 +PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 1 14 +PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649331-00000068 2 18 +PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index <null> tid:7ff2755e9621-2a649331-00000068 1 17 +PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5960-0000006f 2 11 +PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 3 16 +PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa810-00000070 2 13 +PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary <null> tid:7ff2755e9621-e36b5960-0000006f 1 10 PartsSupplier pg_catalog pg_attribute oid pk_pg_attr Primary <null> tid:7ff2755e9621-db38c73a-0000001a 1 19 PartsSupplier pg_catalog pg_class oid pk_pg_class Primary <null> tid:7ff2755e9621-265d38e8-0000000e 1 20 -PartsSupplier pg_catalog pg_index oid pk_pg_index Primary <null> tid:7ff2755e9621-dd3e1454-00000030 1 21 -PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> tid:7ff2755e9621-2e2ffa61-0000003f 1 22 -PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abee4-00000066 2 15 -PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa7f1-0000006f 1 12 +PartsSupplier pg_catalog pg_index oid pk_pg_index Primary <null> tid:7ff2755e9621-dd3e1454-00000031 1 21 +PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary <null> tid:7ff2755e9621-2e2ffa80-00000040 1 22 +PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary <null> tid:7ff2755e9621-965abf03-00000067 2 15 +PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index <null> tid:7ff2755e9621-ed0fa810-00000070 1 12 Row Count : 22 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String VDBName string SYS KeyColumns 255 255 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -8,14 +8,14 @@ PartsSupplier PartsSupplier PARTSSUPPLIER.STATUS PK_STATUS <null> <null> Primary false <null> mmuuid:25a8a740-73ff-1edc-a81c-ecf397b10590 3 PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER PK_SUPPLIER <null> <null> Primary false <null> mmuuid:375c8380-73ff-1edc-a81c-ecf397b10590 4 PartsSupplier PartsSupplier PARTSSUPPLIER.SUPPLIER_PARTS PK_SUPPLIER_PARTS <null> <null> Primary false <null> mmuuid:455e5440-73ff-1edc-a81c-ecf397b10590 6 -PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids <null> <null> Index false <null> tid:7ff2755e9621-2a649312-00000067 12 -PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> tid:7ff2755e9621-ed0fa7f1-0000006f 10 -PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> tid:7ff2755e9621-e36b5941-0000006e 9 -PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> tid:7ff2755e9621-965abee4-00000066 11 +PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids <null> <null> Index false <null> tid:7ff2755e9621-2a649331-00000068 12 +PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids <null> <null> Index false <null> tid:7ff2755e9621-ed0fa810-00000070 10 +PartsSupplier pg_catalog matpg_datatype matpg_datatype_names <null> <null> Primary false <null> tid:7ff2755e9621-e36b5960-0000006f 9 +PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names <null> <null> Primary false <null> tid:7ff2755e9621-965abf03-00000067 11 PartsSupplier pg_catalog pg_attribute pk_pg_attr <null> <null> Primary false <null> tid:7ff2755e9621-db38c73a-0000001a 13 PartsSupplier pg_catalog pg_class pk_pg_class <null> <null> Primary false <null> tid:7ff2755e9621-265d38e8-0000000e 14 -PartsSupplier pg_catalog pg_index pk_pg_index <null> <null> Primary false <null> tid:7ff2755e9621-dd3e1454-00000030 15 -PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> tid:7ff2755e9621-2e2ffa61-0000003f 16 +PartsSupplier pg_catalog pg_index pk_pg_index <null> <null> Primary false <null> tid:7ff2755e9621-dd3e1454-00000031 15 +PartsSupplier pg_catalog pg_proc pk_pg_proc <null> <null> Primary false <null> tid:7ff2755e9621-2e2ffa80-00000040 16 Row Count : 16 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String VDBName string SYS Keys 255 255 0 false true false false 0 true true false false Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -18,19 +18,19 @@ PartsSupplier SYS Tables Table <null> true false tid:2cb59cfd55db-94dc2a85-00000083 -1 <null> true false 15 PartsSupplier SYSADMIN VDBResources Table <null> true false tid:60b87e792634-1e9b1131-0000000b -1 <null> true false 18 PartsSupplier SYS VirtualDatabases Table <null> true false tid:2cb59cfd55db-a9e11fad-00000091 -1 <null> true false 16 -PartsSupplier pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000068 -1 <null> true true 19 -PartsSupplier pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005e -1 <null> true true 20 -PartsSupplier pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000031 -1 <null> true false 21 -PartsSupplier pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004a -1 <null> true false 22 +PartsSupplier pg_catalog matpg_datatype Table <null> false false tid:7ff2755e9621-e544c1cc-00000069 -1 <null> true true 19 +PartsSupplier pg_catalog matpg_relatt Table <null> false false tid:7ff2755e9621-75d65150-0000005f -1 <null> true true 20 +PartsSupplier pg_catalog pg_am Table <null> false false tid:7ff2755e9621-065a8b74-00000032 -1 <null> true false 21 +PartsSupplier pg_catalog pg_attrdef Table <null> false false tid:7ff2755e9621-ec00662c-0000004b -1 <null> true false 22 PartsSupplier pg_catalog pg_attribute Table <null> false false tid:7ff2755e9621-edc4ea54-0000000f -1 <null> true true 23 PartsSupplier pg_catalog pg_class Table <null> false false tid:7ff2755e9621-62e78530-00000004 -1 <null> true true 24 -PartsSupplier pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-0000004f -1 <null> true false 25 +PartsSupplier pg_catalog pg_database Table <null> false false tid:7ff2755e9621-dda8fac3-00000050 -1 <null> true false 25 PartsSupplier pg_catalog pg_index Table <null> false false tid:7ff2755e9621-633d048a-00000027 -1 <null> true true 26 PartsSupplier pg_catalog pg_namespace Table <null> false false tid:7ff2755e9621-37a09513-00000001 -1 <null> true false 27 -PartsSupplier pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000034 -1 <null> true true 28 -PartsSupplier pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000040 -1 <null> true false 29 -PartsSupplier pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true false 30 -PartsSupplier pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-00000059 -1 <null> true false 31 +PartsSupplier pg_catalog pg_proc Table <null> false false tid:7ff2755e9621-d9ec709e-00000035 -1 <null> true true 28 +PartsSupplier pg_catalog pg_trigger Table <null> false false tid:7ff2755e9621-d50d2370-00000041 -1 <null> true false 29 +PartsSupplier pg_catalog pg_type Table <null> false false tid:7ff2755e9621-d9ee5c82-0000001b -1 <null> true true 30 +PartsSupplier pg_catalog pg_user Table <null> false false tid:7ff2755e9621-d9eeb913-0000005a -1 <null> true false 31 Row Count : 31 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable VDBName 12 PartsSupplier java.lang.String VDBName string SYS Tables 255 255 0 false true false false 1 true true false false Modified: trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-08-31 18:45:31 UTC (rev 4388) +++ trunk/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected 2012-08-31 19:27:33 UTC (rev 4389) @@ -2,11 +2,12 @@ Name Value UID NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1 NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1 -pg_type:oid 30 tid:7ff2755e9621-c69d9997-0000003a -pg_type:oid 1009 tid:7ff2755e9621-c63e1866-0000003b -pg_type:oid 1002 tid:7ff2755e9621-c6363c4e-0000003c -pg_type:oid 1028 tid:7ff2755e9621-f418fbbe-0000003d -Row Count : 6 +pg_type:oid 22 tid:7ff2755e9621-ef456826-00000030 +pg_type:oid 30 tid:7ff2755e9621-c69d99b6-0000003b +pg_type:oid 1009 tid:7ff2755e9621-c63e1885-0000003c +pg_type:oid 1002 tid:7ff2755e9621-c6363c6d-0000003d +pg_type:oid 1028 tid:7ff2755e9621-f418fbdd-0000003e +Row Count : 7 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable Name 12 xmlvp java.lang.String Name string SYS Properties 255 255 0 false true false false 0 true true false false Value 12 xmlvp java.lang.String Value string SYS Properties 255 255 0 false true false false 0 true true false false