Skip to content

Commit af7fc5c

Browse files
committed
changed source encoding to utf8 from win-1252
1 parent 86423b0 commit af7fc5c

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

pom.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<source>1.6</source>
3232
<target>1.6</target>
3333
<showWarnings>true</showWarnings>
34+
<encoding>${project.build.sourceEncoding}</encoding>
3435
</configuration>
3536
</plugin>
3637
<plugin>
@@ -57,6 +58,17 @@
5758
</sourceIncludes>
5859
</configuration>
5960
</plugin>
61+
<plugin>
62+
<groupId>org.apache.maven.plugins</groupId>
63+
<artifactId>maven-resources-plugin</artifactId>
64+
<version>2.4.3</version>
65+
<configuration>
66+
<encoding>${project.build.sourceEncoding}</encoding>
67+
</configuration>
68+
</plugin>
6069
</plugins>
6170
</build>
71+
<properties>
72+
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
73+
</properties>
6274
</project>

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ TOKEN: /* SQL Keywords. prefixed with K_ to avoid name clashes */
201201
| <K_BEGIN:"BEGIN">
202202
| <K_INDEX: "INDEX">
203203
| <K_INNER:"INNER">
204-
| <K_LIMIT:"LIMIT">
204+
| <K_LIMIT:"LIMIT">
205205
| <K_OUTER:"OUTER">
206206
| <K_ORDER:"ORDER">
207207
| <K_RIGHT:"RIGHT">
@@ -267,8 +267,8 @@ addition of german umlauts.
267267

268268
There seems to be no way to recognize letters by an external function to allow
269269
a configurable addition. One must rebuild JSqlParser with this new "Letterset".
270-
*/
271-
| < #ADDITIONAL_LETTERS: ["","","","","","",""] >
270+
*/
271+
| < #ADDITIONAL_LETTERS: ["ä","ö","ü","Ä","Ö","Ü","ß"] >
272272
}
273273

274274

src/test/java/net/sf/jsqlparser/test/select/SelectTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -738,13 +738,13 @@ public void testProblemFunction2() throws JSQLParserException {
738738
}
739739

740740
public void testAdditionalLettersGerman() throws JSQLParserException {
741-
String stmt = "SELECT colä, colü, colö FROM testtableöäü";
741+
String stmt = "SELECT colä, colö, colü FROM testtableäöü";
742742
assertSqlCanBeParsedAndDeparsed(stmt);
743743

744-
stmt = "SELECT colÄ, colÜ, colÖ FROM testtableÖÜÄ";
744+
stmt = "SELECT colA, colÖ, colÜ FROM testtableÄÖÜ";
745745
assertSqlCanBeParsedAndDeparsed(stmt);
746746

747-
stmt = "SELECT Äcol FROM testtableÖÜÄ";
747+
stmt = "SELECT Äcol FROM testtableÄÖÜ";
748748
assertSqlCanBeParsedAndDeparsed(stmt);
749749
}
750750

0 commit comments

Comments
 (0)