Enhance the built-in function quote() to support blob values. (CVS 1541)

FossilOrigin-Name: 97aa54bb70715934e0af082d51b9b0f6bb847e8e

diff --git a/manifest b/manifest
index e331efb1bd3f6cad59c2588c74dacb8da08543b1..14d333b338a3caf19a4da93b63d84e404f03c4fb 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sthird\sargument\sfrom\sthe\ssqlite3_open()\sAPI.\s(CVS\s1540)
-D 2004-06-08T00:02:33
+C Enhance\sthe\sbuilt-in\sfunction\squote()\sto\ssupport\sblob\svalues.\s(CVS\s1541)
+D 2004-06-08T00:39:01
 F Makefile.in ab7b0d5118e2da97bac66be8684a1034e3500f5a
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -32,7 +32,7 @@ F src/date.c 8e6fa3173386fb29fdef012ee08a853c1e9908b2
 F src/delete.c b30f08250c9ed53a25a13c7c04599c1e8753992d
 F src/encode.c a876af473d1d636faa3dca51c7571f2e007eea37
 F src/expr.c 2b18dd4ed178e39989f22d75bf0e68ba6ed3923c
-F src/func.c 730741443e8de788de370e2b0d641df69d174697
+F src/func.c ffbdfa4cad2a16a41390c2ce923ef8b0f173d777
 F src/hash.c 440c2f8cb373ee1b4e13a0988489c7cd95d55b6f
 F src/hash.h 762d95f1e567664d1eafc1687de755626be962fb
 F src/insert.c 4268d9e3959cc845ea243fb4ec7507269404dad9
@@ -54,7 +54,7 @@ F src/pragma.c 54b4d67fa81fd38b911aa3325348dcae9ceac5a4
 F src/printf.c 63b15f1ea9fe3daa066bb7430fd20d4a2d717dc8
 F src/random.c eff68e3f257e05e81eae6c4d50a51eb88beb4ff3
 F src/select.c 0ac0adeb2ae15255ac4399d9ee1b0d25a266a676
-F src/shell.c a70b41be0377ef74e85841025330ebbd34e0dd8b
+F src/shell.c ca519519dcbbc582f6d88f7d0e7583b857fd3469
 F src/sqlite.h.in 577974e9a1b85815ccddfb5b858695b62000f595
 F src/sqliteInt.h 845d2a3ffdb9a9050a1b55044d4856227b649b84
 F src/table.c af14284fa36c8d41f6829e3f2819dce07d3e2de2
@@ -215,7 +215,7 @@ F www/support.tcl 1801397edd271cc39a2aadd54e701184b5181248
 F www/tclsqlite.tcl 19191cf2a1010eaeff74c51d83fd5f5a4d899075
 F www/vdbe.tcl 59288db1ac5c0616296b26dce071c36cb611dfe9
 F www/whentouse.tcl a8335bce47cc2fddb07f19052cb0cb4d9129a8e4
-P 0c2d169cf3c0f36972015c952a2b46cb9a333881
-R ae36aa59d9c9bbd9dcea25dbefbbc5f3
+P 62e31f396cb6b49f542977e2fade78e11e371132
+R 87169ec73e15b83e9be0f5b8ac7aaebe
 U danielk1977
-Z 9bd0ddefb661cdb7cba70d74baa55d54
+Z e31a621434c9bec95d63eda46f31cc00

diff --git a/manifest.uuid b/manifest.uuid
index 3f23a925d0f474cfc1afd1dc90cdc511ead522d8..84b3f262b8a4512754e32e524810db8ab8d5a252 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-62e31f396cb6b49f542977e2fade78e11e371132
\ No newline at end of file
+97aa54bb70715934e0af082d51b9b0f6bb847e8e
\ No newline at end of file

diff --git a/src/func.c b/src/func.c
index bf4d6d4ae875d21a1635cd5fff6f43132d9c70e9..cbeaf4e6541ca92951ee256c2a5d46c86d6fa566 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.64 2004/06/06 12:41:50 danielk1977 Exp $
+** $Id: func.c,v 1.65 2004/06/08 00:39:01 danielk1977 Exp $
 */
 #include <ctype.h>
 #include <math.h>
@@ -604,7 +604,33 @@ static void quoteFunc(sqlite3_context *context, int argc, sqlite3_value **argv){
       sqlite3_result_value(context, argv[0]);
       break;
     }
