[ADQL] Fix handling of delimited column references (e.g. items of ORDER BY). (118f357a) · Commits · Sonia Zorba / vollt

src/adql/db/DBChecker.java

+10 −12

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@ package adql.db;
		* You should have received a copy of the GNU Lesser General Public License
		* along with ADQLLibrary. If not, see <http://www.gnu.org/licenses/>.
		*
		* Copyright 2011-2016 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
		* Copyright 2011-2017 - UDS/Centre de Données astronomiques de Strasbourg (CDS),
		* Astronomisches Rechen Institut (ARI)
		*/

		@@ -97,7 +97,7 @@ import adql.search.SimpleSearchHandler;
		* </i></p>
		*
		* @author Grégory Mantelet (CDS;ARI)
		* @version 1.4 (03/2016)
		* @version 1.4 (03/2017)
		*/
		public class DBChecker implements QueryChecker {

		@@ -723,18 +723,16 @@ public class DBChecker implements QueryChecker {
		}else
		throw new ParseException("Column index out of bounds: " + index + " (must be between 1 and " + select.size() + ") !", colRef.getPosition());
		}else{
		ADQLColumn col = new ADQLColumn(colRef.getColumnName());
		ADQLColumn col = new ADQLColumn(null, colRef.getColumnName());
		col.setCaseSensitive(colRef.isCaseSensitive());
		col.setPosition(colRef.getPosition());

		// search among the select_item aliases:
		if (col.getTableName() == null){
		ArrayList<SelectItem> founds = select.searchByAlias(colRef.getColumnName(), colRef.isCaseSensitive());
		if (founds.size() == 1)
		return null;
		else if (founds.size() > 1)
		throw new UnresolvedColumnException(col, founds.get(0).getAlias(), founds.get(1).getAlias());
		}

		// check the corresponding column:
		return resolveColumn(col, dbColumns, null);

+17 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import adql.query.operand.function.DefaultUDF;
		import adql.query.operand.function.UserDefinedFunction;
		import adql.search.SimpleSearchHandler;
		import adql.translator.ADQLTranslator;
		import adql.translator.PostgreSQLTranslator;
		import adql.translator.TranslationException;

		public class TestDBChecker {
		@@ -135,6 +136,22 @@ public class TestDBChecker {
		}catch(ParseException pe){}
		}

		@Test
		public void testColRefWithDottedAlias(){
		ADQLParser parser = new ADQLParser(new DBChecker(tables));
		try{
		ADQLQuery adql = parser.parseQuery("SELECT colI AS \"col.I\" FROM aschema.foo ORDER BY \"col.I\"");
		assertNotNull(adql);
		assertEquals("SELECT \"aschema\".\"foo\".\"colI\" AS \"col.I\"\nFROM \"aschema\".\"foo\"\nORDER BY \"col.I\" ASC", (new PostgreSQLTranslator()).translate(adql));
		}catch(ParseException pe){
		pe.printStackTrace();
		fail();
		}catch(TranslationException te){
		te.printStackTrace();
		fail();
		}
		}

		@Test
		public void testNumericOrStringValueExpressionPrimary(){
		ADQLParser parser = new ADQLParser();