Author: shawkins
Date: 2011-04-28 21:33:21 -0400 (Thu, 28 Apr 2011)
New Revision: 3130
Modified:
trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
Log:
TEIID-1570 fix for type mismatches
Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2011-04-28 18:03:41 UTC (rev 3129)
+++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2011-04-29 01:33:21 UTC (rev 3130)
@@ -202,7 +202,7 @@
addColumn("relhasrules", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$
// True if we generate an OID for each row of the relation
- addColumn("relhasoids", DataTypeManager.DefaultDataTypes.STRING, t); //$NON-NLS-1$
+ addColumn("relhasoids", DataTypeManager.DefaultDataTypes.BOOLEAN, t); //$NON-NLS-1$
addPrimaryKey("pk_pg_class", Arrays.asList("oid"), t); //$NON-NLS-1$ //$NON-NLS-2$
@@ -252,7 +252,7 @@
"(CASE t1.KeyType WHEN 'Unique' THEN true ELSE false END) as indisunique, " + //$NON-NLS-1$
"(CASE t1.KeyType WHEN 'Primary' THEN true ELSE false END) as indisprimary, " + //$NON-NLS-1$
"'' as indexprs, " + //$NON-NLS-1$
- "0 as indkey " + //$NON-NLS-1$
+ "'0' as indkey " + //$NON-NLS-1$
"FROM SYS.KeyColumns as t1"; //$NON-NLS-1$
t.setSelectTransformation(transformation);
t.setMaterialized(true);
Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2011-04-28 18:03:41 UTC (rev 3129)
+++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetColumns.expected 2011-04-29 01:33:21 UTC (rev 3130)
@@ -812,7 +812,7 @@
QT_Ora9DS pg_catalog pg_class reltuples 7 float 20 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_class relpages 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_class relhasrules -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
-QT_Ora9DS pg_catalog pg_class relhasoids 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
+QT_Ora9DS pg_catalog pg_class relhasoids -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_database oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_database datname 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
QT_Ora9DS pg_catalog pg_database encoding 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2011-04-28 18:03:41 UTC (rev 3129)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2011-04-29 01:33:21 UTC (rev 3130)
@@ -173,7 +173,7 @@
171 20 reltuples 700 4 6 0 false false false
172 20 relpages 23 4 7 0 false false false
173 20 relhasrules 16 1 8 0 false false false
-174 20 relhasoids 1043 -1 9 0 false false false
+174 20 relhasoids 16 1 9 0 false false false
175 21 oid 23 4 1 0 false false false
176 21 attrelid 23 4 2 0 false false false
177 21 attname 1043 -1 3 0 false false false
Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected 2011-04-28 18:03:41 UTC (rev 3129)
+++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_CLASS.expected 2011-04-29 01:33:21 UTC (rev 3130)
@@ -1,36 +1,36 @@
-integer string integer char integer float integer boolean string
-oid relname relnamespace relkind relam reltuples relpages relhasrules relhasoids
-1 PARTSSUPPLIER.PARTS 1 r 0 0.0 0 false false
-2 PARTSSUPPLIER.SHIP_VIA 1 r 0 0.0 0 false false
-3 PARTSSUPPLIER.STATUS 1 r 0 0.0 0 false false
-4 PARTSSUPPLIER.SUPPLIER_PARTS 1 r 0 0.0 0 false false
-5 PARTSSUPPLIER.SUPPLIER 1 r 0 0.0 0 false false
-6 MatViews 2 r 0 0.0 0 false false
-7 VDBResources 2 r 0 0.0 0 false false
-8 Columns 3 r 0 0.0 0 false false
-9 DataTypes 3 r 0 0.0 0 false false
-10 KeyColumns 3 r 0 0.0 0 false false
-11 Keys 3 r 0 0.0 0 false false
-12 ProcedureParams 3 r 0 0.0 0 false false
-13 Procedures 3 r 0 0.0 0 false false
-14 Properties 3 r 0 0.0 0 false false
-15 ReferenceKeyColumns 3 r 0 0.0 0 false false
-16 Schemas 3 r 0 0.0 0 false false
-17 Tables 3 r 0 0.0 0 false false
-18 VirtualDatabases 3 r 0 0.0 0 false false
-19 pg_namespace 4 v 0 0.0 0 false false
-20 pg_class 4 v 0 0.0 0 false false
-21 pg_attribute 4 v 0 0.0 0 false false
-22 pg_type 4 v 0 0.0 0 false false
-23 pg_index 4 v 0 0.0 0 false false
-24 pg_am 4 v 0 0.0 0 false false
-25 pg_proc 4 v 0 0.0 0 false false
-26 pg_trigger 4 v 0 0.0 0 false false
-27 pg_attrdef 4 v 0 0.0 0 false false
-28 pg_database 4 v 0 0.0 0 false false
-29 pg_user 4 v 0 0.0 0 false false
-30 matpg_relatt 4 v 0 0.0 0 false false
-31 matpg_datatype 4 v 0 0.0 0 false false
+integer string integer char integer float integer boolean boolean
+oid relname relnamespace relkind relam reltuples relpages relhasrules relhasoids
+1 PARTSSUPPLIER.PARTS 1 r 0 0.0 0 false false
+2 PARTSSUPPLIER.SHIP_VIA 1 r 0 0.0 0 false false
+3 PARTSSUPPLIER.STATUS 1 r 0 0.0 0 false false
+4 PARTSSUPPLIER.SUPPLIER_PARTS 1 r 0 0.0 0 false false
+5 PARTSSUPPLIER.SUPPLIER 1 r 0 0.0 0 false false
+6 MatViews 2 r 0 0.0 0 false false
+7 VDBResources 2 r 0 0.0 0 false false
+8 Columns 3 r 0 0.0 0 false false
+9 DataTypes 3 r 0 0.0 0 false false
+10 KeyColumns 3 r 0 0.0 0 false false
+11 Keys 3 r 0 0.0 0 false false
+12 ProcedureParams 3 r 0 0.0 0 false false
+13 Procedures 3 r 0 0.0 0 false false
+14 Properties 3 r 0 0.0 0 false false
+15 ReferenceKeyColumns 3 r 0 0.0 0 false false
+16 Schemas 3 r 0 0.0 0 false false
+17 Tables 3 r 0 0.0 0 false false
+18 VirtualDatabases 3 r 0 0.0 0 false false
+19 pg_namespace 4 v 0 0.0 0 false false
+20 pg_class 4 v 0 0.0 0 false false
+21 pg_attribute 4 v 0 0.0 0 false false
+22 pg_type 4 v 0 0.0 0 false false
+23 pg_index 4 v 0 0.0 0 false false
+24 pg_am 4 v 0 0.0 0 false false
+25 pg_proc 4 v 0 0.0 0 false false
+26 pg_trigger 4 v 0 0.0 0 false false
+27 pg_attrdef 4 v 0 0.0 0 false false
+28 pg_database 4 v 0 0.0 0 false false
+29 pg_user 4 v 0 0.0 0 false false
+30 matpg_relatt 4 v 0 0.0 0 false false
+31 matpg_datatype 4 v 0 0.0 0 false false
Row Count : 31
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 2 true true false false
@@ -41,4 +41,4 @@
reltuples 7 PartsSupplier java.lang.Float reltuples float pg_catalog pg_class 22 20 0 false false false false 2 true true false false
relpages 4 PartsSupplier java.lang.Integer relpages integer pg_catalog pg_class 11 10 0 false false false false 2 true true false false
relhasrules -7 PartsSupplier java.lang.Boolean relhasrules boolean pg_catalog pg_class 5 1 0 false false false false 2 true true false false
-relhasoids 12 PartsSupplier java.lang.String relhasoids string pg_catalog pg_class 4000 4000 0 false false false false 2 true true false false
+relhasoids -7 PartsSupplier java.lang.Boolean relhasoids boolean pg_catalog pg_class 5 1 0 false false false false 2 true true false false
Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2011-04-28 18:03:41 UTC (rev 3129)
+++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testColumns.expected 2011-04-29 01:33:21 UTC (rev 3130)
@@ -199,7 +199,7 @@
PartsSupplier pg_catalog pg_class reltuples 7 float 20 <null> 0 0 2 <null> <null> <null> <null> 0 6 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_class relpages 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 7 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_class relhasrules -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 8 <null> <null> <null> !
<null> NO
-PartsSupplier pg_catalog pg_class relhasoids 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
+PartsSupplier pg_catalog pg_class relhasoids -7 boolean 1 <null> 0 0 2 <null> <null> <null> <null> 0 9 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_database oid 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 1 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_database datname 12 string 4000 <null> 0 0 2 <null> <null> <null> <null> 0 2 <null> <null> <null> !
<null> NO
PartsSupplier pg_catalog pg_database encoding 4 integer 10 <null> 0 0 2 <null> <null> <null> <null> 0 3 <null> <null> <null> !
<null> NO
Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2011-04-28 18:03:41 UTC (rev 3129)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testColumns.expected 2011-04-29 01:33:21 UTC (rev 3130)
@@ -219,7 +219,7 @@
PartsSupplier pg_catalog pg_proc proretset 3 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:e0244e1d-431c-4!
1fa-8194-1e357e2b688b <null> 206
PartsSupplier pg_catalog pg_proc prorettype 4 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:9fb5a34a-3a7e-4!
d38-b7cd-239f28a3504e <null> 207
PartsSupplier pg_catalog pg_class relam 5 <null> integer 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Integer 0 0 0 mmuid:c2f92b1a-6ba0-4!
486-8936-f5185d926178 <null> 170
-PartsSupplier pg_catalog pg_class relhasoids 9 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:3ac5a14a-1f9e-4!
55b-8ea1-cf0878774fd7 <null> 174
+PartsSupplier pg_catalog pg_class relhasoids 9 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:3ac5a14a-1f9e-4!
55b-8ea1-cf0878774fd7 <null> 174
PartsSupplier pg_catalog pg_class relhasrules 8 <null> boolean 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Boolean 0 0 0 mmuid:6c26fd66-2a4a-4!
ccf-949a-a06a858db7f6 <null> 173
PartsSupplier pg_catalog pg_class relkind 4 <null> char 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.Character 0 0 0 mmuid:ef4359eb-6d51-4!
249-bfea-40bc0f407d10 <null> 169
PartsSupplier pg_catalog pg_class relname 2 <null> string 0 0 false true false false false false false Unknown <null> <null> -1 -1 Searchable <null> <null> java.lang.String 0 0 0 mmuid:5f9b50fa-8188-4!
048-93c2-3ad1587915df <null> 167