[teiid-commits] teiid SVN: r2935 - branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema.

Author: rareddy Date: 2011-02-23 16:50:25 -0500 (Wed, 23 Feb 2011) New Revision: 2935 Modified: branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected Log: TEIID-1477: Fixing the unit tests that failed because of the odbc type bug fix Modified: branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2011-02-23 18:51:19 UTC (rev 2934) +++ branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2011-02-23 21:50:25 UTC (rev 2935) @@ -25,18 +25,18 @@ 22 5 Valid 16 0 6 0 false false false 23 5 LoadState 1043 255 7 255 false false false 24 5 Updated 1114 0 8 0 false false false -25 5 Cardinality <null> 10 9 10 false false false +25 5 Cardinality 23 10 9 10 false false false 26 6 resourcePath 1043 255 1 255 false false false 27 6 contents 14939 0 2 0 false false false 28 7 VDBName 1043 255 1 255 false false false 29 7 SchemaName 1043 255 2 255 false false false 30 7 TableName 1043 255 3 255 false false false 31 7 Name 1043 255 4 255 false false false -32 7 Position <null> 10 5 10 false false false +32 7 Position 23 10 5 10 false false false 33 7 NameInSource 1043 255 6 255 false false false 34 7 DataType 1043 100 7 100 false false false -35 7 Scale <null> 10 8 10 false false false -36 7 Length <null> 10 9 10 false false false +35 7 Scale 23 10 8 10 false false false +36 7 Length 23 10 9 10 false false false 37 7 IsLengthFixed 16 1 10 1 false false false 38 7 SupportsSelect 16 1 11 1 false false false 39 7 SupportsUpdates 16 1 12 1 false false false @@ -51,31 +51,31 @@ 48 7 Format 1043 255 21 255 false false false 49 7 DefaultValue 1043 255 22 255 false false false 50 7 JavaClass 1043 500 23 500 false false false -51 7 Precision <null> 10 24 10 false false false -52 7 CharOctetLength <null> 10 25 10 false false false -53 7 Radix <null> 10 26 10 false false false +51 7 Precision 23 10 24 10 false false false +52 7 CharOctetLength 23 10 25 10 false false false +53 7 Radix 23 10 26 10 false false false 54 7 UID 1043 50 27 50 false false false 55 7 Description 1043 255 28 255 false false false -56 7 OID <null> 10 29 10 false false false +56 7 OID 23 10 29 10 false false false 57 8 Name 1043 100 1 100 false false false 58 8 IsStandard 16 1 2 1 false false false 59 8 IsPhysical 16 1 3 1 false false false 60 8 TypeName 1043 100 4 100 false false false 61 8 JavaClass 1043 500 5 500 false false false -62 8 Scale <null> 10 6 10 false false false -63 8 TypeLength <null> 10 7 10 false false false +62 8 Scale 23 10 6 10 false false false +63 8 TypeLength 23 10 7 10 false false false 64 8 NullType 1043 20 8 20 false false false 65 8 IsSigned 16 1 9 1 false false false 66 8 IsAutoIncremented 16 1 10 1 false false false 67 8 IsCaseSensitive 16 1 11 1 false false false -68 8 Precision <null> 10 12 10 false false false -69 8 Radix <null> 10 13 10 false false false +68 8 Precision 23 10 12 10 false false false +69 8 Radix 23 10 13 10 false false false 70 8 SearchType 1043 20 14 20 false false false 71 8 UID 1043 50 15 50 false false false 72 8 RuntimeType 1043 64 16 64 false false false 73 8 BaseType 1043 64 17 64 false false false 74 8 Description 1043 255 18 255 false false false -75 8 OID <null> 10 19 10 false false false +75 8 OID 23 10 19 10 false false false 76 9 VDBName 1043 255 1 255 false false false 77 9 SchemaName 1043 255 2 255 false false false 78 9 TableName 1043 2048 3 2048 false false false @@ -84,8 +84,8 @@ 81 9 KeyType 1043 20 6 20 false false false 82 9 RefKeyUID 1043 50 7 50 false false false 83 9 UID 1043 50 8 50 false false false -84 9 Position <null> 10 9 10 false false false -85 9 OID <null> 10 10 10 false false false +84 9 Position 23 10 9 10 false false false +85 9 OID 23 10 10 10 false false false 86 10 VDBName 1043 255 1 255 false false false 87 10 SchemaName 1043 255 2 255 false false false 88 10 TableName 1043 2048 3 2048 false false false @@ -96,23 +96,23 @@ 93 10 IsIndexed 16 1 8 1 false false false 94 10 RefKeyUID 1043 50 9 50 false false false 95 10 UID 1043 50 10 50 false false false -96 10 OID <null> 10 11 10 false false false +96 10 OID 23 10 11 10 false false false 97 11 VDBName 1043 255 1 255 false false false 98 11 SchemaName 1043 255 2 255 false false false 99 11 ProcedureName 1043 255 3 255 false false false 100 11 Name 1043 255 4 255 false false false 101 11 DataType 1043 25 5 25 false false false -102 11 Position <null> 10 6 10 false false false +102 11 Position 23 10 6 10 false false false 103 11 Type 1043 100 7 100 false false false 104 11 Optional 16 1 8 1 false false false -105 11 Precision <null> 10 9 10 false false false -106 11 TypeLength <null> 10 10 10 false false false -107 11 Scale <null> 10 11 10 false false false -108 11 Radix <null> 10 12 10 false false false +105 11 Precision 23 10 9 10 false false false +106 11 TypeLength 23 10 10 10 false false false +107 11 Scale 23 10 11 10 false false false +108 11 Radix 23 10 12 10 false false false 109 11 NullType 1043 10 13 10 false false false 110 11 UID 1043 50 14 50 false false false 111 11 Description 1043 255 15 255 false false false -112 11 OID <null> 10 16 10 false false false +112 11 OID 23 10 16 10 false false false 113 12 VDBName 1043 255 1 255 false false false 114 12 SchemaName 1043 255 2 255 false false false 115 12 Name 1043 255 3 255 false false false @@ -120,11 +120,11 @@ 117 12 ReturnsResults 16 1 5 1 false false false 118 12 UID 1043 50 6 50 false false false 119 12 Description 1043 255 7 255 false false false -120 12 OID <null> 10 8 10 false false false +120 12 OID 23 10 8 10 false false false 121 13 Name 1043 255 1 255 false false false 122 13 Value 1043 255 2 255 false false false 123 13 UID 1043 50 3 50 false false false -124 13 OID <null> 10 4 10 false false false +124 13 OID 23 10 4 10 false false false 125 14 PKTABLE_CAT 1043 255 1 255 false false false 126 14 PKTABLE_SCHEM 1043 255 2 255 false false false 127 14 PKTABLE_NAME 1043 255 3 255 false false false @@ -134,18 +134,18 @@ 131 14 FKTABLE_NAME 1043 255 7 255 false false false 132 14 FKCOLUMN_NAME 1043 255 8 255 false false false 133 14 KEY_SEQ 21 5 9 5 false false false -134 14 UPDATE_RULE <null> 10 10 10 false false false -135 14 DELETE_RULE <null> 10 11 10 false false false +134 14 UPDATE_RULE 23 10 10 10 false false false +135 14 DELETE_RULE 23 10 11 10 false false false 136 14 FK_NAME 1043 255 12 255 false false false 137 14 PK_NAME 1043 255 13 255 false false false -138 14 DEFERRABILITY <null> 10 14 10 false false false +138 14 DEFERRABILITY 23 10 14 10 false false false 139 15 VDBName 1043 255 1 255 false false false 140 15 Name 1043 255 2 255 false false false 141 15 IsPhysical 16 1 3 1 false false false 142 15 UID 1043 50 4 50 false false false 143 15 Description 1043 255 5 255 false false false 144 15 PrimaryMetamodelURI 1043 255 6 255 false false false -145 15 OID <null> 10 7 10 false false false +145 15 OID 23 10 7 10 false false false 146 16 VDBName 1043 255 1 255 false false false 147 16 SchemaName 1043 255 2 255 false false false 148 16 Name 1043 255 3 255 false false false @@ -154,85 +154,85 @@ 151 16 IsPhysical 16 1 6 1 false false false 152 16 SupportsUpdates 16 1 7 1 false false false 153 16 UID 1043 50 8 50 false false false -154 16 Cardinality <null> 10 9 10 false false false +154 16 Cardinality 23 10 9 10 false false false 155 16 Description 1043 255 10 255 false false false 156 16 IsSystem 16 1 11 1 false false false 157 16 IsMaterialized 16 0 12 0 false false false -158 16 OID <null> 10 13 10 false false false +158 16 OID 23 10 13 10 false false false 159 17 Name 1043 255 1 255 false false false 160 17 Version 1043 50 2 50 false false false -161 18 oid <null> 0 1 0 false false false +161 18 oid 23 0 1 0 false false false 162 18 nspname 1043 0 2 0 false false false -163 19 oid <null> 0 1 0 false false false +163 19 oid 23 0 1 0 false false false 164 19 relname 1043 0 2 0 false false false -165 19 relnamespace <null> 0 3 0 false false false +165 19 relnamespace 23 0 3 0 false false false 166 19 relkind 1042 0 4 0 false false false -167 19 relam <null> 0 5 0 false false false +167 19 relam 23 0 5 0 false false false 168 19 reltuples 700 0 6 0 false false false -169 19 relpages <null> 0 7 0 false false false +169 19 relpages 23 0 7 0 false false false 170 19 relhasrules 16 0 8 0 false false false 171 19 relhasoids 1043 0 9 0 false false false -172 20 oid <null> 0 1 0 false false false -173 20 attrelid <null> 0 2 0 false false false +172 20 oid 23 0 1 0 false false false +173 20 attrelid 23 0 2 0 false false false 174 20 attname 1043 0 3 0 false false false -175 20 atttypid <null> 0 4 0 false false false +175 20 atttypid 23 0 4 0 false false false 176 20 attlen 21 0 5 0 false false false 177 20 attnum 21 0 6 0 false false false -178 20 atttypmod <null> 0 7 0 false false false +178 20 atttypmod 23 0 7 0 false false false 179 20 attnotnull 16 0 8 0 false false false 180 20 attisdropped 16 0 9 0 false false false 181 20 atthasdef 16 0 10 0 false false false -182 21 oid <null> 0 1 0 false false false +182 21 oid 23 0 1 0 false false false 183 21 typname 1043 0 2 0 false false false -184 21 typnamespace <null> 0 3 0 false false false +184 21 typnamespace 23 0 3 0 false false false 185 21 typlen 21 0 4 0 false false false 186 21 typtype 1042 0 5 0 false false false -187 21 typbasetype <null> 0 6 0 false false false -188 21 typtypmod <null> 0 7 0 false false false -189 21 typrelid <null> 0 8 0 false false false -190 22 oid <null> 0 1 0 false false false -191 22 indexrelid <null> 0 2 0 false false false -192 22 indrelid <null> 0 3 0 false false false +187 21 typbasetype 23 0 6 0 false false false +188 21 typtypmod 23 0 7 0 false false false +189 21 typrelid 23 0 8 0 false false false +190 22 oid 23 0 1 0 false false false +191 22 indexrelid 23 0 2 0 false false false +192 22 indrelid 23 0 3 0 false false false 193 22 indisclustered 16 0 4 0 false false false 194 22 indisunique 16 0 5 0 false false false 195 22 indisprimary 16 0 6 0 false false false 196 22 indexprs 1043 0 7 0 false false false 197 22 indkey 1043 0 8 0 false false false -198 23 oid <null> 0 1 0 false false false +198 23 oid 23 0 1 0 false false false 199 23 amname 1043 0 2 0 false false false -200 24 oid <null> 0 1 0 false false false +200 24 oid 23 0 1 0 false false false 201 24 proname 1043 0 2 0 false false false 202 24 proretset 16 0 3 0 false false false -203 24 prorettype <null> 0 4 0 false false false +203 24 prorettype 23 0 4 0 false false false 204 24 pronargs 21 0 5 0 false false false 205 24 proargtypes <null> 0 6 0 false false false 206 24 proargnames <null> 0 7 0 false false false 207 24 proargmodes <null> 0 8 0 false false false 208 24 proallargtypes <null> 0 9 0 false false false -209 24 pronamespace <null> 0 10 0 false false false -210 25 oid <null> 0 1 0 false false false -211 25 tgconstrrelid <null> 0 2 0 false false false -212 25 tgfoid <null> 0 3 0 false false false -213 25 tgargs <null> 0 4 0 false false false -214 25 tgnargs <null> 0 5 0 false false false +209 24 pronamespace 23 0 10 0 false false false +210 25 oid 23 0 1 0 false false false +211 25 tgconstrrelid 23 0 2 0 false false false +212 25 tgfoid 23 0 3 0 false false false +213 25 tgargs 23 0 4 0 false false false +214 25 tgnargs 23 0 5 0 false false false 215 25 tgdeferrable 16 0 6 0 false false false 216 25 tginitdeferred 16 0 7 0 false false false 217 25 tgconstrname 1043 0 8 0 false false false -218 25 tgrelid <null> 0 9 0 false false false -219 26 oid <null> 0 1 0 false false false -220 26 adsrc <null> 0 2 0 false false false -221 26 adrelid <null> 0 3 0 false false false -222 26 adnum <null> 0 4 0 false false false -223 27 oid <null> 0 1 0 false false false +218 25 tgrelid 23 0 9 0 false false false +219 26 oid 23 0 1 0 false false false +220 26 adsrc 23 0 2 0 false false false +221 26 adrelid 23 0 3 0 false false false +222 26 adnum 23 0 4 0 false false false +223 27 oid 23 0 1 0 false false false 224 27 datname 1043 0 2 0 false false false -225 27 encoding <null> 0 3 0 false false false -226 27 datlastsysoid <null> 0 4 0 false false false +225 27 encoding 23 0 3 0 false false false +226 27 datlastsysoid 23 0 4 0 false false false 227 27 datallowconn 1042 0 5 0 false false false 228 27 datconfig <null> 0 6 0 false false false 229 27 datacl <null> 0 7 0 false false false -230 27 datdba <null> 0 8 0 false false false -231 27 dattablespace <null> 0 9 0 false false false -232 28 oid <null> 0 1 0 false false false +230 27 datdba 23 0 8 0 false false false +231 27 dattablespace 23 0 9 0 false false false +232 28 oid 23 0 1 0 false false false 233 28 usename 1043 0 2 0 false false false 234 28 usecreatedb 16 0 3 0 false false false 235 28 usesuper 16 0 4 0 false false false Modified: branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected =================================================================== --- branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2011-02-23 18:51:19 UTC (rev 2934) +++ branches/7.1.x/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2011-02-23 21:50:25 UTC (rev 2935) @@ -3,7 +3,7 @@ 16 boolean 2 1 b 0 -1 0 20 long 2 8 b 0 -1 0 21 short 2 2 b 0 -1 0 -23 int 2 4 b 0 -1 0 +23 integer 2 4 b 0 -1 0 25 text 2 -1 b 0 -1 0 26 oid 2 4 b 0 -1 0 142 xml 2 -1 b 0 -1 0