mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-10 01:02:56 +03:00
Fix CVS merge problem. (CVS 1693)
FossilOrigin-Name: dfab1e9ac0fbe57fe4a1cbe6c363ef43b3b075ef
This commit is contained in:
danielk1977
12
manifest
12
manifest
@@ -1,5 +1,5 @@
|
||||
C Add\sa\schecksum\sto\sthe\smaster\sjournal\sname\sstored\sat\sthe\send\sof\sa\sjournal\nfile.\s(CVS\s1692)
|
||||
D 2004-06-25T11:11:54
|
||||
C Fix\sCVS\smerge\sproblem.\s(CVS\s1693)
|
||||
D 2004-06-25T12:08:47
|
||||
F Makefile.in cb7a9889c38723f72b2506c4236ff30a05ff172b
|
||||
F Makefile.linux-gcc a9e5a0d309fa7c38e7c14d3ecf7690879d3a5457
|
||||
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
|
||||
@@ -62,7 +62,7 @@ F src/sqlite.h.in b70fded2bdfeaddfb06adea3888118b722975136
|
||||
F src/sqliteInt.h dd796b6abc6d50505fe33c54f0143d7000681a41
|
||||
F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2
|
||||
F src/tclsqlite.c 8d093146332b2f0cbf2a8ebe8597d481619308a3
|
||||
F src/test1.c fcf1a914c27f50d93a41e0b90890008c3ea28cbc
|
||||
F src/test1.c e4e0ae8af8040c848ef35f92e6a22b2245b9b873
|
||||
F src/test2.c dafd8bd314a554bf376c6d3a8c83fd69219f5a40
|
||||
F src/test3.c 7247090d15a5a43823079b6fd8dad1ed3cccdedf
|
||||
F src/test4.c a921a69821fd30209589228e64f94e9f715b6fe2
|
||||
@@ -229,7 +229,7 @@ F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
|
||||
F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
|
||||
F www/version3.tcl 563ba3ac02f64da27ab17f3edbe8e56bfd0293fb
|
||||
F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
|
||||
P 2a9cea61f90be4881b01f8a7c1ca4dab77706d2f
|
||||
R bd27578118e1d5c93a1e7eca81aa4432
|
||||
P 4905e74925a4e9d467c51dc174f265b9395ae9fa
|
||||
R 98cae54b77ddaa39769902b12d5a271c
|
||||
U danielk1977
|
||||
Z 3291e0dae2ad58b9c1c0c10b19637fd1
|
||||
Z 7a7f720eca297a401dca9b9f9bbfe29b
|
||||
|
||||
@@ -1 +1 @@
|
||||
4905e74925a4e9d467c51dc174f265b9395ae9fa
|
||||
dfab1e9ac0fbe57fe4a1cbe6c363ef43b3b075ef
|
||||
146
src/test1.c
146
src/test1.c
@@ -13,7 +13,7 @@
|
||||
** is not included in the SQLite library. It is used for automated
|
||||
** testing of the SQLite library.
|
||||
**
|
||||
** $Id: test1.c,v 1.87 2004/06/25 01:10:48 drh Exp $
|
||||
** $Id: test1.c,v 1.88 2004/06/25 12:08:47 danielk1977 Exp $
|
||||
*/
|
||||
#include "sqliteInt.h"
|
||||
#include "tcl.h"
|
||||
@@ -1015,24 +1015,153 @@ bad_args:
|
||||
return TCL_ERROR;
|
||||
}
|
||||
|
||||
static int sqlite3_crashseed(
|
||||
/*
|
||||
** Usage: add_test_function <db ptr> <utf8> <utf16le> <utf16be>
|
||||
**
|
||||
** This function is used to test that SQLite selects the correct user
|
||||
** function callback when multiple versions (for different text encodings)
|
||||
** are available.
|
||||
**
|
||||
** Calling this routine registers up to three versions of the user function
|
||||
** "test_function" with database handle <db>. If the second argument is
|
||||
** true, then a version of test_function is registered for UTF-8, if the
|
||||
** third is true, a version is registered for UTF-16le, if the fourth is
|
||||
** true, a UTF-16be version is available. Previous versions of
|
||||
** test_function are deleted.
|
||||
**
|
||||
** The user function is implemented by calling the following TCL script:
|
||||
**
|
||||
** "test_function <enc> <arg>"
|
||||
**
|
||||
** Where <enc> is one of UTF-8, UTF-16LE or UTF16BE, and <arg> is the
|
||||
** single argument passed to the SQL function. The value returned by
|
||||
** the TCL script is used as the return value of the SQL function. It
|
||||
** is passed to SQLite using UTF-16BE for a UTF-8 test_function(), UTF-8
|
||||
** for a UTF-16LE test_function(), and UTF-16LE for an implementation that
|
||||
** prefers UTF-16BE.
|
||||
*/
|
||||
static void test_function_utf8(
|
||||
sqlite3_context *pCtx,
|
||||
int nArg,
|
||||
sqlite3_value **argv
|
||||
){
|
||||
Tcl_Interp *interp;
|
||||
Tcl_Obj *pX;
|
||||
sqlite3_value *pVal;
|
||||
interp = (Tcl_Interp *)sqlite3_user_data(pCtx);
|
||||
pX = Tcl_NewStringObj("test_function", -1);
|
||||
Tcl_IncrRefCount(pX);
|
||||
Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-8", -1));
|
||||
Tcl_ListObjAppendElement(interp, pX,
|
||||
Tcl_NewStringObj(sqlite3_value_text(argv[0]), -1));
|
||||
Tcl_EvalObjEx(interp, pX, 0);
|
||||
Tcl_DecrRefCount(pX);
|
||||
sqlite3_result_text(pCtx, Tcl_GetStringResult(interp), -1, SQLITE_TRANSIENT);
|
||||
pVal = sqlite3ValueNew();
|
||||
sqlite3ValueSetStr(pVal, -1, Tcl_GetStringResult(interp),
|
||||
SQLITE_UTF8, SQLITE_STATIC);
|
||||
sqlite3_result_text16be(pCtx, sqlite3_value_text16be(pVal),
|
||||
-1, SQLITE_TRANSIENT);
|
||||
sqlite3ValueFree(pVal);
|
||||
}
|
||||
static void test_function_utf16le(
|
||||
sqlite3_context *pCtx,
|
||||
int nArg,
|
||||
sqlite3_value **argv
|
||||
){
|
||||
Tcl_Interp *interp;
|
||||
Tcl_Obj *pX;
|
||||
sqlite3_value *pVal;
|
||||
interp = (Tcl_Interp *)sqlite3_user_data(pCtx);
|
||||
pX = Tcl_NewStringObj("test_function", -1);
|
||||
Tcl_IncrRefCount(pX);
|
||||
Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-16LE", -1));
|
||||
Tcl_ListObjAppendElement(interp, pX,
|
||||
Tcl_NewStringObj(sqlite3_value_text(argv[0]), -1));
|
||||
Tcl_EvalObjEx(interp, pX, 0);
|
||||
Tcl_DecrRefCount(pX);
|
||||
pVal = sqlite3ValueNew();
|
||||
sqlite3ValueSetStr(pVal, -1, Tcl_GetStringResult(interp),
|
||||
SQLITE_UTF8, SQLITE_STATIC);
|
||||
sqlite3_result_text(pCtx,sqlite3_value_text(pVal),-1,SQLITE_TRANSIENT);
|
||||
sqlite3ValueFree(pVal);
|
||||
}
|
||||
static void test_function_utf16be(
|
||||
sqlite3_context *pCtx,
|
||||
int nArg,
|
||||
sqlite3_value **argv
|
||||
){
|
||||
Tcl_Interp *interp;
|
||||
Tcl_Obj *pX;
|
||||
sqlite3_value *pVal;
|
||||
interp = (Tcl_Interp *)sqlite3_user_data(pCtx);
|
||||
pX = Tcl_NewStringObj("test_function", -1);
|
||||
Tcl_IncrRefCount(pX);
|
||||
Tcl_ListObjAppendElement(interp, pX, Tcl_NewStringObj("UTF-16BE", -1));
|
||||
Tcl_ListObjAppendElement(interp, pX,
|
||||
Tcl_NewStringObj(sqlite3_value_text(argv[0]), -1));
|
||||
Tcl_EvalObjEx(interp, pX, 0);
|
||||
Tcl_DecrRefCount(pX);
|
||||
pVal = sqlite3ValueNew();
|
||||
sqlite3ValueSetStr(pVal, -1, Tcl_GetStringResult(interp),
|
||||
SQLITE_UTF8, SQLITE_STATIC);
|
||||
sqlite3_result_text16le(pCtx, sqlite3_value_text16le(pVal),
|
||||
-1, SQLITE_TRANSIENT);
|
||||
sqlite3ValueFree(pVal);
|
||||
}
|
||||
static int test_function(
|
||||
void * clientData,
|
||||
Tcl_Interp *interp,
|
||||
int objc,
|
||||
Tcl_Obj *CONST objv[]
|
||||
){
|
||||
sqlite3 *db;
|
||||
int val;
|
||||
|
||||
if( objc!=5 ) goto bad_args;
|
||||
if( getDbPointer(interp, Tcl_GetString(objv[1]), &db) ) return TCL_ERROR;
|
||||
|
||||
if( TCL_OK!=Tcl_GetBooleanFromObj(interp, objv[2], &val) ) return TCL_ERROR;
|
||||
if( val ){
|
||||
sqlite3_create_function(db, "test_function", 1, SQLITE_UTF8,
|
||||
interp, test_function_utf8, 0, 0);
|
||||
}
|
||||
if( TCL_OK!=Tcl_GetBooleanFromObj(interp, objv[3], &val) ) return TCL_ERROR;
|
||||
if( val ){
|
||||
sqlite3_create_function(db, "test_function", 1, SQLITE_UTF16LE,
|
||||
interp, test_function_utf16le, 0, 0);
|
||||
}
|
||||
if( TCL_OK!=Tcl_GetBooleanFromObj(interp, objv[4], &val) ) return TCL_ERROR;
|
||||
if( val ){
|
||||
sqlite3_create_function(db, "test_function", 1, SQLITE_UTF16BE,
|
||||
interp, test_function_utf16be, 0, 0);
|
||||
}
|
||||
|
||||
return TCL_OK;
|
||||
bad_args:
|
||||
Tcl_AppendResult(interp, "wrong # args: should be \"",
|
||||
Tcl_GetStringFromObj(objv[0], 0), " <DB> <utf8> <utf16le> <utf16be>", 0);
|
||||
return TCL_ERROR;
|
||||
}
|
||||
|
||||
static int sqlite3_crashparams(
|
||||
void * clientData,
|
||||
Tcl_Interp *interp,
|
||||
int objc,
|
||||
Tcl_Obj *CONST objv[]
|
||||
){
|
||||
#ifdef OS_TEST
|
||||
int seed;
|
||||
if( objc!=2 ) goto bad_args;
|
||||
if( Tcl_GetIntFromObj(interp, objv[1], &seed) ) return TCL_ERROR;
|
||||
sqlite3SetCrashseed(seed);
|
||||
int delay;
|
||||
if( objc!=3 ) goto bad_args;
|
||||
if( Tcl_GetIntFromObj(interp, objv[1], &delay) ) return TCL_ERROR;
|
||||
sqlite3SetCrashParams(delay, Tcl_GetString(objv[2]));
|
||||
#endif
|
||||
return TCL_OK;
|
||||
|
||||
#ifdef OS_TEST
|
||||
bad_args:
|
||||
Tcl_AppendResult(interp, "wrong # args: should be \"",
|
||||
Tcl_GetStringFromObj(objv[0], 0), "<seed>", 0);
|
||||
Tcl_GetStringFromObj(objv[0], 0), "<delay> <filename>", 0);
|
||||
return TCL_ERROR;
|
||||
#endif
|
||||
}
|
||||
@@ -2100,7 +2229,8 @@ int Sqlitetest1_Init(Tcl_Interp *interp){
|
||||
{ "sqlite3OsLock", test_sqlite3OsLock, 0 },
|
||||
{ "sqlite3OsUnlock", test_sqlite3OsUnlock, 0 },
|
||||
{ "add_test_collate", test_collate, 0 },
|
||||
{ "sqlite3_crashseed", sqlite3_crashseed, 0 },
|
||||
{ "add_test_function", test_function, 0 },
|
||||
{ "sqlite3_crashparams", sqlite3_crashparams, 0 },
|
||||
|
||||
};
|
||||
int i;
|
||||
|
||||
Reference in New Issue
Block a user