Author: shawkins Date: 2012-02-13 17:01:48 -0500 (Mon, 13 Feb 2012) New Revision: 3876 Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected Log: forward merge from 7.7 Modified: trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected 2012-02-13 21:52:06 UTC (rev 3875) +++ trunk/test-integration/common/src/test/resources/TestMMDatabaseMetaData/testGetTypeInfo_TotalNumber.expected 2012-02-13 22:01:48 UTC (rev 3876) @@ -2,15 +2,21 @@ TYPE_NAME DATA_TYPE PRECISION LITERAL_PREFIX LITERAL_SUFFIX CREATE_PARAMS NULLABLE CASE_SENSITIVE SEARCHABLE UNSIGNED_ATTRIBUTE FIXED_PREC_SCALE AUTO_INCREMENT LOCAL_TYPE_NAME MINIMUM_SCALE MAXIMUM_SCALE SQL_DATA_TYPE SQL_DATETIME_SUB NUM_PREC_RADIX boolean -7 1 {b' } <null> 1 false 3 true true false boolean 0 255 <null> <null> 0 byte -6 3 <null> <null> <null> 1 false 3 true true false byte 0 255 <null> <null> 0 +tinyint -6 3 <null> <null> <null> 1 false 3 true true false tinyint 0 255 <null> <null> 0 long -5 19 <null> <null> <null> 1 false 3 false false false long 0 255 <null> <null> 10 +bigint -5 19 <null> <null> <null> 1 false 3 false false false bigint 0 255 <null> <null> 10 char 1 1 ' ' <null> 1 false 3 true true false char 0 255 <null> <null> 0 bigdecimal 2 20 <null> <null> <null> 1 false 3 false true false bigdecimal 0 255 <null> <null> 10 +decimal 2 20 <null> <null> <null> 1 false 3 false true false decimal 0 255 <null> <null> 10 biginteger 2 19 <null> <null> <null> 1 false 3 false false false biginteger 0 255 <null> <null> 10 integer 4 10 <null> <null> <null> 1 false 3 false false false integer 0 255 <null> <null> 10 short 5 5 <null> <null> <null> 1 false 3 false false false short 0 255 <null> <null> 10 +smallint 5 5 <null> <null> <null> 1 false 3 false false false smallint 0 255 <null> <null> 10 float 7 20 <null> <null> <null> 1 false 3 false false false float 0 255 <null> <null> 10 +real 7 20 <null> <null> <null> 1 false 3 false false false real 0 255 <null> <null> 10 double 8 20 <null> <null> <null> 1 false 3 false false false double 0 255 <null> <null> 10 string 12 4000 ' ' <null> 1 false 3 true true false string 0 255 <null> <null> 0 +varchar 12 4000 ' ' <null> 1 false 3 true true false varchar 0 255 <null> <null> 0 xml 2009 2147483647 <null> <null> <null> 1 false 3 true true false xml 0 255 <null> <null> 0 date 91 10 {d' } <null> 1 false 3 true true false date 0 255 <null> <null> 0 time 92 8 {t' } <null> 1 false 3 true true false time 0 255 <null> <null> 0 @@ -19,7 +25,7 @@ blob 2004 2147483647 <null> <null> <null> 1 false 3 true true false blob 0 255 <null> <null> 0 varbinary -3 8192 X' ' <null> 1 false 3 true true false varbinary 0 255 <null> <null> 0 clob 2005 2147483647 <null> <null> <null> 1 false 3 true true false clob 0 255 <null> <null> 0 -Row Count : 19 +Row Count : 25 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable TYPE_NAME 12 QT_Ora9DS java.lang.String TYPE_NAME string SYS DataTypes 4000 4000 0 false false false false 0 true true false false DATA_TYPE 4 QT_Ora9DS java.lang.Integer DATA_TYPE integer SYS DataTypes 11 10 0 false false false true 1 false true true true Modified: trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected =================================================================== --- trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected 2012-02-13 21:52:06 UTC (rev 3875) +++ trunk/test-integration/common/src/test/resources/TestPartsDatabaseMetadata/testTypeInfo.expected 2012-02-13 22:01:48 UTC (rev 3876) @@ -2,15 +2,21 @@ TYPE_NAME DATA_TYPE PRECISION LITERAL_PREFIX LITERAL_SUFFIX CREATE_PARAMS NULLABLE CASE_SENSITIVE SEARCHABLE UNSIGNED_ATTRIBUTE FIXED_PREC_SCALE AUTO_INCREMENT LOCAL_TYPE_NAME MINIMUM_SCALE MAXIMUM_SCALE SQL_DATA_TYPE SQL_DATETIME_SUB NUM_PREC_RADIX boolean -7 1 {b' } <null> 1 false 3 true true false boolean 0 255 <null> <null> 0 byte -6 3 <null> <null> <null> 1 false 3 true true false byte 0 255 <null> <null> 0 +tinyint -6 3 <null> <null> <null> 1 false 3 true true false tinyint 0 255 <null> <null> 0 long -5 19 <null> <null> <null> 1 false 3 false false false long 0 255 <null> <null> 10 +bigint -5 19 <null> <null> <null> 1 false 3 false false false bigint 0 255 <null> <null> 10 char 1 1 ' ' <null> 1 false 3 true true false char 0 255 <null> <null> 0 bigdecimal 2 20 <null> <null> <null> 1 false 3 false true false bigdecimal 0 255 <null> <null> 10 +decimal 2 20 <null> <null> <null> 1 false 3 false true false decimal 0 255 <null> <null> 10 biginteger 2 19 <null> <null> <null> 1 false 3 false false false biginteger 0 255 <null> <null> 10 integer 4 10 <null> <null> <null> 1 false 3 false false false integer 0 255 <null> <null> 10 short 5 5 <null> <null> <null> 1 false 3 false false false short 0 255 <null> <null> 10 +smallint 5 5 <null> <null> <null> 1 false 3 false false false smallint 0 255 <null> <null> 10 float 7 20 <null> <null> <null> 1 false 3 false false false float 0 255 <null> <null> 10 +real 7 20 <null> <null> <null> 1 false 3 false false false real 0 255 <null> <null> 10 double 8 20 <null> <null> <null> 1 false 3 false false false double 0 255 <null> <null> 10 string 12 4000 ' ' <null> 1 false 3 true true false string 0 255 <null> <null> 0 +varchar 12 4000 ' ' <null> 1 false 3 true true false varchar 0 255 <null> <null> 0 xml 2009 2147483647 <null> <null> <null> 1 false 3 true true false xml 0 255 <null> <null> 0 date 91 10 {d' } <null> 1 false 3 true true false date 0 255 <null> <null> 0 time 92 8 {t' } <null> 1 false 3 true true false time 0 255 <null> <null> 0 @@ -19,7 +25,7 @@ blob 2004 2147483647 <null> <null> <null> 1 false 3 true true false blob 0 255 <null> <null> 0 varbinary -3 8192 X' ' <null> 1 false 3 true true false varbinary 0 255 <null> <null> 0 clob 2005 2147483647 <null> <null> <null> 1 false 3 true true false clob 0 255 <null> <null> 0 -Row Count : 19 +Row Count : 25 getColumnName getColumnType getCatalogName getColumnClassName getColumnLabel getColumnTypeName getSchemaName getTableName getColumnDisplaySize getPrecision getScale isAutoIncrement isCaseSensitive isCurrency isDefinitelyWritable isNullable isReadOnly isSearchable isSigned isWritable TYPE_NAME 12 PartsSupplier java.lang.String TYPE_NAME string SYS DataTypes 4000 4000 0 false false false false 0 true true false false DATA_TYPE 4 PartsSupplier java.lang.Integer DATA_TYPE integer SYS DataTypes 11 10 0 false false false true 1 false true true true