In the documentation, amplify the fact that encodings cannot be changed

on a database that already exists.  Ticket #1277. (CVS 2503)

FossilOrigin-Name: 4704f3a19af73261ec03c0192c74a0416aeba794

diff --git a/manifest b/manifest
index c237f003f087fb0cd86f63e6880155c62ec09bd5..6bcf3ed8e0b6d52fcc8733a735a9a320be6eb54c 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sSSE\svacuum\shook.\s(CVS\s2502)
-D 2005-06-07T09:21:07
+C In\sthe\sdocumentation,\samplify\sthe\sfact\sthat\sencodings\scannot\sbe\schanged\non\sa\sdatabase\sthat\salready\sexists.\s\sTicket\s#1277.\s(CVS\s2503)
+D 2005-06-07T20:07:24
 F Makefile.in 8129e7f261d405db783676f9ca31e0841768c652
 F Makefile.linux-gcc 06be33b2a9ad4f005a5f42b22c4a19dab3cbb5c7
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -272,7 +272,7 @@ F www/oldnews.tcl 61e4b210569e3f45b2df77482ddabb3fa2e8a8a6
 F www/omitted.tcl f1e57977299c3ed54fbae55e4b5ea6a64de39e19
 F www/opcode.tcl 5bd68059416b223515a680d410a9f7cb6736485f
 F www/optimizing.tcl f0b2538988d1bbad16cbfe63ec6e8f48c9eb04e5
-F www/pragma.tcl fee45a370a6c29872fdba2234285c791d59bbc6b
+F www/pragma.tcl 56d29b0c14b38d61b12c17f3e3e6025a8e15c057
 F www/quickstart.tcl 6f6f694b6139be2d967b1492eb9a6bdf7058aa60
 F www/speed.tcl 656ed5be8cc9d536353e1a96927b925634a62933
 F www/sqlite.tcl b51fd15f0531a54874de785a9efba323eecd5975
@@ -281,7 +281,7 @@ F www/tclsqlite.tcl 425be741b8ae664f55cb1ef2371aab0a75109cf9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
 F www/whentouse.tcl 528299b8316726dbcc5548e9aa0648c8b1bd055b
-P f2ce662e81cea4983f335606ed18a74b97d35609
-R b285850649455952342d34d05db04462
-U danielk1977
-Z b8c49df80d5e3a430cde9098091775ab
+P 59960a59151ae6c711dee404e60e12d4edaa3dda
+R 7ea160d72256bceb147ad6d0504408dd
+U drh
+Z ad33796489b4694e8b4b6ddd2c758430

diff --git a/manifest.uuid b/manifest.uuid
index b4d83d690a1d68895fdc8f63a2681141ed8d6607..560fec250796392b87ebd0c2bfb8b51a5d5df0fb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-59960a59151ae6c711dee404e60e12d4edaa3dda
\ No newline at end of file
+4704f3a19af73261ec03c0192c74a0416aeba794
\ No newline at end of file

diff --git a/www/pragma.tcl b/www/pragma.tcl
index 2df633408d51fac18c1ecdf09c864fb8ae3fa580..75221f875b1d524d5687636bff04b53a7a308d9b 100644 (file)
--- a/www/pragma.tcl
+++ b/www/pragma.tcl
@@ -1,7 +1,7 @@
 #
 # Run this Tcl script to generate the pragma.html file.
 #
-set rcsid {$Id: pragma.tcl,v 1.14 2005/05/16 02:13:18 danielk1977 Exp $}
+set rcsid {$Id: pragma.tcl,v 1.15 2005/06/07 20:07:24 drh Exp $}
 source common.tcl
 header {Pragma statements supported by SQLite}
 
@@ -160,7 +160,7 @@ puts {
        <br>PRAGMA encoding = "UTF-16";
        <br>PRAGMA encoding = "UTF-16le";
        <br>PRAGMA encoding = "UTF-16be";</b></p>
-    <p>In it's first form, if the main database has already been
+    <p>In first form, if the main database has already been
     created, then this pragma returns the text encoding used by the
     main database, one of "UTF-8", "UTF-16le" (little-endian UTF-16
     encoding) or "UTF-16be" (big-endian UTF-16 encoding).  If the main
@@ -171,7 +171,12 @@ puts {
     the main database has not already been created. In this case the 
     pragma sets the encoding that the main database will be created with if
     it is created by this session. The string "UTF-16" is interpreted
-    as "UTF-16 encoding using native machine byte-ordering".</p>
+    as "UTF-16 encoding using native machine byte-ordering".  If the second
+    and subsequent forms are used after the database file has already
+    been created, they have no effect and are silently ignored.</p>
+
+    <p>Once an encoding has been set for a database, it cannot be changed.</p>
+
     <p>Databases created by the ATTACH command always use the same encoding
     as the main database.</p>
 </li>