/[volute]/trunk/projects/dal/ADQL/ADQL.tex
ViewVC logotype

Diff of /trunk/projects/dal/ADQL/ADQL.tex

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 4585 by yrvafhom, Tue Nov 28 02:30:31 2017 UTC revision 4586 by yrvafhom, Tue Nov 28 03:04:55 2017 UTC
# Line 454  Line 454 
454              }              }
455    
456          [ WHERE search_condition ]          [ WHERE search_condition ]
457          [ GROUP BY column_name, ... ]          [ GROUP BY group_by_term, ... ]
458          [ HAVING search_condition ]          [ HAVING search_condition ]
459          [ ORDER BY          [ ORDER BY
460              { column_name | unsigned_decimal } [ ASC | DESC],              { order_by_expression } [ ASC | DESC],
461              ...              ...
462              ]              ]
463          [ OFFSET unsigned_decimal ]          [ OFFSET unsigned_decimal ]
# Line 3298  Line 3298 
3298    
3299      <greater_than_or_equals_operator> ::= >=      <greater_than_or_equals_operator> ::= >=
3300    
3301      <group_by_clause> ::= GROUP BY <grouping_column_reference_list>      <group_by_clause> ::= GROUP BY <group_by_term_list>
3302    
3303      <grouping_column_reference> ::= <column_reference>      <group_by_term> ::=
3304              <column_reference>
3305      <grouping_column_reference_list> ::=          | <value_expression>
3306          <grouping_column_reference>  
3307          [ { <comma> <grouping_column_reference> }... ]      <group_by_term_list> ::=
3308            <group_by_term>
3309            [ { <comma> <group_by_term> }... ]
3310    
3311      <having_clause> ::= HAVING <search_condition>      <having_clause> ::= HAVING <search_condition>
3312    
# Line 3448  Line 3450 
3450    
3451      <offset_clause> ::= OFFSET <unsigned_decimal>      <offset_clause> ::= OFFSET <unsigned_decimal>
3452    
3453      <order_by_clause> ::= ORDER BY <sort_specification_list>      <order_by_clause> ::= ORDER BY <order_by_term_list>
3454    
3455        <order_by_direction> ::= ASC | DESC
3456    
3457        <order_by_expression> ::=
3458              <unsigned_decimal>
3459            | <column_reference>
3460            | <value_expression>
3461    
3462        <order_by_term> ::=
3463            <order_by_expression> [ <order_by_direction> ]
3464    
3465      <ordering_specification> ::= ASC | DESC      <order_by_term_list> ::=
3466            <order_by_term> [ { <comma> <order_by_term> }... ]
3467    
3468      <outer_join_type> ::= LEFT | RIGHT | FULL      <outer_join_type> ::= LEFT | RIGHT | FULL
3469    
# Line 3569  Line 3582 
3582    
3583      <solidus> ::= /      <solidus> ::= /
3584    
     <sort_key> ::= <column_name> | <unsigned_decimal>  
   
     <sort_specification> ::=  
         <sort_key> [ <ordering_specification> ]  
   
     <sort_specification_list> ::=  
         <sort_specification> [ { <comma> <sort_specification> }... ]  
   
3585      <space> ::=      <space> ::=
3586    
3587      <string_geometry_function> ::= <extract_coordsys>      <string_geometry_function> ::= <extract_coordsys>

Legend:
Removed from v.4585  
changed lines
  Added in v.4586

msdemlei@ari.uni-heidelberg.de
ViewVC Help
Powered by ViewVC 1.1.26