Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Additional testing of LEFT OUTER JOIN. (CVS 588) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
d8d04c14f18d1feba89ccea0be70530a |
User & Date: | drh 2002-05-25 00:18:21.000 |
Context
2002-05-26
| ||
20:54 | NULL values are distinct. A comparison involving a NULL is always false. Operations on a NULL value yield a NULL result. This change makes SQLite operate more like the SQL spec, but it may break existing applications that assumed the old behavior. All the old tests pass but we still need to add new tests to better verify the new behavior. Fix for ticket #44. (CVS 589) (check-in: 9051173742 user: drh tags: trunk) | |
2002-05-25
| ||
00:18 | Additional testing of LEFT OUTER JOIN. (CVS 588) (check-in: d8d04c14f1 user: drh tags: trunk) | |
2002-05-24
| ||
20:31 | Initial implementation of LEFT OUTER JOIN including the expanded SQL92 join syntax. The basic functionality is there but there is still a lot of testing to do. (CVS 587) (check-in: 99bd1f5b9a user: drh tags: trunk) | |
Changes
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.85 2002/05/25 00:18:21 drh Exp $ */ #include "sqliteInt.h" /* ** Allocate a new Select structure and return a pointer to that ** structure. */ |
︙ | ︙ | |||
77 78 79 80 81 82 83 | Token *p; static struct { const char *zKeyword; int nChar; int code; } keywords[] = { { "natural", 7, JT_NATURAL }, | | | | | | < > > > > > | 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 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 | Token *p; static struct { const char *zKeyword; int nChar; int code; } keywords[] = { { "natural", 7, JT_NATURAL }, { "left", 4, JT_LEFT|JT_OUTER }, { "right", 5, JT_RIGHT|JT_OUTER }, { "full", 4, JT_LEFT|JT_RIGHT|JT_OUTER }, { "outer", 5, JT_OUTER }, { "inner", 5, JT_INNER }, { "cross", 5, JT_INNER }, }; int i, j; apAll[0] = pA; apAll[1] = pB; apAll[2] = pC; for(i=0; i<3 && apAll[i]; i++){ p = apAll[i]; for(j=0; j<sizeof(keywords)/sizeof(keywords[0]); j++){ if( p->n==keywords[j].nChar && sqliteStrNICmp(p->z, keywords[j].zKeyword, p->n)==0 ){ jointype |= keywords[j].code; break; } } if( j>=sizeof(keywords)/sizeof(keywords[0]) ){ jointype |= JT_ERROR; break; } } if( (jointype & (JT_INNER|JT_OUTER))==(JT_INNER|JT_OUTER) || (jointype & JT_ERROR)!=0 ){ static Token dummy = { 0, 0 }; char *zSp1 = " ", *zSp2 = " "; if( pB==0 ){ pB = &dummy; zSp1 = 0; } if( pC==0 ){ pC = &dummy; zSp2 = 0; } sqliteSetNString(&pParse->zErrMsg, "unknown or unsupported join type: ", 0, pA->z, pA->n, zSp1, 1, pB->z, pB->n, zSp2, 1, pC->z, pC->n, 0); pParse->nErr++; jointype = JT_INNER; }else if( jointype & JT_RIGHT ){ sqliteSetString(&pParse->zErrMsg, "RIGHT and FULL OUTER JOINs are not currently supported", 0); pParse->nErr++; jointype = JT_INNER; } return jointype; } /* ** Return the index of a column in a table. Return -1 if the column |
︙ | ︙ |
Changes to src/sqliteInt.h.
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. ** ************************************************************************* ** Internal interface definitions for SQLite. ** | | | 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. ** ************************************************************************* ** Internal interface definitions for SQLite. ** ** @(#) $Id: sqliteInt.h,v 1.116 2002/05/25 00:18:21 drh Exp $ */ #include "sqlite.h" #include "hash.h" #include "vdbe.h" #include "parse.h" #include "btree.h" #include <stdio.h> |
︙ | ︙ | |||
457 458 459 460 461 462 463 | }; /* ** Permitted values of the SrcList.a.jointype field */ #define JT_INNER 0x0001 /* Any kind of inner or cross join */ #define JT_NATURAL 0x0002 /* True for a "natural" join */ | | | < | 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 | }; /* ** Permitted values of the SrcList.a.jointype field */ #define JT_INNER 0x0001 /* Any kind of inner or cross join */ #define JT_NATURAL 0x0002 /* True for a "natural" join */ #define JT_LEFT 0x0004 /* Left outer join */ #define JT_RIGHT 0x0008 /* Right outer join */ #define JT_OUTER 0x0010 /* The "OUTER" keyword is present */ #define JT_ERROR 0x0020 /* unknown or unsupported join type */ /* ** For each nested loop in a WHERE clause implementation, the WhereInfo ** structure contains a single instance of this structure. This structure ** is intended to be private the the where.c module and should not be |
︙ | ︙ |
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.2 2002/05/25 00:18:21 drh Exp $ set testdir [file dirname $argv0] source $testdir/tester.tcl do_test join-1.1 { execsql { CREATE TABLE t1(a,b,c); |
︙ | ︙ | |||
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 | } {1 2 3 2 3 4 3 4 5} do_test join-1.3 { execsql2 { SELECT * FROM t1 NATURAL JOIN t2; } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.d 5} do_test join-1.4 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(b,c); } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.d 5} do_test join-1.5 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(b); } } {t1.a 1 t1.b 2 t1.c 3 t2.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.c 4 t2.d 5} do_test join-1.6 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(c); } } {t1.a 1 t1.b 2 t1.c 3 t2.b 2 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.b 3 t2.d 5} do_test join-1.7 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(c,b); } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.d 5} do_test join-2.1 { execsql { SELECT * FROM t1 NATURAL LEFT JOIN t2; } } {1 2 3 4 2 3 4 5 3 4 5 {}} | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 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 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 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 | } {1 2 3 2 3 4 3 4 5} do_test join-1.3 { execsql2 { SELECT * FROM t1 NATURAL JOIN t2; } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.d 5} do_test join-1.3.1 { execsql2 { SELECT * FROM t2 NATURAL JOIN t1; } } {t2.b 2 t2.c 3 t2.d 4 t1.a 1 t2.b 3 t2.c 4 t2.d 5 t1.a 2} do_test join-1.4 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(b,c); } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.d 5} do_test join-1.5 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(b); } } {t1.a 1 t1.b 2 t1.c 3 t2.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.c 4 t2.d 5} do_test join-1.6 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(c); } } {t1.a 1 t1.b 2 t1.c 3 t2.b 2 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.b 3 t2.d 5} do_test join-1.7 { execsql2 { SELECT * FROM t1 INNER JOIN t2 USING(c,b); } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t1.a 2 t1.b 3 t1.c 4 t2.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 { execsql { SELECT * FROM t1 CROSS JOIN t2 USING(b,c); } } {1 2 3 4 2 3 4 5} do_test join-1.10 { execsql { SELECT * FROM t1 NATURAL INNER JOIN t2; } } {1 2 3 4 2 3 4 5} do_test join-1.11 { execsql { SELECT * FROM t1 INNER JOIN t2 USING(b,c); } } {1 2 3 4 2 3 4 5} do_test join-1.12 { execsql { SELECT * FROM t1 natural inner join t2; } } {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 } } {t1.a 1 t1.b 2 t1.c 3 t3.d 4 t3.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 } } {tx.c 3 tx.d 4 tx.e 5 t1.a 1 t1.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; } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t3.e 5 t1.a 2 t1.b 3 t1.c 4 t2.d 5 t3.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 { execsql { SELECT * FROM t1 natural join t2 natural join t4; } } {1 2 3 4 5 6} do_test join-1.19 { execsql2 { SELECT * FROM t1 natural join t2 natural join t4; } } {t1.a 1 t1.b 2 t1.c 3 t2.d 4 t4.e 5 t4.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 { execsql { SELECT * FROM t1 NATURAL LEFT JOIN t2; } } {1 2 3 4 2 3 4 5 3 4 5 {}} do_test join-2.2 { execsql { SELECT * FROM t2 NATURAL LEFT OUTER JOIN t1; } } {1 2 3 {} 2 3 4 1 3 4 5 2} do_test join-2.3 { catchsql { SELECT * FROM t1 NATURAL RIGHT OUTER JOIN t2; } } {1 {RIGHT and FULL OUTER JOINs are not currently supported}} do_test join-3.1 { catchsql { SELECT * FROM t1 NATURAL JOIN t2 ON t1.a=t2.b; } } {1 {a NATURAL join may not have an ON or USING clause}} do_test join-3.2 { catchsql { SELECT * FROM t1 NATURAL JOIN t2 USING(b); } } {1 {a NATURAL join may not have an ON or USING clause}} do_test join-3.3 { catchsql { SELECT * FROM t1 JOIN t2 ON t1.a=t2.b USING(b); } } {1 {cannot have both ON and USING clauses in the same join}} do_test join-3.4 { catchsql { SELECT * FROM t1 JOIN t2 USING(a); } } {1 {cannot join using column a - column not present in both tables}} do_test join-3.5 { catchsql { SELECT * FROM t1 USING(a); } } {0 {1 2 3 2 3 4 3 4 5}} do_test join-3.6 { catchsql { SELECT * FROM t1 JOIN t2 ON t3.a=t2.b; } } {1 {no such column: t3.a}} do_test join-3.7 { catchsql { SELECT * FROM t1 INNER OUTER JOIN t2; } } {1 {unknown or unsupported join type: INNER OUTER}} do_test join-3.7 { catchsql { SELECT * FROM t1 BOGUS JOIN t2; } } {1 {unknown or unsupported join type: BOGUS}} finish_test |