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

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

Author: roy
Date: 2007-10-28 11:42:25 +0100 (Sun, 28 Oct 2007)
New Revision: 186

Modified:
   src/main/java/nl/improved/sqlclient/SQLUtil.java
   src/test/java/nl/improved/sqlclient/SQLUtilTest.java
Log:
tab completion fix for from with multiple column select


Modified: src/main/java/nl/improved/sqlclient/SQLUtil.java
===================================================================
--- src/main/java/nl/improved/sqlclient/SQLUtil.java	2007-10-26 12:20:56 UTC (rev 185)
+++ src/main/java/nl/improved/sqlclient/SQLUtil.java	2007-10-28 10:42:25 UTC (rev 186)
@@ -216,6 +216,7 @@
                         , Arrays.asList(new String[]{"WHERE"}), end);
             }
             String end;
+            startOfCommand = startOfCommand.substring(startOfCommand.indexOf("FROM"));
             if (startOfCommand.indexOf(',') > 0) {
                end = startOfCommand.substring(startOfCommand.lastIndexOf(',')+1).trim();
             } else {

Modified: src/test/java/nl/improved/sqlclient/SQLUtilTest.java
===================================================================
--- src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2007-10-26 12:20:56 UTC (rev 185)
+++ src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2007-10-28 10:42:25 UTC (rev 186)
@@ -162,6 +162,15 @@
         matches = info.getPossibleMatches();
         assertEquals(0, matches.size());
         assertEquals("A", info.getStart());
+
+        sqlCommand = Arrays.asList(new String[]{"SELECT A.b, A.c FROM A"});
+        cursorPos = new Point(sqlCommand.get(0).length(),0);
+        info = SQLUtil.getTabCompletionInfo(sqlCommand, cursorPos);
+        assertNotNull(info);
+        assertEquals(SQLUtil.TabCompletionInfo.MatchType.TABLE_NAMES, info.getMatchType());
+        matches = info.getPossibleMatches();
+        assertEquals(0, matches.size());
+        assertEquals("A", info.getStart());
     }
 
     public void testTabCompletionInfoWHERE() {