Skip to content
Snippets Groups Projects
Commit dc766f2c authored by gmantele's avatar gmantele
Browse files

[ADQL] Fix the ADQL DEBUG mode ; now ADQLParser.setParser(boolean) is doing...

[ADQL] Fix the ADQL DEBUG mode ; now ADQLParser.setParser(boolean) is doing what it is supposed to do.
parent d4682d94
No related branches found
No related tags found
No related merge requests found
This diff is collapsed.
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
* If the syntax is not conform to the ADQL definition an error message is printed else it will be the message "Correct syntax". * If the syntax is not conform to the ADQL definition an error message is printed else it will be the message "Correct syntax".
* *
* Author: Grégory Mantelet (CDS;ARI) - gmantele@ari.uni-heidelberg.de * Author: Grégory Mantelet (CDS;ARI) - gmantele@ari.uni-heidelberg.de
* Version: 1.3 (10/2014) * Version: 1.4 (06/2015)
*/ */
/* ########### */ /* ########### */
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
options { options {
STATIC = false; STATIC = false;
IGNORE_CASE = true; IGNORE_CASE = true;
DEBUG_PARSER = false; DEBUG_PARSER = true;
} }
/* ########## */ /* ########## */
...@@ -89,7 +89,7 @@ import adql.translator.TranslationException; ...@@ -89,7 +89,7 @@ import adql.translator.TranslationException;
* @see ADQLQueryFactory * @see ADQLQueryFactory
* *
* @author Grégory Mantelet (CDS;ARI) - gmantele@ari.uni-heidelberg.de * @author Grégory Mantelet (CDS;ARI) - gmantele@ari.uni-heidelberg.de
* @version 1.3 (10/2014) * @version 1.4 (06/2015)
*/ */
public class ADQLParser { public class ADQLParser {
...@@ -113,6 +113,7 @@ public class ADQLParser { ...@@ -113,6 +113,7 @@ public class ADQLParser {
*/ */
public ADQLParser(){ public ADQLParser(){
this(new java.io.ByteArrayInputStream("".getBytes())); this(new java.io.ByteArrayInputStream("".getBytes()));
setDebug(false);
} }
/** /**
...@@ -158,6 +159,8 @@ public class ADQLParser { ...@@ -158,6 +159,8 @@ public class ADQLParser {
public ADQLParser(java.io.InputStream stream, QueryChecker checker, ADQLQueryFactory factory) { public ADQLParser(java.io.InputStream stream, QueryChecker checker, ADQLQueryFactory factory) {
this(stream); this(stream);
setDebug(false);
queryChecker = checker; queryChecker = checker;
if (factory != null) if (factory != null)
...@@ -233,6 +236,8 @@ public class ADQLParser { ...@@ -233,6 +236,8 @@ public class ADQLParser {
public ADQLParser(java.io.Reader reader, QueryChecker checker, ADQLQueryFactory factory) { public ADQLParser(java.io.Reader reader, QueryChecker checker, ADQLQueryFactory factory) {
this(reader); this(reader);
setDebug(false);
queryChecker = checker; queryChecker = checker;
if (factory != null) if (factory != null)
...@@ -269,6 +274,8 @@ public class ADQLParser { ...@@ -269,6 +274,8 @@ public class ADQLParser {
public ADQLParser(ADQLParserTokenManager tm, QueryChecker checker, ADQLQueryFactory factory) { public ADQLParser(ADQLParserTokenManager tm, QueryChecker checker, ADQLQueryFactory factory) {
this(tm); this(tm);
setDebug(false);
queryChecker = checker; queryChecker = checker;
if (factory != null) if (factory != null)
......
...@@ -26,6 +26,18 @@ public class TestADQLParser { ...@@ -26,6 +26,18 @@ public class TestADQLParser {
@After @After
public void tearDown() throws Exception{} public void tearDown() throws Exception{}
@Test
public void testDelimitedIdentifiersWithDot(){
ADQLParser parser = new ADQLParser();
try{
ADQLQuery query = parser.parseQuery("SELECT * FROM \"B/avo.rad/catalog\";");
assertEquals("B/avo.rad/catalog", query.getFrom().getTables().get(0).getTableName());
}catch(Exception e){
e.printStackTrace(System.err);
fail("The ADQL query is strictly correct! No error should have occured. (see stdout for more details)");
}
}
@Test @Test
public void test(){ public void test(){
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment