Add test cases to demonstrate the memory leak on the COLLATE clause.

FossilOrigin-Name: 0a60212c9c8404ee079985a58094ed2b2b554d48

diff --git a/manifest b/manifest
index a8d7872f9f737eeac1a8d9ad8e8f6bed35b4f0d9..0e613d65e3a3bd070e4002d3d0f61c091a2510d8 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Candidate\sfix\sfor\sa\smemory\sleak\sthat\soccurs\sif\sa\sCREATE\sTABLE\sstatement\ncontains\stwo\sor\smore\sCOLLATE\sclauses\son\sthe\ssame\scolumn\sdefinition.
-D 2013-06-08T19:58:27.523
+C Add\stest\scases\sto\sdemonstrate\sthe\smemory\sleak\son\sthe\sCOLLATE\sclause.
+D 2013-06-09T20:16:26.380
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -365,7 +365,7 @@ F test/check.test 2eb93611139a7dfaed3be80067c7dc5ceb5fb287
 F test/close.test e37610d60e9c9b9979a981f3f50071d7dff28616
 F test/closure01.test dbb28f1ea9eeaf0a53ec5bc0fed352e479def8c7
 F test/coalesce.test cee0dccb9fbd2d494b77234bccf9dc6c6786eb91
-F test/collate1.test fd02c4d8afc71879c4bb952586389961a21fb0ce
+F test/collate1.test b709989e6e6ff6e1d2bd64231c2c1d8146846c9e
 F test/collate2.test 04cebe4a033be319d6ddbb3bbc69464e01700b49
 F test/collate3.test 79558a286362cb9ed603c6fa543f1cda7f563f0f
 F test/collate4.test 031f7265c13308b724ba3c49f41cc04612bd92b1
@@ -1093,10 +1093,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P d5bc1fe1c461bdb3d889ab2e50feb944881822a4
-R 7e8f7769982f409b915035bea30221de
-T *branch * memleak
-T *sym-memleak *
-T -sym-trunk *
+P 60fc77bc537b099bdd48916746109d0332f839af
+R 866dc59c759cbc65061f28ee32001d2c
 U drh
-Z 33f096f01bc764624aabd9216a446650
+Z a5328cd2740f305b4d17636362fdc07d

diff --git a/manifest.uuid b/manifest.uuid
index e01f4543fa083af6087e7ea75004e93562f96113..002808b770fd0652ed22aca137f62cf6917d3ed3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-60fc77bc537b099bdd48916746109d0332f839af
\ No newline at end of file
+0a60212c9c8404ee079985a58094ed2b2b554d48
\ No newline at end of file

diff --git a/test/collate1.test b/test/collate1.test
index b493ee8f1c90121d4aa1ec70869150c365f05157..e9ac93aa304756763903776d402e71fdd8631fc2 100644 (file)
--- a/test/collate1.test
+++ b/test/collate1.test
@@ -305,4 +305,33 @@ do_test collate1-4.5 {
   }
 } {}
 
+# A problem reported on the mailing list:  A CREATE TABLE statement
+# is allowed to have two or more COLLATE clauses on the same column.
+# That probably ought to be an error, but we allow it for backwards
+# compatibility.  Just make sure it works and doesn't leak memory.
+#
+do_test collate1-5.1 {
+  execsql {
+    CREATE TABLE c5(
+      id INTEGER PRIMARY KEY,
+      a TEXT COLLATE binary COLLATE nocase COLLATE rtrim,
+      b TEXT COLLATE nocase COLLATE binary,
+      c TEXT COLLATE rtrim COLLATE binary COLLATE rtrim COLLATE nocase
+    );
+    INSERT INTO c5 VALUES(1, 'abc','abc','abc');
+    INSERT INTO c5 VALUES(2, 'abc   ','ABC','ABC');
+    SELECT id FROM c5 WHERE a='abc' ORDER BY id;
+  }
+} {1 2}
+do_test collate1-5.2 {
+  execsql {
+    SELECT id FROM c5 WHERE b='abc' ORDER BY id;
+  }
+} {1}
+do_test collate1-5.3 {
+  execsql {
+    SELECT id FROM c5 WHERE c='abc' ORDER BY id;
+  }
+} {1 2}
+
 finish_test