aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2012-03-19 17:42:46 +0000
committerdrh <drh@noemail.net>2012-03-19 17:42:46 +0000
commit0299b40f0fa6ae9de1af5dd1c15cb64fc7797a1a (patch)
tree2cf687720300a50b72c8cf9f4d1288c456bea705
parentd13a3bc772e5c57dcd3d8f084b37b2bc1f0d8757 (diff)
downloadsqlite-0299b40f0fa6ae9de1af5dd1c15cb64fc7797a1a.tar.gz
sqlite-0299b40f0fa6ae9de1af5dd1c15cb64fc7797a1a.zip
Add additional test cases to e_insert.test. Update evidence marks.
no changes to core code. FossilOrigin-Name: 036395c0a8e08883b11df025e3da9e2461e4b1eb
-rw-r--r--manifest14
-rw-r--r--manifest.uuid2
-rw-r--r--src/util.c10
-rw-r--r--test/e_insert.test16
4 files changed, 28 insertions, 14 deletions
diff --git a/manifest b/manifest
index 02ccade03..50503f540 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sone\smore\scompiler\swarning\smissed\sby\sthe\sprevious\scheck-in.
-D 2012-03-19T14:57:49.232
+C Add\sadditional\stest\scases\sto\se_insert.test.\s\sUpdate\sevidence\smarks.\nno\schanges\sto\score\scode.
+D 2012-03-19T17:42:46.646
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 2f37e468503dbe79d35c9f6dffcf3fae1ae9ec20
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -238,7 +238,7 @@ F src/tokenize.c 1e86210d3976717a19238ea7b047fac481fe8c12
F src/trigger.c ee7e178fb9188f44b532cebd449a7c1df90fb684
F src/update.c d3076782c887c10e882996550345da9c4c9f9dea
F src/utf.c 890c67dcfcc7a74623c95baac7535aadfe265e84
-F src/util.c 906731099c4397bf8adf3fa90a833355e7472af0
+F src/util.c 4f6cfad661b2e3454b0cdd5b1b9d39a54942d0e3
F src/vacuum.c bfd53f9bd20a8fdb70b0fa8e77182b866875c0d8
F src/vdbe.c 32720e873ed0a23e6ee928b676cd995864b984d6
F src/vdbe.h 18f581cac1f4339ec3299f3e0cc6e11aec654cdb
@@ -383,7 +383,7 @@ F test/e_dropview.test 583411e470458c5d76148542cfb5a5fa84c8f93e
F test/e_expr.test 5489424d3d9a452ac3701cdf4b680ae31a157894
F test/e_fkey.test 057eed81a41a2b21b1790032f4e8aaba0b2b0e17
F test/e_fts3.test 5c02288842e4f941896fd44afdef564dd5fc1459
-F test/e_insert.test 92d2dab07366aef112f53af4539e30559f5d35a7
+F test/e_insert.test c6ac239a97cb16dfbd0c16496f8cd871b4068c0c
F test/e_reindex.test dfedfc32c5a282b0596c6537cbcd4217fbb1a216
F test/e_resolve.test dcce9308fb13b934ce29591105d031d3e14fbba6
F test/e_select.test f5d4b81205701deacfae42051ae200969c41d2c0
@@ -992,7 +992,7 @@ F tool/tostr.awk e75472c2f98dd76e06b8c9c1367f4ab07e122d06
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
F tool/warnings-clang.sh 9f406d66e750e8ac031c63a9ef3248aaa347ef2a
F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
-P 4fd68647c8d4b120e04d054617cef31001f44c6f
-R d0de9386b7862d0d496b567825b3fc4a
+P bc03d99a78e90c02b69037e5f5f81537b5a3ac60
+R 69afcc9757d71d53b13c043daaf0c06c
U drh
-Z d75a5126aa3d9bafa8a4a6d3f6859d6d
+Z e41b3b1650d5b16145f025deed2994e7
diff --git a/manifest.uuid b/manifest.uuid
index 8ce488b11..0d3f57ac8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-bc03d99a78e90c02b69037e5f5f81537b5a3ac60 \ No newline at end of file
+036395c0a8e08883b11df025e3da9e2461e4b1eb \ No newline at end of file
diff --git a/src/util.c b/src/util.c
index 325c75aae..dd3b08ae4 100644
--- a/src/util.c
+++ b/src/util.c
@@ -216,11 +216,11 @@ int sqlite3Dequote(char *z){
** Some systems have stricmp(). Others have strcasecmp(). Because
** there is no consistency, we will define our own.
**
-** IMPLEMENTATION-OF: R-20522-24639 The sqlite3_strnicmp() API allows
-** applications and extensions to compare the contents of two buffers
-** containing UTF-8 strings in a case-independent fashion, using the same
-** definition of case independence that SQLite uses internally when
-** comparing identifiers.
+** IMPLEMENTATION-OF: R-30243-02494 The sqlite3_stricmp() and
+** sqlite3_strnicmp() APIs allow applications and extensions to compare
+** the contents of two buffers containing UTF-8 strings in a
+** case-independent fashion, using the same definition of "case
+** independence" that SQLite uses internally when comparing identifiers.
*/
int sqlite3_stricmp(const char *zLeft, const char *zRight){
register unsigned char *a, *b;
diff --git a/test/e_insert.test b/test/e_insert.test
index a10d5283d..ac4361f8d 100644
--- a/test/e_insert.test
+++ b/test/e_insert.test
@@ -50,7 +50,7 @@ proc do_insert_tests {args} {
uplevel do_select_tests $args
}
-# EVIDENCE-OF: R-55375-41353 -- syntax diagram insert-stmt
+# EVIDENCE-OF: R-21350-31508 -- syntax diagram insert-stmt
#
do_insert_tests e_insert-0 {
1 "INSERT INTO a1 DEFAULT VALUES" {}
@@ -123,6 +123,20 @@ do_insert_tests e_insert-0 {
68 "INSERT OR IGNORE INTO a1 (b, a) SELECT c, b FROM a2" {}
69 "REPLACE INTO a1 (b, a) SELECT c, b FROM a2" {}
70 "REPLACE INTO main.a1 (b, a) SELECT c, b FROM a2" {}
+ 71 "INSERT INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 72 "INSERT INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 73 "INSERT OR ROLLBACK INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 74 "INSERT OR ROLLBACK INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 75 "INSERT OR ABORT INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 76 "INSERT OR ABORT INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 77 "INSERT OR REPLACE INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 78 "INSERT OR REPLACE INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 79 "INSERT OR FAIL INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 80 "INSERT OR FAIL INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 81 "INSERT OR FAIL INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 82 "INSERT OR IGNORE INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 83 "REPLACE INTO a1 (b, a) VALUES(1, 2),(3,4)" {}
+ 84 "REPLACE INTO main.a1 (b, a) VALUES(1, 2),(3,4)" {}
}
delete_all_data