Documentation Source Text

Check-in [a467d7a4b8]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix an error in the table-or-subquery syntax diagram.
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: a467d7a4b88641929228e960eba6a23aba08820d
User & Date: drh 2014-01-30 20:55:58
Context
2014-02-03
14:00
Add the sha1sum and SQLITE_SOURCE_ID for version 3.8.3 to the changelog. check-in: c161234538 user: dan tags: trunk
2014-02-02
22:43
Enhancements to the bubble diagram generator. Leaf check-in: 4dc85d1094 user: drh tags: bubble-diagrams
2014-01-30
20:55
Fix an error in the table-or-subquery syntax diagram. check-in: a467d7a4b8 user: drh tags: trunk
20:51
Add the "factored-select-stmt" syntax diagram. Improve the way diagrams are hidden and shown. check-in: fac98d12ae user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Show Whitespace Changes Patch

Changes to art/syntax/bubble-generator-data.tcl.

   407    407          {stack
   408    408             {line
   409    409                {optx /database-name .} /table-name
   410    410                {optx {optx AS} /table-alias}
   411    411             }
   412    412             {or nil {line INDEXED BY /index-name} {line NOT INDEXED}}
   413    413          }
   414         -       {line ( {loop
   415         -                          table-or-subquery
   416         -                          {join-op table-or-subquery join-constraint}} )}
          414  +       {line ( {or {loop table-or-subquery ,} join-clause} )}
   417    415          {line
   418    416             ( select-stmt ) {optx {optx AS} /table-alias}
   419    417          }
   420    418     }
   421    419     result-column {
   422    420        or
   423    421           *

Changes to art/syntax/syntax_linkage.tcl.

    24     24   set syntax_linkage(drop-trigger-stmt) {{} sql-stmt}
    25     25   set syntax_linkage(drop-view-stmt) {{} sql-stmt}
    26     26   set syntax_linkage(expr) {{literal-value raise-function select-stmt type-name} {attach-stmt column-constraint compound-select-stmt create-index-stmt create-trigger-stmt delete-stmt delete-stmt-limited factored-select-stmt insert-stmt join-constraint ordering-term result-column select-core select-stmt simple-select-stmt table-constraint update-stmt update-stmt-limited}}
    27     27   set syntax_linkage(factored-select-stmt) {{common-table-expression compound-operator expr ordering-term select-core} {}}
    28     28   set syntax_linkage(foreign-key-clause) {{} {column-constraint table-constraint}}
    29     29   set syntax_linkage(indexed-column) {{} {create-index-stmt table-constraint}}
    30     30   set syntax_linkage(insert-stmt) {{expr select-stmt with-clause} {create-trigger-stmt sql-stmt}}
    31         -set syntax_linkage(join-clause) {{join-constraint join-operator table-or-subquery} {select-core select-stmt}}
    32         -set syntax_linkage(join-constraint) {expr {join-clause table-or-subquery}}
           31  +set syntax_linkage(join-clause) {{join-constraint join-operator table-or-subquery} {select-core select-stmt table-or-subquery}}
           32  +set syntax_linkage(join-constraint) {expr join-clause}
    33     33   set syntax_linkage(join-operator) {{} join-clause}
    34     34   set syntax_linkage(literal-value) {{} {column-constraint expr}}
    35     35   set syntax_linkage(numeric-literal) {{} {}}
    36     36   set syntax_linkage(ordering-term) {expr {compound-select-stmt delete-stmt-limited factored-select-stmt select-stmt simple-select-stmt update-stmt-limited}}
    37     37   set syntax_linkage(pragma-stmt) {pragma-value sql-stmt}
    38     38   set syntax_linkage(pragma-value) {signed-number pragma-stmt}
    39     39   set syntax_linkage(qualified-table-name) {{} {delete-stmt delete-stmt-limited update-stmt update-stmt-limited}}
................................................................................
    47     47   set syntax_linkage(select-core) {{expr join-clause result-column table-or-subquery} {compound-select-stmt factored-select-stmt simple-select-stmt}}
    48     48   set syntax_linkage(select-stmt) {{common-table-expression compound-operator expr join-clause ordering-term result-column table-or-subquery} {common-table-expression create-table-stmt create-trigger-stmt create-view-stmt expr insert-stmt sql-stmt table-or-subquery with-clause}}
    49     49   set syntax_linkage(signed-number) {{} {column-constraint pragma-value type-name}}
    50     50   set syntax_linkage(simple-select-stmt) {{common-table-expression expr ordering-term select-core} {}}
    51     51   set syntax_linkage(sql-stmt) {{alter-table-stmt analyze-stmt attach-stmt begin-stmt commit-stmt create-index-stmt create-table-stmt create-trigger-stmt create-view-stmt create-virtual-table-stmt delete-stmt delete-stmt-limited detach-stmt drop-index-stmt drop-table-stmt drop-trigger-stmt drop-view-stmt insert-stmt pragma-stmt reindex-stmt release-stmt rollback-stmt savepoint-stmt select-stmt update-stmt update-stmt-limited vacuum-stmt} sql-stmt-list}
    52     52   set syntax_linkage(sql-stmt-list) {sql-stmt {}}
    53     53   set syntax_linkage(table-constraint) {{conflict-clause expr foreign-key-clause indexed-column} create-table-stmt}
    54         -set syntax_linkage(table-or-subquery) {{join-constraint select-stmt} {join-clause select-core select-stmt}}
           54  +set syntax_linkage(table-or-subquery) {{join-clause select-stmt} {join-clause select-core select-stmt}}
    55     55   set syntax_linkage(type-name) {signed-number {column-def expr}}
    56     56   set syntax_linkage(update-stmt) {{expr qualified-table-name with-clause} {create-trigger-stmt sql-stmt}}
    57     57   set syntax_linkage(update-stmt-limited) {{expr ordering-term qualified-table-name with-clause} sql-stmt}
    58     58   set syntax_linkage(vacuum-stmt) {{} sql-stmt}
    59     59   set syntax_linkage(with-clause) {{cte-table-name select-stmt} {delete-stmt delete-stmt-limited insert-stmt update-stmt update-stmt-limited}}
    60     60   set syntax_order {sql-stmt-list sql-stmt alter-table-stmt analyze-stmt attach-stmt begin-stmt commit-stmt rollback-stmt savepoint-stmt release-stmt create-index-stmt indexed-column create-table-stmt column-def type-name column-constraint signed-number table-constraint foreign-key-clause conflict-clause create-trigger-stmt create-view-stmt create-virtual-table-stmt with-clause cte-table-name recursive-cte common-table-expression delete-stmt delete-stmt-limited detach-stmt drop-index-stmt drop-table-stmt drop-trigger-stmt drop-view-stmt expr raise-function literal-value numeric-literal insert-stmt pragma-stmt pragma-value reindex-stmt select-stmt join-clause select-core factored-select-stmt simple-select-stmt compound-select-stmt table-or-subquery result-column join-operator join-constraint ordering-term compound-operator update-stmt update-stmt-limited qualified-table-name vacuum-stmt comment-syntax}

Changes to art/syntax/table-or-subquery.gif.

cannot compute difference between binary files