mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-07 02:42:48 +03:00
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
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
Reference in New Issue
Block a user