db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r543590 - in /db/derby/code/trunk/java/engine/org/apache/derby: catalog/types/TypeDescriptorImpl.java iapi/types/DataTypeDescriptor.java
Date Fri, 01 Jun 2007 19:56:37 GMT
Author: mikem
Date: Fri Jun  1 12:56:37 2007
New Revision: 543590

URL: http://svn.apache.org/viewvc?view=rev&rev=543590
Log:
DERBY-2717

Change DataTypeDescriptor.getCollationName() to call 
typeDescriptor.getCollationName().


Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
    db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java

Modified: db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java?view=diff&rev=543590&r1=543589&r2=543590
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
(original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/catalog/types/TypeDescriptorImpl.java
Fri Jun  1 12:56:37 2007
@@ -432,8 +432,6 @@
 	/**
 	 * Converts this data type descriptor (including length/precision)
 	 * to a string. E.g.
-
-
 	 *
 	 *			VARCHAR(30)
 	 *

Modified: db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java?view=diff&rev=543590&r1=543589&r2=543590
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/iapi/types/DataTypeDescriptor.java Fri
Jun  1 12:56:37 2007
@@ -865,8 +865,7 @@
 	 */
 	public String getCollationName()
 	{
-        return(typeDescriptor.getCollationType() == 0 ?
-                    "UCS_BASIC" : "TERRITORY_BASED");
+        return(typeDescriptor.getCollationName());
 	}
 
 	/** @see TypeDescriptor#setCollationType(int) */



Mime
View raw message