[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 16:48:47 +0100 (Wed, 09 Jan 2008)
New Revision: 204

Modified:
   src/main/java/nl/improved/sqlclient/SQLUtil.java
   src/test/java/nl/improved/sqlclient/SQLUtilTest.java
Log:
added another test
no longer spaces around operators required


Modified: src/main/java/nl/improved/sqlclient/SQLUtil.java
===================================================================
--- src/main/java/nl/improved/sqlclient/SQLUtil.java	2008-01-09 15:41:37 UTC (rev 203)
+++ src/main/java/nl/improved/sqlclient/SQLUtil.java	2008-01-09 15:48:47 UTC (rev 204)
@@ -235,7 +235,7 @@
             String upperCommandString = tmpCommand.toUpperCase();
             String subPart = "(|"+VAR+"(|[\\s]+"+COMPARATOR+"[\\s]+(|"+VAR+")))";
             //String regExp = "(|"+VALUE+"(|[\\s]+"+COMPARATOR+"[\\s]+(|"+VALUE+"(|([\\s]+(AND|OR)[\\s]+)))))";
-            String regExp = "(|"+VALUE+"(|[\\s]+"+COMPARATOR+"[\\s]+(|"+VALUE+"(|([\\s]+(AND|OR)[\\s]+(|"+VALUE+"(|[\\s]+"+COMPARATOR+"[\\s]+(|"+VALUE+"))))*))))";
+            String regExp = "(|"+VALUE+"(|[\\s]*"+COMPARATOR+"[\\s]*(|"+VALUE+"(|([\\s]+(AND|OR)[\\s]+(|"+VALUE+"(|[\\s]+"+COMPARATOR+"[\\s]+(|"+VALUE+"))))*))))";
             if (upperCommandString.matches(regExp)) {
                 String end = tmpCommand.substring(tmpCommand.lastIndexOf(' ')+1);
                 if (end.indexOf(".") > 0) {
@@ -244,7 +244,7 @@
                 return new TabCompletionInfo(TabCompletionInfo.MatchType.COLUMN_NAMES
                     , parseTableNames(commandInfo, commandPoint), end);
             }
-            //System.out.println("'"+upperCommandString +"'\n not matches\n"+regExp);
+            System.out.println("'"+upperCommandString +"'\n not matches\n"+regExp);
             return new TabCompletionInfo(TabCompletionInfo.MatchType.SQL_KEYWORD
                     , Arrays.asList(new String[]{"AND", "OR", "IN", "GROUP BY", "ORDER BY"}));
             /*String tmpCommand = startOfCommand.substring(startOfCommand.indexOf(lastKeyword)+lastKeyword.length()+1).toUpperCase();

Modified: src/test/java/nl/improved/sqlclient/SQLUtilTest.java
===================================================================
--- src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2008-01-09 15:41:37 UTC (rev 203)
+++ src/test/java/nl/improved/sqlclient/SQLUtilTest.java	2008-01-09 15:48:47 UTC (rev 204)
@@ -222,7 +222,7 @@
         assertTrue(matches.contains("B"));
         assertEquals("I", info.getStart());
 
-        /*sqlCommand = Arrays.asList(new String[]{"SELECT * FROM A,B WHERE I=bla AND I"});
+        sqlCommand = Arrays.asList(new String[]{"SELECT * FROM A,B WHERE I=bla AND I"});
         cursorPos = new Point(sqlCommand.get(0).length(),0);
         info = SQLUtil.getTabCompletionInfo(sqlCommand, cursorPos);
         assertNotNull(info);
@@ -231,7 +231,7 @@
         assertEquals(2, matches.size());
         assertTrue(matches.contains("A"));
         assertTrue(matches.contains("B"));
-        assertEquals("I", info.getStart());*/
+        assertEquals("I", info.getStart());
 
         sqlCommand = Arrays.asList(new String[]{"SELECT * FROM A,B WHERE A.I"});
         cursorPos = new Point(sqlCommand.get(0).length(),0);