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

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

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

View File

@@ -11,7 +11,7 @@
*************************************************************************
** This file contains code used to implement the ATTACH and DETACH commands.
**
** $Id: attach.c,v 1.27 2004/09/05 23:23:42 drh Exp $
** $Id: attach.c,v 1.28 2004/09/06 17:24:12 drh Exp $
*/
#include "sqliteInt.h"
@@ -33,7 +33,7 @@ void sqlite3Attach(
Db *aNew;
int rc, i;
char *zFile, *zName;
sqlite *db;
sqlite3 *db;
Vdbe *v;
v = sqlite3GetVdbe(pParse);
@@ -154,7 +154,7 @@ void sqlite3Attach(
*/
void sqlite3Detach(Parse *pParse, Token *pDbname){
int i;
sqlite *db;
sqlite3 *db;
Vdbe *v;
Db *pDb = 0;
@@ -206,7 +206,7 @@ int sqlite3FixInit(
const char *zType, /* "view", "trigger", or "index" */
const Token *pName /* Name of the view, trigger, or index */
){
sqlite *db;
sqlite3 *db;
if( iDb<0 || iDb==1 ) return 0;
db = pParse->db;