fix #250 remove first comma regexp fixed.

README.ja.md

@@ -24,14 +24,14 @@ Installation
 <dependency>
     <groupId>jp.co.future</groupId>
     <artifactId>uroborosql</artifactId>
-    <version>0.17.0</version>
+    <version>0.17.1</version>
 </dependency>
 ```
 
 #### for Gradle
 
 ```gradle
-compile group: 'jp.co.future', name: 'uroborosql', version: '0.17.0'
+compile group: 'jp.co.future', name: 'uroborosql', version: '0.17.1'
 ```
 
 Documentation

README.md

@@ -26,14 +26,14 @@ Installation
 <dependency>
     <groupId>jp.co.future</groupId>
     <artifactId>uroborosql</artifactId>
-    <version>0.17.0</version>
+    <version>0.17.1</version>
 </dependency>
 ```
 
 #### for Gradle
 
 ```gradle
-compile group: 'jp.co.future', name: 'uroborosql', version: '0.17.0'
+compile group: 'jp.co.future', name: 'uroborosql', version: '0.17.1'
 ```
 
 Documentation

pom.xml

@@ -3,7 +3,7 @@
 	<modelVersion>4.0.0</modelVersion>
 	<groupId>jp.co.future</groupId>
 	<artifactId>uroborosql</artifactId>
-	<version>0.18.0-SNAPSHOT</version>
+	<version>0.17.1</version>
 	<packaging>jar</packaging>
 	<name>uroboroSQL</name>
 	<description>Developer-oriented and SQL centric database access library</description>

src/main/java/jp/co/future/uroborosql/context/SqlContextImpl.java

@@ -78,11 +78,12 @@ public boolean contains(final Object o) {
 
 	/** where句の直後にくるANDやORを除外するための正規表現 */
 	protected static final Pattern WHERE_CLAUSE_PATTERN = Pattern
-			.compile("(?i)(WHERE\\s+(--.*|/\\*.*\\*/\\s*)*\\s*)(AND\\s+|OR\\s+)");
+			.compile("(?i)(?<clause>(^|\\s+)(WHERE\\s+(--.*|/\\*.*\\*/\\s*)*\\s*))(AND\\s+|OR\\s+)");
 
 	/** 各句の最初に現れるカンマを除去するための正規表現 */
 	protected static final Pattern REMOVE_FIRST_COMMA_PATTERN = Pattern
-			.compile("(?i)(((SELECT|ORDER\\s+BY|GROUP\\s+BY|SET)\\s+|\\(\\s*)(--.*|/\\*.*\\*/\\s*)*\\s*)(,)");
+			.compile(
+					"(?i)(?<keyword>((^|\\s+)(SELECT|ORDER\\s+BY|GROUP\\s+BY|SET)\\s+|\\(\\s*)(--.*|/\\*.*\\*/\\s*)*\\s*)(,)");
 	/** 不要な空白、改行を除去するための正規表現 */
 	protected static final Pattern CLEAR_BLANK_PATTERN = Pattern.compile("(?m)^\\s*(\\r\\n|\\r|\\n)");
 
@@ -222,7 +223,7 @@ public String getExecutableSql() {
 					StringBuffer buff = new StringBuffer();
 					Matcher matcher = WHERE_CLAUSE_PATTERN.matcher(executableSqlCache);
 					while (matcher.find()) {
-						String whereClause = matcher.group(1);
+						String whereClause = matcher.group("clause");
 						matcher.appendReplacement(buff, whereClause);
 					}
 					matcher.appendTail(buff);
@@ -232,7 +233,7 @@ public String getExecutableSql() {
 				StringBuffer buff = new StringBuffer();
 				Matcher removeCommaMatcher = REMOVE_FIRST_COMMA_PATTERN.matcher(executableSqlCache);
 				while (removeCommaMatcher.find()) {
-					String clauseWords = removeCommaMatcher.group(1);
+					String clauseWords = removeCommaMatcher.group("keyword");
 					removeCommaMatcher.appendReplacement(buff, clauseWords);
 				}
 				removeCommaMatcher.appendTail(buff);