From 717811c995d5853b0b7bbb02ccea65730c1a720d Mon Sep 17 00:00:00 2001 From: danielk1977 Date: Fri, 27 Mar 2009 15:26:03 +0000 Subject: [PATCH] When "PRAGMA case_sensitive_like" is invoked, override all existing "LIKE" functions, including UTF-16 versions. (CVS 6394) FossilOrigin-Name: 1c6521e53b846eec2e046b1e9c04c60658b8e0e8 --- manifest | 14 +++++++------- manifest.uuid | 2 +- src/func.c | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/manifest b/manifest index 7e1b00011a..2ddf4fa7ba 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sanother\scompiler\swarning\sin\sthe\stest\slogic\sof\stclsqlite.c.\s(CVS\s6393) -D 2009-03-27T12:44:35 +C When\s"PRAGMA\scase_sensitive_like"\sis\sinvoked,\soverride\sall\sexisting\s"LIKE"\sfunctions,\sincluding\sUTF-16\sversions.\s(CVS\s6394) +D 2009-03-27T15:26:03 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -113,7 +113,7 @@ F src/date.c 0d804df3bbda46329946a01ff5c75c3f4f135218 F src/delete.c eb1066b2f35489fee46ad765d2b66386fc7d8adf F src/expr.c 14853cd56107292de6af664a24c6255111a4257d F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff -F src/func.c de2eed7d96365210faecda877c5a12cf440bdf42 +F src/func.c 42d12d31d350defcabb8f3f476cdaeedfc9e9615 F src/global.c 448419c44ce0701104c2121b0e06919b44514c0c F src/hash.c 5824e6ff7ba78cd34c8d6cd724367713583e5b55 F src/hash.h 28f38ebb1006a5beedcb013bcdfe31befe7437ae @@ -710,7 +710,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P a43ecc9cb91ea8693e0fcce12c1bb5c5e4baf434 -R e60e82e5515f1b7218767f55150bf743 -U drh -Z 551dbae88da7e0915e39aab6d2459b60 +P 47ffc4dca8f106d0da8cbc0a8ff7453016e9b40d +R 23b49298724349268429293de172be20 +U danielk1977 +Z be074c2bfafbf3137c382192388f787a diff --git a/manifest.uuid b/manifest.uuid index 1b0b72e3ed..202e6b75a3 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -47ffc4dca8f106d0da8cbc0a8ff7453016e9b40d \ No newline at end of file +1c6521e53b846eec2e046b1e9c04c60658b8e0e8 \ No newline at end of file diff --git a/src/func.c b/src/func.c index 540a878940..154c4eb6e9 100644 --- a/src/func.c +++ b/src/func.c @@ -16,7 +16,7 @@ ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id: func.c,v 1.224 2009/02/24 10:01:52 danielk1977 Exp $ +** $Id: func.c,v 1.225 2009/03/27 15:26:03 danielk1977 Exp $ */ #include "sqliteInt.h" #include @@ -1305,9 +1305,9 @@ void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive){ }else{ pInfo = (struct compareInfo*)&likeInfoNorm; } - sqlite3CreateFunc(db, "like", 2, SQLITE_UTF8, pInfo, likeFunc, 0, 0); - sqlite3CreateFunc(db, "like", 3, SQLITE_UTF8, pInfo, likeFunc, 0, 0); - sqlite3CreateFunc(db, "glob", 2, SQLITE_UTF8, + sqlite3CreateFunc(db, "like", 2, SQLITE_ANY, pInfo, likeFunc, 0, 0); + sqlite3CreateFunc(db, "like", 3, SQLITE_ANY, pInfo, likeFunc, 0, 0); + sqlite3CreateFunc(db, "glob", 2, SQLITE_ANY, (struct compareInfo*)&globInfo, likeFunc, 0,0); setLikeOptFlag(db, "glob", SQLITE_FUNC_LIKE | SQLITE_FUNC_CASE); setLikeOptFlag(db, "like", -- 2.47.2