Minor simplifications to SQL function implementations. (CVS 6231)

FossilOrigin-Name: 92e5c27f20f150c1777c1b91d35207ade961319d

diff --git a/manifest b/manifest
index a054ecee7a7ac36b01140e330a736998b301eda0..5986bf2af4168392757e7f4de965181daa65d654 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sthe\sSUBSTR\sfunction\sso\sthat\sworks\sconsistently\swhen\sthe\n2nd\sparameter\sis\s0.\s\sTicket\s#3628.\s(CVS\s6230)
-D 2009-02-02T16:32:55
+C Minor\ssimplifications\sto\sSQL\sfunction\simplementations.\s(CVS\s6231)
+D 2009-02-02T17:30:00
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 3871d308188cefcb7c5ab20da4c7b6aad023bc52
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -113,7 +113,7 @@ F src/date.c 870770dde3fb56772ab247dfb6a6eda44d16cfbc
 F src/delete.c 6249005bdd8f85db6ec5f31ddb5c07de023693cc
 F src/expr.c 76dc3dc83b56ab8db50a772714fac49def8bbf12
 F src/fault.c dc88c821842157460750d2d61a8a8b4197d047ff
-F src/func.c f58648e196e86a1c7dfced3f1c82a7fbc714ebd0
+F src/func.c 4a837d75d6f46a9543bb2dd15cbf2ff32634415a
 F src/global.c ab003581ea4ff193cfe17a00e1303bc51db619a5
 F src/hash.c 5824e6ff7ba78cd34c8d6cd724367713583e5b55
 F src/hash.h 28f38ebb1006a5beedcb013bcdfe31befe7437ae
@@ -693,7 +693,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P b8b546b6ed799dc1621ef7b06273249af1042fb2
-R b631440e88a8d4df13cea097fdad8929
+P 5fc125d362df4b8525c7e1ab34a14f505756af24
+R b7f789dd91f22c5545aa187a43c65833
 U drh
-Z bb04b6d0ebe7bcb9aeeb21b9182eef4e
+Z 4951ab79196ed7bd6ab94577ec125524

diff --git a/manifest.uuid b/manifest.uuid
index e6b16f01f636a3bc2e83f63d2578773ff4493314..1599e813ead9eeef2185c68105b104a40cf9532f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5fc125d362df4b8525c7e1ab34a14f505756af24
\ No newline at end of file
+92e5c27f20f150c1777c1b91d35207ade961319d
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index d92fa5bbf0dc340e8d03d03a73c5e3889bcc43f7..56f5c1344a0ff4637e82efb698c35439875ac4f6 100644 (file)
--- 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.216 2009/02/02 16:32:55 drh Exp $
+** $Id: func.c,v 1.217 2009/02/02 17:30:00 drh Exp $
 */
 #include "sqliteInt.h"
 #include <stdlib.h>
@@ -286,7 +286,6 @@ static void upperFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
   char *z1;
   const char *z2;
   int i, n;
-  if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
   z2 = (char*)sqlite3_value_text(argv[0]);
   n = sqlite3_value_bytes(argv[0]);
   /* Verify that the call to _bytes() does not invalidate the _text() pointer */
@@ -306,7 +305,6 @@ static void lowerFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
   u8 *z1;
   const char *z2;
   int i, n;
-  if( argc<1 || SQLITE_NULL==sqlite3_value_type(argv[0]) ) return;
   z2 = (char*)sqlite3_value_text(argv[0]);
   n = sqlite3_value_bytes(argv[0]);
   /* Verify that the call to _bytes() does not invalidate the _text() pointer */
@@ -707,12 +705,8 @@ static const char hexdigits[] = {
 ** single-quote escapes.
 */
 static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
-  if( argc<1 ) return;
+  assert( argc==1 );
   switch( sqlite3_value_type(argv[0]) ){
-    case SQLITE_NULL: {
-      sqlite3_result_text(context, "NULL", 4, SQLITE_STATIC);
-      break;
-    }
     case SQLITE_INTEGER:
     case SQLITE_FLOAT: {
       sqlite3_result_value(context, argv[0]);
@@ -760,6 +754,12 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
         z[j] = 0;
         sqlite3_result_text(context, z, j, sqlite3_free);
       }
+      break;
+    }
+    default: {
+      assert( sqlite3_value_type(argv[0])==SQLITE_NULL );
+      sqlite3_result_text(context, "NULL", 4, SQLITE_STATIC);
+      break;
     }
   }
 }