db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r553794 - /db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
Date Fri, 06 Jul 2007 08:49:22 GMT
Author: mamta
Date: Fri Jul  6 01:49:21 2007
New Revision: 553794

URL: http://svn.apache.org/viewvc?view=rev&rev=553794
Log:
Merging simple change (revision 553793) from main into Derby 10.3.1.1 codeline
Commit comments

DERBY-2777

We were incorrectly trying to set collation info on non-character string types. This commit
will remove that code.



Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java?view=diff&rev=553794&r1=553793&r2=553794
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
(original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/impl/sql/compile/TernaryOperatorNode.java
Fri Jul  6 01:49:21 2007
@@ -905,14 +905,25 @@
         }
     } // end of bindDateTimeArg
 
+    /**
+     * This method gets called for non-character string types and hence no need 
+     * to set any collation info. Collation applies only to character string
+     * types.
+     *  
+     * @param arg Check if arg is a ? param and if yes, then set it's type to
+     *    jdbcType if arg doesn't have a type associated with it.
+     *    
+     * @param jdbcType Associate this type with arg if arg is a ? param with no
+     *    type associated with it
+     *    
+     * @return true if arg is a ? param with no type associated with it
+     * @throws StandardException
+     */
     private boolean bindParameter( ValueNode arg, int jdbcType) throws StandardException
     {
         if( arg.requiresTypeFromContext() && arg.getTypeId() == null)
         {
             arg.setType( new DataTypeDescriptor(TypeId.getBuiltInTypeId( jdbcType), true));
-			//collation of ? operand should be same as the compilation schema
-			arg.setCollationUsingCompilationSchema(
-					StringDataValue.COLLATION_DERIVATION_IMPLICIT);
             return true;
         }
         return false;



Mime
View raw message