Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hopefully uncontroversial changes from the DAL review feedback #98

Merged
merged 2 commits into from
Oct 17, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions ADQL.tex
Original file line number Diff line number Diff line change
Expand Up @@ -1626,7 +1626,7 @@ \subsubsection{BOX}
{\footnotesize \verb|type: ivo://ivoa.net/std/tapregext#features-adqlgeo|}\\
{\footnotesize \verb|name: BOX|}\\

Note - the \verb|BOX| function has been deprecated in this version of the standard,
Note - the \verb|BOX| function has been deprecated in version 2.1 of the standard,
and will be removed from future versions of the specification.

The BOX function expresses a box on the sky. A BOX is a special case of POLYGON,
Expand Down Expand Up @@ -1695,7 +1695,7 @@ \subsubsection{BOX}
%coordsys param
For historical reasons, the BOX function accepts an optional string literal as
the first argument.
As of this version of the specification this parameter has been
As of version 2.1 of the specification this parameter has been
marked as deprecated.
Future versions of this specification may remove this parameter
\SectionSee{sec:geom.coordsys.param}.
Expand Down Expand Up @@ -1770,7 +1770,7 @@ \subsubsection{CIRCLE}
%coordsys param
For historical reasons, the CIRCLE function accepts an optional string literal
as the first argument.
As of this version of the specification this parameter has been
As of version 2.1 of the specification this parameter has been
marked as deprecated.
Future versions of this specification may remove this parameter
\SectionSee{sec:geom.coordsys.param}.
Expand Down Expand Up @@ -1886,7 +1886,7 @@ \subsubsection{COORDSYS}
{\footnotesize \verb|type: ivo://ivoa.net/std/tapregext#features-adqlgeo|}\\
{\footnotesize \verb|name: COORDSYS|}\\

As of this version of the specification the COORDSYS function has
As of version 2.1 of the specification the COORDSYS function has
been marked as deprecated. This function may be removed in future versions
of this specification.
Details of the coordinate system for a database column are available as part of
Expand Down Expand Up @@ -2074,7 +2074,7 @@ \subsubsection{POINT}
%coordsys param
For historical reasons, the POINT function accepts an optional string literal
as the first argument.
As of this version of the specification this parameter has been
As of version 2.1 of the specification this parameter has been
marked as deprecated.
Future versions of this specification may remove this parameter
\SectionSee{sec:geom.coordsys.param}.
Expand Down Expand Up @@ -2143,7 +2143,7 @@ \subsubsection{POLYGON}
%coordsys param
For historical reasons, the POLYGON function accepts an optional string literal
as the first argument.
As of this version of the specification this parameter has been
As of version 2.1 of the specification this parameter has been
marked as deprecated.
Future versions of this specification may remove this parameter
\SectionSee{sec:geom.coordsys.param}.
Expand Down Expand Up @@ -2288,7 +2288,7 @@ \subsubsection{LOWER}
{\footnotesize \verb|type: ivo://ivoa.net/std/tapregext#features-adql-string|}\\
{\footnotesize \verb|name: LOWER|}\\

The LOWER function converts its string parameter to lower case.
The LOWER function converts its string parameter to lower case in accordance with the rules of the database's locale.

\begin{verbatim}
LOWER('Francis Albert Augustus Charles Emmanuel')
Expand All @@ -2302,7 +2302,7 @@ \subsubsection{UPPER}
{\footnotesize \verb|type: ivo://ivoa.net/std/tapregext#features-adql-string|}\\
{\footnotesize \verb|name: UPPER|}\\

The UPPER function converts its string parameter to upper case.
The UPPER function converts its string parameter to upper case in accordance with the rules of the database's locale.

\begin{verbatim}
UPPER('Francis Albert Augustus Charles Emmanuel')
Expand All @@ -2329,7 +2329,7 @@ \subsection{Common table expressions}
\label{sec:common-table}

An ADQL service implementation MAY include support for the following optional
support for common table expressions:
common table expressions:

\begin{itemize}
\item \verb:WITH:
Expand Down Expand Up @@ -2572,7 +2572,7 @@ \subsubsection{CAST}

The range of types allowed for the value to cast entirely depends on the target
type. Although cast operations may vary from one implementation to another, ADQL
SHOULD support the following ones:
SHOULD support the ones listed in Table \ref{table:cast.inputtypes}.

\begin{table}[!h]
\center{
Expand All @@ -2597,7 +2597,9 @@ \subsubsection{CAST}
\hline
\end{tabular}
}
\textit{\footnotesize{X: supported ; X*: supported but possible implementation differences}}
\textit{\footnotesize{X: supported ; X*: supported but possible implementation differences}}
\caption{CAST allowed types}
\label{table:cast.inputtypes}
}
\end{table}

Expand Down Expand Up @@ -2715,7 +2717,7 @@ \subsubsection{IN\_UNIT}
The \verb:IN_UNIT(): function returns the value of the first argument
transformed into the unit defined by the second argument.

The first argument MUST be a numeric expression.
The first argument MUST be a numeric value expression.

The second argument MUST be a string literal containing a valid unit
description using the formatting defined in the \VOUnitSpec{}.
Expand Down Expand Up @@ -2754,7 +2756,7 @@ \subsubsection{IN\_UNIT}
Currently, ADQL does not provide any way to specify the unit of a numeric
literal (e.g. a number such as \verb:42: or \verb:3.14:) or of the result of an
operation or function. Consequently, regarding the unitless aspect of such
numeric expression, \verb:IN_UNIT(): MUST report an error.
a numeric expression, \verb:IN_UNIT(): MUST report an error.

Examples:

Expand Down