Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Column names coming back from a SELECT are now just the name of the source column without the "table." prefix. In other words, "PRAGMA short_column_names=ON" is now the default. This makes the names of columns behave more like other SQL engines. The old behavior can be restored by setting "PRAGMA short_column_names=OFF". (CVS 2231) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
9295050af1bf2d9d4dc63adc225a2848 |
User & Date: | drh 2005-01-18 16:02:40.000 |
Context
2005-01-18
| ||
17:20 | CREATE TABLE ... AS ... uses short names for columns. Ticket #1036. (CVS 2232) (check-in: b1d4c42d2b user: drh tags: trunk) | |
16:02 | Column names coming back from a SELECT are now just the name of the source column without the "table." prefix. In other words, "PRAGMA short_column_names=ON" is now the default. This makes the names of columns behave more like other SQL engines. The old behavior can be restored by setting "PRAGMA short_column_names=OFF". (CVS 2231) (check-in: 9295050af1 user: drh tags: trunk) | |
14:45 | Continue refactoring name resolution. Fix for ticket #1047. (CVS 2230) (check-in: 88d4834fec user: drh tags: trunk) | |
Changes
Changes to src/main.c.
︙ | ︙ | |||
10 11 12 13 14 15 16 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** | | | 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | ** ************************************************************************* ** Main file for the SQLite library. The routines in this file ** implement the programmer interface to the library. Routines in ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** ** $Id: main.c,v 1.272 2005/01/18 16:02:40 drh Exp $ */ #include "sqliteInt.h" #include "os.h" #include <ctype.h> /* ** The following constant value is used by the SQLITE_BIGENDIAN and |
︙ | ︙ | |||
1107 1108 1109 1110 1111 1112 1113 | if( db==0 ) goto opendb_out; db->priorNewRowid = 0; db->magic = SQLITE_MAGIC_BUSY; db->nDb = 2; db->aDb = db->aDbStatic; db->enc = SQLITE_UTF8; db->autoCommit = 1; | | | 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 | if( db==0 ) goto opendb_out; db->priorNewRowid = 0; db->magic = SQLITE_MAGIC_BUSY; db->nDb = 2; db->aDb = db->aDbStatic; db->enc = SQLITE_UTF8; db->autoCommit = 1; db->flags |= SQLITE_ShortColNames; sqlite3HashInit(&db->aFunc, SQLITE_HASH_STRING, 0); sqlite3HashInit(&db->aCollSeq, SQLITE_HASH_STRING, 0); for(i=0; i<db->nDb; i++){ sqlite3HashInit(&db->aDb[i].tblHash, SQLITE_HASH_STRING, 0); sqlite3HashInit(&db->aDb[i].idxHash, SQLITE_HASH_STRING, 0); sqlite3HashInit(&db->aDb[i].trigHash, SQLITE_HASH_STRING, 0); sqlite3HashInit(&db->aDb[i].aFKey, SQLITE_HASH_STRING, 1); |
︙ | ︙ |
Changes to src/select.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** ** $Id: select.c,v 1.226 2005/01/18 16:02:40 drh Exp $ */ #include "sqliteInt.h" /* ** Allocate a new Select structure and return a pointer to that ** structure. |
︙ | ︙ | |||
753 754 755 756 757 758 759 | int iCol = p->iColumn; for(j=0; j<pTabList->nSrc && pTabList->a[j].iCursor!=p->iTable; j++){} assert( j<pTabList->nSrc ); pTab = pTabList->a[j].pTab; if( iCol<0 ) iCol = pTab->iPKey; assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) ); if( iCol<0 ){ | | | | 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 | int iCol = p->iColumn; for(j=0; j<pTabList->nSrc && pTabList->a[j].iCursor!=p->iTable; j++){} assert( j<pTabList->nSrc ); pTab = pTabList->a[j].pTab; if( iCol<0 ) iCol = pTab->iPKey; assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) ); if( iCol<0 ){ zCol = "rowid"; }else{ zCol = pTab->aCol[iCol].zName; } if( !shortNames && !fullNames && p->span.z && p->span.z[0] ){ sqlite3VdbeSetColName(v, i, p->span.z, p->span.n); }else if( fullNames || (!shortNames && pTabList->nSrc>1) ){ char *zName = 0; char *zTab; zTab = pTabList->a[j].zAlias; if( fullNames || zTab==0 ) zTab = pTab->zName; sqlite3SetString(&zName, zTab, ".", zCol, 0); sqlite3VdbeSetColName(v, i, zName, P3_DYNAMIC); }else{ sqlite3VdbeSetColName(v, i, zCol, strlen(zCol)); } }else if( p->span.z && p->span.z[0] ){ sqlite3VdbeSetColName(v, i, p->span.z, p->span.n); /* sqlite3VdbeCompressSpace(v, addr); */ }else{ char zName[30]; assert( p->op!=TK_COLUMN || pTabList==0 ); |
︙ | ︙ |
Changes to test/join.test.
︙ | ︙ | |||
8 9 10 11 12 13 14 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. # # This file implements tests for joins, including outer joins. # | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. # # This file implements tests for joins, including outer joins. # # $Id: join.test,v 1.14 2005/01/18 16:02:40 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl do_test join-1.1 { execsql { CREATE TABLE t1(a,b,c); |
︙ | ︙ | |||
36 37 38 39 40 41 42 | } } {1 2 3 2 3 4 3 4 5} do_test join-1.3 { execsql2 { SELECT * FROM t1 NATURAL JOIN t2; } | | | | | | | | 36 37 38 39 40 41 42 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 | } } {1 2 3 2 3 4 3 4 5} do_test join-1.3 { execsql2 { SELECT * FROM t1 NATURAL JOIN t2; } } {a 1 b 2 c 3 d 4 a 2 b 3 c 4 d 5} do_test join-1.3.1 { execsql2 { SELECT * FROM t2 NATURAL JOIN t1; } } {b 2 c 3 d 4 a 1 b 3 c 4 d 5 a 2} do_test join-1.4 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(b,c); } } {a 1 b 2 c 3 d 4 a 2 b 3 c 4 d 5} do_test join-1.5 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(b); } } {a 1 b 2 c 3 c 3 d 4 a 2 b 3 c 4 c 4 d 5} do_test join-1.6 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(c); } } {a 1 b 2 c 3 b 2 d 4 a 2 b 3 c 4 b 3 d 5} do_test join-1.7 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(c,b); } } {a 1 b 2 c 3 d 4 a 2 b 3 c 4 d 5} do_test join-1.8 { execsql { SELECT * FROM t1 NATURAL CROSS JOIN t2; } } {1 2 3 4 2 3 4 5} do_test join-1.9 { |
︙ | ︙ | |||
93 94 95 96 97 98 99 | } } {1 2 3 4 2 3 4 5} do_test join-1.13 { execsql2 { SELECT * FROM t1 NATURAL JOIN (SELECT b as 'c', c as 'd', d as 'e' FROM t2) as t3 } | | | | | | | | 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | } } {1 2 3 4 2 3 4 5} do_test join-1.13 { execsql2 { SELECT * FROM t1 NATURAL JOIN (SELECT b as 'c', c as 'd', d as 'e' FROM t2) as t3 } } {a 1 b 2 c 3 d 4 e 5} do_test join-1.14 { execsql2 { SELECT * FROM (SELECT b as 'c', c as 'd', d as 'e' FROM t2) as 'tx' NATURAL JOIN t1 } } {c 3 d 4 e 5 a 1 b 2} do_test join-1.15 { execsql { CREATE TABLE t3(c,d,e); INSERT INTO t3 VALUES(2,3,4); INSERT INTO t3 VALUES(3,4,5); INSERT INTO t3 VALUES(4,5,6); SELECT * FROM t3; } } {2 3 4 3 4 5 4 5 6} do_test join-1.16 { execsql { SELECT * FROM t1 natural join t2 natural join t3; } } {1 2 3 4 5 2 3 4 5 6} do_test join-1.17 { execsql2 { SELECT * FROM t1 natural join t2 natural join t3; } } {a 1 b 2 c 3 d 4 e 5 a 2 b 3 c 4 d 5 e 6} do_test join-1.18 { execsql { CREATE TABLE t4(d,e,f); INSERT INTO t4 VALUES(2,3,4); INSERT INTO t4 VALUES(3,4,5); INSERT INTO t4 VALUES(4,5,6); SELECT * FROM t4; } } {2 3 4 3 4 5 4 5 6} do_test join-1.19.1 { execsql { SELECT * FROM t1 natural join t2 natural join t4; } } {1 2 3 4 5 6} do_test join-1.19.2 { execsql2 { SELECT * FROM t1 natural join t2 natural join t4; } } {a 1 b 2 c 3 d 4 e 5 f 6} do_test join-1.20 { execsql { SELECT * FROM t1 natural join t2 natural join t3 WHERE t1.a=1 } } {1 2 3 4 5} do_test join-2.1 { |
︙ | ︙ |
Changes to test/select1.test.
1 2 3 4 5 6 7 8 9 10 11 12 13 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the SELECT statement. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # 2001 September 15 # # The author disclaims copyright to this source code. In place of # a legal notice, here is a blessing: # # May you do good and not evil. # May you find forgiveness for yourself and forgive others. # May you share freely, never taking more than you give. # #*********************************************************************** # This file implements regression tests for SQLite library. The # focus of this file is testing the SELECT statement. # # $Id: select1.test,v 1.39 2005/01/18 16:02:41 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl # Try to select on a non-existant table. # do_test select1-1.1 { |
︙ | ︙ | |||
434 435 436 437 438 439 440 | ORDER BY f2}} msg] lappend v $msg } {0 {test1.f1+F2 33 t1 abc test1.f1+F2 77 t1 abc}} do_test select1-6.7 { set v [catch {execsql2 {SELECT A.f1, t1 FROM test1 as A, test2 ORDER BY f2}} msg] lappend v $msg | | | > > > > > | | 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 | ORDER BY f2}} msg] lappend v $msg } {0 {test1.f1+F2 33 t1 abc test1.f1+F2 77 t1 abc}} do_test select1-6.7 { set v [catch {execsql2 {SELECT A.f1, t1 FROM test1 as A, test2 ORDER BY f2}} msg] lappend v $msg } {0 {f1 11 t1 abc f1 33 t1 abc}} do_test select1-6.8 { set v [catch {execsql2 {SELECT A.f1, f1 FROM test1 as A, test1 as B ORDER BY f2}} msg] lappend v $msg } {1 {ambiguous column name: f1}} do_test select1-6.8b { set v [catch {execsql2 {SELECT A.f1, B.f1 FROM test1 as A, test1 as B ORDER BY f2}} msg] lappend v $msg } {1 {ambiguous column name: f2}} do_test select1-6.8c { set v [catch {execsql2 {SELECT A.f1, f1 FROM test1 as A, test1 as A ORDER BY f2}} msg] lappend v $msg } {1 {ambiguous column name: A.f1}} do_test select1-6.9.1 { set v [catch {execsql {SELECT A.f1, B.f1 FROM test1 as A, test1 as B ORDER BY A.f1, B.f1}} msg] lappend v $msg } {0 {11 11 11 33 33 11 33 33}} do_test select1-6.9.2 { set v [catch {execsql2 {SELECT A.f1, B.f1 FROM test1 as A, test1 as B ORDER BY A.f1, B.f1}} msg] lappend v $msg } {0 {f1 11 f1 11 f1 33 f1 33 f1 11 f1 11 f1 33 f1 33}} ifcapable compound { do_test select1-6.10 { set v [catch {execsql2 { SELECT f1 FROM test1 UNION SELECT f2 FROM test1 ORDER BY f2; }} msg] |
︙ | ︙ | |||
637 638 639 640 641 642 643 | DELETE FROM t3; DELETE FROM t4; INSERT INTO t3 VALUES(1,2); INSERT INTO t4 VALUES(3,4); SELECT * FROM t3, t4; } } {1 2 3 4} | | > > > > > < < < < < | | | | | | | | | | | | 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 | DELETE FROM t3; DELETE FROM t4; INSERT INTO t3 VALUES(1,2); INSERT INTO t4 VALUES(3,4); SELECT * FROM t3, t4; } } {1 2 3 4} do_test select1-11.2.1 { execsql { SELECT * FROM t3, t4; } } {1 2 3 4} do_test select1-11.2.2 { execsql2 { SELECT * FROM t3, t4; } } {a 3 b 4 a 3 b 4} do_test select1-11.4.1 { execsql { SELECT t3.*, t4.b FROM t3, t4; } } {1 2 4} do_test select1-11.4.2 { execsql { SELECT "t3".*, t4.b FROM t3, t4; } } {1 2 4} do_test select1-11.5.1 { execsql2 { SELECT t3.*, t4.b FROM t3, t4; } } {a 1 b 4 b 4} do_test select1-11.6 { execsql2 { SELECT x.*, y.b FROM t3 AS x, t4 AS y; } } {a 1 b 4 b 4} do_test select1-11.7 { execsql { SELECT t3.b, t4.* FROM t3, t4; } } {2 3 4} do_test select1-11.8 { execsql2 { SELECT t3.b, t4.* FROM t3, t4; } } {b 4 a 3 b 4} do_test select1-11.9 { execsql2 { SELECT x.b, y.* FROM t3 AS x, t4 AS y; } } {b 4 a 3 b 4} do_test select1-11.10 { catchsql { SELECT t5.* FROM t3, t4; } } {1 {no such table: t5}} do_test select1-11.11 { catchsql { SELECT t3.* FROM t3 AS x, t4; } } {1 {no such table: t3}} do_test select1-11.12 { execsql2 { SELECT t3.* FROM t3, (SELECT max(a), max(b) FROM t4) } } {a 1 b 2} do_test select1-11.13 { execsql2 { SELECT t3.* FROM (SELECT max(a), max(b) FROM t4), t3 } } {a 1 b 2} do_test select1-11.14 { execsql2 { SELECT * FROM t3, (SELECT max(a), max(b) FROM t4) AS 'tx' } } {a 1 b 2 max(a) 3 max(b) 4} do_test select1-11.15 { execsql2 { SELECT y.*, t3.* FROM t3, (SELECT max(a), max(b) FROM t4) AS y } } {max(a) 3 max(b) 4 a 1 b 2} do_test select1-11.16 { execsql2 { SELECT y.* FROM t3 as y, t4 as z } } {a 1 b 2} # Tests of SELECT statements without a FROM clause. # do_test select1-12.1 { execsql2 { SELECT 1+2+3 } |
︙ | ︙ | |||
781 782 783 784 785 786 787 | } {x 1 x 3} do_test select1-12.10 { execsql2 { SELECT z.x FROM ( SELECT a,b FROM t3 UNION SELECT a AS 'x', b AS 'y' FROM t4 ORDER BY a,b ) AS 'z' ORDER BY x; } | | | 786 787 788 789 790 791 792 793 794 795 796 797 | } {x 1 x 3} do_test select1-12.10 { execsql2 { SELECT z.x FROM ( SELECT a,b FROM t3 UNION SELECT a AS 'x', b AS 'y' FROM t4 ORDER BY a,b ) AS 'z' ORDER BY x; } } {x 1 x 3} } ;# ifcapable compound finish_test |