Merge pull request #36 from lsst-sqre/tickets/DM-21176

[DM-21176] Add remaining scisql functions to TAP's list
lsst-sqre · Dec 19, 2019 · 34527b4 · 34527b4
2 parents b5a8933 + 99b583d
commit 34527b4
Showing 1 changed file with 27 additions and 1 deletion.
diff --git a/src/main/java/org/opencadc/tap/schema/ALMATapSchemaDAO.java b/src/main/java/org/opencadc/tap/schema/ALMATapSchemaDAO.java
@@ -103,13 +103,39 @@ protected List<FunctionDesc> getFunctionDescs() {
         functionDescs.add(new FunctionDesc("qserv_areaspec_ellipse", TapDataType.INTEGER));
         functionDescs.add(new FunctionDesc("qserv_areaspec_poly", TapDataType.INTEGER));
 
-        // SciSQL specific functions.
+        // SciSQL functions: https://lsst-web.ncsa.illinois.edu/schema/sciSQL/
+        // SciSQL Spherical Geometry functions.
         functionDescs.add(new FunctionDesc("scisql_angSep", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_s2CPolyHtmRanges", TapDataType.STRING));
+        functionDescs.add(new FunctionDesc("scisql_s2CPolyToBin", TapDataType.STRING));
+        functionDescs.add(new FunctionDesc("scisql_s2CircleHtmRanges", TapDataType.STRING));
+        functionDescs.add(new FunctionDesc("scisql_s2HtmId", TapDataType.LONG));
+        functionDescs.add(new FunctionDesc("scisql_s2HtmLevel", TapDataType.INTEGER));
         functionDescs.add(new FunctionDesc("scisql_s2PtInBox", TapDataType.INTEGER));
         functionDescs.add(new FunctionDesc("scisql_s2PtInCPoly", TapDataType.INTEGER));
         functionDescs.add(new FunctionDesc("scisql_s2PtInCircle", TapDataType.INTEGER));
         functionDescs.add(new FunctionDesc("scisql_s2PtInEllipse", TapDataType.INTEGER));
 
+        // SciSQL Photometry functions
+        functionDescs.add(new FunctionDesc("scisql_abMagToDn", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_abMagToDnSigma", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_abMagToFlux", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_abMagToFluxSigma", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_dnToAbMag", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_dnToAbMagSigma", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_dnToFlux", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_dnToFluxSigma", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_fluxToAbMag", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_fluxToAbMagSigma", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_fluxToDn", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_fluxToDnSigma", TapDataType.DOUBLE));
+
+        // SciSQL Statistics
+        functionDescs.add(new FunctionDesc("scisql_median", TapDataType.DOUBLE));
+        functionDescs.add(new FunctionDesc("scisql_percentile", TapDataType.DOUBLE));
+
+        // SciSQL misc
+        functionDescs.add(new FunctionDesc("scisql_getVersion", TapDataType.CHAR));
         return functionDescs;
     }
 }