db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r586035 - in /db/derby/code/branches/10.3/java: engine/org/apache/derby/iapi/types/Like.java testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Date Thu, 18 Oct 2007 17:06:52 GMT
Author: mamta
Date: Thu Oct 18 10:06:43 2007
New Revision: 586035

URL: http://svn.apache.org/viewvc?rev=586035&view=rev
Log:
Merging javadoc fix from trunk(586033) into 10.3 codeline.


Modified:
    db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java

Modified: db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java?rev=586035&r1=586034&r2=586035&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java (original)
+++ db/derby/code/branches/10.3/java/engine/org/apache/derby/iapi/types/Like.java Thu Oct
18 10:06:43 2007
@@ -277,9 +277,11 @@
 	 * @param pat pattern to look for in val.
 	 * @param pLoc character position in pat.
 	 * @param collator null if we are dealing with UCS_BASIC character string
-	 * types. If not null, then we use it to get collation elements for 
-	 * character in val and pat to do the equality comparison.
-	 * @return
+	 *   types. If not null, then we use it to get collation elements for 
+	 *   character in val and pat to do the equality comparison.
+	 * @return TRUE if the character in val and vLoc match based on straight
+	 *   equality or collation element based equality. Otherwise we will 
+	 *   return FALSE.
 	 */
 	private static boolean checkEquality(char[] val, int vLoc,
 			char[] pat, int pLoc, RuleBasedCollator collator) {

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java?rev=586035&r1=586034&r2=586035&view=diff
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/lang/CollationTest.java
Thu Oct 18 10:06:43 2007
@@ -294,7 +294,10 @@
    * based on equal and like. 
    *  
    * @param conn
-   * @param expectedMatchCount  number of rows we expect back. 2 for french, 1 for English

+   * @param expectedMatchCountForEqual  number of rows we expect back for =. 
+   * 	2 for French, 1 for English 
+   * @param expectedMatchCountForLike  number of rows we expect back for LIKE. 
+   * 	1 for French and English 
    * @throws SQLException
    */
    private void compareAgrave(Connection conn, int expectedMatchCountForEqual,



Mime
View raw message