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

Fix a naming conflict between sqlite versions 2 and 3. An open sqlite3

Browse Source 
connection now *must* be called "sqlite3".  You cannot call it "sqlite".
This might break existing code. (CVS 1941)

FossilOrigin-Name: 3ddf5a9d1c480a2e3aa32685879063b11afddbe1
This commit is contained in:
drh
2004-09-06 17:24:11 +00:00
parent 873cdcb2ce
commit 9bb575fd72
31 changed files with 203 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/select.c
View File

@@ -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.206 2004/09/01 03:06:35 drh Exp $
** $Id: select.c,v 1.207 2004/09/06 17:24:13 drh Exp $
*/
#include "sqliteInt.h"
@@ -565,7 +565,7 @@ static void generateSortTail(
KeyInfo *pInfo;
ExprList *pOrderBy;
int nCol, i;
sqlite *db = pParse->db;
sqlite3 *db = pParse->db;
if( eDest==SRT_Sorter ) return;
pOrderBy = p->pOrderBy;
@@ -720,7 +720,7 @@ static void generateColumnNames(
){
Vdbe *v = pParse->pVdbe;
int i, j;
sqlite *db = pParse->db;
sqlite3 *db = pParse->db;
int fullNames, shortNames;
/* If this is an EXPLAIN, skip this step */
@@ -1253,7 +1253,7 @@ static void computeLimitRegisters(Parse *pParse, Select *p){
static int openTempIndex(Parse *pParse, Select *p, int iTab, int keyAsData){
KeyInfo *pKeyInfo;
int nColumn;
sqlite *db = pParse->db;
sqlite3 *db = pParse->db;
int i;
Vdbe *v = pParse->pVdbe;
int addr;