[Sqlshell-svn] /devel/src: main/java/nl/improved/sqlclient test/java/nl/improved/sqlclient

[SVN by r. <sv...@ca...>]

Author: roy
Date: 2008-01-09 17:11:26 +0100 (Wed, 09 Jan 2008)
New Revision: 206

Modified:
   src/main/java/nl/improved/sqlclient/SQLUtil.java
   src/test/java/nl/improved/sqlclient/SQLUtilTest.java
Log:
made completion for 'and' case sensitive (a=>and ,A=>AND)


Modified: src/main/java/nl/improved/sqlclient/SQLUtil.java
===================================================================
--- src/main/java/nl/improved/sqlclient/SQLUtil.java	2008-01-09 15:53:31 UTC (rev 205)
+++ src/main/java/nl/improved/sqlclient/SQLUtil.java	2008-01-09 16:11:26 UTC (rev 206)
@@ -249,7 +249,7 @@
             if (upperCommandString.matches(".*[\\s]+")) {
                 end = "";
             } else {
-                end = upperCommandString.substring(upperCommandString.lastIndexOf(' ')+1);
+                end = tmpCommand.substring(tmpCommand.lastIndexOf(' ')+1);
             }
             return new TabCompletionInfo(TabCompletionInfo.MatchType.SQL_KEYWORD
                     , Arrays.asList(new String[]{"AND", "OR", "IN", "GROUP BY", "ORDER BY"}), end);

Modified: src/test/java/nl/improved/sqlclient/SQLUtilTest.java
===================================================================
--- src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2008-01-09 15:53:31 UTC (rev 205)
+++ src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2008-01-09 16:11:26 UTC (rev 206)
@@ -316,6 +316,15 @@
         matches = info.getPossibleMatches();
         assertTrue(matches.contains("AND"));
         assertEquals("A", info.getStart());
+
+        sqlCommand = Arrays.asList(new String[]{"SELECT * FROM A,B WHERE A.x = 'x' a"});
+        cursorPos = new Point(sqlCommand.get(0).length(),0);
+        info = SQLUtil.getTabCompletionInfo(sqlCommand, cursorPos);
+        assertNotNull(info);
+        assertEquals(TabCompletionInfo.MatchType.SQL_KEYWORD, info.getMatchType());
+        matches = info.getPossibleMatches();
+        assertTrue(matches.contains("AND"));
+        assertEquals("a", info.getStart());
     }
 
     public void testParseTableNames() {