-    case SQLITE_BLOB:  /*** FIX ME.  Use a BLOB encoding ***/
+    case SQLITE_BLOB: {
+      static const char hexdigits[] = { 
+        '0', '1', '2', '3', '4', '5', '6', '7',
+        '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' 
+      };
+      char *zText = 0;
+      int nBlob = sqlite3_value_bytes(argv[0]);
+      char const *zBlob = sqlite3_value_blob(argv[0]);
+
+      zText = (char *)sqliteMalloc((2*nBlob)+4); 
+      if( !zText ){
+        sqlite3_result_error(context, "out of memory", -1);
+      }else{
+        int i;
+        for(i=0; i<nBlob; i++){
+          zText[(i*2)+2] = hexdigits[(zBlob[i]>>4)&0x0F];
+          zText[(i*2)+3] = hexdigits[(zBlob[i])&0x0F];
+        }
+        zText[(nBlob*2)+2] = '\'';
+        zText[(nBlob*2)+3] = '\0';
+        zText[0] = 'X';
+        zText[1] = '\'';
+        sqlite3_result_text(context, zText, -1, 1);
+        sqliteFree(zText);
+      }
+      break;
+    }
     case SQLITE_TEXT: {
       int i,j,n;
       const char *zArg = sqlite3_value_text(argv[0]);

diff --git a/src/shell.c b/src/shell.c
index 181af99071b8bb42a10a0561c60e61c9d0fe60cd..444be5d5bd252531757b0674e84fdd91b3370b03 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -12,7 +12,7 @@
 ** This file contains code to implement the "sqlite" command line
 ** utility for accessing SQLite databases.
 **
-** $Id: shell.c,v 1.103 2004/06/08 00:02:34 danielk1977 Exp $
+** $Id: shell.c,v 1.104 2004/06/08 00:39:01 danielk1977 Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -490,80 +490,6 @@ static char * appendText(char *zIn, char const *zAppend, char quote){
   return zIn;
 }
 
-/* This function implements the SQL scalar function dump_literal()used by
- * the '.dump' built-in. It takes one argument and returns the fully quoted
-** literal version of the argument depending on the type.
-**
-** Type          Example
-** -----------------------
-** NULL          "NULL"
-** INTEGER       "0"
-** REAL          "0.0"
-** TEXT          "'abc'"
-** BLOB          "X'89AB'"
-**
-*/
-static void dump_literalFunc(
-  sqlite3_context *context,
-  int argc,
-  sqlite3_value **argv
-){
-  static const char hexdigits[] = { 
-      '0', '1', '2', '3', '4', '5', '6', '7',
-      '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' 
-  };
-  assert( argc==1 );
-
-  switch( sqlite3_value_type(argv[0]) ){
-    case SQLITE_NULL:
-      sqlite3_result_text(context, "NULL", -1, 0);
-      break;
-    case SQLITE_INTEGER:
-      sqlite3_result_text(context, sqlite3_value_text(argv[0]), -1, 1);
-      break;
-    case SQLITE_FLOAT: {
-      char zBuf[40];
-      sprintf(zBuf, "%.15g", sqlite3_value_double(argv[0]));
-      sqlite3_result_text(context, zBuf, -1, 1);
-      break;
-    }
-    case SQLITE_TEXT: {
-      char *zText;
-      zText = appendText(0, sqlite3_value_text(argv[0]), '\'');
-      if( !zText ){
-        sqlite3_result_error(context, "out of memory", -1);
-      }else{
-        sqlite3_result_text(context, zText, -1, 1);
-        free(zText);
-      }
-      break;
-    }
-    case SQLITE_BLOB: {
-      char *zText = 0;
-      int nBlob = sqlite3_value_bytes(argv[0]);
-      char const *zBlob = sqlite3_value_blob(argv[0]);
-
-      zText = (char *)malloc((2*nBlob)+4); 
-      if( !zText ){
-        sqlite3_result_error(context, "out of memory", -1);
-      }else{
-        int i;
-        for(i=0; i<nBlob; i++){
-          zText[(i*2)+2] = hexdigits[(zBlob[i]>>4)&0x0F];
-          zText[(i*2)+3] = hexdigits[(zBlob[i])&0x0F];
-        }
-        zText[(nBlob*2)+2] = '\'';
-        zText[(nBlob*2)+3] = '\0';
-        zText[0] = 'X';
-        zText[1] = '\'';
-        sqlite3_result_text(context, zText, -1, 1);
-        free(zText);
-      }
-      break;
-    }
-  }
-}
-
 /*
 ** This is a different callback routine used for dumping the database.
 ** Each row received by this callback consists of a table name,
@@ -609,7 +535,7 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     zSelect = appendText(zSelect, " || ' VALUES(' || ", 0);
     rc = sqlite3_step(pTableInfo);
     while( rc==SQLITE_ROW ){
-      zSelect = appendText(zSelect, "dump_literal(", 0);
+      zSelect = appendText(zSelect, "quote(", 0);
       zSelect = appendText(zSelect, sqlite3_column_text(pTableInfo, 1), '"');
       rc = sqlite3_step(pTableInfo);
       if( rc==SQLITE_ROW ){
@@ -700,9 +626,6 @@ static void open_db(struct callback_data *p){
           p->zDbFilename, sqlite3_errmsg(db));
       exit(1);
     }
-
-    /* Add the 'dump_literal' SQL function used by .dump */
-    sqlite3_create_function(db,"dump_literal",1,0,0,0,dump_literalFunc,0,0);
   }
 }