Author: shawkins
Date: 2011-11-22 13:10:52 -0500 (Tue, 22 Nov 2011)
New Revision: 3690
Modified:
trunk/api/src/main/java/org/teiid/metadata/Table.java
trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java
trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
Log:
TEIID-1022 updating indexing so that -1 can be used as a proper default cardinality
Modified: trunk/api/src/main/java/org/teiid/metadata/Table.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/Table.java 2011-11-22 18:01:23 UTC (rev
3689)
+++ trunk/api/src/main/java/org/teiid/metadata/Table.java 2011-11-22 18:10:52 UTC (rev
3690)
@@ -51,7 +51,7 @@
DELETE
}
- private int cardinality;
+ private int cardinality = -1;
private Type tableType;
private boolean isVirtual;
private boolean isSystem;
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java
===================================================================
---
trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java 2011-11-22
18:01:23 UTC (rev 3689)
+++
trunk/engine/src/main/java/org/teiid/query/metadata/QueryMetadataInterface.java 2011-11-22
18:10:52 UTC (rev 3690)
@@ -44,7 +44,7 @@
/**
* Unknown cardinality.
*/
- int UNKNOWN_CARDINALITY = 0;
+ int UNKNOWN_CARDINALITY = -1;
/**
* Get the metadata-implementation identifier object for the given element name.
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2011-11-22
18:01:23 UTC (rev 3689)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2011-11-22
18:10:52 UTC (rev 3690)
@@ -31,16 +31,7 @@
import org.teiid.core.util.Assertion;
import org.teiid.internal.core.index.EntryResult;
import org.teiid.internal.core.index.IIndexConstants;
-import org.teiid.metadata.AbstractMetadataRecord;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ColumnSet;
-import org.teiid.metadata.Datatype;
-import org.teiid.metadata.ForeignKey;
-import org.teiid.metadata.KeyRecord;
-import org.teiid.metadata.Procedure;
-import org.teiid.metadata.ProcedureParameter;
-import org.teiid.metadata.Schema;
-import org.teiid.metadata.Table;
+import org.teiid.metadata.*;
import org.teiid.metadata.BaseColumn.NullType;
import org.teiid.metadata.Column.SearchType;
import org.teiid.metadata.Datatype.Variety;
@@ -125,6 +116,8 @@
* @since 5.0
*/
public static final int PROCEDURE_UPDATE_COUNT_VERSION = 9;
+
+ public static final int NONZERO_UNKNOWN_CARDINALITY = 10;
/**
* The version number that is encoded with all newly created index records
@@ -397,7 +390,11 @@
tokens.get(tokenIndex++), tokens.get(tokenIndex++));
// The next token is the cardinality
- table.setCardinality( Integer.parseInt(tokens.get(tokenIndex++)) );
+ int cardinality = Integer.parseInt(tokens.get(tokenIndex++));
+ if (indexVersion < NONZERO_UNKNOWN_CARDINALITY && cardinality == 0) {
+ cardinality = -1;
+ }
+ table.setCardinality(cardinality);
// The next token is the tableType
table.setTableType(Table.Type.values()[Integer.parseInt(tokens.get(tokenIndex++))]);
Modified:
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2011-11-22
18:01:23 UTC (rev 3689)
+++
trunk/test-integration/common/src/test/resources/TestJDBCSocketTransport/testSelect.expected 2011-11-22
18:10:52 UTC (rev 3690)
@@ -1,36 +1,36 @@
string string
string
string string
boolean boolean string
integer string
boolean boolean integer
VDBName SchemaName
Name
Type NameInSource
IsPhysical SupportsUpdates UID
Cardinality Description
IsSystem IsMaterialized OID
-parts SYS
Columns
Table <null>
true false
mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 0 <null>
true false 8
-parts SYS
DataTypes
Table <null>
true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0 <null>
true false 9
-parts SYS
KeyColumns
Table <null>
true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0 <null>
true false 10
-parts SYS
Keys
Table <null>
true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0 <null>
true false 11
-parts SYSADMIN
MatViews
Table <null>
true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0 <null>
true false 6
+parts SYS
Columns
Table <null>
true false
mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null>
true false 8
+parts SYS
DataTypes
Table <null>
true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null>
true false 9
+parts SYS
KeyColumns
Table <null>
true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null>
true false 10
+parts SYS
Keys
Table <null>
true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null>
true false 11
+parts SYSADMIN
MatViews
Table <null>
true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null>
true false 6
parts PartsSupplier
PARTSSUPPLIER.PARTS
Table PARTS
true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590
16 <null>
false false 1
parts PartsSupplier
PARTSSUPPLIER.SHIP_VIA
Table SHIP_VIA
true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590
4 <null>
false false 2
parts PartsSupplier
PARTSSUPPLIER.STATUS
Table STATUS
true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590
3 <null>
false false 3
parts PartsSupplier
PARTSSUPPLIER.SUPPLIER
Table SUPPLIER
true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590
16 <null>
false false 5
parts PartsSupplier
PARTSSUPPLIER.SUPPLIER_PARTS
Table SUPPLIER_PARTS
true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590
227 <null>
false false 4
-parts SYS
ProcedureParams
Table <null>
true false
mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 0 <null>
true false 12
-parts SYS
Procedures
Table <null>
true false
mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 0 <null>
true false 13
-parts SYS
Properties
Table <null>
true false
mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 0 <null>
true false 14
-parts SYS
ReferenceKeyColumns
Table <null>
true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0 <null>
true false 15
-parts SYS
Schemas
Table <null>
true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0 <null>
true false 16
-parts SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0 <null>
true false 17
-parts SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0 <null>
true false 7
-parts SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0 <null>
true false 18
-parts pg_catalog
matpg_datatype
Table <null>
false false
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 0 <null>
true true 31
-parts pg_catalog
matpg_relatt
Table <null>
false false
mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 0 <null>
true true 30
-parts pg_catalog
pg_am
Table <null>
false false
mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 0 <null>
true false 24
-parts pg_catalog
pg_attrdef
Table <null>
false false
mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf 0 <null>
true false 27
-parts pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb 0 <null>
true true 21
-parts pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 0 <null>
true true 20
-parts pg_catalog
pg_database
Table <null>
false false
mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 0 <null>
true false 28
-parts pg_catalog
pg_index
Table <null>
false false
mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 0 <null>
true true 23
-parts pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 0 <null>
true false 19
-parts pg_catalog
pg_proc
Table <null>
false false
mmuid:f20c9489-10ca-4596-8a37-24218b67f764 0 <null>
true true 25
-parts pg_catalog
pg_trigger
Table <null>
false false
mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a 0 <null>
true false 26
-parts pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a 0 <null>
true false 22
-parts pg_catalog
pg_user
Table <null>
false false
mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb 0 <null>
true false 29
+parts SYS
ProcedureParams
Table <null>
true false
mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null>
true false 12
+parts SYS
Procedures
Table <null>
true false
mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null>
true false 13
+parts SYS
Properties
Table <null>
true false
mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null>
true false 14
+parts SYS
ReferenceKeyColumns
Table <null>
true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null>
true false 15
+parts SYS
Schemas
Table <null>
true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null>
true false 16
+parts SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null>
true false 17
+parts SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null>
true false 7
+parts SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null>
true false 18
+parts pg_catalog
matpg_datatype
Table <null>
false false
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null>
true true 31
+parts pg_catalog
matpg_relatt
Table <null>
false false
mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null>
true true 30
+parts pg_catalog
pg_am
Table <null>
false false
mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null>
true false 24
+parts pg_catalog
pg_attrdef
Table <null>
false false
mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null>
true false 27
+parts pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null>
true true 21
+parts pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null>
true true 20
+parts pg_catalog
pg_database
Table <null>
false false
mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null>
true false 28
+parts pg_catalog
pg_index
Table <null>
false false
mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null>
true true 23
+parts pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null>
true false 19
+parts pg_catalog
pg_proc
Table <null>
false false
mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null>
true true 25
+parts pg_catalog
pg_trigger
Table <null>
false false
mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null>
true false 26
+parts pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null>
true false 22
+parts pg_catalog
pg_user
Table <null>
false false
mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null>
true false 29
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 true 1 false
true true true
Modified:
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2011-11-22
18:01:23 UTC (rev 3689)
+++
trunk/test-integration/common/src/test/resources/TestODBCSocketTransport/testSelect.expected 2011-11-22
18:10:52 UTC (rev 3690)
@@ -1,36 +1,36 @@
varchar varchar
varchar
varchar
varchar bool bool
varchar int4
varchar bool bool
int4
vdbname schemaname
name
type
nameinsource isphysical
supportsupdates uid
cardinality description issystem
ismaterialized oid
-parts SYS
Columns
Table
<null> true false
mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 0
<null> true false
8
-parts SYS
DataTypes
Table
<null> true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0
<null> true false
9
-parts SYS
KeyColumns
Table
<null> true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0
<null> true false
10
-parts SYS
Keys
Table
<null> true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0
<null> true false
11
-parts SYSADMIN
MatViews
Table
<null> true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0
<null> true false
6
+parts SYS
Columns
Table
<null> true false
mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1
<null> true false
8
+parts SYS
DataTypes
Table
<null> true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1
<null> true false
9
+parts SYS
KeyColumns
Table
<null> true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1
<null> true false
10
+parts SYS
Keys
Table
<null> true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1
<null> true false
11
+parts SYSADMIN
MatViews
Table
<null> true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1
<null> true false
6
parts PartsSupplier
PARTSSUPPLIER.PARTS
Table
PARTS true true
mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590 16
<null> false false
1
parts PartsSupplier
PARTSSUPPLIER.SHIP_VIA
Table
SHIP_VIA true true
mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590 4
<null> false false
2
parts PartsSupplier
PARTSSUPPLIER.STATUS
Table
STATUS true true
mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590 3
<null> false false
3
parts PartsSupplier
PARTSSUPPLIER.SUPPLIER
Table
SUPPLIER true true
mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590 16
<null> false false
5
parts PartsSupplier
PARTSSUPPLIER.SUPPLIER_PARTS
Table
SUPPLIER_PARTS true true
mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590 227
<null> false false
4
-parts SYS
ProcedureParams
Table
<null> true false
mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 0
<null> true false
12
-parts SYS
Procedures
Table
<null> true false
mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 0
<null> true false
13
-parts SYS
Properties
Table
<null> true false
mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 0
<null> true false
14
-parts SYS
ReferenceKeyColumns
Table
<null> true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0
<null> true false
15
-parts SYS
Schemas
Table
<null> true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0
<null> true false
16
-parts SYS
Tables
Table
<null> true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0
<null> true false
17
-parts SYSADMIN
VDBResources
Table
<null> true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0
<null> true false
7
-parts SYS
VirtualDatabases
Table
<null> true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0
<null> true false
18
-parts pg_catalog
matpg_datatype
Table
<null> false false
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 0
<null> true true
31
-parts pg_catalog
matpg_relatt
Table
<null> false false
mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 0
<null> true true
30
-parts pg_catalog
pg_am
Table
<null> false false
mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 0
<null> true false
24
-parts pg_catalog
pg_attrdef
Table
<null> false false
mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf 0
<null> true false
27
-parts pg_catalog
pg_attribute
Table
<null> false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb 0
<null> true true
21
-parts pg_catalog
pg_class
Table
<null> false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 0
<null> true true
20
-parts pg_catalog
pg_database
Table
<null> false false
mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 0
<null> true false
28
-parts pg_catalog
pg_index
Table
<null> false false
mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 0
<null> true true
23
-parts pg_catalog
pg_namespace
Table
<null> false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 0
<null> true false
19
-parts pg_catalog
pg_proc
Table
<null> false false
mmuid:f20c9489-10ca-4596-8a37-24218b67f764 0
<null> true true
25
-parts pg_catalog
pg_trigger
Table
<null> false false
mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a 0
<null> true false
26
-parts pg_catalog
pg_type
Table
<null> false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a 0
<null> true false
22
-parts pg_catalog
pg_user
Table
<null> false false
mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb 0
<null> true false
29
+parts SYS
ProcedureParams
Table
<null> true false
mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1
<null> true false
12
+parts SYS
Procedures
Table
<null> true false
mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1
<null> true false
13
+parts SYS
Properties
Table
<null> true false
mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1
<null> true false
14
+parts SYS
ReferenceKeyColumns
Table
<null> true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1
<null> true false
15
+parts SYS
Schemas
Table
<null> true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1
<null> true false
16
+parts SYS
Tables
Table
<null> true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1
<null> true false
17
+parts SYSADMIN
VDBResources
Table
<null> true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1
<null> true false
7
+parts SYS
VirtualDatabases
Table
<null> true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1
<null> true false
18
+parts pg_catalog
matpg_datatype
Table
<null> false false
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1
<null> true true
31
+parts pg_catalog
matpg_relatt
Table
<null> false false
mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1
<null> true true
30
+parts pg_catalog
pg_am
Table
<null> false false
mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1
<null> true false
24
+parts pg_catalog
pg_attrdef
Table
<null> false false
mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1
<null> true false
27
+parts pg_catalog
pg_attribute
Table
<null> false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb -1
<null> true true
21
+parts pg_catalog
pg_class
Table
<null> false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1
<null> true true
20
+parts pg_catalog
pg_database
Table
<null> false false
mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1
<null> true false
28
+parts pg_catalog
pg_index
Table
<null> false false
mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1
<null> true true
23
+parts pg_catalog
pg_namespace
Table
<null> false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1
<null> true false
19
+parts pg_catalog
pg_proc
Table
<null> false false
mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1
<null> true true
25
+parts pg_catalog
pg_trigger
Table
<null> false false
mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1
<null> true false
26
+parts pg_catalog
pg_type
Table
<null> false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1
<null> true false
22
+parts pg_catalog
pg_user
Table
<null> false false
mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1
<null> true false
29
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 2147483647 0 0
false true false false 1 false
true false true
Modified:
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected
===================================================================
---
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2011-11-22
18:01:23 UTC (rev 3689)
+++
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testTables.expected 2011-11-22
18:10:52 UTC (rev 3690)
@@ -1,36 +1,36 @@
string string
string
string string
boolean boolean string
integer string
boolean boolean integer
VDBName SchemaName
Name
Type NameInSource
IsPhysical SupportsUpdates UID
Cardinality Description
IsSystem IsMaterialized OID
-PartsSupplier SYS
Columns
Table <null>
true false
mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 0 <null>
true false 8
-PartsSupplier SYS
DataTypes
Table <null>
true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 0 <null>
true false 9
-PartsSupplier SYS
KeyColumns
Table <null>
true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 0 <null>
true false 10
-PartsSupplier SYS
Keys
Table <null>
true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 0 <null>
true false 11
-PartsSupplier SYSADMIN
MatViews
Table <null>
true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 0 <null>
true false 6
+PartsSupplier SYS
Columns
Table <null>
true false
mmuuid:1c9a5cb2-17b1-4e4a-8b0e-3a42bd052509 -1 <null>
true false 8
+PartsSupplier SYS
DataTypes
Table <null>
true false
mmuuid:9a8794f9-66f8-49e8-8576-89d212d0f957 -1 <null>
true false 9
+PartsSupplier SYS
KeyColumns
Table <null>
true false
mmuuid:14946083-3bd5-42d5-8283-1c0694347c29 -1 <null>
true false 10
+PartsSupplier SYS
Keys
Table <null>
true false
mmuuid:1e5135dc-ce5d-4b25-a8ff-63f5440b3108 -1 <null>
true false 11
+PartsSupplier SYSADMIN
MatViews
Table <null>
true false
mmuuid:520ba1e8-3553-460f-8d18-9b43f089e256 -1 <null>
true false 6
PartsSupplier PartsSupplier
PARTSSUPPLIER.PARTS
Table PARTS
true true mmuuid:f6276601-73fe-1edc-a81c-ecf397b10590
16 <null>
false false 1
PartsSupplier PartsSupplier
PARTSSUPPLIER.SHIP_VIA
Table SHIP_VIA
true true mmuuid:0f4e9b80-73ff-1edc-a81c-ecf397b10590
4 <null>
false false 2
PartsSupplier PartsSupplier
PARTSSUPPLIER.STATUS
Table STATUS
true true mmuuid:1f297200-73ff-1edc-a81c-ecf397b10590
3 <null>
false false 3
PartsSupplier PartsSupplier
PARTSSUPPLIER.SUPPLIER
Table SUPPLIER
true true mmuuid:2c371ec0-73ff-1edc-a81c-ecf397b10590
16 <null>
false false 5
PartsSupplier PartsSupplier
PARTSSUPPLIER.SUPPLIER_PARTS
Table SUPPLIER_PARTS
true true mmuuid:3deafb00-73ff-1edc-a81c-ecf397b10590
227 <null>
false false 4
-PartsSupplier SYS
ProcedureParams
Table <null>
true false
mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 0 <null>
true false 12
-PartsSupplier SYS
Procedures
Table <null>
true false
mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 0 <null>
true false 13
-PartsSupplier SYS
Properties
Table <null>
true false
mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 0 <null>
true false 14
-PartsSupplier SYS
ReferenceKeyColumns
Table <null>
true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 0 <null>
true false 15
-PartsSupplier SYS
Schemas
Table <null>
true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 0 <null>
true false 16
-PartsSupplier SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 0 <null>
true false 17
-PartsSupplier SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 0 <null>
true false 7
-PartsSupplier SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 0 <null>
true false 18
-PartsSupplier pg_catalog
matpg_datatype
Table <null>
false false
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 0 <null>
true true 31
-PartsSupplier pg_catalog
matpg_relatt
Table <null>
false false
mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 0 <null>
true true 30
-PartsSupplier pg_catalog
pg_am
Table <null>
false false
mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 0 <null>
true false 24
-PartsSupplier pg_catalog
pg_attrdef
Table <null>
false false
mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf 0 <null>
true false 27
-PartsSupplier pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb 0 <null>
true true 21
-PartsSupplier pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 0 <null>
true true 20
-PartsSupplier pg_catalog
pg_database
Table <null>
false false
mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 0 <null>
true false 28
-PartsSupplier pg_catalog
pg_index
Table <null>
false false
mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 0 <null>
true true 23
-PartsSupplier pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 0 <null>
true false 19
-PartsSupplier pg_catalog
pg_proc
Table <null>
false false
mmuid:f20c9489-10ca-4596-8a37-24218b67f764 0 <null>
true true 25
-PartsSupplier pg_catalog
pg_trigger
Table <null>
false false
mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a 0 <null>
true false 26
-PartsSupplier pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a 0 <null>
true false 22
-PartsSupplier pg_catalog
pg_user
Table <null>
false false
mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb 0 <null>
true false 29
+PartsSupplier SYS
ProcedureParams
Table <null>
true false
mmuuid:a56bd7fe-c87a-411c-8f5d-661975a25626 -1 <null>
true false 12
+PartsSupplier SYS
Procedures
Table <null>
true false
mmuuid:0bc132a5-9f8d-4a3c-9f5d-98156a98a962 -1 <null>
true false 13
+PartsSupplier SYS
Properties
Table <null>
true false
mmuuid:7a45e50a-d03f-4548-ba35-761651bbca85 -1 <null>
true false 14
+PartsSupplier SYS
ReferenceKeyColumns
Table <null>
true false
mmuuid:6a9653e8-a337-41b2-86fa-77b98f409a29 -1 <null>
true false 15
+PartsSupplier SYS
Schemas
Table <null>
true false
mmuuid:8648a554-b2ad-4e8e-84ca-2ec618b311a9 -1 <null>
true false 16
+PartsSupplier SYS
Tables
Table <null>
true false
mmuuid:8551b3bd-11cc-4049-9bcf-fe91a0eb7ba7 -1 <null>
true false 17
+PartsSupplier SYSADMIN
VDBResources
Table <null>
true false
mmuuid:1785804d-beaf-4831-9531-e59164fedd49 -1 <null>
true false 7
+PartsSupplier SYS
VirtualDatabases
Table <null>
true false
mmuuid:47297c72-d621-4f4e-af4e-74060ac5f489 -1 <null>
true false 18
+PartsSupplier pg_catalog
matpg_datatype
Table <null>
false false
mmuid:17448311-6679-4dfd-aeb6-4aabbd894729 -1 <null>
true true 31
+PartsSupplier pg_catalog
matpg_relatt
Table <null>
false false
mmuid:8c0714d6-1c72-40b4-8528-3b2c63059107 -1 <null>
true true 30
+PartsSupplier pg_catalog
pg_am
Table <null>
false false
mmuid:f6517a63-8c14-4b73-a18d-afaa5dfb35d9 -1 <null>
true false 24
+PartsSupplier pg_catalog
pg_attrdef
Table <null>
false false
mmuid:76a7dd05-9a7d-4243-b561-f3056500dcaf -1 <null>
true false 27
+PartsSupplier pg_catalog
pg_attribute
Table <null>
false false
mmuid:fa463d98-365f-489a-a707-025193cb51eb -1 <null>
true true 21
+PartsSupplier pg_catalog
pg_class
Table <null>
false false
mmuid:7e21f2e6-06e3-4bca-9b01-72ea47821560 -1 <null>
true true 20
+PartsSupplier pg_catalog
pg_database
Table <null>
false false
mmuid:382f9fc9-8c96-4df7-ab5d-04dfb47ee142 -1 <null>
true false 28
+PartsSupplier pg_catalog
pg_index
Table <null>
false false
mmuid:09daed8d-b0b8-4552-a261-2b6c775b46b0 -1 <null>
true true 23
+PartsSupplier pg_catalog
pg_namespace
Table <null>
false false
mmuid:6609866a-3d7b-4f4b-95fe-ebfac769d699 -1 <null>
true false 19
+PartsSupplier pg_catalog
pg_proc
Table <null>
false false
mmuid:f20c9489-10ca-4596-8a37-24218b67f764 -1 <null>
true true 25
+PartsSupplier pg_catalog
pg_trigger
Table <null>
false false
mmuid:2b75f0b1-7475-4ed5-9da3-d37a8a25f26a -1 <null>
true false 26
+PartsSupplier pg_catalog
pg_type
Table <null>
false false
mmuid:9462e3f8-cd3c-414f-a570-f6f33c40e36a -1 <null>
true false 22
+PartsSupplier pg_catalog
pg_user
Table <null>
false false
mmuid:e63613cb-01ee-4b37-8b91-99d1aac4dfcb -1 <null>
true false 29
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 true 1 false
true true true
Show replies by date