Index: src/sqlite.h.in ================================================================== --- src/sqlite.h.in +++ src/sqlite.h.in @@ -2290,16 +2290,16 @@ ** ^The fourth parameter, eTextRep, specifies the ** [SQLITE4_UTF8 | text encoding] this SQL function prefers for ** its parameters. Every SQL function implementation must be able to work ** with UTF-8, UTF-16le, or UTF-16be. But some implementations may be ** more efficient with one encoding than another. ^An application may -** invoke sqlite4_create_function() or sqlite4_create_function16() multiple -** times with the same function but with different values of eTextRep. -** ^When multiple implementations of the same function are available, SQLite -** will pick the one that involves the least amount of data conversion. -** If there is only a single implementation which does not care what text -** encoding is used, then the fourth argument should be [SQLITE4_ANY]. +** invoke sqlite4_create_function() multiple times with the same function +** but with different values of eTextRep. ^When multiple implementations +** of the same function are available, SQLite will pick the one that +** involves the least amount of data conversion. If there is only a single +** implementation which does not care what text encoding is used, then the +** fourth argument should be [SQLITE4_ANY]. ** ** ^(The fifth parameter is an arbitrary pointer. The implementation of the ** function can gain access to this pointer using [sqlite4_context_appdata()].)^ ** ** ^The sixth, seventh and eighth parameters, xFunc, xStep and xFinal, are @@ -2813,11 +2813,11 @@ ** in the previous paragraphs. */ int sqlite4_sleep(int); /* -** CAPIREF: Test For Auto-Commit Mode +** CAPIREF: Test For An Open Transaction ** KEYWORDS: {autocommit mode} ** ** ^The sqlite4_db_transaction_status() interface returns non-zero if ** the database connection passed as the only argument is currently within ** an explicitly started transaction. An explicit transaction is opened ADDED test/selectF.test Index: test/selectF.test ================================================================== --- test/selectF.test +++ test/selectF.test @@ -0,0 +1,105 @@ +# 2013 June 12 +# +# 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. +# +#*********************************************************************** +# +# Test cases for SELECT statements. +# + +set testdir [file dirname $argv0] +source $testdir/tester.tcl +set testprefix selectF + +# Evaluate the SQL query passed as the only argument using database +# connection [db]. Return any results as a list of lists - one list +# element for each row. i.e. +# +# "SELECT 1, 2 UNION SELECT 3, 4" -> "{1 2} {3 4}" +# +proc eval_to_list {bOrdered sql} { + set sqlresult [list] + db eval $sql a { + set row [list] + foreach c $a(*) { lappend row $a($c) } + lappend sqlresult $row + } + if {!$bOrdered} {set sqlresult [lsort $sqlresult]} + set sqlresult +} + +# Execute SELECT query $zSql using [eval_to_list] and compare the results +# to $lRes. If argument $bOrdered is false, this indicates that the order +# of results is non-deterministic. In this case the results are passed +# to [lsort] before they are compared to $lRes. +# +proc do_select_test {testname bOrdered zSql lRes} { + uplevel [list do_test $testname [list eval_to_list $bOrdered $zSql] $lRes] +} + +# The SELECT tests in this file all use the following command. See the +# example below for details. +# +proc do_select_test_set {tn data indexes tests} { + db_delete_and_reopen + execsql $data + db_save_and_close + + if {$tn=="*"} { + foreach {tn2 bOrder sql res} $tests { + puts "$tn2 $bOrder \"$sql\" {[eval_to_list $bOrder $sql]}" + } + } else { + foreach {tn1 sql} $indexes { + db_restore_and_reopen + foreach {tn2 bOrder sql res} $tests { + do_select_test $tn.$tn1.$tn2 $bOrder $sql $res + } + } + } +} + +#-------------------------------------------------------------------- +# Warm-body tests. This block serves as an example of how to use +# the [do_select_test_set] command. +# +do_select_test_set 1 { + CREATE TABLE t1(a, b, c); + INSERT INTO t1 VALUES(2, 4, 6); + INSERT INTO t1 VALUES(1, 2, 3); + INSERT INTO t1 VALUES(4, 8, 12); + INSERT INTO t1 VALUES(3, 6, 9); + INSERT INTO t1 VALUES(6, 12, 18); + INSERT INTO t1 VALUES(5, 10, 15); +} { + 1 { } + 2 { CREATE INDEX ON t1(a, b, c) } + 3 { CREATE INDEX ON t1(c, b, a) } + 4 { + CREATE INDEX ON t1(a); + CREATE INDEX ON t1(b); + CREATE INDEX ON t1(c); + } +} { +1 0 "SELECT * FROM t1 WHERE a = 2" {{2 4 6}} +2 0 "SELECT * FROM t1 WHERE a < 4" {{1 2 3} {2 4 6} {3 6 9}} +3 0 "SELECT * FROM t1 WHERE a = b/2 AND c%2" {{1 2 3} {3 6 9} {5 10 15}} +4 0 "SELECT (a/2) FROM t1 GROUP BY (a/2)" {0 1 2 3} +5 0 "SELECT a+b FROM t1 GROUP BY (a+b)" {12 15 18 3 6 9} +6 1 "SELECT a+b FROM t1 GROUP BY (a+b) ORDER BY 1" {3 6 9 12 15 18} +7 0 "SELECT a*b FROM t1 WHERE (c%2)" {18 2 50} +8 0 "SELECT count(*) FROM t1, t1 AS t2 WHERE t1.a=t2.a" {6} +9 0 "SELECT * FROM t1 WHERE a=1 AND b=2" {{1 2 3}} +10 0 "SELECT * FROM t1 WHERE a>3 AND b<12" {{4 8 12} {5 10 15}} +} + +finish_test + + + + Index: www/porting.wiki ================================================================== --- www/porting.wiki +++ www/porting.wiki @@ -39,11 +39,11 @@

Many SQLite3 APIs come in two flavours - UTF-8 and UTF-16. For example, sqlite3_complete() and sqlite3_complete16(). In most cases, the only difference between the two versions is that one interprets or returns -text encoded using UTF-8, and the other using native byte-order utf-16. +text encoded using UTF-8, and the other using native byte-order UTF-16. For SQLite4, all UTF-16 APIs have been removed except the following: