diff --git a/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java b/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java index 42be75582b..9b2c23e826 100644 --- a/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java +++ b/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java @@ -429,8 +429,9 @@ private Table add_pg_type() { addColumn("typdelim", DataTypeManager.DefaultDataTypes.CHAR, t); //$NON-NLS-1$ addColumn("typrelid", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ addColumn("typelem", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ + addColumn("typinput", DataTypeManager.DefaultDataTypes.INTEGER, t); //$NON-NLS-1$ String transformation = - "select oid, typname, (SELECT pg_catalog.getOid(uid) FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem from texttable('" + //$NON-NLS-1$ + "select oid, typname, (SELECT pg_catalog.getOid(uid) FROM SYS.Schemas where Name = 'SYS') as typnamespace, typlen, typtype, false as typnotnull, typbasetype, typtypmod, cast(',' as char) as typdelim, typrelid, typelem, null as typeinput from texttable('" + //$NON-NLS-1$ "16,boolean,1,b,0,-1,0,0\n" + //$NON-NLS-1$ "1043,string,-1,b,0,-1,0,0\n" + //$NON-NLS-1$ "25,text,-1,b,0,-1,0,0\n" + //$NON-NLS-1$ diff --git a/runtime/src/main/java/org/teiid/odbc/ScriptReader.java b/runtime/src/main/java/org/teiid/odbc/ScriptReader.java index 08b5444d8a..8d0635c35e 100644 --- a/runtime/src/main/java/org/teiid/odbc/ScriptReader.java +++ b/runtime/src/main/java/org/teiid/odbc/ScriptReader.java @@ -203,6 +203,18 @@ private String readStatementLoop() throws IOException { } builder.insert(expressionStart, "(SELECT oid FROM pg_class WHERE upper(relname) = "); //$NON-NLS-1$ builder.append(")"); //$NON-NLS-1$ + } else if ("regproc".equalsIgnoreCase(type)) { + String name = builder.substring(expressionStart); + if (name.startsWith("'\"") && name.length() > 4) { //$NON-NLS-1$ + name = name.substring(2, name.length()-2); + name = '\''+ name + '\''; + } + if (name.startsWith("'")) { //$NON-NLS-1$ + builder.setLength(expressionStart); + builder.append(name.toUpperCase()); + } + builder.insert(expressionStart, "(SELECT oid FROM pg_proc WHERE upper(proname) = "); //$NON-NLS-1$ + builder.append(")"); //$NON-NLS-1$ } else { builder.insert(expressionStart, "cast("); //$NON-NLS-1$ builder.append(" AS ").append(type).append(")"); //$NON-NLS-1$ //$NON-NLS-2$ diff --git a/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected b/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected index 4659c3b57e..6016fb52cf 100644 --- a/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected +++ b/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected @@ -19,20 +19,20 @@ parts SYS parts SYSADMIN Triggers Table true false tid:60b87e792634-5d71c5db-00000010 -1 true false parts SYSADMIN VDBResources Table true false tid:60b87e792634-1e9b1131-0000000c -1 true false parts SYS VirtualDatabases Table true false tid:2cb59cfd55db-a9e11fad-000000aa -1 true false -parts pg_catalog matpg_datatype Table false false tid:7ff2755e9621-e544c1cc-0000006a -1 true true -parts pg_catalog matpg_relatt Table false false tid:7ff2755e9621-75d65150-00000060 -1 true true -parts pg_catalog pg_am Table false false tid:7ff2755e9621-065a8b74-00000033 -1 true false -parts pg_catalog pg_attrdef Table false false tid:7ff2755e9621-ec00662c-0000004c -1 true false +parts pg_catalog matpg_datatype Table false false tid:7ff2755e9621-e544c1cc-0000006b -1 true true +parts pg_catalog matpg_relatt Table false false tid:7ff2755e9621-75d65150-00000061 -1 true true +parts pg_catalog pg_am Table false false tid:7ff2755e9621-065a8b74-00000034 -1 true false +parts pg_catalog pg_attrdef Table false false tid:7ff2755e9621-ec00662c-0000004d -1 true false parts pg_catalog pg_attribute Table false false tid:7ff2755e9621-edc4ea54-0000000f -1 true true parts pg_catalog pg_class Table false false tid:7ff2755e9621-62e78530-00000004 -1 true true -parts pg_catalog pg_database Table false false tid:7ff2755e9621-dda8fac3-00000051 -1 true false -parts pg_catalog pg_description Table false false tid:7ff2755e9621-3be1b5b4-00000072 -1 true false -parts pg_catalog pg_index Table false false tid:7ff2755e9621-633d048a-00000027 -1 true true +parts pg_catalog pg_database Table false false tid:7ff2755e9621-dda8fac3-00000052 -1 true false +parts pg_catalog pg_description Table false false tid:7ff2755e9621-3be1b5b4-00000073 -1 true false +parts pg_catalog pg_index Table false false tid:7ff2755e9621-633d048a-00000028 -1 true true parts pg_catalog pg_namespace Table false false tid:7ff2755e9621-37a09513-00000001 -1 true false -parts pg_catalog pg_proc Table false false tid:7ff2755e9621-d9ec709e-00000036 -1 true true -parts pg_catalog pg_trigger Table false false tid:7ff2755e9621-d50d2370-00000042 -1 true false +parts pg_catalog pg_proc Table false false tid:7ff2755e9621-d9ec709e-00000037 -1 true true +parts pg_catalog pg_trigger Table false false tid:7ff2755e9621-d50d2370-00000043 -1 true false parts pg_catalog pg_type Table false false tid:7ff2755e9621-d9ee5c82-0000001b -1 true true -parts pg_catalog pg_user Table false false tid:7ff2755e9621-d9eeb913-0000005b -1 true false +parts pg_catalog pg_user Table false false tid:7ff2755e9621-d9eeb913-0000005c -1 true false Row Count : 33 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 diff --git a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected index ca76566819..56d78c20e9 100644 --- a/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected +++ b/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected @@ -392,8 +392,8 @@ QT_Ora9DS BQT1 QT_Ora9DS BQT2 MediumA ByteNum -6 byte 8 0 10 1 0 8 YES NO QT_Ora9DS BQT1 MediumA DateValue 91 date 7 0 10 1 7 9 YES NO QT_Ora9DS BQT2 MediumA DateValue 91 date 7 0 10 1 7 9 YES NO -QT_Ora9DS BQT2 MediumA TimeValue 92 time 7 0 10 1 7 10 YES NO QT_Ora9DS BQT1 MediumA TimeValue 92 time 7 0 10 1 7 10 YES NO +QT_Ora9DS BQT2 MediumA TimeValue 92 time 7 0 10 1 7 10 YES NO QT_Ora9DS BQT2 MediumA TimestampValue 93 timestamp 7 0 10 1 7 11 YES NO QT_Ora9DS BQT1 MediumA TimestampValue 93 timestamp 7 0 10 1 7 11 YES NO QT_Ora9DS BQT2 MediumA BooleanValue -7 boolean 1 0 10 1 1 12 YES NO @@ -878,6 +878,7 @@ QT_Ora9DS pg_catalog QT_Ora9DS pg_catalog pg_type typdelim 1 char 1 0 0 1 0 9 YES NO QT_Ora9DS pg_catalog pg_type typrelid 4 integer 10 0 10 1 0 10 YES NO QT_Ora9DS pg_catalog pg_type typelem 4 integer 10 0 10 1 0 11 YES NO +QT_Ora9DS pg_catalog pg_type typinput 4 integer 10 0 10 1 0 12 YES NO QT_Ora9DS pg_catalog pg_user oid 4 integer 10 0 10 1 0 1 YES NO QT_Ora9DS pg_catalog pg_user usename 12 string 4000 0 0 1 0 2 YES NO QT_Ora9DS pg_catalog pg_user usecreatedb -7 boolean 1 0 10 1 0 3 YES NO @@ -1101,7 +1102,7 @@ QT_Ora9DS XQT QT_Ora9DS XQT xqtFullData BigIntegerValue 2 biginteger 19 0 10 1 28 15 YES NO QT_Ora9DS XQT xqtFullData BigDecimalValue 2 bigdecimal 20 0 10 1 126 16 YES NO QT_Ora9DS XQT xqtFullData ObjectValue 2000 object 2048 0 10 1 2048 17 YES NO -Row Count : 1101 +Row Count : 1102 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 diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected index d72b5d908b..f3ff363d00 100644 --- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected +++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRDEF.expected @@ -265,11 +265,12 @@ adrelid adnum adbin 529 9 529 10 529 11 -541 1 -541 2 -541 3 -541 4 -Row Count : 269 +529 12 +542 1 +542 2 +542 3 +542 4 +Row Count : 270 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 diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected index 0a771ac7ef..602b10cfc7 100644 --- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected +++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected @@ -329,11 +329,12 @@ oid attrelid attname 538 529 typdelim 1042 1 9 5 false false false 539 529 typrelid 23 4 10 8 false false false 540 529 typelem 23 4 11 8 false false false -542 541 oid 23 4 1 8 false false false -543 541 usename 1043 -1 2 4004 false false false -544 541 usecreatedb 16 1 3 5 false false false -545 541 usesuper 16 1 4 5 false false false -Row Count : 333 +541 529 typinput 23 4 12 8 false false false +543 542 oid 23 4 1 8 false false false +544 542 usename 1043 -1 2 4004 false false false +545 542 usecreatedb 16 1 3 5 false false false +546 542 usesuper 16 1 4 5 false false false +Row Count : 334 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 diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected index 6e073979ea..d30c3a3c0a 100644 --- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected +++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected @@ -66,7 +66,7 @@ oid relname 517 pk_pg_proc 414 i 0 0.0 0 false false 519 pg_trigger 414 v 0 0.0 0 false false 529 pg_type 414 v 0 0.0 0 false false -541 pg_user 414 v 0 0.0 0 false false +542 pg_user 414 v 0 0.0 0 false false Row Count : 67 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_class 11 10 0 false false false false 1 true true true false diff --git a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected index 9e805f3f22..281ffa7c2e 100644 --- a/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected +++ b/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected @@ -1,42 +1,42 @@ -integer string integer short char boolean integer integer char integer integer -oid typname typnamespace typlen typtype typnotnull typbasetype typtypmod typdelim typrelid typelem -16 boolean 94 1 b false 0 -1 , 0 0 -1043 string 94 -1 b false 0 -1 , 0 0 -25 text 94 -1 b false 0 -1 , 0 0 -1042 char 94 1 b false 0 -1 , 0 0 -21 short 94 2 b false 0 -1 , 0 0 -20 long 94 8 b false 0 -1 , 0 0 -23 integer 94 4 b false 0 -1 , 0 0 -26 oid 94 4 b false 0 -1 , 0 0 -700 float 94 4 b false 0 -1 , 0 0 -701 double 94 8 b false 0 -1 , 0 0 -705 unknown 94 -2 b false 0 -1 , 0 0 -1082 date 94 4 b false 0 -1 , 0 0 -1083 datetime 94 8 b false 0 -1 , 0 0 -1114 timestamp 94 8 b false 0 -1 , 0 0 -1700 decimal 94 -1 b false 0 -1 , 0 0 -142 xml 94 -1 b false 0 -1 , 0 0 -14939 lo 94 -1 b false 0 -1 , 0 0 -2278 void 94 4 p false 0 -1 , 0 0 -2249 record 94 -1 p false 0 -1 , 0 0 -30 oidvector 94 -1 b false 0 -1 , 0 26 -1000 _bool 94 -1 b false 0 -1 , 0 16 -1002 _char 94 -1 b false 0 -1 , 0 18 -1005 _int2 94 -1 b false 0 -1 , 0 21 -1007 _int4 94 -1 b false 0 -1 , 0 23 -1009 _text 94 -1 b false 0 -1 , 0 25 -1028 _oid 94 -1 b false 0 -1 , 0 26 -1014 _bpchar 94 -1 b false 0 -1 , 0 1042 -1015 _varchar 94 -1 b false 0 -1 , 0 1043 -1016 _int8 94 -1 b false 0 -1 , 0 20 -1021 _float4 94 -1 b false 0 -1 , 0 700 -1022 _float8 94 -1 b false 0 -1 , 0 701 -1115 _timestamp 94 -1 b false 0 -1 , 0 1114 -1182 _date 94 -1 b false 0 -1 , 0 1082 -1183 _time 94 -1 b false 0 -1 , 0 1083 -2287 _record 94 -1 b false 0 -1 , 0 2249 -2283 anyelement 94 4 p false 0 -1 , 0 0 -22 int2vector 94 -1 b false 0 -1 , 0 0 +integer string integer short char boolean integer integer char integer integer integer +oid typname typnamespace typlen typtype typnotnull typbasetype typtypmod typdelim typrelid typelem typinput +16 boolean 94 1 b false 0 -1 , 0 0 +1043 string 94 -1 b false 0 -1 , 0 0 +25 text 94 -1 b false 0 -1 , 0 0 +1042 char 94 1 b false 0 -1 , 0 0 +21 short 94 2 b false 0 -1 , 0 0 +20 long 94 8 b false 0 -1 , 0 0 +23 integer 94 4 b false 0 -1 , 0 0 +26 oid 94 4 b false 0 -1 , 0 0 +700 float 94 4 b false 0 -1 , 0 0 +701 double 94 8 b false 0 -1 , 0 0 +705 unknown 94 -2 b false 0 -1 , 0 0 +1082 date 94 4 b false 0 -1 , 0 0 +1083 datetime 94 8 b false 0 -1 , 0 0 +1114 timestamp 94 8 b false 0 -1 , 0 0 +1700 decimal 94 -1 b false 0 -1 , 0 0 +142 xml 94 -1 b false 0 -1 , 0 0 +14939 lo 94 -1 b false 0 -1 , 0 0 +2278 void 94 4 p false 0 -1 , 0 0 +2249 record 94 -1 p false 0 -1 , 0 0 +30 oidvector 94 -1 b false 0 -1 , 0 26 +1000 _bool 94 -1 b false 0 -1 , 0 16 +1002 _char 94 -1 b false 0 -1 , 0 18 +1005 _int2 94 -1 b false 0 -1 , 0 21 +1007 _int4 94 -1 b false 0 -1 , 0 23 +1009 _text 94 -1 b false 0 -1 , 0 25 +1028 _oid 94 -1 b false 0 -1 , 0 26 +1014 _bpchar 94 -1 b false 0 -1 , 0 1042 +1015 _varchar 94 -1 b false 0 -1 , 0 1043 +1016 _int8 94 -1 b false 0 -1 , 0 20 +1021 _float4 94 -1 b false 0 -1 , 0 700 +1022 _float8 94 -1 b false 0 -1 , 0 701 +1115 _timestamp 94 -1 b false 0 -1 , 0 1114 +1182 _date 94 -1 b false 0 -1 , 0 1082 +1183 _time 94 -1 b false 0 -1 , 0 1083 +2287 _record 94 -1 b false 0 -1 , 0 2249 +2283 anyelement 94 4 p false 0 -1 , 0 0 +22 int2vector 94 -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 @@ -50,3 +50,4 @@ typtypmod 4 PartsSupplier java.lang.Integer typtypmod typdelim 1 PartsSupplier java.lang.String typdelim char pg_catalog pg_type 1 1 0 false true false false 1 true true false false typrelid 4 PartsSupplier java.lang.Integer typrelid integer pg_catalog pg_type 11 10 0 false false false false 1 true true true false typelem 4 PartsSupplier java.lang.Integer typelem integer pg_catalog pg_type 11 10 0 false false false false 1 true true true false +typinput 4 PartsSupplier java.lang.Integer typinput integer pg_catalog pg_type 11 10 0 false false false false 1 true true true false diff --git a/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected b/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected index 4d9bd44ea5..5e713b85ba 100644 --- a/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected +++ b/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected @@ -19,20 +19,20 @@ parts SYS parts SYSADMIN Triggers Table true false tid:60b87e792634-5d71c5db-00000010 -1 true false parts SYSADMIN VDBResources Table true false tid:60b87e792634-1e9b1131-0000000c -1 true false parts SYS VirtualDatabases Table true false tid:2cb59cfd55db-a9e11fad-000000aa -1 true false -parts pg_catalog matpg_datatype Table false false tid:7ff2755e9621-e544c1cc-0000006a -1 true true -parts pg_catalog matpg_relatt Table false false tid:7ff2755e9621-75d65150-00000060 -1 true true -parts pg_catalog pg_am Table false false tid:7ff2755e9621-065a8b74-00000033 -1 true false -parts pg_catalog pg_attrdef Table false false tid:7ff2755e9621-ec00662c-0000004c -1 true false +parts pg_catalog matpg_datatype Table false false tid:7ff2755e9621-e544c1cc-0000006b -1 true true +parts pg_catalog matpg_relatt Table false false tid:7ff2755e9621-75d65150-00000061 -1 true true +parts pg_catalog pg_am Table false false tid:7ff2755e9621-065a8b74-00000034 -1 true false +parts pg_catalog pg_attrdef Table false false tid:7ff2755e9621-ec00662c-0000004d -1 true false parts pg_catalog pg_attribute Table false false tid:7ff2755e9621-edc4ea54-0000000f -1 true true parts pg_catalog pg_class Table false false tid:7ff2755e9621-62e78530-00000004 -1 true true -parts pg_catalog pg_database Table false false tid:7ff2755e9621-dda8fac3-00000051 -1 true false -parts pg_catalog pg_description Table false false tid:7ff2755e9621-3be1b5b4-00000072 -1 true false -parts pg_catalog pg_index Table false false tid:7ff2755e9621-633d048a-00000027 -1 true true +parts pg_catalog pg_database Table false false tid:7ff2755e9621-dda8fac3-00000052 -1 true false +parts pg_catalog pg_description Table false false tid:7ff2755e9621-3be1b5b4-00000073 -1 true false +parts pg_catalog pg_index Table false false tid:7ff2755e9621-633d048a-00000028 -1 true true parts pg_catalog pg_namespace Table false false tid:7ff2755e9621-37a09513-00000001 -1 true false -parts pg_catalog pg_proc Table false false tid:7ff2755e9621-d9ec709e-00000036 -1 true true -parts pg_catalog pg_trigger Table false false tid:7ff2755e9621-d50d2370-00000042 -1 true false +parts pg_catalog pg_proc Table false false tid:7ff2755e9621-d9ec709e-00000037 -1 true true +parts pg_catalog pg_trigger Table false false tid:7ff2755e9621-d50d2370-00000043 -1 true false parts pg_catalog pg_type Table false false tid:7ff2755e9621-d9ee5c82-0000001b -1 true true -parts pg_catalog pg_user Table false false tid:7ff2755e9621-d9eeb913-0000005b -1 true false +parts pg_catalog pg_user Table false false tid:7ff2755e9621-d9eeb913-0000005c -1 true false Row Count : 33 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 diff --git a/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected b/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected index 61afbc790e..fd46eb787f 100644 --- a/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected +++ b/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected @@ -265,11 +265,12 @@ PartsSupplier pg_catalog PartsSupplier pg_catalog pg_type typdelim 1 char 1 0 0 1 0 9 YES NO PartsSupplier pg_catalog pg_type typrelid 4 integer 10 0 10 1 0 10 YES NO PartsSupplier pg_catalog pg_type typelem 4 integer 10 0 10 1 0 11 YES NO +PartsSupplier pg_catalog pg_type typinput 4 integer 10 0 10 1 0 12 YES NO PartsSupplier pg_catalog pg_user oid 4 integer 10 0 10 1 0 1 YES NO PartsSupplier pg_catalog pg_user usename 12 string 4000 0 0 1 0 2 YES NO PartsSupplier pg_catalog pg_user usecreatedb -7 boolean 1 0 10 1 0 3 YES NO PartsSupplier pg_catalog pg_user usesuper -7 boolean 1 0 10 1 0 4 YES NO -Row Count : 269 +Row Count : 270 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 diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected index b5c3186453..e57ff6628e 100644 --- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected +++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected @@ -171,105 +171,106 @@ PartsSupplier SYSADMIN PartsSupplier SYSADMIN MatViews Valid 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:60b87e792634-db6421d6-00000007 PartsSupplier SYS Properties Value 2 string 0 255 false true false true false false false No Nulls -1 -1 Searchable java.lang.String 0 0 0 tid:2cb59cfd55db-0fb9307b-0000007b PartsSupplier SYS VirtualDatabases Version 2 string 0 50 false true false true false false false No Nulls -1 -1 Searchable java.lang.String 0 0 0 tid:2cb59cfd55db-27ff7c7f-000000ac -PartsSupplier pg_catalog pg_attrdef adbin 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-b09489f4-0000004f -PartsSupplier pg_catalog pg_attrdef adnum 2 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-b094b873-0000004e -PartsSupplier pg_catalog pg_attrdef adrelid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-6765c521-0000004d -PartsSupplier pg_catalog pg_attrdef adsrc 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-b094cad1-00000050 -PartsSupplier pg_catalog pg_am amname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-a44d2720-00000035 +PartsSupplier pg_catalog pg_attrdef adbin 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-b0948a13-00000050 +PartsSupplier pg_catalog pg_attrdef adnum 2 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-b094b892-0000004f +PartsSupplier pg_catalog pg_attrdef adrelid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-6765c540-0000004e +PartsSupplier pg_catalog pg_attrdef adsrc 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-b094caf0-00000051 +PartsSupplier pg_catalog pg_am amname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-a44d273f-00000036 PartsSupplier pg_catalog pg_attribute atthasdef 10 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-8b558751-00000019 PartsSupplier pg_catalog pg_attribute attisdropped 9 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-9c40981a-00000018 PartsSupplier pg_catalog pg_attribute attlen 5 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-4826ae19-00000014 PartsSupplier pg_catalog pg_attribute attname 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-73cc52f1-00000012 -PartsSupplier pg_catalog matpg_relatt attname 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-81f4e089-00000063 +PartsSupplier pg_catalog matpg_relatt attname 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-81f4e0a8-00000064 PartsSupplier pg_catalog pg_attribute attnotnull 8 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-ebd3e35e-00000017 PartsSupplier pg_catalog pg_attribute attnum 6 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-4826b78a-00000015 -PartsSupplier pg_catalog matpg_relatt attnum 2 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-564f4522-00000062 +PartsSupplier pg_catalog matpg_relatt attnum 2 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-564f4541-00000063 PartsSupplier pg_catalog pg_attribute attrelid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-bd149bb8-00000011 -PartsSupplier pg_catalog matpg_relatt attrelid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-cb3d2950-00000061 +PartsSupplier pg_catalog matpg_relatt attrelid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-cb3d296f-00000062 PartsSupplier pg_catalog pg_attribute atttypid 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-bd39f12a-00000013 PartsSupplier pg_catalog pg_attribute atttypmod 7 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-a120a8bd-00000016 -PartsSupplier pg_catalog matpg_relatt autoinc 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-83aa4bac-00000066 -PartsSupplier pg_catalog pg_description classoid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-2b28c927-00000074 +PartsSupplier pg_catalog matpg_relatt autoinc 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-83aa4bcb-00000067 +PartsSupplier pg_catalog pg_description classoid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-2b28c946-00000075 PartsSupplier SYSADMIN VDBResources contents 2 blob 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable org.teiid.core.types.BlobType 0 0 0 tid:60b87e792634-2c5e8a12-0000000e -PartsSupplier pg_catalog pg_database datacl 7 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-dad63549-00000058 -PartsSupplier pg_catalog pg_database datallowconn 5 char 0 1 false true false true false false false Nullable -1 -1 Searchable java.lang.Character 0 0 0 tid:7ff2755e9621-5e2b97f4-00000056 -PartsSupplier pg_catalog pg_database datconfig 6 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-1944354f-00000057 -PartsSupplier pg_catalog pg_database datdba 8 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-dad64062-00000059 -PartsSupplier pg_catalog pg_database datlastsysoid 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-6243d880-00000055 -PartsSupplier pg_catalog pg_database datname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-80afd658-00000053 -PartsSupplier pg_catalog pg_database dattablespace 9 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-5f2f9485-0000005a -PartsSupplier pg_catalog pg_description description 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9b185bd1-00000076 -PartsSupplier pg_catalog pg_database encoding 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-90a3a909-00000054 -PartsSupplier pg_catalog pg_index indexprs 9 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-3c9062a5-00000030 -PartsSupplier pg_catalog pg_index indexrelid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-6368efe8-00000029 -PartsSupplier pg_catalog pg_index indisclustered 5 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-47ce22f6-0000002c -PartsSupplier pg_catalog pg_index indisprimary 7 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-2c22f29f-0000002e -PartsSupplier pg_catalog pg_index indisunique 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-56a13c60-0000002d -PartsSupplier pg_catalog pg_index indkey 8 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-ef456826-0000002f -PartsSupplier pg_catalog pg_index indnatts 4 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-3d04d0e7-0000002b -PartsSupplier pg_catalog pg_index indpred 10 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-a9b49486-00000031 -PartsSupplier pg_catalog pg_index indrelid 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-3d3ee0fb-0000002a -PartsSupplier pg_catalog matpg_datatype name 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9edf65ae-0000006d -PartsSupplier pg_catalog matpg_relatt nspname 5 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-2fb8ac33-00000065 +PartsSupplier pg_catalog pg_database datacl 7 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-dad63568-00000059 +PartsSupplier pg_catalog pg_database datallowconn 5 char 0 1 false true false true false false false Nullable -1 -1 Searchable java.lang.Character 0 0 0 tid:7ff2755e9621-5e2b9813-00000057 +PartsSupplier pg_catalog pg_database datconfig 6 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-1944356e-00000058 +PartsSupplier pg_catalog pg_database datdba 8 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-dad64081-0000005a +PartsSupplier pg_catalog pg_database datlastsysoid 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-6243d89f-00000056 +PartsSupplier pg_catalog pg_database datname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-80afd677-00000054 +PartsSupplier pg_catalog pg_database dattablespace 9 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-5f2f94a4-0000005b +PartsSupplier pg_catalog pg_description description 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9b185bf0-00000077 +PartsSupplier pg_catalog pg_database encoding 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-90a3a928-00000055 +PartsSupplier pg_catalog pg_index indexprs 9 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-3c9062c4-00000031 +PartsSupplier pg_catalog pg_index indexrelid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-6368f007-0000002a +PartsSupplier pg_catalog pg_index indisclustered 5 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-47ce2315-0000002d +PartsSupplier pg_catalog pg_index indisprimary 7 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-2c22f2be-0000002f +PartsSupplier pg_catalog pg_index indisunique 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-56a13c7f-0000002e +PartsSupplier pg_catalog pg_index indkey 8 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-ef456845-00000030 +PartsSupplier pg_catalog pg_index indnatts 4 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-3d04d106-0000002c +PartsSupplier pg_catalog pg_index indpred 10 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-a9b494a5-00000032 +PartsSupplier pg_catalog pg_index indrelid 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-3d3ee11a-0000002b +PartsSupplier pg_catalog matpg_datatype name 3 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9edf65cd-0000006e +PartsSupplier pg_catalog matpg_relatt nspname 5 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-2fb8ac52-00000066 PartsSupplier pg_catalog pg_namespace nspname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-e0557576-00000003 -PartsSupplier pg_catalog pg_description objoid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-c4e3a148-00000073 -PartsSupplier pg_catalog pg_description objsubid 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-0814e899-00000075 -PartsSupplier pg_catalog pg_database oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-2aa62980-00000052 -PartsSupplier pg_catalog pg_index oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-35dd0fd0-00000028 +PartsSupplier pg_catalog pg_description objoid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-c4e3a167-00000074 +PartsSupplier pg_catalog pg_description objsubid 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-0814e8b8-00000076 +PartsSupplier pg_catalog pg_database oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-2aa6299f-00000053 +PartsSupplier pg_catalog pg_index oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-35dd0fef-00000029 PartsSupplier pg_catalog pg_namespace oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-5ace9aea-00000002 PartsSupplier pg_catalog pg_class oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-7f51b3be-00000005 PartsSupplier pg_catalog pg_attribute oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9c09440f-00000010 -PartsSupplier pg_catalog matpg_datatype oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9ead98ed-0000006b -PartsSupplier pg_catalog pg_user oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-a35492fb-0000005c +PartsSupplier pg_catalog matpg_datatype oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9ead990c-0000006c +PartsSupplier pg_catalog pg_user oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-a354931a-0000005d PartsSupplier pg_catalog pg_type oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-b1cdf706-0000001c -PartsSupplier pg_catalog pg_trigger oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-d2728b1b-00000043 -PartsSupplier pg_catalog pg_proc oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-eef9ae0f-00000037 -PartsSupplier pg_catalog pg_am oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-f8954433-00000034 -PartsSupplier pg_catalog pg_proc proallargtypes 9 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-f418fbfc-0000003f -PartsSupplier pg_catalog pg_proc proargmodes 8 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-c6363c8c-0000003e -PartsSupplier pg_catalog pg_proc proargnames 7 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-c63e18a4-0000003d -PartsSupplier pg_catalog pg_proc proargtypes 6 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-c69d99d5-0000003c -PartsSupplier pg_catalog pg_proc proname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-dc8a0efd-00000038 -PartsSupplier pg_catalog pg_proc pronamespace 10 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-d1035593-00000040 -PartsSupplier pg_catalog pg_proc pronargs 5 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-b3a7dc03-0000003b -PartsSupplier pg_catalog pg_proc proretset 3 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-c7507153-00000039 -PartsSupplier pg_catalog pg_proc prorettype 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-21ae7053-0000003a +PartsSupplier pg_catalog pg_trigger oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-d2728b3a-00000044 +PartsSupplier pg_catalog pg_proc oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-eef9ae2e-00000038 +PartsSupplier pg_catalog pg_am oid 1 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-f8954452-00000035 +PartsSupplier pg_catalog pg_proc proallargtypes 9 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-f418fc1b-00000040 +PartsSupplier pg_catalog pg_proc proargmodes 8 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-c6363cab-0000003f +PartsSupplier pg_catalog pg_proc proargnames 7 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-c63e18c3-0000003e +PartsSupplier pg_catalog pg_proc proargtypes 6 object 0 2147483647 false true false false false false false Nullable -1 -1 Unsearchable java.lang.Object 0 0 0 tid:7ff2755e9621-c69d99f4-0000003d +PartsSupplier pg_catalog pg_proc proname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-dc8a0f1c-00000039 +PartsSupplier pg_catalog pg_proc pronamespace 10 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-d10355b2-00000041 +PartsSupplier pg_catalog pg_proc pronargs 5 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-b3a7dc22-0000003c +PartsSupplier pg_catalog pg_proc proretset 3 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-c7507172-0000003a +PartsSupplier pg_catalog pg_proc prorettype 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-21ae7072-0000003b PartsSupplier pg_catalog pg_class relam 5 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-85c60879-00000009 PartsSupplier pg_catalog pg_class relhasoids 9 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-c399e0be-0000000d PartsSupplier pg_catalog pg_class relhasrules 8 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-c4715c2a-0000000c PartsSupplier pg_catalog pg_class relkind 4 char 0 1 false true false true false false false Nullable -1 -1 Searchable java.lang.Character 0 0 0 tid:7ff2755e9621-c05405a1-00000008 PartsSupplier pg_catalog pg_class relname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-c0554498-00000006 -PartsSupplier pg_catalog matpg_relatt relname 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-eb356281-00000064 +PartsSupplier pg_catalog matpg_relatt relname 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-eb3562a0-00000065 PartsSupplier pg_catalog pg_class relnamespace 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-04453ed6-00000007 PartsSupplier pg_catalog pg_class relpages 7 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-5f0eb4bf-0000000b PartsSupplier pg_catalog pg_class reltuples 6 float 3 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Float 7 0 10 tid:7ff2755e9621-9f589978-0000000a PartsSupplier SYSADMIN VDBResources resourcePath 1 string 0 255 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:60b87e792634-3744144b-0000000d -PartsSupplier pg_catalog pg_trigger tgargs 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3c4b21-00000046 -PartsSupplier pg_catalog pg_trigger tgconstrname 8 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-2ba0987e-0000004a -PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9f72b463-00000044 -PartsSupplier pg_catalog pg_trigger tgdeferrable 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-2e2d789e-00000048 -PartsSupplier pg_catalog pg_trigger tgfoid 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3e85e8-00000045 -PartsSupplier pg_catalog pg_trigger tginitdeferred 7 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-cb893433-00000049 -PartsSupplier pg_catalog pg_trigger tgnargs 5 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-80c2c909-00000047 -PartsSupplier pg_catalog pg_trigger tgrelid 9 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-80fce232-0000004b +PartsSupplier pg_catalog pg_trigger tgargs 4 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3c4b40-00000047 +PartsSupplier pg_catalog pg_trigger tgconstrname 8 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-2ba0989d-0000004b +PartsSupplier pg_catalog pg_trigger tgconstrrelid 2 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9f72b482-00000045 +PartsSupplier pg_catalog pg_trigger tgdeferrable 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-2e2d78bd-00000049 +PartsSupplier pg_catalog pg_trigger tgfoid 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-9e3e8607-00000046 +PartsSupplier pg_catalog pg_trigger tginitdeferred 7 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-cb893452-0000004a +PartsSupplier pg_catalog pg_trigger tgnargs 5 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-80c2c928-00000048 +PartsSupplier pg_catalog pg_trigger tgrelid 9 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-80fce251-0000004c PartsSupplier pg_catalog pg_type typbasetype 7 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-17871652-00000022 PartsSupplier pg_catalog pg_type typdelim 9 char 0 1 false true false true false false false Nullable -1 -1 Searchable java.lang.Character 0 0 0 tid:7ff2755e9621-89762000-00000024 PartsSupplier pg_catalog pg_type typelem 11 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-7ef359d6-00000026 -PartsSupplier pg_catalog matpg_datatype typlen 5 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-6b7bbacd-0000006f +PartsSupplier pg_catalog pg_type typinput 12 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-89c0bd5b-00000027 +PartsSupplier pg_catalog matpg_datatype typlen 5 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-6b7bbaec-00000070 PartsSupplier pg_catalog pg_type typlen 4 short 0 2 false true false false true false false Nullable -1 -1 Searchable java.lang.Short 5 0 10 tid:7ff2755e9621-7e9c18e6-0000001f -PartsSupplier pg_catalog matpg_datatype typname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-6bd6eab9-0000006c +PartsSupplier pg_catalog matpg_datatype typname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-6bd6ead8-0000006d PartsSupplier pg_catalog pg_type typname 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-7ef748d2-0000001d PartsSupplier pg_catalog pg_type typnamespace 3 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-b928886c-0000001e PartsSupplier pg_catalog pg_type typnotnull 6 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-68dd732b-00000021 -PartsSupplier pg_catalog matpg_relatt typoid 7 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-76ffff3c-00000067 +PartsSupplier pg_catalog matpg_relatt typoid 7 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-76ffff5b-00000068 PartsSupplier pg_catalog pg_type typrelid 10 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-8a3b6905-00000025 PartsSupplier pg_catalog pg_type typtype 5 char 0 1 false true false true false false false Nullable -1 -1 Searchable java.lang.Character 0 0 0 tid:7ff2755e9621-7efa5d81-00000020 PartsSupplier pg_catalog pg_type typtypmod 8 integer 0 4 false true false false true false false Nullable -1 -1 Searchable java.lang.Integer 10 0 10 tid:7ff2755e9621-ebc68c1e-00000023 -PartsSupplier pg_catalog matpg_datatype uid 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9eadaf73-0000006e -PartsSupplier pg_catalog pg_user usecreatedb 3 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-58579232-0000005e -PartsSupplier pg_catalog pg_user usename 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9a8c09c3-0000005d -PartsSupplier pg_catalog pg_user usesuper 4 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-938deb85-0000005f -Row Count : 269 +PartsSupplier pg_catalog matpg_datatype uid 4 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9eadaf92-0000006f +PartsSupplier pg_catalog pg_user usecreatedb 3 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-58579251-0000005f +PartsSupplier pg_catalog pg_user usename 2 string 0 4000 false true false true false false false Nullable -1 -1 Searchable java.lang.String 0 0 0 tid:7ff2755e9621-9a8c09e2-0000005e +PartsSupplier pg_catalog pg_user usesuper 4 boolean 0 1 false true false false false false false Nullable -1 -1 Searchable java.lang.Boolean 1 0 10 tid:7ff2755e9621-938deba4-00000060 +Row Count : 270 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 diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected index 4a70f1744a..59e6bd68c5 100644 --- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected +++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeyColumns.expected @@ -71,20 +71,20 @@ PartsSupplier SYS PartsSupplier SYSADMIN MatViews VDBName PK Primary tid:60b87e792634-d67a8bf5-0000000b 1 PartsSupplier SYSADMIN Triggers VDBName PK Primary tid:60b87e792634-e9ce2805-0000001a 1 PartsSupplier SYS VirtualDatabases Version PK Primary tid:2cb59cfd55db-afd1d1c2-000000ad 2 -PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary tid:7ff2755e9621-965abc3a-00000068 1 -PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index tid:7ff2755e9621-2a649068-00000069 2 -PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index tid:7ff2755e9621-2a649068-00000069 1 -PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary tid:7ff2755e9621-e36b5e38-00000070 2 -PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary tid:7ff2755e9621-965abc3a-00000068 3 -PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index tid:7ff2755e9621-ed0face8-00000071 2 -PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary tid:7ff2755e9621-e36b5e38-00000070 1 +PartsSupplier pg_catalog matpg_relatt attname pk_matpg_relatt_names Primary tid:7ff2755e9621-965abc59-00000069 1 +PartsSupplier pg_catalog matpg_relatt attnum idx_matpg_relatt_ids Index tid:7ff2755e9621-2a649087-0000006a 2 +PartsSupplier pg_catalog matpg_relatt attrelid idx_matpg_relatt_ids Index tid:7ff2755e9621-2a649087-0000006a 1 +PartsSupplier pg_catalog matpg_datatype name matpg_datatype_names Primary tid:7ff2755e9621-e36b5e57-00000071 2 +PartsSupplier pg_catalog matpg_relatt nspname pk_matpg_relatt_names Primary tid:7ff2755e9621-965abc59-00000069 3 +PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_ids Index tid:7ff2755e9621-ed0fad07-00000072 2 +PartsSupplier pg_catalog matpg_datatype oid matpg_datatype_names Primary tid:7ff2755e9621-e36b5e57-00000071 1 PartsSupplier pg_catalog pg_attribute oid pk_pg_attr Primary tid:7ff2755e9621-db38c73a-0000001a 1 PartsSupplier pg_catalog pg_class oid pk_pg_class Primary tid:7ff2755e9621-265d38e8-0000000e 1 -PartsSupplier pg_catalog pg_index oid pk_pg_index Primary tid:7ff2755e9621-dd3e1454-00000032 1 -PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary tid:7ff2755e9621-2e2ffa9f-00000041 1 -PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary tid:7ff2755e9621-965abc3a-00000068 2 +PartsSupplier pg_catalog pg_index oid pk_pg_index Primary tid:7ff2755e9621-dd3e1473-00000033 1 +PartsSupplier pg_catalog pg_proc oid pk_pg_proc Primary tid:7ff2755e9621-2e2ffabe-00000042 1 +PartsSupplier pg_catalog matpg_relatt relname pk_matpg_relatt_names Primary tid:7ff2755e9621-965abc59-00000069 2 PartsSupplier SYSADMIN VDBResources resourcePath PK Primary tid:60b87e792634-4e2f38f3-0000000f 1 -PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index tid:7ff2755e9621-ed0face8-00000071 1 +PartsSupplier pg_catalog matpg_datatype typname matpg_datatype_ids Index tid:7ff2755e9621-ed0fad07-00000072 1 Row Count : 85 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 diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected index 7c5266ee3c..8ee2b85dcc 100644 --- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected +++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testKeys.expected @@ -37,14 +37,14 @@ PartsSupplier SYS PartsSupplier SYS Properties UNIQUE0 Unique false tid:2cb59cfd55db-248609a9-0000007f PartsSupplier SYS Schemas UNIQUE0 Unique false tid:2cb59cfd55db-d6ca5cae-00000098 PartsSupplier SYS Tables UNIQUE0 Unique false tid:2cb59cfd55db-d2923ab0-000000a9 -PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids Index false tid:7ff2755e9621-2a649068-00000069 -PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids Index false tid:7ff2755e9621-ed0face8-00000071 -PartsSupplier pg_catalog matpg_datatype matpg_datatype_names Primary false tid:7ff2755e9621-e36b5e38-00000070 -PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names Primary false tid:7ff2755e9621-965abc3a-00000068 +PartsSupplier pg_catalog matpg_relatt idx_matpg_relatt_ids Index false tid:7ff2755e9621-2a649087-0000006a +PartsSupplier pg_catalog matpg_datatype matpg_datatype_ids Index false tid:7ff2755e9621-ed0fad07-00000072 +PartsSupplier pg_catalog matpg_datatype matpg_datatype_names Primary false tid:7ff2755e9621-e36b5e57-00000071 +PartsSupplier pg_catalog matpg_relatt pk_matpg_relatt_names Primary false tid:7ff2755e9621-965abc59-00000069 PartsSupplier pg_catalog pg_attribute pk_pg_attr Primary false tid:7ff2755e9621-db38c73a-0000001a PartsSupplier pg_catalog pg_class pk_pg_class Primary false tid:7ff2755e9621-265d38e8-0000000e -PartsSupplier pg_catalog pg_index pk_pg_index Primary false tid:7ff2755e9621-dd3e1454-00000032 -PartsSupplier pg_catalog pg_proc pk_pg_proc Primary false tid:7ff2755e9621-2e2ffa9f-00000041 +PartsSupplier pg_catalog pg_index pk_pg_index Primary false tid:7ff2755e9621-dd3e1473-00000033 +PartsSupplier pg_catalog pg_proc pk_pg_proc Primary false tid:7ff2755e9621-2e2ffabe-00000042 Row Count : 45 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 diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected index f97311b2d9..156fbba284 100644 --- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected +++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testProperties.expected @@ -1,11 +1,11 @@ string string string integer clob Name Value UID OID ClobValue -pg_type:oid 1002 tid:7ff2755e9621-c6363c8c-0000003e Clob[4] -pg_type:oid 1009 tid:7ff2755e9621-c63e18a4-0000003d Clob[4] -pg_type:oid 30 tid:7ff2755e9621-c69d99d5-0000003c Clob[2] -teiid:pass-through-type true tid:7ff2755e9621-e548fc4c-0000007a Clob[4] -pg_type:oid 22 tid:7ff2755e9621-ef456826-0000002f Clob[2] -pg_type:oid 1028 tid:7ff2755e9621-f418fbfc-0000003f Clob[4] +pg_type:oid 1002 tid:7ff2755e9621-c6363cab-0000003f Clob[4] +pg_type:oid 1009 tid:7ff2755e9621-c63e18c3-0000003e Clob[4] +pg_type:oid 30 tid:7ff2755e9621-c69d99f4-0000003d Clob[2] +teiid:pass-through-type true tid:7ff2755e9621-e548fc4c-0000007b Clob[4] +pg_type:oid 22 tid:7ff2755e9621-ef456845-00000030 Clob[2] +pg_type:oid 1028 tid:7ff2755e9621-f418fc1b-00000040 Clob[4] Row Count : 6 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 Properties 255 255 0 false true false false 0 true true false false diff --git a/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected b/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected index b18f26a564..b10cd1d4d5 100644 --- a/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected +++ b/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected @@ -19,20 +19,20 @@ PartsSupplier SYS PartsSupplier SYSADMIN Triggers Table true false tid:60b87e792634-5d71c5db-00000010 -1 true false PartsSupplier SYSADMIN VDBResources Table true false tid:60b87e792634-1e9b1131-0000000c -1 true false PartsSupplier SYS VirtualDatabases Table true false tid:2cb59cfd55db-a9e11fad-000000aa -1 true false -PartsSupplier pg_catalog matpg_datatype Table false false tid:7ff2755e9621-e544c1cc-0000006a -1 true true -PartsSupplier pg_catalog matpg_relatt Table false false tid:7ff2755e9621-75d65150-00000060 -1 true true -PartsSupplier pg_catalog pg_am Table false false tid:7ff2755e9621-065a8b74-00000033 -1 true false -PartsSupplier pg_catalog pg_attrdef Table false false tid:7ff2755e9621-ec00662c-0000004c -1 true false +PartsSupplier pg_catalog matpg_datatype Table false false tid:7ff2755e9621-e544c1cc-0000006b -1 true true +PartsSupplier pg_catalog matpg_relatt Table false false tid:7ff2755e9621-75d65150-00000061 -1 true true +PartsSupplier pg_catalog pg_am Table false false tid:7ff2755e9621-065a8b74-00000034 -1 true false +PartsSupplier pg_catalog pg_attrdef Table false false tid:7ff2755e9621-ec00662c-0000004d -1 true false PartsSupplier pg_catalog pg_attribute Table false false tid:7ff2755e9621-edc4ea54-0000000f -1 true true PartsSupplier pg_catalog pg_class Table false false tid:7ff2755e9621-62e78530-00000004 -1 true true -PartsSupplier pg_catalog pg_database Table false false tid:7ff2755e9621-dda8fac3-00000051 -1 true false -PartsSupplier pg_catalog pg_description Table false false tid:7ff2755e9621-3be1b5b4-00000072 -1 true false -PartsSupplier pg_catalog pg_index Table false false tid:7ff2755e9621-633d048a-00000027 -1 true true +PartsSupplier pg_catalog pg_database Table false false tid:7ff2755e9621-dda8fac3-00000052 -1 true false +PartsSupplier pg_catalog pg_description Table false false tid:7ff2755e9621-3be1b5b4-00000073 -1 true false +PartsSupplier pg_catalog pg_index Table false false tid:7ff2755e9621-633d048a-00000028 -1 true true PartsSupplier pg_catalog pg_namespace Table false false tid:7ff2755e9621-37a09513-00000001 -1 true false -PartsSupplier pg_catalog pg_proc Table false false tid:7ff2755e9621-d9ec709e-00000036 -1 true true -PartsSupplier pg_catalog pg_trigger Table false false tid:7ff2755e9621-d50d2370-00000042 -1 true false +PartsSupplier pg_catalog pg_proc Table false false tid:7ff2755e9621-d9ec709e-00000037 -1 true true +PartsSupplier pg_catalog pg_trigger Table false false tid:7ff2755e9621-d50d2370-00000043 -1 true false PartsSupplier pg_catalog pg_type Table false false tid:7ff2755e9621-d9ee5c82-0000001b -1 true true -PartsSupplier pg_catalog pg_user Table false false tid:7ff2755e9621-d9eeb913-0000005b -1 true false +PartsSupplier pg_catalog pg_user Table false false tid:7ff2755e9621-d9eeb913-0000005c -1 true false Row Count : 33 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 diff --git a/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected b/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected index 1a52839637..f069f6d790 100644 --- a/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected +++ b/test-integration/common/src/test/resources/TestVirtualDocWithVirtualProc/testDefect15241b.expected @@ -2,12 +2,12 @@ string string Name Value UID NugentXAttribute Nuuuuuge22222 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1 NugentYAttribute Nuuuuuge44444 mmuuid:4789b280-841c-1f15-9526-ebd0cace03e1 -pg_type:oid 1002 tid:7ff2755e9621-c6363c8c-0000003e -pg_type:oid 1009 tid:7ff2755e9621-c63e18a4-0000003d -pg_type:oid 30 tid:7ff2755e9621-c69d99d5-0000003c -pg_type:oid 22 tid:7ff2755e9621-ef456826-0000002f -pg_type:oid 1028 tid:7ff2755e9621-f418fbfc-0000003f -teiid:pass-through-type true tid:7ff2755e9621-e548fc4c-0000007a +pg_type:oid 1002 tid:7ff2755e9621-c6363cab-0000003f +pg_type:oid 1009 tid:7ff2755e9621-c63e18c3-0000003e +pg_type:oid 30 tid:7ff2755e9621-c69d99f4-0000003d +pg_type:oid 22 tid:7ff2755e9621-ef456845-00000030 +pg_type:oid 1028 tid:7ff2755e9621-f418fc1b-00000040 +teiid:pass-through-type true tid:7ff2755e9621-e548fc4c-0000007b Row Count : 8 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