Make sure the result of a user-defined function uses the text encoding of

the database. (CVS 1670)

FossilOrigin-Name: d333ac8002feff9423e286369e5ae5a6bfe3be50

diff --git a/manifest b/manifest
index 1e0b4fad796f71316cd20f106d6d25bc932b5455..5e512ff24a373d2841133143e61a9bd38e6ebb60 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Version\s3.0.1\sALPHA\s(CVS\s1669)
-D 2004-06-22T14:59:41
+C Make\ssure\sthe\sresult\sof\sa\suser-defined\sfunction\suses\sthe\stext\sencoding\sof\nthe\sdatabase.\s(CVS\s1670)
+D 2004-06-22T17:59:56
 F Makefile.in 0a3d7aaefa50717bd550b0cf568a51072c4c103c
 F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -73,7 +73,7 @@ F src/update.c b66b1896c9da54678ba3eff2bf0b4d291a95986a
 F src/utf.c 3a2596013e4b9582d075ca742de7f067ff7dee95
 F src/util.c e31e35d3d76cab7a02045095064897eca49cbce3
 F src/vacuum.c fcb930215a3f6c50087300782555f61ad11dd80c
-F src/vdbe.c 4fd24e030878888962a7da383639eb1af4a0e087
+F src/vdbe.c a6b9eaaceab862076debbf98c9445089473394d6
 F src/vdbe.h 2d87155e31e84bb00cdc48cc1ce6987a3a484250
 F src/vdbeInt.h 0b8eda5e0a1331d23b38d7888f187119a3491b40
 F src/vdbeapi.c d3659f3f2982e79c06ab8e338604a39e0ea0d2d3
@@ -110,6 +110,7 @@ F test/date.test aed5030482ebc02bd8d386c6c86a29f694ab068d
 F test/delete.test 4f0c86e2bebdc822d179c80697b1ceabe6bbcd07
 F test/enc.test e29a0d0558f4597ac1652a7bbac03b0e4ce17416
 F test/enc2.test 57c847492afd46eef7a498fc3853fe909a40fef7
+F test/enc3.test 315f302ed9a6042be76710eb6aa70e4551e9aa73
 F test/expr.test b4e945265c4c697bf5213b72558914ba10a989cc
 F test/fkey1.test d65c824459916249bee501532d6154ddab0b5db7
 F test/func.test c97954ad23bdbc58e2b73f264f6a006bae79f626
@@ -228,7 +229,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 04673066ff6a7c127559ba448fe50a4d95a26347
-R 2c20ba5b608dc97c31a1297639248d6a
+P ac6683e380f6199a980d587b2933c3cb0a4024f2
+R c4ba0af43930c42a3e91240b5e6fce3f
 U drh
-Z d8debe02f5236fe47dd4542a10377f03
+Z ad60bac31934b5ba795c9a17c77f245b

diff --git a/manifest.uuid b/manifest.uuid
index 0a61183198ced9f0bb5cbb167aaae31038b6682f..cb353b43fea573ad6ca973524a6708c1b0e7d0b1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ac6683e380f6199a980d587b2933c3cb0a4024f2
\ No newline at end of file
+d333ac8002feff9423e286369e5ae5a6bfe3be50
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index c8276debc973930c263c105223e2959bace8f713..e8d544c5b5b8ddcd4bfc589084eb593b3f26a6b2 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -43,7 +43,7 @@
 ** in this file for details.  If in doubt, do not deviate from existing
 ** commenting and indentation practices when changing or adding code.
 **
-** $Id: vdbe.c,v 1.386 2004/06/22 13:22:41 drh Exp $
+** $Id: vdbe.c,v 1.387 2004/06/22 17:59:56 drh Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -1282,6 +1282,7 @@ case OP_Function: {
 
   /* Copy the result of the function to the top of the stack */
   pTos++;
+  sqlite3VdbeChangeEncoding(&ctx.s, db->enc);
   *pTos = ctx.s;
   if( pTos->flags & MEM_Short ){
     pTos->z = pTos->zShort;

diff --git a/test/enc3.test b/test/enc3.test
new file mode 100644 (file)
index 0000000..f864107
--- /dev/null
+++ b/test/enc3.test
@@ -0,0 +1,41 @@
+# 2002 May 24
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library. 
+#
+# The focus of this file is testing of the proper handling of conversions
+# to the native text representation.
+#
+# $Id: enc3.test,v 1.1 2004/06/22 17:59:57 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+do_test enc3-1.1 {
+  execsql {
+    PRAGMA encoding=utf16le;
+    PRAGMA encoding;
+  }
+} {UTF-16le}
+do_test enc3-1.2 {
+  execsql {
+    CREATE TABLE t1(x,y);
+    INSERT INTO t1 VALUES('abc''123',5);
+    SELECT * FROM t1
+  }
+} {abc'123 5}
+do_test enc3-1.3 {
+  execsql {
+    SELECT quote(x) || ' ' || quote(y) FROM t1
+  }
+} {{'abc''123' 5}}
+
+
+finish_test