From 65cd027938aeec0a58065f3c880f19eb408c3719 Mon Sep 17 00:00:00 2001
From: vforchi <vforchi@users.noreply.github.com>
Date: Thu, 9 Feb 2017 16:39:05 +0100
Subject: [PATCH] added support for ATAN2
---
src/adql/translator/SQLServerTranslator.java | 29 +++++---------------
1 file changed, 7 insertions(+), 22 deletions(-)
diff --git a/src/adql/translator/SQLServerTranslator.java b/src/adql/translator/SQLServerTranslator.java
index 2afdcb3..b147bee 100644
--- a/src/adql/translator/SQLServerTranslator.java
+++ b/src/adql/translator/SQLServerTranslator.java
@@ -19,18 +19,9 @@ package adql.translator;
* Copyright 2016 - Astronomisches Rechen Institut (ARI)
*/
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import adql.db.DBChecker;
-import adql.db.DBColumn;
-import adql.db.DBTable;
-import adql.db.DBType;
+import adql.db.*;
import adql.db.DBType.DBDatatype;
-import adql.db.DefaultDBColumn;
-import adql.db.DefaultDBTable;
import adql.db.STCS.Region;
-import adql.db.SearchColumnList;
import adql.db.exception.UnresolvedJoinException;
import adql.parser.ADQLParser;
import adql.parser.ParseException;
@@ -41,18 +32,10 @@ import adql.query.IdentifierField;
import adql.query.from.ADQLJoin;
import adql.query.operand.ADQLColumn;
import adql.query.operand.function.MathFunction;
-import adql.query.operand.function.geometry.AreaFunction;
-import adql.query.operand.function.geometry.BoxFunction;
-import adql.query.operand.function.geometry.CentroidFunction;
-import adql.query.operand.function.geometry.CircleFunction;
-import adql.query.operand.function.geometry.ContainsFunction;
-import adql.query.operand.function.geometry.DistanceFunction;
-import adql.query.operand.function.geometry.ExtractCoord;
-import adql.query.operand.function.geometry.ExtractCoordSys;
-import adql.query.operand.function.geometry.IntersectsFunction;
-import adql.query.operand.function.geometry.PointFunction;
-import adql.query.operand.function.geometry.PolygonFunction;
-import adql.query.operand.function.geometry.RegionFunction;
+import adql.query.operand.function.geometry.*;
+
+import java.util.ArrayList;
+import java.util.Iterator;
/**
* <p>MS SQL Server translator.</p>
@@ -343,6 +326,8 @@ public class SQLServerTranslator extends JDBCTranslator {
return "round(" + ((fct.getNbParameters() >= 2) ? (translate(fct.getParameter(0)) + ", " + translate(fct.getParameter(1))) : "") + ",1)";
case MOD:
return ((fct.getNbParameters() >= 2) ? (translate(fct.getParameter(0)) + "% " + translate(fct.getParameter(1))) : "");
+ case ATAN2:
+ return "ATN2(" + translate(fct.getParameter(0)) + ", " + translate(fct.getParameter(1)) + ")";
default:
return getDefaultADQLFunction(fct);
}
--
GitLab