Skip to content

Commit 0d5911f

Browse files
authored
Prepare last PR before REC-2.0
Fix typos and Update PR version/date Merge pull request #53 from gmantele/adql_pr_20210528
2 parents b7849f5 + 64df135 commit 0d5911f

File tree

4 files changed

+54
-54
lines changed

4 files changed

+54
-54
lines changed

ADQL.bib

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
@misc{note:VOARCH,
2+
year=2010,
3+
month=nov,
4+
addurl={http://www.ivoa.net/documents/Notes/IVOAArchitecture},
5+
author={Christophe Arviset and Severin Gaudet and the {IVOA} Technical Coordination Group},
6+
editor = {Christophe Arviset},
7+
title = {{IVOA} Architecture},
8+
version = {1.0},
9+
howpublished = {{IVOA Note}}}

ADQL.tex

Lines changed: 44 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,8 @@ \subsubsection{SQL reserved keywords}
220220
\texttt{AT,} \texttt{AUTHORIZATION,} \texttt{AVG,} \texttt{BEGIN,}
221221
\texttt{BETWEEN,} \texttt{BIT,} \texttt{BIT\_LENGTH,} \texttt{BOTH,}
222222
\texttt{BY,} \texttt{CASCADE,} \texttt{CASCADED,} \texttt{CASE,}
223-
\texttt{CAST,} \texttt{CATALOG,} \texttt{CHAR,} \texttt{CHARACTER,}
224-
\texttt{CHARACTER\_LENGTH,} \texttt{CHAR\_LENGTH,} \texttt{CHECK,}
223+
\texttt{CATALOG,} \texttt{CHAR,} \texttt{CHARACTER,}
224+
\texttt{CHAR\_LENGTH,} \texttt{CHARACTER\_LENGTH,} \texttt{CHECK,}
225225
\texttt{CLOSE,} \texttt{COALESCE,} \texttt{COLLATE,}
226226
\texttt{COLLATION,} \texttt{COLUMN,} \texttt{COMMIT,}
227227
\texttt{CONNECT,} \texttt{CONNECTION,} \texttt{CONSTRAINT,}
@@ -234,47 +234,47 @@ \subsubsection{SQL reserved keywords}
234234
\texttt{DEFAULT,} \texttt{DEFERRABLE,} \texttt{DEFERRED,}
235235
\texttt{DELETE,} \texttt{DESC,} \texttt{DESCRIBE,}
236236
\texttt{DESCRIPTOR,} \texttt{DIAGNOSTICS,} \texttt{DISCONNECT,}
237-
\texttt{DISTINCT,} \texttt{DOMAIN,} \texttt{DOUBLE,} \texttt{DROP,}
237+
\texttt{DISTINCT,} \texttt{DOMAIN,} \texttt{DROP,}
238238
\texttt{ELSE,} \texttt{END,} \texttt{END-EXEC,} \texttt{ESCAPE,}
239239
\texttt{EXCEPT,} \texttt{EXCEPTION,} \texttt{EXEC,} \texttt{EXECUTE,}
240240
\texttt{EXISTS,} \texttt{EXTERNAL,} \texttt{EXTRACT,} \texttt{FALSE,}
241241
\texttt{FETCH,} \texttt{FIRST,} \texttt{FLOAT,} \texttt{FOR,}
242242
\texttt{FOREIGN,} \texttt{FOUND,} \texttt{FROM,} \texttt{FULL,}
243243
\texttt{GET,} \texttt{GLOBAL,} \texttt{GO,} \texttt{GOTO,}
244244
\texttt{GRANT,} \texttt{GROUP,} \texttt{HAVING,} \texttt{HOUR,}
245-
\texttt{IDENTITY,} \texttt{IMMEDIATE,} \texttt{IN,}
245+
\texttt{IDENTITY,} \texttt{IMMEDIATE,} \texttt{IN,}
246246
\texttt{INDICATOR,} \texttt{INITIALLY,} \texttt{INNER,}
247247
\texttt{INPUT,} \texttt{INSENSITIVE,} \texttt{INSERT,} \texttt{INT,}
248-
\texttt{INTEGER,} \texttt{INTERSECT,} \texttt{INTERVAL,}
248+
\texttt{INTERSECT,} \texttt{INTERVAL,}
249249
\texttt{INTO,} \texttt{IS,} \texttt{ISOLATION,} \texttt{JOIN,}
250250
\texttt{KEY,} \texttt{LANGUAGE,} \texttt{LAST,} \texttt{LEADING,}
251251
\texttt{LEFT,} \texttt{LEVEL,} \texttt{LIKE,} \texttt{LOCAL,}
252-
\texttt{LOWER,} \texttt{MATCH,} \texttt{MAX,} \texttt{MIN,}
252+
\texttt{MATCH,} \texttt{MAX,} \texttt{MIN,}
253253
\texttt{MINUTE,} \texttt{MODULE,} \texttt{MONTH,} \texttt{NAMES,}
254254
\texttt{NATIONAL,} \texttt{NATURAL,} \texttt{NCHAR,} \texttt{NEXT,}
255255
\texttt{NO,} \texttt{NOT,} \texttt{NULL,} \texttt{NULLIF,}
256256
\texttt{NUMERIC,} \texttt{OCTET\_LENGTH,} \texttt{OF,} \texttt{ON,}
257257
\texttt{ONLY,} \texttt{OPEN,} \texttt{OPTION,} \texttt{OR,}
258258
\texttt{ORDER,} \texttt{OUTER,} \texttt{OUTPUT,} \texttt{OVERLAPS,}
259259
\texttt{PAD,} \texttt{PARTIAL,} \texttt{POSITION,}
260-
\texttt{PRECISION,} \texttt{PREPARE,} \texttt{PRESERVE,}
260+
\texttt{PREPARE,} \texttt{PRESERVE,}
261261
\texttt{PRIMARY,} \texttt{PRIOR,} \texttt{PRIVILEGES,}
262-
\texttt{PROCEDURE,} \texttt{PUBLIC,} \texttt{READ,} \texttt{REAL,}
262+
\texttt{PROCEDURE,} \texttt{PUBLIC,} \texttt{READ,}
263263
\texttt{REFERENCES,} \texttt{RELATIVE,} \texttt{RESTRICT,}
264264
\texttt{REVOKE,} \texttt{RIGHT,} \texttt{ROLLBACK,} \texttt{ROWS,}
265265
\texttt{SCHEMA,} \texttt{SCROLL,} \texttt{SECOND,} \texttt{SECTION,}
266266
\texttt{SELECT,} \texttt{SESSION,} \texttt{SESSION\_USER,}
267-
\texttt{SET,} \texttt{SIZE,} \texttt{SMALLINT,} \texttt{SOME,}
267+
\texttt{SET,} \texttt{SIZE,} \texttt{SOME,}
268268
\texttt{SPACE,} \texttt{SQL,} \texttt{SQLCODE,} \texttt{SQLERROR,}
269269
\texttt{SQLSTATE,} \texttt{SUBSTRING,} \texttt{SUM,}
270270
\texttt{SYSTEM\_USER,} \texttt{TABLE,} \texttt{TEMPORARY,}
271-
\texttt{THEN,} \texttt{TIME,} \texttt{TIMESTAMP,}
271+
\texttt{THEN,} \texttt{TIME,}
272272
\texttt{TIMEZONE\_HOUR,} \texttt{TIMEZONE\_MINUTE,} \texttt{TO,}
273273
\texttt{TRAILING,} \texttt{TRANSACTION,} \texttt{TRANSLATE,}
274274
\texttt{TRANSLATION,} \texttt{TRIM,} \texttt{TRUE,} \texttt{UNION,}
275-
\texttt{UNIQUE,} \texttt{UNKNOWN,} \texttt{UPDATE,} \texttt{UPPER,}
275+
\texttt{UNIQUE,} \texttt{UNKNOWN,} \texttt{UPDATE,}
276276
\texttt{USAGE,} \texttt{USER,} \texttt{USING,} \texttt{VALUE,}
277-
\texttt{VALUES,} \texttt{VARCHAR,} \texttt{VARYING,} \texttt{VIEW,}
277+
\texttt{VALUES,} \texttt{VARYING,} \texttt{VIEW,}
278278
\texttt{WHEN,} \texttt{WHENEVER,} \texttt{WHERE,} \texttt{WITH,}
279279
\texttt{WORK,} \texttt{WRITE,} \texttt{YEAR,} \texttt{ZONE}
280280

@@ -289,7 +289,7 @@ \subsubsection{ADQL reserved keywords}
289289
\texttt{EXP,} \texttt{FLOOR,} \texttt{LOG,} \texttt{LOG10,}
290290
\texttt{MOD,} \texttt{PI,} \texttt{POWER,} \texttt{RADIANS,}
291291
\texttt{RAND,} \texttt{ROUND,} \texttt{SIN,} \texttt{SQRT,}
292-
\texttt{TAN,} \texttt{TOP,} \texttt{TRUNCATE}
292+
\texttt{TAN,} \texttt{TRUNCATE}
293293
\newline
294294

295295
\noindent
@@ -299,6 +299,27 @@ \subsubsection{ADQL reserved keywords}
299299
\texttt{CONTAINS,} \texttt{COORD1,} \texttt{COORD2,}
300300
\texttt{COORDSYS,} \texttt{DISTANCE,} \texttt{INTERSECTS,}
301301
\texttt{POINT,} \texttt{POLYGON,} \texttt{REGION}
302+
\newline
303+
304+
\noindent
305+
\verb:CAST: function and datatypes:\\
306+
\noindent
307+
\texttt{BIGINT,} \texttt{CAST,} \texttt{CHAR,} \texttt{DOUBLE PRECISION,}
308+
\texttt{INTEGER,} \texttt{REAL,} \texttt{SMALLINT,} \texttt{TIMESTAMP,}
309+
\texttt{VARCHAR}
310+
\newline
311+
312+
\noindent
313+
String functions and operators:\\
314+
\noindent
315+
\texttt{ILIKE,} \texttt{LOWER,} \texttt{UPPER}
316+
\newline
317+
318+
\noindent
319+
Conversion functions:\\
320+
\noindent
321+
\texttt{IN\_UNIT}
322+
302323

303324
\subsubsection{Identifiers}
304325
\label{sec:adql.identifiers}
@@ -398,7 +419,7 @@ \subsubsection{Whitespace}
398419
\subsection{Query syntax}
399420
\label{sec:syntax}
400421

401-
A more detailed definition of the select statement is given by the \verb:<query_specification>:
422+
A more detailed definition of the \verb:SELECT: statement is given by the \verb:<query_specification>:
402423
construct defined in \AppendixRef{sec:grammar}.
403424

404425
A simplified syntax for the \verb:SELECT: statement follows, showing the main constructs for
@@ -416,10 +437,10 @@ \subsection{Query syntax}
416437
FROM {
417438
{
418439
table_name [ [AS] identifier ]
419-
| ( SELECT ....) [ [AS] identifier ]
420-
| table_name [NATURAL]
440+
| ( SELECT ...) [AS] identifier
441+
| table_reference [NATURAL]
421442
[ INNER | { LEFT | RIGHT | FULL [OUTER] } ]
422-
JOIN table_name
443+
JOIN table_reference
423444
[ON search_condition | USING ( column_name,...) ]
424445
},
425446
...
@@ -656,7 +677,7 @@ \subsection{Mathematical and Trigonometrical Functions}
656677
\textit{n} integer &
657678
double &
658679
Rounds \textit{x} to \textit{n} decimal places.
659-
The integer \textit{n} is optinal and defaults to 0 if not specified.
680+
The integer \textit{n} is optional and defaults to 0 if not specified.
660681
A negative value of \textit{n} will round to the left of the decimal point.
661682
\tabularnewline
662683

@@ -667,7 +688,7 @@ \subsection{Mathematical and Trigonometrical Functions}
667688
\textit{n} integer &
668689
double &
669690
Truncates \textit{x} to \textit{n} decimal places.
670-
The integer \textit{n} is optinal and defaults to 0 if not specified.
691+
The integer \textit{n} is optional and defaults to 0 if not specified.
671692
\tabularnewline
672693

673694
\hline
@@ -1609,7 +1630,7 @@ \subsubsection{Preferred crossmatch syntax}
16091630
unnecessarily slow operation of the common sky crossmatch operation.
16101631

16111632
The purpose of this section is to recommend a preferred form of ADQL
1612-
to use for sky crossmatches. Clients posing crossmatch-like
1633+
to use for sky crossmatches. Clients proposing crossmatch-like
16131634
queries are advised to phrase them this way rather than semantically
16141635
equivalent alternatives, and services are encouraged to ensure that
16151636
this form of join is executed efficiently; this might involve
@@ -2924,6 +2945,7 @@ \subsubsection{CAST}
29242945
\textit{\footnotesize{X: supported ; X*: supported but possible implementation differences}}
29252946
}
29262947
\end{table}
2948+
\newpage % to force the compatibility table to be close to the "Input types" paragragh
29272949

29282950
\paragraph{Cast into a smaller datatype}
29292951

@@ -3970,35 +3992,6 @@ \section{Language feature support}
39703992
</languageFeatures>
39713993
\end{verbatim}
39723994

3973-
\newpage
3974-
\section{Outstanding issues}
3975-
\label{sec:issues}
3976-
3977-
The following section identifies areas of the specification that have known
3978-
issues that are still to be resolved.
3979-
3980-
\begin{itemize}
3981-
3982-
\item 20171129-003 Now that we allow polymorphism, do we still need to deprecate
3983-
the coordsys param for BOX, CIRCLE AND POLYGON? \SectionSee{sec:geom.coordsys.param}.
3984-
3985-
\item 20171129-004 Should support for REGION be optional (if so, how) ? \SectionSee{sec:types.geom.region}
3986-
\item 20171129-005 Should we add a literal constructor for REGION? \SectionSee{sec:types.geom.region}.
3987-
3988-
\item 20171129-007 Should we add prefixes to the xytpe names to indicate
3989-
which standard they are defined in?.
3990-
3991-
\item 20171129-008 INTERVAL is defined in DALI but not in ADQL. \SectionSee{sec:types.numeric.interval}.
3992-
3993-
\item 20170608-009 Can we add in ADQL an INTERSECTION function
3994-
which returns the polygon intersection of two regions?.
3995-
http://mail.ivoa.net/pipermail/dal/2017-June/007721.html
3996-
3997-
\item 20171228-010 Table inserted between text and example (POINT).
3998-
3999-
4000-
\end{itemize}
4001-
40023995
\newpage
40033996
\section{Changes from previous versions}
40043997
\label{sec:changes}
@@ -4025,6 +4018,7 @@ \section{Changes from previous versions}
40254018
\item Added \verb:UPPER(): function
40264019
\item Added recommendation to data providers about case folding
40274020
\item Re-added \verb:CAST(): function
4021+
\item Replaced the section for outstanding issues by the GitHub Issue mechanism
40284022
\end{itemize}
40294023

40304024
\item Changes from PR-ADQL-2.1-20180112
@@ -4175,7 +4169,7 @@ \section{Changes from previous versions}
41754169

41764170
\end{itemize}
41774171

4178-
\bibliography{ivoatex/ivoabib,ivoatex/docrepo}
4172+
\bibliography{ivoatex/ivoabib,ivoatex/docrepo,ADQL}
41794173

41804174
\end{document}
41814175

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ DOCNAME = ADQL
77
DOCVERSION = 2.1
88

99
# Publication date, ISO format; update manually for "releases"
10-
DOCDATE = 2018-01-12
10+
DOCDATE = 2021-05-28
1111

1212
# What is it you're writing: NOTE, WD, PR, or REC
1313
DOCTYPE = PR

ivoa-cite.tex

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,3 @@
3838
\newcommand{\SectionRef}[1]{Section \ref{#1}\xspace}
3939
\newcommand{\SectionSee}[1]{(see Section \ref{#1})\xspace}
4040
\newcommand{\AppendixRef}[1]{Appendix \ref{#1}\xspace}
41-
42-
43-

0 commit comments

Comments
 (0)