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

Back out check-in (3058) - it breaks too much application code. (CVS 3063)

Browse Source 
FossilOrigin-Name: 731f1e3245fafbda24355d5bdc5b249c4229305f
This commit is contained in:
drh
2006-02-09 16:52:23 +00:00
parent deb802cd83
commit 9f6696ac9f
5 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/pragma.c
View File

@@ -11,7 +11,7 @@
*************************************************************************
** This file contains code used to implement the PRAGMA command.
**
** $Id: pragma.c,v 1.115 2006/02/06 21:34:27 drh Exp $
** $Id: pragma.c,v 1.116 2006/02/09 16:52:24 drh Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -469,15 +469,13 @@ void sqlite3Pragma(
if( pTab ){
int i;
Column *pCol;
sqlite3VdbeSetNumCols(v, 8);
sqlite3VdbeSetNumCols(v, 6);
sqlite3VdbeSetColName(v, 0, "cid", P3_STATIC);
sqlite3VdbeSetColName(v, 1, "name", P3_STATIC);
sqlite3VdbeSetColName(v, 2, "type", P3_STATIC);
sqlite3VdbeSetColName(v, 3, "notnull", P3_STATIC);
sqlite3VdbeSetColName(v, 4, "dflt_value", P3_STATIC);
sqlite3VdbeSetColName(v, 5, "pk", P3_STATIC);
sqlite3VdbeSetColName(v, 6, "autoinc", P3_STATIC);
sqlite3VdbeSetColName(v, 7, "collseq", P3_STATIC);
sqlite3ViewGetColumnNames(pParse, pTab);
for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){
sqlite3VdbeAddOp(v, OP_Integer, i, 0);
@@ -487,10 +485,7 @@ void sqlite3Pragma(
sqlite3VdbeAddOp(v, OP_Integer, pCol->notNull, 0);
sqlite3ExprCode(pParse, pCol->pDflt);
sqlite3VdbeAddOp(v, OP_Integer, pCol->isPrimKey, 0);
sqlite3VdbeAddOp(v, OP_Integer, pCol->isPrimKey && pTab->autoInc, 0);
sqlite3VdbeOp3(v, OP_String8, 0, 0,
pCol->zColl ? pCol->zColl : "binary", 0);
sqlite3VdbeAddOp(v, OP_Callback, 8, 0);
sqlite3VdbeAddOp(v, OP_Callback, 6, 0);
}
}
}else