mirror of https://github.com/sqlite/sqlite
Change the fts5 multi-column syntax to use parenthesis instead of square brackets.
FossilOrigin-Name: ab85a6fc4f7580278fc9d1f0090fdcf0a90d065b
This commit is contained in:
parent
167fd757f0
commit
f67bb4a21b
|
@ -154,8 +154,8 @@ static int fts5ExprGetToken(
|
||||||
switch( *z ){
|
switch( *z ){
|
||||||
case '(': tok = FTS5_LP; break;
|
case '(': tok = FTS5_LP; break;
|
||||||
case ')': tok = FTS5_RP; break;
|
case ')': tok = FTS5_RP; break;
|
||||||
case '[': tok = FTS5_LSP; break;
|
case '{': tok = FTS5_LCP; break;
|
||||||
case ']': tok = FTS5_RSP; break;
|
case '}': tok = FTS5_RCP; break;
|
||||||
case ':': tok = FTS5_COLON; break;
|
case ':': tok = FTS5_COLON; break;
|
||||||
case ',': tok = FTS5_COMMA; break;
|
case ',': tok = FTS5_COMMA; break;
|
||||||
case '+': tok = FTS5_PLUS; break;
|
case '+': tok = FTS5_PLUS; break;
|
||||||
|
|
|
@ -106,7 +106,7 @@ cnearset(A) ::= colset(X) COLON nearset(Y). {
|
||||||
%type colsetlist {Fts5ExprColset*}
|
%type colsetlist {Fts5ExprColset*}
|
||||||
%destructor colsetlist { sqlite3_free($$); }
|
%destructor colsetlist { sqlite3_free($$); }
|
||||||
|
|
||||||
colset(A) ::= LSP colsetlist(X) RSP. { A = X; }
|
colset(A) ::= LCP colsetlist(X) RCP. { A = X; }
|
||||||
colset(A) ::= STRING(X). {
|
colset(A) ::= STRING(X). {
|
||||||
A = sqlite3Fts5ParseColset(pParse, 0, &X);
|
A = sqlite3Fts5ParseColset(pParse, 0, &X);
|
||||||
}
|
}
|
||||||
|
|
|
@ -258,20 +258,20 @@ foreach {tn2 sql} {
|
||||||
1.2 "y:a"
|
1.2 "y:a"
|
||||||
1.3 "x:b"
|
1.3 "x:b"
|
||||||
1.4 "y:b"
|
1.4 "y:b"
|
||||||
2.1 "[x]:a"
|
2.1 "{x}:a"
|
||||||
2.2 "[y]:a"
|
2.2 "{y}:a"
|
||||||
2.3 "[x]:b"
|
2.3 "{x}:b"
|
||||||
2.4 "[y]:b"
|
2.4 "{y}:b"
|
||||||
|
|
||||||
3.1 "[x y]:a"
|
3.1 "{x y}:a"
|
||||||
3.2 "[y x]:a"
|
3.2 "{y x}:a"
|
||||||
3.3 "[x x]:b"
|
3.3 "{x x}:b"
|
||||||
3.4 "[y y]:b"
|
3.4 "{y y}:b"
|
||||||
|
|
||||||
4.1 {["x" "y"]:a}
|
4.1 {{"x" "y"}:a}
|
||||||
4.2 {["y" x]:a}
|
4.2 {{"y" x}:a}
|
||||||
4.3 {[x "x"]:b}
|
4.3 {{x "x"}:b}
|
||||||
4.4 {["y" y]:b}
|
4.4 {{"y" y}:b}
|
||||||
} {
|
} {
|
||||||
set res [matchdata 1 $expr]
|
set res [matchdata 1 $expr]
|
||||||
do_execsql_test $tn2.3.$tn.[llength $res] {
|
do_execsql_test $tn2.3.$tn.[llength $res] {
|
||||||
|
|
|
@ -301,20 +301,20 @@ for {set fold 0} {$fold < 3} {incr fold} {
|
||||||
|
|
||||||
|
|
||||||
foreach {tn expr} {
|
foreach {tn expr} {
|
||||||
A.1 { [a] : x }
|
A.1 { {a} : x }
|
||||||
A.2 { [a b] : x }
|
A.2 { {a b} : x }
|
||||||
A.3 { [a b f] : x }
|
A.3 { {a b f} : x }
|
||||||
A.4 { [f a b] : x }
|
A.4 { {f a b} : x }
|
||||||
A.5 { [f a b] : x y }
|
A.5 { {f a b} : x y }
|
||||||
A.6 { [f a b] : x + y }
|
A.6 { {f a b} : x + y }
|
||||||
A.7 { [c a b] : x + c }
|
A.7 { {c a b} : x + c }
|
||||||
A.8 { [c d] : "l m" }
|
A.8 { {c d} : "l m" }
|
||||||
A.9 { [c e] : "l m" }
|
A.9 { {c e} : "l m" }
|
||||||
|
|
||||||
B.1 { a NOT b }
|
B.1 { a NOT b }
|
||||||
B.2 { a NOT a:b }
|
B.2 { a NOT a:b }
|
||||||
B.3 { a OR (b AND c) }
|
B.3 { a OR (b AND c) }
|
||||||
B.4 { a OR (b AND [a b c]:c) }
|
B.4 { a OR (b AND {a b c}:c) }
|
||||||
B.5 { a OR "b c" }
|
B.5 { a OR "b c" }
|
||||||
B.6 { a OR b OR c }
|
B.6 { a OR b OR c }
|
||||||
|
|
||||||
|
|
18
manifest
18
manifest
|
@ -1,5 +1,5 @@
|
||||||
C Merge\slatest\strunk\schanges\swith\sthis\sbranch.
|
C Change\sthe\sfts5\smulti-column\ssyntax\sto\suse\sparenthesis\sinstead\sof\ssquare\sbrackets.
|
||||||
D 2015-06-02T18:07:58.512
|
D 2015-06-02T19:38:15.157
|
||||||
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
|
||||||
F Makefile.in d272f8755b464f20e02dd7799bfe16794c9574c4
|
F Makefile.in d272f8755b464f20e02dd7799bfe16794c9574c4
|
||||||
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
|
||||||
|
@ -111,7 +111,7 @@ F ext/fts5/fts5Int.h 4c677f3b797acde90ba1b7730eca6a32e7def742
|
||||||
F ext/fts5/fts5_aux.c d53f00f31ad615ca4f139dd8751f9041afa00971
|
F ext/fts5/fts5_aux.c d53f00f31ad615ca4f139dd8751f9041afa00971
|
||||||
F ext/fts5/fts5_buffer.c 9ec57c75c81e81dca118568876b1caead0aadadf
|
F ext/fts5/fts5_buffer.c 9ec57c75c81e81dca118568876b1caead0aadadf
|
||||||
F ext/fts5/fts5_config.c 11f969ed711a0a8b611d47431d74c372ad78c713
|
F ext/fts5/fts5_config.c 11f969ed711a0a8b611d47431d74c372ad78c713
|
||||||
F ext/fts5/fts5_expr.c aa5683ce005fc8589d0336c10da153de5bebe14b
|
F ext/fts5/fts5_expr.c b28917bc2ec08eca4c8395f2d2b61adeae489462
|
||||||
F ext/fts5/fts5_hash.c c1cfdb2cae0fad00b06fae38a40eaf9261563ccc
|
F ext/fts5/fts5_hash.c c1cfdb2cae0fad00b06fae38a40eaf9261563ccc
|
||||||
F ext/fts5/fts5_index.c 7cea402924cd3d8cd5943a7f9514c9153696571b
|
F ext/fts5/fts5_index.c 7cea402924cd3d8cd5943a7f9514c9153696571b
|
||||||
F ext/fts5/fts5_storage.c 04e6717656b78eb230a1c730cac3b935eb94889b
|
F ext/fts5/fts5_storage.c 04e6717656b78eb230a1c730cac3b935eb94889b
|
||||||
|
@ -120,12 +120,12 @@ F ext/fts5/fts5_tokenize.c 97251d68d7a6a9415bde1203f9382864dfc1f989
|
||||||
F ext/fts5/fts5_unicode2.c da3cf712f05cd8347c8c5bc00964cc0361c88da9
|
F ext/fts5/fts5_unicode2.c da3cf712f05cd8347c8c5bc00964cc0361c88da9
|
||||||
F ext/fts5/fts5_varint.c 366452037bf9a000c351374b489badc1b3541796
|
F ext/fts5/fts5_varint.c 366452037bf9a000c351374b489badc1b3541796
|
||||||
F ext/fts5/fts5_vocab.c 1f8543b2c1ae4427f127a911bc8e60873fcd7bf9
|
F ext/fts5/fts5_vocab.c 1f8543b2c1ae4427f127a911bc8e60873fcd7bf9
|
||||||
F ext/fts5/fts5parse.y 7f256d4de575f60f06c7c42c1514537168f0c035
|
F ext/fts5/fts5parse.y 833db1101b78c0c47686ab1b84918e38c36e9452
|
||||||
F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
|
F ext/fts5/mkportersteps.tcl 5acf962d2e0074f701620bb5308155fa1e4a63ba
|
||||||
F ext/fts5/test/fts5_common.tcl 0b465b1127adcd1c8131f3454ab4264a6964674c
|
F ext/fts5/test/fts5_common.tcl 0b465b1127adcd1c8131f3454ab4264a6964674c
|
||||||
F ext/fts5/test/fts5aa.test 5f73afe6a1394fdba9bc18302876ded81021bee6
|
F ext/fts5/test/fts5aa.test 5f73afe6a1394fdba9bc18302876ded81021bee6
|
||||||
F ext/fts5/test/fts5ab.test 6fe3a56731d15978afbb74ae51b355fc9310f2ad
|
F ext/fts5/test/fts5ab.test 6fe3a56731d15978afbb74ae51b355fc9310f2ad
|
||||||
F ext/fts5/test/fts5ac.test 999fd5f44579f1eb565ed7cf3861c427537ff097
|
F ext/fts5/test/fts5ac.test 0990ae7497ebaea2ab5f7fd5caedd93a71a905fc
|
||||||
F ext/fts5/test/fts5ad.test 312f3c8ed9592533499c5b94d2059ae6382913a0
|
F ext/fts5/test/fts5ad.test 312f3c8ed9592533499c5b94d2059ae6382913a0
|
||||||
F ext/fts5/test/fts5ae.test 9175201baf8c885fc1cbb2da11a0c61fd11224db
|
F ext/fts5/test/fts5ae.test 9175201baf8c885fc1cbb2da11a0c61fd11224db
|
||||||
F ext/fts5/test/fts5af.test c2501ec2b61d6b179c305f5d2b8782ab3d4f832a
|
F ext/fts5/test/fts5af.test c2501ec2b61d6b179c305f5d2b8782ab3d4f832a
|
||||||
|
@ -135,7 +135,7 @@ F ext/fts5/test/fts5ai.test f20e53bbf0c55bc596f1fd47f2740dae028b8f37
|
||||||
F ext/fts5/test/fts5aj.test 05b569f5c16ea3098fb1984eec5cf50dbdaae5d8
|
F ext/fts5/test/fts5aj.test 05b569f5c16ea3098fb1984eec5cf50dbdaae5d8
|
||||||
F ext/fts5/test/fts5ak.test 7b8c5df96df599293f920b7e5521ebc79f647592
|
F ext/fts5/test/fts5ak.test 7b8c5df96df599293f920b7e5521ebc79f647592
|
||||||
F ext/fts5/test/fts5al.test fc60ebeac9d8e366e71309d4c31fa72199d711d7
|
F ext/fts5/test/fts5al.test fc60ebeac9d8e366e71309d4c31fa72199d711d7
|
||||||
F ext/fts5/test/fts5auto.test 04286120430fea482ee4b3756ce1941acd3d3962
|
F ext/fts5/test/fts5auto.test 3cef6f63c306bac05b95f47a94c3e87de71e61e3
|
||||||
F ext/fts5/test/fts5aux.test e5631607bbc05ac1c38cf7d691000509aca71ef3
|
F ext/fts5/test/fts5aux.test e5631607bbc05ac1c38cf7d691000509aca71ef3
|
||||||
F ext/fts5/test/fts5auxdata.test c69b86092bf1a157172de5f9169731af3403179b
|
F ext/fts5/test/fts5auxdata.test c69b86092bf1a157172de5f9169731af3403179b
|
||||||
F ext/fts5/test/fts5bigpl.test b1cfd00561350ab04994ba7dd9d48468e5e0ec3b
|
F ext/fts5/test/fts5bigpl.test b1cfd00561350ab04994ba7dd9d48468e5e0ec3b
|
||||||
|
@ -1357,7 +1357,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
|
||||||
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
|
||||||
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
|
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
|
||||||
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
|
||||||
P 80fe305b3eefb17310a9d6185d1c8cd73ee38b1e 9678646d9a14ba283a83839be329599a676a537a
|
P c9ffda4abb4390bbc5719e269196e2807b254f97
|
||||||
R 085e764566126c29cff07829afec22bb
|
R 29c0ea9b35d0dc8e0559ad6dbdc1731d
|
||||||
U dan
|
U dan
|
||||||
Z caf6ceaecaeb79d76ac38c51b7f66e87
|
Z 95711865cf9f19b5a5f7ef868f1de2a7
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
c9ffda4abb4390bbc5719e269196e2807b254f97
|
ab85a6fc4f7580278fc9d1f0090fdcf0a90d065b
|
Loading…
Reference in New Issue