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

[ADQL] Fix few Javadoc links.

parent 7ca49f81
No related branches found
No related tags found
No related merge requests found
......@@ -411,7 +411,7 @@ public class ADQLQueryFactory {
}
/**
* @deprecated since 1.4 ; Former version's mistake: an ORDER BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createOrder(IdentifierItem, boolean)} ; This function is no longer used by ADQLParser.
* @deprecated since 1.4 ; Former version's mistake: an ORDER BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createOrder(adql.parser.IdentifierItems.IdentifierItem, boolean)} ; This function is no longer used by ADQLParser.
*/
@Deprecated
public ADQLOrder createOrder(final IdentifierItems idItems, final boolean desc) throws Exception{
......@@ -431,7 +431,7 @@ public class ADQLQueryFactory {
}
/**
* @deprecated since 1.4 ; Former version's mistake: a GROUP BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createColRef(IdentifierItem)} ; This function is no longer used by ADQLParser.
* @deprecated since 1.4 ; Former version's mistake: a GROUP BY item is either a regular/delimited column name or an integer, not a qualified column name ; Replaced by {@link #createColRef(adql.parser.IdentifierItems.IdentifierItem)} ; This function is no longer used by ADQLParser.
*/
@Deprecated
public ColumnReference createColRef(final IdentifierItems idItems) throws Exception{
......
......@@ -93,7 +93,7 @@ public class SQLServer_InnerJoin extends InnerJoin {
*
* @param left Left "table".
* @param right Right "table".
* @param condition Join condition.
* @param lstColumns List of columns to join.
*
* @see InnerJoin#InnerJoin(FromContent, FromContent, Collection)
*/
......
......@@ -47,8 +47,7 @@ import adql.query.operand.ADQLColumn;
* Since this special behavior is also valid for {@link InnerJoin}, a special implementation
* of this class has been also created: {@link SQLServer_InnerJoin}. Both must have exactly the
* same behavior when {@link #getDBColumns()} is called. That's why the static function
* {@link InnerJoin#getDBColumns(ADQLJoin)} has been created. It is called by {@link SQLServer_InnerJoin}
* and {@link SQLServer_OuterJoin}.
* {@link SQLServer_InnerJoin#getDBColumns(ADQLJoin)} has been created.
* </p>
*
* @author Gr&eacute;gory Mantelet (ARI)
......
......@@ -26,11 +26,11 @@ import adql.db.DBChecker;
import adql.db.DBColumn;
import adql.db.DBTable;
import adql.db.DBType;
import adql.db.DBType.DBDatatype;
import adql.db.DefaultDBColumn;
import adql.db.DefaultDBTable;
import adql.db.SearchColumnList;
import adql.db.DBType.DBDatatype;
import adql.db.STCS.Region;
import adql.db.SearchColumnList;
import adql.db.exception.UnresolvedJoinException;
import adql.parser.ADQLParser;
import adql.parser.ParseException;
......@@ -40,10 +40,7 @@ import adql.query.ClauseSelect;
import adql.query.IdentifierField;
import adql.query.from.ADQLJoin;
import adql.query.operand.ADQLColumn;
import adql.query.operand.ADQLOperand;
import adql.query.operand.function.DefaultUDF;
import adql.query.operand.function.MathFunction;
import adql.query.operand.function.UserDefinedFunction;
import adql.query.operand.function.geometry.AreaFunction;
import adql.query.operand.function.geometry.BoxFunction;
import adql.query.operand.function.geometry.CentroidFunction;
......@@ -68,7 +65,7 @@ import adql.query.operand.function.geometry.RegionFunction;
* TODO See how case sensitivity is supported by MS SQL Server and modify this translator accordingly.
*
* TODO Extend this class for each MS SQL Server extension supporting geometry and particularly
* {@link #translateGeometryFromDB(Object)}, {@link #translateGeometryToDB(Region)} and all this other
* {@link #translateGeometryFromDB(Object)}, {@link #translateGeometryToDB(adql.db.STCS.Region)} and all this other
* translate(...) functions for the ADQL's geometrical functions.
*
* TODO Check MS SQL Server datatypes (see {@link #convertTypeFromDB(int, String, String, String[])},
......@@ -192,9 +189,7 @@ public class SQLServerTranslator extends JDBCTranslator {
for(int i = 0; i < clause.size(); i++){
if (i == 0){
sql = clause.getName() +
(clause.hasLimit() ? " TOP " + clause.getLimit() + " " : "") +
(clause.distinctColumns() ? " DISTINCT" : "");
sql = clause.getName() + (clause.hasLimit() ? " TOP " + clause.getLimit() + " " : "") + (clause.distinctColumns() ? " DISTINCT" : "");
}else
sql += " " + clause.getSeparator(i);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment