When reporting back the datatype of columns, use the text of the datatype

as it appears in the CREATE TABLE statement, if available.  Also: removed
the ".reindex" command from the shell. (CVS 669)

FossilOrigin-Name: ff8b6f4ee8099a7170cb786b8ead9a3e42ab5869

diff --git a/manifest b/manifest
index d0da83838d21214664521bcdcc4bc751333b5fe7..52c7f8f2975a3780a9d6a526ec421b9813e9375f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\ssupport\sfor\sTEMPORARY\sviews.\s\sThe\scode\sis\shere\sbut\sit\sis\smostly\suntested.\s(CVS\s668)
-D 2002-07-08T22:03:32
+C When\sreporting\sback\sthe\sdatatype\sof\scolumns,\suse\sthe\stext\sof\sthe\sdatatype\r\nas\sit\sappears\sin\sthe\sCREATE\sTABLE\sstatement,\sif\savailable.\s\sAlso:\sremoved\r\nthe\s".reindex"\scommand\sfrom\sthe\sshell.\s(CVS\s669)
+D 2002-07-10T21:26:01
 F Makefile.in 6291a33b87d2a395aafd7646ee1ed562c6f2c28c
 F Makefile.template 4e11752e0b5c7a043ca50af4296ec562857ba495
 F README a4c0ba11354ef6ba0776b400d057c59da47a4cc0
@@ -35,19 +35,19 @@ F src/os.h 4a361fccfbc4e7609b3e1557f604f94c1e96ad10
 F src/pager.c b8415b02a2a5c4e9d8bfd45311a5f15e785c7f1f
 F src/pager.h 6fddfddd3b73aa8abc081b973886320e3c614f0e
 F src/parse.y 9267b7681882205f904f6564fff733d8fbcd58a3
-F src/printf.c 236ed7a79386feed4456fa728fff8be793f1547c
+F src/printf.c 06f4c8725063e0faf0e34824ab70feace7146bf7
 F src/random.c 19e8e00fe0df32a742f115773f57651be327cabe
-F src/select.c 1c7c0b42c27b9d115c955023074a292197a17b3b
-F src/shell.c 0b06e4421ddf34f30263a2674abe768a2b5fd538
+F src/select.c 9e67a79bda57a587b919074df8d8a18cb95c3ba8
+F src/shell.c 16cb2db27f2d3045f78e74e83bac965a8249357b
 F src/shell.tcl 27ecbd63dd88396ad16d81ab44f73e6c0ea9d20e
 F src/sqlite.h.in 75c5bbb066d0faf34424b7d1babf8b44d5b31af2
 F src/sqliteInt.h ad5a60c1b28356c956bea4f947509206725519ce
 F src/table.c eed2098c9b577aa17f8abe89313a9c4413f57d63
-F src/tclsqlite.c 8a6a8cf06f9d3107f06d04996fda39483cd25d87
-F src/test1.c a2f2b6b1df07d4e8b380323896c3ed34442cea91
+F src/tclsqlite.c f5d194f1d3e2ddd615c9784affbb8c840e30b3fd
+F src/test1.c 456cb080db85056be723e770435d9509afc3a83a
 F src/test2.c 669cc22781c6461a273416ec1a7414d25c081730
 F src/test3.c fda085b4cdd5a2d7f65786ce679036e955f4bfa2
-F src/threadtest.c 81f0598e0f031c1bd506af337fdc1b7e8dff263f
+F src/threadtest.c 72bce0a284647314847bbea44616ceb056bfb77f
 F src/tokenize.c b5500e193a82b5b9888fbf947efd90d3b4858178
 F src/trigger.c d88ab4d68d68955c217b38fb6717e090fbbf54a4
 F src/update.c 494479cc4fe34165cb9ea97bccefb405e7b875d2
@@ -140,7 +140,7 @@ F www/speed.tcl da8afcc1d3ccc5696cfb388a68982bc3d9f7f00f
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P fd7e41f0eed80fb1c7e18eb84834ec3cea74a649
-R fdc61bc38062d3eb8e5cf64639119d71
+P 87cd10c1f638db5d1f47bc12669f150485415b3e
+R dfabcf7e6ad6024dc64e99aa6198b20c
 U drh
-Z 5b35bb17d4be31b8bee0d38218de414a
+Z a0a55547557628906064ab1285cc2b8e

diff --git a/manifest.uuid b/manifest.uuid
index 5798d392c2c2c72215a6c51b6819b972d8555917..47a74df0d9ae179fdcc580ec256ff7d87b2de091 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-87cd10c1f638db5d1f47bc12669f150485415b3e
\ No newline at end of file
+ff8b6f4ee8099a7170cb786b8ead9a3e42ab5869
\ No newline at end of file

