diff options
| author |   jturner <jturner@openbsd.org> | 2013-09-21 17:34:00 +0000 |
|---|---|---|
| committer | jturner <jturner@openbsd.org> | 2013-09-21 17:34:00 +0000 |
| commit | fc5be0f32a9749b504f189091b6126cf8417bcab (patch) | |
| tree | 68602384a19e477f8c42a3c00958ea5ef981f7ea /lib/libsqlite3/src/parse.y | |
| parent | Update sqlite to 3.8.0.2. A list of changes are available here: (diff) | |
| download | wireguard-openbsd-fc5be0f32a9749b504f189091b6126cf8417bcab.tar.xz wireguard-openbsd-fc5be0f32a9749b504f189091b6126cf8417bcab.zip | |
Merge conflicts
Diffstat (limited to 'lib/libsqlite3/src/parse.y')
| -rw-r--r-- | lib/libsqlite3/src/parse.y | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libsqlite3/src/parse.y b/lib/libsqlite3/src/parse.y index 8310b26989b..e9c8a156351 100644 --- a/lib/libsqlite3/src/parse.y +++ b/lib/libsqlite3/src/parse.y @@ -213,7 +213,7 @@ id(A) ::= INDEXED(X). {A = X;} . %wildcard ANY. -// Define operator precedence early so that this is the first occurance +// Define operator precedence early so that this is the first occurrence // of the operator tokens in the grammer. Keeping the operators together // causes them to be assigned integer values that are close together, // which keeps parser tables smaller. @@ -417,6 +417,7 @@ select(A) ::= select(X) multiselect_op(Y) oneselect(Z). { if( Z ){ Z->op = (u8)Y; Z->pPrior = X; + if( Y!=TK_ALL ) pParse->hasCompound = 1; }else{ sqlite3SelectDelete(pParse->db, X); } @@ -1125,10 +1126,10 @@ nexprlist(A) ::= expr(Y). ///////////////////////////// The CREATE INDEX command /////////////////////// // cmd ::= createkw(S) uniqueflag(U) INDEX ifnotexists(NE) nm(X) dbnm(D) - ON nm(Y) LP idxlist(Z) RP(E). { + ON nm(Y) LP idxlist(Z) RP where_opt(W). { sqlite3CreateIndex(pParse, &X, &D, sqlite3SrcListAppend(pParse->db,0,&Y,0), Z, U, - &S, &E, SQLITE_SO_ASC, NE); + &S, W, SQLITE_SO_ASC, NE); } %type uniqueflag {int} |