From: drh <drh@noemail.net>
Date: Tue, 22 Oct 2013 10:23:26 +0000 (+0000)
Subject: Extra backwards-compatibility tests verify that UNIQUE and PRIMARY KEY
X-Git-Tag: version-3.8.2~137^2~71
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42533337e28f0654c7335a3a062d51f2ed81b1fe;p=thirdparty%2Fsqlite.git

Extra backwards-compatibility tests verify that UNIQUE and PRIMARY KEY
indices are created in the correct order.  Other backwards-compatibility
tests already cover this, but it does not hurt to double up.

FossilOrigin-Name: 5ca0ea2e9b40a7fa133d2af8a2ecc676de7a8723
---

diff --git a/manifest b/manifest
index 38f44944ea..a2104b474e 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Previous\srefactor\sis\snot\sgoing\sto\sbe\shelpful\sbecause\simplied\sindices\smust\sbe\ncreated\sin\sthe\ssame\sorder\sthat\sthey\sappear\sin\sthe\sCREATE\sTABLE\sstatement\nfor\sbackwards\scompatibility.\s\sThis\sis\sa\smuch\ssmaller\schange\sto\sclean\sup\sa\nfew\sloose\sends.
-D 2013-10-22T01:18:17.015
+C Extra\sbackwards-compatibility\stests\sverify\sthat\sUNIQUE\sand\sPRIMARY\sKEY\s\nindices\sare\screated\sin\sthe\scorrect\sorder.\s\sOther\sbackwards-compatibility\ntests\salready\scover\sthis,\sbut\sit\sdoes\snot\shurt\sto\sdouble\sup.
+D 2013-10-22T10:23:26.180
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 0522b53cdc1fcfc18f3a98e0246add129136c654
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -333,7 +333,7 @@ F test/autoindex1.test d4dfe14001dfcb74cfbd7107f45a79fc1ab6183e
 F test/autovacuum.test 9f22a7733f39c56ef6a5665d10145ac25d8cb574
 F test/autovacuum_ioerr2.test 8a367b224183ad801e0e24dcb7d1501f45f244b4
 F test/avtrans.test 0252654f4295ddda3b2cce0e894812259e655a85
-F test/backcompat.test ecd841f3a3bfb81518721879cc56a760670e3198
+F test/backcompat.test cf76ac18830b61df960f74229e1a4107258d3ee0
 F test/backup.test c9cdd23a495864b9edf75a9fa66f5cb7e10fcf62
 F test/backup2.test 34986ef926ea522911a51dfdb2f8e99b7b75ebcf
 F test/backup4.test 2a2e4a64388090b152de753fd9e123f28f6a3bd4
@@ -1127,7 +1127,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh d1a6de74685f360ab718efda6265994b99bbea01
 F tool/win/sqlite.vsix 030f3eeaf2cb811a3692ab9c14d021a75ce41fff
-P 131cc6e152abe1a2d48e6d8d40d2c2f8dbe723e7
-R 54bdf6646aff1f9967ce8b64fbd84f07
+P 824b549f9b42935609b283d51f6c386da89a08a7
+R 9d2be800f6ffbad5da228b87aaad6222
 U drh
-Z 08be2e08ad7edb9bab0058e9dd4f6679
+Z f634bb8c33954589aeee61350877589e
diff --git a/manifest.uuid b/manifest.uuid
index 4bc28c27fc..de64d0792b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-824b549f9b42935609b283d51f6c386da89a08a7
\ No newline at end of file
+5ca0ea2e9b40a7fa133d2af8a2ecc676de7a8723
\ No newline at end of file
diff --git a/test/backcompat.test b/test/backcompat.test
index dd40fed23a..3d8c9d1a8f 100644
--- a/test/backcompat.test
+++ b/test/backcompat.test
@@ -200,6 +200,39 @@ do_allbackcompat_test {
 
   do_test backcompat-1.2.7 { sql1 { PRAGMA integrity_check } } {ok}
   do_test backcompat-1.2.8 { sql2 { PRAGMA integrity_check } } {ok}
+
+  do_test backcompat-2.1 {
+    sql1 {
+      CREATE TABLE t2(a UNIQUE, b PRIMARY KEY, c UNIQUE);
+      INSERT INTO t2 VALUES(1,9,5),(5,5,1),(9,1,9);
+      SELECT * FROM t2 ORDER BY a;
+    }
+  } {1 9 5 5 5 1 9 1 9}
+  do_test backcompat-2.2 {
+    sql2 {
+      SELECT * FROM t2 ORDER BY a;
+    }
+  } {1 9 5 5 5 1 9 1 9}
+  do_test backcompat-2.3 {
+    sql1 {
+      SELECT * FROM t2 ORDER BY b;
+    }
+  } {9 1 9 5 5 1 1 9 5}
+  do_test backcompat-2.4 {
+    sql2 {
+      SELECT * FROM t2 ORDER BY b;
+    }
+  } {9 1 9 5 5 1 1 9 5}
+  do_test backcompat-2.5 {
+    sql1 {
+      SELECT * FROM t2 ORDER BY c;
+    }
+  } {5 5 1 1 9 5 9 1 9}
+  do_test backcompat-2.6 {
+    sql2 {
+      SELECT * FROM t2 ORDER BY c;
+    }
+  } {5 5 1 1 9 5 9 1 9}
 }
 foreach k [lsort [array names ::incompatible]] {
   puts "ERROR: Detected journal incompatibility with version $k"