diff --git a/src/printf.c b/src/printf.c
index 827b7bbcb90499844bb7e8571173cb6eb711fa18..e1ae39df7fb49b93ec221ae8391063cfc382d512 100644 (file)
--- a/src/printf.c
+++ b/src/printf.c
@@ -699,14 +699,10 @@ char *sqlite_mprintf(const char *zFormat, ...){
   vxprintf(mout,&sMprintf,zFormat,ap);
   va_end(ap);
   sMprintf.zText[sMprintf.nChar] = 0;
-  if( sMprintf.zText==sMprintf.zBase ){
-    zNew = sqliteMalloc( sMprintf.nChar+1 );
-    if( zNew ) strcpy(zNew,zBuf);
-  }else{
-    zNew = sqliteRealloc(sMprintf.zText,sMprintf.nChar+1);
-    if( zNew==0 ){
-      sqliteFree(sMprintf.zText);
-    }
+  zNew = malloc( sMprintf.nChar+1 );
+  if( zNew ) strcpy(zNew,sMprintf.zText);
+  if( sMprintf.zText!=sMprintf.zBase ){
+    sqliteFree(sMprintf.zText);
   }
   return zNew;
 }
@@ -715,6 +711,7 @@ char *sqlite_mprintf(const char *zFormat, ...){
 */
 char *sqlite_vmprintf(const char *zFormat, va_list ap){
   struct sgMprintf sMprintf;
+  char *zNew;
   char zBuf[200];
   sMprintf.nChar = 0;
   sMprintf.zText = zBuf;
@@ -722,17 +719,12 @@ char *sqlite_vmprintf(const char *zFormat, va_list ap){
   sMprintf.zBase = zBuf;
   vxprintf(mout,&sMprintf,zFormat,ap);
   sMprintf.zText[sMprintf.nChar] = 0;
-  if( sMprintf.zText==sMprintf.zBase ){
-    sMprintf.zText = sqliteMalloc( strlen(zBuf)+1 );
-    if( sMprintf.zText ) strcpy(sMprintf.zText,zBuf);
-  }else{
-    char *z = sqliteRealloc(sMprintf.zText,sMprintf.nChar+1);
-    if( z==0 ){
-      sqliteFree(sMprintf.zText);
-    }
-    sMprintf.zText = z;
+  zNew = malloc( sMprintf.nChar+1 );
+  if( zNew ) strcpy(zNew,sMprintf.zText);
+  if( sMprintf.zText!=sMprintf.zBase ){
+    sqliteFree(sMprintf.zText);
   }
-  return sMprintf.zText;
+  return zNew;
 }
 
 /*
@@ -772,7 +764,7 @@ int sqlite_exec_vprintf(
 
   zSql = sqlite_vmprintf(sqlFormat, ap);
   rc = sqlite_exec(db, zSql, xCallback, pArg, errmsg);
-  sqliteFree(zSql);
+  free(zSql);
   return rc;
 }
 int sqlite_get_table_printf(
@@ -806,6 +798,6 @@ int sqlite_get_table_vprintf(
 
   zSql = sqlite_vmprintf(sqlFormat, ap);
   rc = sqlite_get_table(db, zSql, resultp, nrow, ncolumn, errmsg);
-  sqliteFree(zSql);
+  free(zSql);
   return rc;
 }

diff --git a/src/select.c b/src/select.c
index 882e8885c3c0fe3dab2419aed314bb172aded4f8..73c1f6a3db62d44478c057aac9c092b62c225357 100644 (file)
--- a/src/select.c
+++ b/src/select.c
@@ -12,7 +12,7 @@
 ** This file contains C code routines that are called by the parser
 ** to handle SELECT statements in SQLite.
 **
-** $Id: select.c,v 1.103 2002/07/05 21:42:37 drh Exp $
+** $Id: select.c,v 1.104 2002/07/10 21:26:01 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -626,11 +626,7 @@ static void generateColumnNames(
     p = pEList->a[i].pExpr;
     if( p==0 ) continue;
     showFullNames = (pParse->db->flags & SQLITE_FullColNames)!=0;
-    if( p->span.z && p->span.z[0] && !showFullNames ){
-      int addr = sqliteVdbeAddOp(v,OP_ColumnName, i, 0);
-      sqliteVdbeChangeP3(v, -1, p->span.z, p->span.n);
-      sqliteVdbeCompressSpace(v, addr);
-    }else if( p->op==TK_COLUMN && pTabList ){
+    if( p->op==TK_COLUMN && pTabList ){
       Table *pTab = pTabList->a[p->iTable - base].pTab;
       char *zCol;
       int iCol = p->iColumn;
@@ -643,7 +639,11 @@ static void generateColumnNames(
         zCol = pTab->aCol[iCol].zName;
         zType = pTab->aCol[iCol].zType;
       }
-      if( pTabList->nSrc>1 || showFullNames ){
+      if( p->span.z && p->span.z[0] && !showFullNames ){
+        int addr = sqliteVdbeAddOp(v,OP_ColumnName, i, 0);
+        sqliteVdbeChangeP3(v, -1, p->span.z, p->span.n);
+        sqliteVdbeCompressSpace(v, addr);
+      }else if( pTabList->nSrc>1 || showFullNames ){
         char *zName = 0;
         char *zTab;
  
@@ -657,6 +657,10 @@ static void generateColumnNames(
         sqliteVdbeAddOp(v, OP_ColumnName, i, 0);
         sqliteVdbeChangeP3(v, -1, zCol, 0);
       }
+    }else if( p->span.z && p->span.z[0] && !showFullNames ){
+      int addr = sqliteVdbeAddOp(v,OP_ColumnName, i, 0);
+      sqliteVdbeChangeP3(v, -1, p->span.z, p->span.n);
+      sqliteVdbeCompressSpace(v, addr);
     }else if( p->span.z && p->span.z[0] ){
       int addr = sqliteVdbeAddOp(v,OP_ColumnName, i, 0);
       sqliteVdbeChangeP3(v, -1, p->span.z, p->span.n);

diff --git a/src/shell.c b/src/shell.c
index a3c94bf67f5fd83bc76a960d9ec7979544f897e7..ef31ceeaae94fb7dffb5b802ccfc642820566dca 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.59 2002/06/25 19:31:18 drh Exp $
+** $Id: shell.c,v 1.60 2002/07/10 21:26:01 drh Exp $
 */
 #include <stdlib.h>
 #include <string.h>
@@ -492,8 +492,6 @@ static char zHelp[] =
   ".prompt MAIN CONTINUE  Replace the standard prompts\n"
   ".quit                  Exit this program\n"
   ".read FILENAME         Execute SQL in FILENAME\n"
-  ".reindex ?TABLE?       Rebuild indices\n"
-/*  ".rename OLD NEW        Change the name of a table or index\n" */
   ".schema ?TABLE?        Show the CREATE statements\n"
   ".separator STRING      Change separator string for \"list\" mode\n"
   ".show                  Show the current values for various settings\n"
@@ -754,40 +752,6 @@ static int do_meta_command(char *zLine, sqlite *db, struct callback_data *p){
     }
   }else
 
-  if( c=='r' && strncmp(azArg[0], "reindex", n)==0 ){
-    char **azResult;
-    int nRow, rc;
-    char *zErrMsg;
-    int i;
-    char *zSql;
-    if( nArg==1 ){
-      rc = sqlite_get_table(db,
-        "SELECT name, sql FROM sqlite_master "
-        "WHERE type='index'",
-        &azResult, &nRow, 0, &zErrMsg
-      );
-    }else{
-      rc = sqlite_get_table_printf(db,
-        "SELECT name, sql FROM sqlite_master "
-        "WHERE type='index' AND tbl_name LIKE '%q'",
-        &azResult, &nRow, 0, &zErrMsg, azArg[1]
-      );
-    }
-    for(i=1; rc==SQLITE_OK && i<=nRow; i++){
-      extern char *sqlite_mprintf(const char *, ...);
-      zSql = sqlite_mprintf(
-         "DROP INDEX '%q';\n%s;\nVACUUM '%q';",
-         azResult[i*2], azResult[i*2+1], azResult[i*2]);
-      if( p->echoOn ) printf("%s\n", zSql);
-      rc = sqlite_exec(db, zSql, 0, 0, &zErrMsg);
-    }
-    sqlite_free_table(azResult);
-    if( zErrMsg ){
-      fprintf(stderr,"Error: %s\n", zErrMsg);
-      free(zErrMsg);
-    }
-  }else
-
   if( c=='s' && strncmp(azArg[0], "schema", n)==0 ){
     struct callback_data data;
     char *zErrMsg = 0;

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index fecc6ab58c54ba58bfe4abac900a611e20ab5b29..b8e2a5ee3ced187089f8ac013f7df49051851d64 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -11,7 +11,7 @@
 *************************************************************************
 ** A TCL Interface to SQLite
 **
-** $Id: tclsqlite.c,v 1.36 2002/07/07 17:12:36 drh Exp $
+** $Id: tclsqlite.c,v 1.37 2002/07/10 21:26:01 drh Exp $
 */
 #ifndef NO_TCL     /* Omit this whole file if TCL is unavailable */
 
@@ -93,9 +93,20 @@ static int DbEvalCallback(
         return 1;
       }
       if( cbData->zArray[0] ){
+        Tcl_DString dType;
+        Tcl_DStringInit(&dType);
         Tcl_SetVar2(cbData->interp, cbData->zArray, "*",
              Tcl_DStringValue(&dCol), TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
+        Tcl_DStringAppend(&dType, "typeof:", -1);
+        Tcl_DStringAppend(&dType, Tcl_DStringValue(&dCol), -1);
+        Tcl_DStringFree(&dCol);
+        Tcl_ExternalToUtfDString(NULL, azN[i+argc+1], -1, &dCol);
+        Tcl_SetVar2(cbData->interp, cbData->zArray, 
+             Tcl_DStringValue(&dType), Tcl_DStringValue(&dCol),
+             TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
+        Tcl_DStringFree(&dType);
       }
+      
       Tcl_DStringFree(&dCol);
     }
   }
@@ -152,8 +163,13 @@ static int DbEvalCallback(
   if( azCol==0 || (cbData->once && cbData->zArray[0]) ){
     Tcl_SetVar2(cbData->interp, cbData->zArray, "*", "", 0);
     for(i=0; i<nCol; i++){
+      char *z;
       Tcl_SetVar2(cbData->interp, cbData->zArray, "*", azN[i],
          TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
+      z = sqlite_mprintf("typeof:%s", azN[i]);
+      Tcl_SetVar2(cbData->interp, cbData->zArray, z, azN[i+nCol+1],
+         TCL_LIST_ELEMENT|TCL_APPEND_VALUE);
+      sqlite_freemem(z);
     }
     cbData->once = 0;
   }

diff --git a/src/test1.c b/src/test1.c
index 771b26d61bedb61ed7558a9099059cbadacb0673..6bb76a7ee261a8242e2afd1e197262d780cf19ff 100644 (file)
--- a/src/test1.c
+++ b/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.11 2002/07/01 00:31:36 drh Exp $
+** $Id: test1.c,v 1.12 2002/07/10 21:26:01 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
@@ -331,7 +331,7 @@ static int sqlite_mprintf_int(
   }
   z = sqlite_mprintf(argv[1], a[0], a[1], a[2]);
   Tcl_AppendResult(interp, z, 0);
-  sqliteFree(z);
+  sqlite_freemem(z);
   return TCL_OK;
 }
 
@@ -358,7 +358,7 @@ static int sqlite_mprintf_str(
   }
   z = sqlite_mprintf(argv[1], a[0], a[1], argc>4 ? argv[4] : NULL);
   Tcl_AppendResult(interp, z, 0);
-  sqliteFree(z);
+  sqlite_freemem(z);
   return TCL_OK;
 }
 
@@ -387,7 +387,7 @@ static int sqlite_mprintf_double(
   if( Tcl_GetDouble(interp, argv[4], &r) ) return TCL_ERROR;
   z = sqlite_mprintf(argv[1], a[0], a[1], r);
   Tcl_AppendResult(interp, z, 0);
-  sqliteFree(z);
+  sqlite_freemem(z);
   return TCL_OK;
 }
 

diff --git a/src/threadtest.c b/src/threadtest.c
index 7255ba9196b9c4ac0dff237e52ab6f4c91631249..b85f7d6abc02122ec80ccf6d16dbefb92f35c2ee 100644 (file)
--- a/src/threadtest.c
+++ b/src/threadtest.c
@@ -25,8 +25,6 @@
 #include <string.h>
 #include <unistd.h>
 
-#define sqliteFree(X)  sqliteFree_(X,__FILE__,__LINE__)
-
 /*
 ** Come here to die.
 */
@@ -100,7 +98,7 @@ char **db_query(sqlite *db, const char *zFile, const char *zFormat, ...){
     free(zSql);
     Exit(1);
   }
-  sqliteFree(zSql);
+  sqlite_freemem(zSql);
   if( sResult.azElem==0 ){
     db_query_callback(&sResult, 0, 0, 0);
   }
@@ -123,10 +121,10 @@ void db_execute(sqlite *db, const char *zFile, const char *zFormat, ...){
   if( zErrMsg ){
     fprintf(stderr,"%s: command failed: %s - %s\n", zFile, zSql, zErrMsg);
     free(zErrMsg);
-    sqliteFree(zSql);
+    sqlite_freemem(zSql);
     Exit(1);
   }
-  sqliteFree(zSql);
+  sqlite_freemem(zSql);
 }
 
 /*
@@ -135,7 +133,7 @@ void db_execute(sqlite *db, const char *zFile, const char *zFormat, ...){
 void db_query_free(char **az){
   int i;
   for(i=0; az[i]; i++){
-    sqliteFree(az[i]);
+    sqlite_freemem(az[i]);
   }
   free(az);
 }