Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | Update the syntax diagrams for new syntax: (1) table-valued functions (2) column names on CREATE VIEW statements (3) Indexes on expressions |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
866fda3b5a1d9e551d75f89025dc8a01 |
User & Date: | drh 2015-09-08 15:16:31.506 |
2015-09-08
| ||
16:25 | Update language documentation to begin describing new features: (1) indexes on expressions (2) table-valued functions (3) column names on VIEWs. (check-in: d9a422f858 user: drh tags: trunk) | |
15:16 | Update the syntax diagrams for new syntax: (1) table-valued functions (2) column names on CREATE VIEW statements (3) Indexes on expressions (check-in: 866fda3b5a user: drh tags: trunk) | |
2015-09-07
| ||
10:53 | Fix two typos. (check-in: 0506240273 user: drh tags: trunk) | |
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
︙ | ︙ | |||
43 44 45 46 47 48 49 | select-stmt update-stmt update-stmt-limited vacuum-stmt } } alter-table-stmt { | | | | | | | | | | | | 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 | select-stmt update-stmt update-stmt-limited vacuum-stmt } } alter-table-stmt { rightstack {line ALTER TABLE {optx /schema-name .} /table-name} {tailbranch {line RENAME TO /new-table-name} {line ADD {optx COLUMN} column-def} } } analyze-stmt { line ANALYZE {or nil /schema-name /table-or-index-name {line /schema-name . /table-or-index-name}} } attach-stmt { line ATTACH {or DATABASE nil} expr AS /schema-name } begin-stmt { line BEGIN {or nil DEFERRED IMMEDIATE EXCLUSIVE} {optx TRANSACTION} } commit-stmt { line {or COMMIT END} {optx TRANSACTION} } rollback-stmt { line ROLLBACK {optx TRANSACTION} {optx TO {optx SAVEPOINT} /savepoint-name} } savepoint-stmt { line SAVEPOINT /savepoint-name } release-stmt { line RELEASE {optx SAVEPOINT} /savepoint-name } create-index-stmt { rightstack {line CREATE {opt UNIQUE} INDEX {opt IF NOT EXISTS}} {line {optx /schema-name .} /index-name ON /table-name ( {loop indexed-column ,} )} {line {opt WHERE expr}} } indexed-column { line {or /column-name expr } {opt COLLATE /collation-name} {or nil ASC DESC} } create-table-stmt { stack {line CREATE {or {} TEMP TEMPORARY} TABLE {opt IF NOT EXISTS}} {line {optx /schema-name .} /table-name} {or {line ( {loop column-def ,} {loop {} {, table-constraint}} ) {opt WITHOUT ROWID}} {line AS select-stmt} } } column-def { line /column-name {or type-name nil} {loop nil {nil column-constraint nil}} |
︙ | ︙ | |||
169 170 171 172 173 174 175 | } conflict-clause { opt {line ON CONFLICT {or ROLLBACK ABORT FAIL IGNORE REPLACE}} } create-trigger-stmt { stack {line CREATE {or {} TEMP TEMPORARY} TRIGGER {opt IF NOT EXISTS}} | | | 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 | } conflict-clause { opt {line ON CONFLICT {or ROLLBACK ABORT FAIL IGNORE REPLACE}} } create-trigger-stmt { stack {line CREATE {or {} TEMP TEMPORARY} TRIGGER {opt IF NOT EXISTS}} {line {optx /schema-name .} /trigger-name {or BEFORE AFTER {line INSTEAD OF} nil} } {line {or DELETE INSERT {line UPDATE {opt OF {loop /column-name ,} }} } ON /table-name |
︙ | ︙ | |||
192 193 194 195 196 197 198 | } END } } create-view-stmt { stack {line CREATE {or {} TEMP TEMPORARY} VIEW {opt IF NOT EXISTS}} | > | | | 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 | } END } } create-view-stmt { stack {line CREATE {or {} TEMP TEMPORARY} VIEW {opt IF NOT EXISTS}} {line {opt /schema-name .} /view-name {opt ( {loop /column-name ,} )} AS select-stmt} } create-virtual-table-stmt { stack {line CREATE VIRTUAL TABLE {opt IF NOT EXISTS}} {line {optx /schema-name .} /table-name} {line USING /module-name {optx ( {loop /module-argument ,} )}} } with-clause { line WITH {opt RECURSIVE} {loop {line cte-table-name AS ( select-stmt )} ,} } cte-table-name { |
︙ | ︙ | |||
231 232 233 234 235 236 237 | {stack {optx ORDER BY {loop ordering-term ,}} {line LIMIT expr {optx {or OFFSET ,} expr}} } } } detach-stmt { | | | | | | | | | | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 | {stack {optx ORDER BY {loop ordering-term ,}} {line LIMIT expr {optx {or OFFSET ,} expr}} } } } detach-stmt { line DETACH {optx DATABASE} /schema-name } drop-index-stmt { line DROP INDEX {optx IF EXISTS} {optx /schema-name .} /index-name } drop-table-stmt { line DROP TABLE {optx IF EXISTS} {optx /schema-name .} /table-name } drop-trigger-stmt { line DROP TRIGGER {optx IF EXISTS} {optx /schema-name .} /trigger-name } drop-view-stmt { line DROP VIEW {optx IF EXISTS} {optx /schema-name .} /view-name } expr { or {line literal-value} {line bind-parameter} {line {optx {optx /schema-name .} /table-name .} /column-name} {line /unary-operator expr} {line expr /binary-operator expr} {line /function-name ( {or {line {optx DISTINCT} {toploop expr ,}} {} *} )} {line ( expr )} {line CAST ( expr AS type-name )} {line expr COLLATE /collation-name} {line expr {optx NOT} {or LIKE GLOB REGEXP MATCH} expr {opt ESCAPE expr}} {line expr {or ISNULL NOTNULL {line NOT NULL}}} {line expr IS {optx NOT} expr} {line expr {optx NOT} BETWEEN expr AND expr} {line expr {optx NOT} IN {or {line ( {or {} select-stmt {loop expr ,}} )} {line {optx /schema-name .} /table-name} } } {line {optx {optx NOT} EXISTS} ( select-stmt )} {line CASE {optx expr} {loop {line WHEN expr THEN expr} {}} {optx ELSE expr} END} {line raise-function} } |
︙ | ︙ | |||
311 312 313 314 315 316 317 | {line INSERT OR ROLLBACK} {line INSERT OR ABORT} {line INSERT OR FAIL} {line INSERT OR IGNORE} } INTO } | | | | | | | | | 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 | {line INSERT OR ROLLBACK} {line INSERT OR ABORT} {line INSERT OR FAIL} {line INSERT OR IGNORE} } INTO } {line {optx /schema-name .} /table-name {optx ( {loop /column-name ,} )}} {or {line VALUES {loop {line ( {loop expr ,} )} ,}} select-stmt {line DEFAULT VALUES} } } pragma-stmt { line PRAGMA {optx /schema-name .} /pragma-name {or nil {line = pragma-value} {line ( pragma-value )} } } pragma-value { or signed-number /name /string-literal } reindex-stmt { line REINDEX {tailbranch nil /collation-name {line {optx /schema-name .} {tailbranch /table-name /index-name} } } } select-stmt { stack {opt {line WITH {opt RECURSIVE} {loop common-table-expression ,}}} {loop {or {indentstack 2 {line SELECT {or nil DISTINCT ALL} {loop result-column ,}} {optx FROM {or {loop table-or-subquery ,} join-clause}} {optx WHERE expr} {optx GROUP BY {loop expr ,} {optx HAVING expr}} } {line VALUES {loop {line ( {toploop expr ,} )} ,}} } compound-operator } {optx ORDER BY {loop ordering-term ,}} {optx LIMIT expr {optx {or OFFSET ,} expr}} } join-clause { line table-or-subquery {opt {loop {line join-operator table-or-subquery join-constraint}}} } select-core { or {indentstack 2 {line SELECT {or nil DISTINCT ALL} {loop result-column ,}} {optx FROM {or {loop table-or-subquery ,} join-clause}} {optx WHERE expr} {optx GROUP BY {loop expr ,} {optx HAVING expr}} } {line VALUES {loop {line ( {toploop expr ,} )} ,}} } factored-select-stmt { stack {opt {line WITH {opt RECURSIVE} {loop common-table-expression ,}}} {line {loop select-core compound-operator}} {optx ORDER BY {loop ordering-term ,}} {optx LIMIT expr {optx {or OFFSET ,} expr}} |
︙ | ︙ | |||
404 405 406 407 408 409 410 | {optx ORDER BY {loop ordering-term ,}} {optx LIMIT expr {optx {or OFFSET ,} expr}} } table-or-subquery { or {stack {line | | < > > | > > > > > > > > > > | > < | 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 | {optx ORDER BY {loop ordering-term ,}} {optx LIMIT expr {optx {or OFFSET ,} expr}} } table-or-subquery { or {stack {line {opt /schema-name .} /table-name } {line {opt {optx AS} /table-alias} {or nil {line INDEXED BY /index-name} {line NOT INDEXED}} } } {rightstack {line {opt /schema-name .} /table-function-name ( {or {toploop expr ,} {}} ) } {line {opt {optx AS} /table-alias} } } {line ( {or {loop table-or-subquery ,} join-clause} )} {line ( select-stmt ) {opt {optx AS} /table-alias} } } result-column { or {line expr {opt {optx AS} /column-alias}} * {line /table-name . *} } join-operator { or {line ,} {line {opt NATURAL} {or nil {line LEFT {or OUTER nil}} INNER CROSS} |
︙ | ︙ | |||
442 443 444 445 446 447 448 | ordering-term { line expr {opt COLLATE /collation-name} {or nil ASC DESC} } compound-operator { or UNION {line UNION ALL} INTERSECT EXCEPT } update-stmt { | | | 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 | ordering-term { line expr {opt COLLATE /collation-name} {or nil ASC DESC} } compound-operator { or UNION {line UNION ALL} INTERSECT EXCEPT } update-stmt { rightstack {line {opt with-clause} UPDATE {or {} {line OR ROLLBACK} {line OR ABORT} {line OR REPLACE} {line OR FAIL} {line OR IGNORE}} qualified-table-name} {line SET {loop {line /column-name = expr} ,} {optx WHERE expr}} |
︙ | ︙ | |||
468 469 470 471 472 473 474 | {stack {optx ORDER BY {loop ordering-term ,}} {line LIMIT expr {optx {or OFFSET ,} expr}} } } } qualified-table-name { | | | 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 | {stack {optx ORDER BY {loop ordering-term ,}} {line LIMIT expr {optx {or OFFSET ,} expr}} } } } qualified-table-name { line {optx /schema-name .} /table-name {or nil {line INDEXED BY /index-name} {line NOT INDEXED}} } vacuum-stmt { line VACUUM } comment-syntax { or {line -- {loop nil /anything-except-newline} {or /newline /end-of-input}} {line /* {loop nil /anything-except-*/} {or */ /end-of-input}} } } |
︙ | ︙ | |||
254 255 256 257 258 259 260 | set btm 0 set n [llength $lx] set i 0 set next_bypass_y 0 foreach term $lx { set bypass_y $next_bypass_y | | > > > > > > | > | 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 | set btm 0 set n [llength $lx] set i 0 set next_bypass_y 0 foreach term $lx { set bypass_y $next_bypass_y if {$i>0 && $i<$n && [llength $term]>1 && $indent>=0 && ([lindex $term 0]=="opt" || [lindex $term 0]=="optx")} { set bypass 1 set term "line [lrange $term 1 end]" } else { set bypass 0 set next_bypass_y 0 } set m [draw_diagram $term] foreach {t exx exy} $m break foreach {tx0 ty0 tx1 ty1} [.c bbox $t] break if {$i==0} { set btm $ty1 set exit_y $exy set exit_x $exx } else { set enter_y [expr {$btm - $ty0 + $sep*2 + 2}] if {$bypass} {set next_bypass_y [expr {$enter_y - $RADIUS}]} if {$indent<0} { set w [expr {$tx1 - $tx0}] set enter_x [expr {$exit_x - $w + $sep*$indent}] set ex2 [expr {$sep*2 - $indent}] if {$ex2>$enter_x} {set enter_x $ex2} } else { set enter_x [expr {$sep*2 + $indent}] } set back_y [expr {$btm + $sep + 1}] if {$bypass_y>0} { set mid_y [expr {($bypass_y+$RADIUS+$back_y)/2}] .c create line $bypass_x $bypass_y $bypass_x $mid_y \ -width 2 -tags $tag -arrow last .c create line $bypass_x $mid_y $bypass_x [expr {$back_y+$RADIUS}] \ -tags $tag -width 2 |
︙ | ︙ | |||
591 592 593 594 595 596 597 | if {$cmd=="line"} { return [draw_line [lrange $spec 1 end]] } if {$cmd=="stack"} { return [draw_stack 0 [lrange $spec 1 end]] } if {$cmd=="indentstack"} { | > | > > > | 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 | if {$cmd=="line"} { return [draw_line [lrange $spec 1 end]] } if {$cmd=="stack"} { return [draw_stack 0 [lrange $spec 1 end]] } if {$cmd=="indentstack"} { set hsep [expr {$::HSEP*[lindex $spec 1]}] return [draw_stack $hsep [lrange $spec 2 end]] } if {$cmd=="rightstack"} { return [draw_stack -1 [lrange $spec 1 end]] } if {$cmd=="loop"} { return [draw_loop [lindex $spec 1] [lindex $spec 2]] } if {$cmd=="toploop"} { return [draw_toploop [lindex $spec 1] [lindex $spec 2]] } |
︙ | ︙ |
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
︙ | ︙ | |||
19 20 21 22 23 24 25 | set syntax_linkage(delete-stmt) {{expr qualified-table-name with-clause} {create-trigger-stmt sql-stmt}} set syntax_linkage(delete-stmt-limited) {{expr ordering-term qualified-table-name with-clause} sql-stmt} set syntax_linkage(detach-stmt) {{} sql-stmt} set syntax_linkage(drop-index-stmt) {{} sql-stmt} set syntax_linkage(drop-table-stmt) {{} sql-stmt} set syntax_linkage(drop-trigger-stmt) {{} sql-stmt} set syntax_linkage(drop-view-stmt) {{} sql-stmt} | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | set syntax_linkage(delete-stmt) {{expr qualified-table-name with-clause} {create-trigger-stmt sql-stmt}} set syntax_linkage(delete-stmt-limited) {{expr ordering-term qualified-table-name with-clause} sql-stmt} set syntax_linkage(detach-stmt) {{} sql-stmt} set syntax_linkage(drop-index-stmt) {{} sql-stmt} set syntax_linkage(drop-table-stmt) {{} sql-stmt} set syntax_linkage(drop-trigger-stmt) {{} sql-stmt} set syntax_linkage(drop-view-stmt) {{} sql-stmt} 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 indexed-column insert-stmt join-constraint ordering-term result-column select-core select-stmt simple-select-stmt table-constraint table-or-subquery update-stmt update-stmt-limited}} set syntax_linkage(factored-select-stmt) {{common-table-expression compound-operator expr ordering-term select-core} {}} set syntax_linkage(foreign-key-clause) {{} {column-constraint table-constraint}} set syntax_linkage(indexed-column) {expr {create-index-stmt table-constraint}} set syntax_linkage(insert-stmt) {{expr select-stmt with-clause} {create-trigger-stmt sql-stmt}} set syntax_linkage(join-clause) {{join-constraint join-operator table-or-subquery} {select-core select-stmt table-or-subquery}} set syntax_linkage(join-constraint) {expr join-clause} set syntax_linkage(join-operator) {{} join-clause} set syntax_linkage(literal-value) {{} {column-constraint expr}} set syntax_linkage(numeric-literal) {{} {}} set syntax_linkage(ordering-term) {expr {compound-select-stmt delete-stmt-limited factored-select-stmt select-stmt simple-select-stmt update-stmt-limited}} |
︙ | ︙ | |||
47 48 49 50 51 52 53 | set syntax_linkage(select-core) {{expr join-clause result-column table-or-subquery} {compound-select-stmt factored-select-stmt simple-select-stmt}} 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}} set syntax_linkage(signed-number) {{} {column-constraint pragma-value type-name}} set syntax_linkage(simple-select-stmt) {{common-table-expression expr ordering-term select-core} {}} 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} set syntax_linkage(sql-stmt-list) {sql-stmt {}} set syntax_linkage(table-constraint) {{conflict-clause expr foreign-key-clause indexed-column} create-table-stmt} | | | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | set syntax_linkage(select-core) {{expr join-clause result-column table-or-subquery} {compound-select-stmt factored-select-stmt simple-select-stmt}} 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}} set syntax_linkage(signed-number) {{} {column-constraint pragma-value type-name}} set syntax_linkage(simple-select-stmt) {{common-table-expression expr ordering-term select-core} {}} 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} set syntax_linkage(sql-stmt-list) {sql-stmt {}} set syntax_linkage(table-constraint) {{conflict-clause expr foreign-key-clause indexed-column} create-table-stmt} set syntax_linkage(table-or-subquery) {{expr join-clause select-stmt} {join-clause select-core select-stmt}} set syntax_linkage(type-name) {signed-number {column-def expr}} set syntax_linkage(update-stmt) {{expr qualified-table-name with-clause} {create-trigger-stmt sql-stmt}} set syntax_linkage(update-stmt-limited) {{expr ordering-term qualified-table-name with-clause} sql-stmt} set syntax_linkage(vacuum-stmt) {{} sql-stmt} set syntax_linkage(with-clause) {{cte-table-name select-stmt} {delete-stmt delete-stmt-limited insert-stmt update-stmt update-stmt-limited}} 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} |
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files
cannot compute difference between binary files