forked frompostgres/postgres
- Notifications
You must be signed in to change notification settings - Fork6
Commite67867b
committed
Allow AS to be omitted when specifying an output column name in SELECT
(or RETURNING), but only when the output name is not any SQL keyword.This seems as close as we can get to the standard's syntax without agreat deal of thrashing. Original patch by Hiroshi Saito, amended by me.1 parentcc80f0a commite67867b
File tree
10 files changed
+119
-51
lines changed- doc/src/sgml
- ref
- src
- backend/parser
- interfaces/ecpg/preproc
- test/regress/expected
10 files changed
+119
-51
lines changedLines changed: 24 additions & 5 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 |
| - | |
| 1 | + | |
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
| |||
491 | 491 |
| |
492 | 492 |
| |
493 | 493 |
| |
494 |
| - | |
| 494 | + | |
495 | 495 |
| |
496 | 496 |
| |
497 | 497 |
| |
| |||
1040 | 1040 |
| |
1041 | 1041 |
| |
1042 | 1042 |
| |
1043 |
| - | |
1044 |
| - | |
1045 |
| - | |
| 1043 | + | |
| 1044 | + | |
| 1045 | + | |
1046 | 1046 |
| |
1047 | 1047 |
| |
1048 | 1048 |
| |
1049 | 1049 |
| |
| 1050 | + | |
| 1051 | + | |
| 1052 | + | |
| 1053 | + | |
| 1054 | + | |
| 1055 | + | |
| 1056 | + | |
| 1057 | + | |
| 1058 | + | |
| 1059 | + | |
| 1060 | + | |
| 1061 | + | |
| 1062 | + | |
| 1063 | + | |
| 1064 | + | |
| 1065 | + | |
| 1066 | + | |
| 1067 | + | |
| 1068 | + | |
1050 | 1069 |
| |
1051 | 1070 |
| |
1052 | 1071 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
23 | 23 |
| |
24 | 24 |
| |
25 | 25 |
| |
26 |
| - | |
| 26 | + | |
27 | 27 |
| |
28 | 28 |
| |
29 | 29 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
22 | 22 |
| |
23 | 23 |
| |
24 | 24 |
| |
25 |
| - | |
| 25 | + | |
26 | 26 |
| |
27 | 27 |
| |
28 | 28 |
| |
|
Lines changed: 59 additions & 28 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
21 | 21 |
| |
22 | 22 |
| |
23 | 23 |
| |
24 |
| - | |
| 24 | + | |
25 | 25 |
| |
26 | 26 |
| |
27 | 27 |
| |
| |||
477 | 477 |
| |
478 | 478 |
| |
479 | 479 |
| |
480 |
| - | |
481 |
| - | |
482 |
| - | |
483 |
| - | |
484 |
| - | |
485 |
| - | |
486 |
| - | |
487 |
| - | |
488 |
| - | |
| 480 | + | |
| 481 | + | |
| 482 | + | |
| 483 | + | |
| 484 | + | |
| 485 | + | |
| 486 | + | |
| 487 | + | |
| 488 | + | |
| 489 | + | |
| 490 | + | |
| 491 | + | |
| 492 | + | |
| 493 | + | |
| 494 | + | |
| 495 | + | |
| 496 | + | |
| 497 | + | |
| 498 | + | |
| 499 | + | |
| 500 | + | |
| 501 | + | |
| 502 | + | |
| 503 | + | |
| 504 | + | |
| 505 | + | |
| 506 | + | |
| 507 | + | |
| 508 | + | |
489 | 509 |
| |
490 | 510 |
| |
491 | 511 |
| |
492 | 512 |
| |
493 | 513 |
| |
494 |
| - | |
| 514 | + | |
495 | 515 |
| |
496 |
| - | |
| 516 | + | |
| 517 | + | |
| 518 | + | |
497 | 519 |
| |
498 | 520 |
| |
499 | 521 |
| |
| |||
661 | 683 |
| |
662 | 684 |
| |
663 | 685 |
| |
664 |
| - | |
| 686 | + | |
665 | 687 |
| |
666 | 688 |
| |
667 |
| - | |
| 689 | + | |
668 | 690 |
| |
669 | 691 |
| |
670 | 692 |
| |
671 | 693 |
| |
672 | 694 |
| |
673 | 695 |
| |
674 |
| - | |
| 696 | + | |
675 | 697 |
| |
676 | 698 |
| |
677 | 699 |
| |
| |||
684 | 706 |
| |
685 | 707 |
| |
686 | 708 |
| |
687 |
| - | |
688 |
| - | |
| 709 | + | |
| 710 | + | |
689 | 711 |
| |
690 | 712 |
| |
691 | 713 |
| |
| |||
1135 | 1157 |
| |
1136 | 1158 |
| |
1137 | 1159 |
| |
1138 |
| - | |
| 1160 | + | |
| 1161 | + | |
| 1162 | + | |
| 1163 | + | |
| 1164 | + | |
| 1165 | + | |
| 1166 | + | |
| 1167 | + | |
| 1168 | + | |
| 1169 | + | |
| 1170 | + | |
| 1171 | + | |
1139 | 1172 |
| |
1140 | 1173 |
| |
1141 |
| - | |
1142 |
| - | |
1143 |
| - | |
1144 |
| - | |
1145 |
| - | |
1146 |
| - | |
1147 |
| - | |
| 1174 | + | |
| 1175 | + | |
| 1176 | + | |
| 1177 | + | |
| 1178 | + | |
1148 | 1179 |
| |
1149 | 1180 |
| |
1150 | 1181 |
| |
| |||
1153 | 1184 |
| |
1154 | 1185 |
| |
1155 | 1186 |
| |
1156 |
| - | |
| 1187 | + | |
1157 | 1188 |
| |
1158 | 1189 |
| |
1159 | 1190 |
| |
1160 | 1191 |
| |
1161 | 1192 |
| |
1162 | 1193 |
| |
1163 | 1194 |
| |
1164 |
| - | |
| 1195 | + | |
1165 | 1196 |
| |
1166 | 1197 |
| |
1167 | 1198 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
21 | 21 |
| |
22 | 22 |
| |
23 | 23 |
| |
24 |
| - | |
| 24 | + | |
25 | 25 |
| |
26 | 26 |
| |
27 | 27 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 | 1 |
| |
2 |
| - | |
| 2 | + | |
3 | 3 |
| |
4 | 4 |
| |
5 | 5 |
| |
| |||
25 | 25 |
| |
26 | 26 |
| |
27 | 27 |
| |
28 |
| - | |
| 28 | + | |
29 | 29 |
| |
30 | 30 |
| |
31 | 31 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 |
| - | |
| 1 | + | |
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
| |||
853 | 853 |
| |
854 | 854 |
| |
855 | 855 |
| |
856 |
| - | |
| 856 | + | |
857 | 857 |
| |
858 | 858 |
| |
859 | 859 |
| |
|
Lines changed: 18 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
11 | 11 |
| |
12 | 12 |
| |
13 | 13 |
| |
14 |
| - | |
| 14 | + | |
15 | 15 |
| |
16 | 16 |
| |
17 | 17 |
| |
| |||
477 | 477 |
| |
478 | 478 |
| |
479 | 479 |
| |
| 480 | + | |
480 | 481 |
| |
481 | 482 |
| |
482 | 483 |
| |
| |||
8705 | 8706 |
| |
8706 | 8707 |
| |
8707 | 8708 |
| |
8708 |
| - | |
8709 | 8709 |
| |
8710 | 8710 |
| |
8711 | 8711 |
| |
| |||
8714 | 8714 |
| |
8715 | 8715 |
| |
8716 | 8716 |
| |
| 8717 | + | |
| 8718 | + | |
| 8719 | + | |
| 8720 | + | |
| 8721 | + | |
| 8722 | + | |
| 8723 | + | |
| 8724 | + | |
| 8725 | + | |
| 8726 | + | |
| 8727 | + | |
| 8728 | + | |
| 8729 | + | |
| 8730 | + | |
| 8731 | + | |
| 8732 | + | |
8717 | 8733 |
| |
8718 | 8734 |
| |
8719 | 8735 |
| |
|
Lines changed: 6 additions & 4 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
1 |
| - | |
| 1 | + | |
2 | 2 |
| |
3 | 3 |
| |
4 | 4 |
| |
| |||
521 | 521 |
| |
522 | 522 |
| |
523 | 523 |
| |
524 |
| - | |
525 |
| - | |
| 524 | + | |
| 525 | + | |
| 526 | + | |
526 | 527 |
| |
527 | 528 |
| |
528 | 529 |
| |
| |||
4695 | 4696 |
| |
4696 | 4697 |
| |
4697 | 4698 |
| |
4698 |
| - | |
4699 | 4699 |
| |
4700 | 4700 |
| |
| 4701 | + | |
| 4702 | + | |
4701 | 4703 |
| |
4702 | 4704 |
| |
4703 | 4705 |
| |
|
Lines changed: 2 additions & 2 deletions
Original file line number | Diff line number | Diff line change | |
---|---|---|---|
| |||
2337 | 2337 |
| |
2338 | 2338 |
| |
2339 | 2339 |
| |
2340 |
| - | |
| 2340 | + | |
2341 | 2341 |
| |
2342 |
| - | |
| 2342 | + | |
2343 | 2343 |
| |
2344 | 2344 |
| |
2345 | 2345 |
| |
|
0 commit comments
Comments
(0)