From ee8d0b4111b47bd91e9d3280e8540d3a560b0cc7 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 15 Sep 2014 15:22:32 +0000
Subject: [PATCH] Have sqlite3ota.c use grave accents instead of double-quotes
 to enclose identifiers in generated SQL. To avoid having the SQL engine
 substitute a literal string if a column reference cannot be resolved.

FossilOrigin-Name: 79f2418429aa05c56069c56d51b4d72f662a6970
---
 ext/ota/ota3.test    | 24 ++++++++++++++++++++++++
 ext/ota/sqlite3ota.c |  8 ++++----
 manifest             | 14 +++++++-------
 manifest.uuid        |  2 +-
 4 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/ext/ota/ota3.test b/ext/ota/ota3.test
index a4eee32271..dcf8f817aa 100644
--- a/ext/ota/ota3.test
+++ b/ext/ota/ota3.test
@@ -75,5 +75,29 @@ do_execsql_test 2.2 {
   PRAGMA integrity_check;
 } {ok}
 
+#--------------------------------------------------------------------
+# Test that missing columns are detected.
+#
+forcedelete ota.db
+reset_db
+
+do_execsql_test 2.0 {
+  CREATE TABLE x1(a INTEGER PRIMARY KEY, b, c);
+  CREATE INDEX i1 ON x1(b, c);
+} {}
+
+do_test 2.1 {
+  sqlite3 db2 ota.db
+  db2 eval {
+    CREATE TABLE data_x1(a, b, ota_control);
+    INSERT INTO data_x1 VALUES(1, 'a', 0);
+  }
+  db2 close
+  list [catch { run_ota test.db ota.db } msg] $msg
+} {1 {SQLITE_ERROR - no such column: c}}
+
+do_execsql_test 2.2 {
+  PRAGMA integrity_check;
+} {ok}
 
 finish_test
diff --git a/ext/ota/sqlite3ota.c b/ext/ota/sqlite3ota.c
index aca28e2e3b..999bc00cf7 100644
--- a/ext/ota/sqlite3ota.c
+++ b/ext/ota/sqlite3ota.c
@@ -299,7 +299,7 @@ static int otaObjIterFirst(sqlite3ota *p, OtaObjIter *pIter){
 ** string in the argument buffer, suitable for use as an SQL identifier. 
 ** For example:
 **
-**      [quick "brown" fox]    ->    ["quick ""brown"" fox"]
+**      [quick `brown` fox]    ->    [`quick ``brown`` fox`]
 **
 ** Assuming the allocation is successful, a pointer to the new buffer is 
 ** returned. It is the responsibility of the caller to free it using 
@@ -312,12 +312,12 @@ static char *otaQuoteName(const char *zName){
   if( zRet ){
     int i;
     char *p = zRet;
-    *p++ = '"';
+    *p++ = '`';
     for(i=0; i<nName; i++){
-      if( zName[i]=='"' ) *p++ = '"';
+      if( zName[i]=='`' ) *p++ = '`';
       *p++ = zName[i];
     }
-    *p++ = '"';
+    *p++ = '`';
     *p++ = '\0';
   }
   return zRet;
diff --git a/manifest b/manifest
index 9496fcd9a5..ad2d06197d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Ensure\sthe\scorrect\scollation\ssequences\sare\sused\swhen\ssorting\sdata\sin\ssqlite3ota.c.
-D 2014-09-15T14:54:07.328
+C Have\ssqlite3ota.c\suse\sgrave\saccents\sinstead\sof\sdouble-quotes\sto\senclose\sidentifiers\sin\sgenerated\sSQL.\sTo\savoid\shaving\sthe\sSQL\sengine\ssubstitute\sa\sliteral\sstring\sif\sa\scolumn\sreference\scannot\sbe\sresolved.
+D 2014-09-15T15:22:32.496
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -124,8 +124,8 @@ F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212
 F ext/ota/ota.c d37097e92a005d3915883adefbb93019ea6f8841
 F ext/ota/ota1.test fe0bb8acf0caef6c19937b84c6547b788342610d
 F ext/ota/ota2.test 13f76922446c62ed96192e938b8e625ebf0142fa
-F ext/ota/ota3.test 7179a90eb64cf8135a6885568653f158fb130872
-F ext/ota/sqlite3ota.c c29b3eb617f37d0e51744508b8f609014244727d
+F ext/ota/ota3.test 1c48b7476af1c5920db9a43e7b1476d421a463b5
+F ext/ota/sqlite3ota.c 668ed08dd81ff8ae1e8524b2d4bf0f2609cbf907
 F ext/ota/sqlite3ota.h 39ce4dffbfcf4ade9e4526369fe2243709345c8e
 F ext/rtree/README 6315c0d73ebf0ec40dedb5aa0e942bc8b54e3761
 F ext/rtree/rtree.c 57bec53e1a677ab74217fe1f20a58c3a47261d6b
@@ -1199,7 +1199,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P cca376bff3510dc5e99fc5824862c3471ceced16
-R 286b5daf6c561394d2eea11438cdac48
+P 473a72d7009a22ea514a98ee8869e7e7bca14cf5
+R 6e8944bfcc8da0bf6b98d50ae7beb161
 U dan
-Z e26ad3cda7162cfc9e1d6f5aeb5cd971
+Z 793743aae527be1bb170d7639993b8ad
diff --git a/manifest.uuid b/manifest.uuid
index 4e033cd4fd..b4f504617c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-473a72d7009a22ea514a98ee8869e7e7bca14cf5
\ No newline at end of file
+79f2418429aa05c56069c56d51b4d72f662a6970
\ No newline at end of file