[teiid-commits] teiid SVN: r2943 - in trunk: runtime/src/main/java/org/teiid/odbc and 1 other directories.

Author: shawkins Date: 2011-02-25 00:37:40 -0500 (Fri, 25 Feb 2011) New Revision: 2943 Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected Log: forward merge from 7.1.1 Modified: trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2011-02-25 05:36:52 UTC (rev 2942) +++ trunk/runtime/src/main/java/org/teiid/deployers/PgCatalogMetadataStore.java 2011-02-25 05:37:40 UTC (rev 2943) @@ -369,7 +369,7 @@ " union " + //$NON-NLS-1$ "SELECT 20 as oid, 'long' as typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, convert(8, short) as typlen, convert('b', char) as typtype, 0 as typbasetype, -1 as typtypmod, 0 as typrelid FROM (SELECT 1) X" + //$NON-NLS-1$ " union " + //$NON-NLS-1$ - "SELECT 23 as oid, 'int' as typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, convert(4, short) as typlen, convert('b', char) as typtype, 0 as typbasetype, -1 as typtypmod, 0 as typrelid FROM (SELECT 1) X" + //$NON-NLS-1$ + "SELECT 23 as oid, 'integer' as typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typnamespace, convert(4, short) as typlen, convert('b', char) as typtype, 0 as typbasetype, -1 as typtypmod, 0 as typrelid FROM (SELECT 1) X" + //$NON-NLS-1$ " union " + //$NON-NLS-1$ "SELECT 26 as oid, 'oid' as typname, (SELECT OID FROM SYS.Schemas where Name = 'SYS') as typname, convert(4, short) as typlen, convert('b', char) as typtype, 0 as typbasetype, -1 as typtypmod, 0 as typrelid FROM (SELECT 1) X" + //$NON-NLS-1$ " union " + //$NON-NLS-1$ Modified: trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java =================================================================== --- trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-02-25 05:36:52 UTC (rev 2942) +++ trunk/runtime/src/main/java/org/teiid/odbc/ODBCServerRemoteImpl.java 2011-02-25 05:37:40 UTC (rev 2943) @@ -34,6 +34,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.teiid.core.util.ApplicationInfo; import org.teiid.jdbc.ConnectionImpl; import org.teiid.jdbc.TeiidDriver; import org.teiid.logging.LogConstants; @@ -300,7 +301,8 @@ // set client_encoding to 'WIN1252' if (sql != null) { // selects are coming with "select\t" so using a space after "select" does not always work - if (sql.startsWith("select") || sql.startsWith("SELECT")) { //$NON-NLS-1$ //$NON-NLS-2$ + String sqlLower = sql.toLowerCase(); + if (sqlLower.startsWith("select")) { //$NON-NLS-1$ modified = sql.replace('\n', ' '); Matcher m = null; @@ -321,6 +323,15 @@ "FKTABLE_NAME, FKCOLUMN_NAME, KEY_SEQ, UPDATE_RULE, DELETE_RULE, FK_NAME, PK_NAME, DEFERRABILITY "+//$NON-NLS-1$ "FROM SYS.ReferenceKeyColumns WHERE PKTABLE_NAME LIKE '"+m.group(14)+"' and PKTABLE_SCHEM LIKE '"+m.group(15)+"'";//$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ } + else if (modified.equalsIgnoreCase("select version()")) { //$NON-NLS-1$ + modified = "SELECT 'Teiid "+ApplicationInfo.getInstance().getReleaseNumber()+"'"; //$NON-NLS-1$ //$NON-NLS-2$ + } + else if (modified.startsWith("SELECT name FROM master..sysdatabases")) { //$NON-NLS-1$ + modified = "SELECT 'Teiid'"; //$NON-NLS-1$ + } + else if (modified.equalsIgnoreCase("select db_name() dbname")) { //$NON-NLS-1$ + modified = "SELECT current_database()"; //$NON-NLS-1$ + } else { modified = modified.replaceAll("E'", "'"); //$NON-NLS-1$ //$NON-NLS-2$ modified = modified.replaceAll("::[A-Za-z0-9]*", " "); //$NON-NLS-1$ //$NON-NLS-2$ @@ -342,8 +353,11 @@ if (m.matches()) { if (m.group(2).equalsIgnoreCase("client_encoding")) { //$NON-NLS-1$ this.client.setEncoding(PGCharsetConverter.getCharset(m.group(4))); - modified = "SELECT 'SET'"; //$NON-NLS-1$ } + else { + this.props.setProperty(m.group(2), m.group(4)); + } + modified = "SELECT 'SET'"; //$NON-NLS-1$ } else if (modified.equalsIgnoreCase("BEGIN")) { //$NON-NLS-1$ try { 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-02-25 05:36:52 UTC (rev 2942) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_ATTRIBUTE.expected 2011-02-25 05:37:40 UTC (rev 2943) @@ -1,42 +1,42 @@ integer integer string integer short short integer boolean boolean boolean oid attrelid attname atttypid attlen attnum atttypmod attnotnull attisdropped atthasdef -0 0 PART_ID 1043 4 1 4 false false false -1 0 PART_NAME 1043 255 2 255 false false false -2 0 PART_COLOR 1043 30 3 30 false false false -3 0 PART_WEIGHT 1043 255 4 255 false false false -4 1 SHIPPER_ID 21 0 1 0 false false false -5 1 SHIPPER_NAME 1043 30 2 30 false false false -6 2 STATUS_ID 21 0 1 0 false false false -7 2 STATUS_NAME 1043 30 2 30 false false false -8 3 SUPPLIER_ID 1043 10 1 10 false false false -9 3 PART_ID 1043 4 2 4 false false false -10 3 QUANTITY 21 0 3 0 false false false -11 3 SHIPPER_ID 21 0 4 0 false false false -12 4 SUPPLIER_ID 1043 10 1 10 false false false -13 4 SUPPLIER_NAME 1043 30 2 30 false false false -14 4 SUPPLIER_STATUS 21 0 3 0 false false false -15 4 SUPPLIER_CITY 1043 30 4 30 false false false -16 4 SUPPLIER_STATE 1043 2 5 2 false false false -17 5 VDBName 1043 255 1 255 false false false -18 5 SchemaName 1043 255 2 255 false false false -19 5 Name 1043 255 3 255 false false false -20 5 TargetSchemaName 1043 255 4 255 false false false -21 5 TargetName 1043 4000 5 4000 false false false -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 -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 -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 +0 0 PART_ID 1043 -1 1 4 false false false +1 0 PART_NAME 1043 -1 2 255 false false false +2 0 PART_COLOR 1043 -1 3 30 false false false +3 0 PART_WEIGHT 1043 -1 4 255 false false false +4 1 SHIPPER_ID 21 2 1 0 false false false +5 1 SHIPPER_NAME 1043 -1 2 30 false false false +6 2 STATUS_ID 21 2 1 0 false false false +7 2 STATUS_NAME 1043 -1 2 30 false false false +8 3 SUPPLIER_ID 1043 -1 1 10 false false false +9 3 PART_ID 1043 -1 2 4 false false false +10 3 QUANTITY 21 2 3 0 false false false +11 3 SHIPPER_ID 21 2 4 0 false false false +12 4 SUPPLIER_ID 1043 -1 1 10 false false false +13 4 SUPPLIER_NAME 1043 -1 2 30 false false false +14 4 SUPPLIER_STATUS 21 2 3 0 false false false +15 4 SUPPLIER_CITY 1043 -1 4 30 false false false +16 4 SUPPLIER_STATE 1043 -1 5 2 false false false +17 5 VDBName 1043 -1 1 255 false false false +18 5 SchemaName 1043 -1 2 255 false false false +19 5 Name 1043 -1 3 255 false false false +20 5 TargetSchemaName 1043 -1 4 255 false false false +21 5 TargetName 1043 -1 5 4000 false false false +22 5 Valid 16 1 6 0 false false false +23 5 LoadState 1043 -1 7 255 false false false +24 5 Updated 1114 8 8 0 false false false +25 5 Cardinality 23 4 9 10 false false false +26 6 resourcePath 1043 -1 1 255 false false false +27 6 contents 14939 -1 2 0 false false false +28 7 VDBName 1043 -1 1 255 false false false +29 7 SchemaName 1043 -1 2 255 false false false +30 7 TableName 1043 -1 3 255 false false false +31 7 Name 1043 -1 4 255 false false false +32 7 Position 23 4 5 10 false false false +33 7 NameInSource 1043 -1 6 255 false false false +34 7 DataType 1043 -1 7 100 false false false +35 7 Scale 23 4 8 10 false false false +36 7 Length 23 4 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 @@ -44,198 +44,198 @@ 41 7 IsSigned 16 1 14 1 false false false 42 7 IsCurrency 16 1 15 1 false false false 43 7 IsAutoIncremented 16 1 16 1 false false false -44 7 NullType 1043 20 17 20 false false false -45 7 MinRange 1043 50 18 50 false false false -46 7 MaxRange 1043 50 19 50 false false false -47 7 SearchType 1043 20 20 20 false false false -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 -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 -57 8 Name 1043 100 1 100 false false false +44 7 NullType 1043 -1 17 20 false false false +45 7 MinRange 1043 -1 18 50 false false false +46 7 MaxRange 1043 -1 19 50 false false false +47 7 SearchType 1043 -1 20 20 false false false +48 7 Format 1043 -1 21 255 false false false +49 7 DefaultValue 1043 -1 22 255 false false false +50 7 JavaClass 1043 -1 23 500 false false false +51 7 Precision 23 4 24 10 false false false +52 7 CharOctetLength 23 4 25 10 false false false +53 7 Radix 23 4 26 10 false false false +54 7 UID 1043 -1 27 50 false false false +55 7 Description 1043 -1 28 255 false false false +56 7 OID 23 4 29 10 false false false +57 8 Name 1043 -1 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 -64 8 NullType 1043 20 8 20 false false false +60 8 TypeName 1043 -1 4 100 false false false +61 8 JavaClass 1043 -1 5 500 false false false +62 8 Scale 23 4 6 10 false false false +63 8 TypeLength 23 4 7 10 false false false +64 8 NullType 1043 -1 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 -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 -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 -79 9 Name 1043 255 4 255 false false false -80 9 KeyName 1043 255 5 255 false false false -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 -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 -89 10 Name 1043 255 4 255 false false false -90 10 Description 1043 255 5 255 false false false -91 10 NameInSource 1043 255 6 255 false false false -92 10 Type 1043 20 7 20 false false false +68 8 Precision 23 4 12 10 false false false +69 8 Radix 23 4 13 10 false false false +70 8 SearchType 1043 -1 14 20 false false false +71 8 UID 1043 -1 15 50 false false false +72 8 RuntimeType 1043 -1 16 64 false false false +73 8 BaseType 1043 -1 17 64 false false false +74 8 Description 1043 -1 18 255 false false false +75 8 OID 23 4 19 10 false false false +76 9 VDBName 1043 -1 1 255 false false false +77 9 SchemaName 1043 -1 2 255 false false false +78 9 TableName 1043 -1 3 2048 false false false +79 9 Name 1043 -1 4 255 false false false +80 9 KeyName 1043 -1 5 255 false false false +81 9 KeyType 1043 -1 6 20 false false false +82 9 RefKeyUID 1043 -1 7 50 false false false +83 9 UID 1043 -1 8 50 false false false +84 9 Position 23 4 9 10 false false false +85 9 OID 23 4 10 10 false false false +86 10 VDBName 1043 -1 1 255 false false false +87 10 SchemaName 1043 -1 2 255 false false false +88 10 TableName 1043 -1 3 2048 false false false +89 10 Name 1043 -1 4 255 false false false +90 10 Description 1043 -1 5 255 false false false +91 10 NameInSource 1043 -1 6 255 false false false +92 10 Type 1043 -1 7 20 false false false 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 -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 -103 11 Type 1043 100 7 100 false false false +94 10 RefKeyUID 1043 -1 9 50 false false false +95 10 UID 1043 -1 10 50 false false false +96 10 OID 23 4 11 10 false false false +97 11 VDBName 1043 -1 1 255 false false false +98 11 SchemaName 1043 -1 2 255 false false false +99 11 ProcedureName 1043 -1 3 255 false false false +100 11 Name 1043 -1 4 255 false false false +101 11 DataType 1043 -1 5 25 false false false +102 11 Position 23 4 6 10 false false false +103 11 Type 1043 -1 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 -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 -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 -116 12 NameInSource 1043 255 4 255 false false false +105 11 Precision 23 4 9 10 false false false +106 11 TypeLength 23 4 10 10 false false false +107 11 Scale 23 4 11 10 false false false +108 11 Radix 23 4 12 10 false false false +109 11 NullType 1043 -1 13 10 false false false +110 11 UID 1043 -1 14 50 false false false +111 11 Description 1043 -1 15 255 false false false +112 11 OID 23 4 16 10 false false false +113 12 VDBName 1043 -1 1 255 false false false +114 12 SchemaName 1043 -1 2 255 false false false +115 12 Name 1043 -1 3 255 false false false +116 12 NameInSource 1043 -1 4 255 false false false 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 -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 -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 -128 14 PKCOLUMN_NAME 1043 255 4 255 false false false -129 14 FKTABLE_CAT 1043 255 5 255 false false false -130 14 FKTABLE_SCHEM 1043 255 6 255 false false false -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 -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 -139 15 VDBName 1043 255 1 255 false false false -140 15 Name 1043 255 2 255 false false false +118 12 UID 1043 -1 6 50 false false false +119 12 Description 1043 -1 7 255 false false false +120 12 OID 23 4 8 10 false false false +121 13 Name 1043 -1 1 255 false false false +122 13 Value 1043 -1 2 255 false false false +123 13 UID 1043 -1 3 50 false false false +124 13 OID 23 4 4 10 false false false +125 14 PKTABLE_CAT 1043 -1 1 255 false false false +126 14 PKTABLE_SCHEM 1043 -1 2 255 false false false +127 14 PKTABLE_NAME 1043 -1 3 255 false false false +128 14 PKCOLUMN_NAME 1043 -1 4 255 false false false +129 14 FKTABLE_CAT 1043 -1 5 255 false false false +130 14 FKTABLE_SCHEM 1043 -1 6 255 false false false +131 14 FKTABLE_NAME 1043 -1 7 255 false false false +132 14 FKCOLUMN_NAME 1043 -1 8 255 false false false +133 14 KEY_SEQ 21 2 9 5 false false false +134 14 UPDATE_RULE 23 4 10 10 false false false +135 14 DELETE_RULE 23 4 11 10 false false false +136 14 FK_NAME 1043 -1 12 255 false false false +137 14 PK_NAME 1043 -1 13 255 false false false +138 14 DEFERRABILITY 23 4 14 10 false false false +139 15 VDBName 1043 -1 1 255 false false false +140 15 Name 1043 -1 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 -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 -149 16 Type 1043 20 4 20 false false false -150 16 NameInSource 1043 255 5 255 false false false +142 15 UID 1043 -1 4 50 false false false +143 15 Description 1043 -1 5 255 false false false +144 15 PrimaryMetamodelURI 1043 -1 6 255 false false false +145 15 OID 23 4 7 10 false false false +146 16 VDBName 1043 -1 1 255 false false false +147 16 SchemaName 1043 -1 2 255 false false false +148 16 Name 1043 -1 3 255 false false false +149 16 Type 1043 -1 4 20 false false false +150 16 NameInSource 1043 -1 5 255 false false false 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 -155 16 Description 1043 255 10 255 false false false +153 16 UID 1043 -1 8 50 false false false +154 16 Cardinality 23 4 9 10 false false false +155 16 Description 1043 -1 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 -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 -162 18 nspname 1043 0 2 0 false false false -163 19 oid <null> 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 -166 19 relkind 1042 0 4 0 false false false -167 19 relam <null> 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 -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 -174 20 attname 1043 0 3 0 false false false -175 20 atttypid <null> 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 -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 -183 21 typname 1043 0 2 0 false false false -184 21 typnamespace <null> 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 -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 -199 23 amname 1043 0 2 0 false false false -200 24 oid <null> 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 -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 -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 -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 -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 -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 +157 16 IsMaterialized 16 1 12 0 false false false +158 16 OID 23 4 13 10 false false false +159 17 Name 1043 -1 1 255 false false false +160 17 Version 1043 -1 2 50 false false false +161 18 oid 23 4 1 0 false false false +162 18 nspname 1043 -1 2 0 false false false +163 19 oid 23 4 1 0 false false false +164 19 relname 1043 -1 2 0 false false false +165 19 relnamespace 23 4 3 0 false false false +166 19 relkind 1042 1 4 0 false false false +167 19 relam 23 4 5 0 false false false +168 19 reltuples 700 4 6 0 false false false +169 19 relpages 23 4 7 0 false false false +170 19 relhasrules 16 1 8 0 false false false +171 19 relhasoids 1043 -1 9 0 false false false +172 20 oid 23 4 1 0 false false false +173 20 attrelid 23 4 2 0 false false false +174 20 attname 1043 -1 3 0 false false false +175 20 atttypid 23 4 4 0 false false false +176 20 attlen 21 2 5 0 false false false +177 20 attnum 21 2 6 0 false false false +178 20 atttypmod 23 4 7 0 false false false +179 20 attnotnull 16 1 8 0 false false false +180 20 attisdropped 16 1 9 0 false false false +181 20 atthasdef 16 1 10 0 false false false +182 21 oid 23 4 1 0 false false false +183 21 typname 1043 -1 2 0 false false false +184 21 typnamespace 23 4 3 0 false false false +185 21 typlen 21 2 4 0 false false false +186 21 typtype 1042 1 5 0 false false false +187 21 typbasetype 23 4 6 0 false false false +188 21 typtypmod 23 4 7 0 false false false +189 21 typrelid 23 4 8 0 false false false +190 22 oid 23 4 1 0 false false false +191 22 indexrelid 23 4 2 0 false false false +192 22 indrelid 23 4 3 0 false false false +193 22 indisclustered 16 1 4 0 false false false +194 22 indisunique 16 1 5 0 false false false +195 22 indisprimary 16 1 6 0 false false false +196 22 indexprs 1043 -1 7 0 false false false +197 22 indkey 1043 -1 8 0 false false false +198 23 oid 23 4 1 0 false false false +199 23 amname 1043 -1 2 0 false false false +200 24 oid 23 4 1 0 false false false +201 24 proname 1043 -1 2 0 false false false +202 24 proretset 16 1 3 0 false false false +203 24 prorettype 23 4 4 0 false false false +204 24 pronargs 21 2 5 0 false false false +205 24 proargtypes <null> <null> 6 0 false false false +206 24 proargnames <null> <null> 7 0 false false false +207 24 proargmodes <null> <null> 8 0 false false false +208 24 proallargtypes <null> <null> 9 0 false false false +209 24 pronamespace 23 4 10 0 false false false +210 25 oid 23 4 1 0 false false false +211 25 tgconstrrelid 23 4 2 0 false false false +212 25 tgfoid 23 4 3 0 false false false +213 25 tgargs 23 4 4 0 false false false +214 25 tgnargs 23 4 5 0 false false false +215 25 tgdeferrable 16 1 6 0 false false false +216 25 tginitdeferred 16 1 7 0 false false false +217 25 tgconstrname 1043 -1 8 0 false false false +218 25 tgrelid 23 4 9 0 false false false +219 26 oid 23 4 1 0 false false false +220 26 adsrc 23 4 2 0 false false false +221 26 adrelid 23 4 3 0 false false false +222 26 adnum 23 4 4 0 false false false +223 27 oid 23 4 1 0 false false false +224 27 datname 1043 -1 2 0 false false false +225 27 encoding 23 4 3 0 false false false +226 27 datlastsysoid 23 4 4 0 false false false +227 27 datallowconn 1042 1 5 0 false false false +228 27 datconfig <null> <null> 6 0 false false false +229 27 datacl <null> <null> 7 0 false false false +230 27 datdba 23 4 8 0 false false false +231 27 dattablespace 23 4 9 0 false false false +232 28 oid 23 4 1 0 false false false +233 28 usename 1043 -1 2 0 false false false +234 28 usecreatedb 16 1 3 0 false false false +235 28 usesuper 16 1 4 0 false false false Row Count : 236 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 2 true true false false Modified: trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2011-02-25 05:36:52 UTC (rev 2942) +++ trunk/test-integration/common/src/test/resources/TestODBCSchema/test_PG_TYPE.expected 2011-02-25 05:37:40 UTC (rev 2943) @@ -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