database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-14 00:22:38 +03:00
Code Activity

Bug fix in pragma table_info(). (CVS 3440)

Browse Source 
FossilOrigin-Name: c037403bae0d78f9dd2703ff05cc3cd3ac54e062
This commit is contained in:
drh
2006-09-25 13:48:30 +00:00
parent 2e584cd250
commit 6f8359865d
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Remove\slegacy\scruft\sfrom\sshell.c.\s(CVS\s3439) C Bug\sfix\sin\spragma\stable_info().\s(CVS\s3440)
D 2006-09-25T13:09:23 D 2006-09-25T13:48:30
F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99 F Makefile.in cabd42d34340f49260bc2a7668c38eba8d4cfd99
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -79,7 +79,7 @@ F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c 0f966f7fa225c377da2021fbbfdd50a48d877000 F src/pager.c 0f966f7fa225c377da2021fbbfdd50a48d877000
F src/pager.h 0cff9de5e9019cb695a04d18df8caaaff933a272 F src/pager.h 0cff9de5e9019cb695a04d18df8caaaff933a272
F src/parse.y 8c79a1debbd92a4f5609511e9bf0222de78f5ecb F src/parse.y 8c79a1debbd92a4f5609511e9bf0222de78f5ecb
F src/pragma.c dcb79b8170231f3aed99d4004b4d0a0fc14c4b4d F src/pragma.c eac5926df7e10b68fd6ff7bb9188fb296883502c
F src/prepare.c 3d9a1bb0644e8bccb3b78cb0833d269719237f4e F src/prepare.c 3d9a1bb0644e8bccb3b78cb0833d269719237f4e
F src/printf.c b179b6ed12f793e028dd169e2e2e2b2a37eedc63 F src/printf.c b179b6ed12f793e028dd169e2e2e2b2a37eedc63
F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261 F src/random.c d40f8d356cecbd351ccfab6eaedd7ec1b54f5261
@@ -399,7 +399,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 20d7b29443ea7d9ec1ef81219c74ba725e8711e3 P 815d8f84b317d26a3ca87405d27376e1e4493d8b
R 60510ec2b80e60b23c8e8f8a7bf4e900 R 871ac05fe83e4a84b72b5166004ffd47
U drh U drh
Z f2443117c38a4d8a389c6ba3feada653 Z cbd41848a05680adddcda293356aa0eb

2
manifest.uuid
View File

@@ -1 +1 @@
815d8f84b317d26a3ca87405d27376e1e4493d8b c037403bae0d78f9dd2703ff05cc3cd3ac54e062

8
src/pragma.c
View File

@@ -11,7 +11,7 @@
************************************************************************* *************************************************************************
** This file contains code used to implement the PRAGMA command. ** This file contains code used to implement the PRAGMA command.
** **
** $Id: pragma.c,v 1.122 2006/08/14 14:23:42 drh Exp $ ** $Id: pragma.c,v 1.123 2006/09/25 13:48:30 drh Exp $
*/ */
#include "sqliteInt.h" #include "sqliteInt.h"
#include "os.h" #include "os.h"
@@ -490,7 +490,11 @@ void sqlite3Pragma(
pCol->zType ? pCol->zType : "", 0); pCol->zType ? pCol->zType : "", 0);
sqlite3VdbeAddOp(v, OP_Integer, pCol->notNull, 0); sqlite3VdbeAddOp(v, OP_Integer, pCol->notNull, 0);
pDflt = pCol->pDflt ? &pCol->pDflt->span : &noDflt; pDflt = pCol->pDflt ? &pCol->pDflt->span : &noDflt;
sqlite3VdbeOp3(v, OP_String8, 0, 0, (char*)pDflt->z, pDflt->n); if( pDflt->z ){
sqlite3VdbeOp3(v, OP_String8, 0, 0, (char*)pDflt->z, pDflt->n);
}else{
sqlite3VdbeAddOp(v, OP_Null, 0, 0);
}
sqlite3VdbeAddOp(v, OP_Integer, pCol->isPrimKey, 0); sqlite3VdbeAddOp(v, OP_Integer, pCol->isPrimKey, 0);
sqlite3VdbeAddOp(v, OP_Callback, 6, 0); sqlite3VdbeAddOp(v, OP_Callback, 6, 0);
} }