1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-05 15:55:57 +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

@@ -53,7 +53,7 @@ void sqlite3BeginTrigger(
Trigger *pTrigger;
Table *pTab;
char *zName = 0; /* Name of the trigger */
sqlite *db = pParse->db;
sqlite3 *db = pParse->db;
int iDb; /* The database to store the trigger in */
Token *pName; /* The unqualified db name */
DbFixer sFix;
@@ -191,7 +191,7 @@ void sqlite3FinishTrigger(
Token *pAll /* Token that describes the complete CREATE TRIGGER */
){
Trigger *nt = 0; /* The trigger whose construction is finishing up */
sqlite *db = pParse->db; /* The database */
sqlite3 *db = pParse->db; /* The database */
DbFixer sFix;
if( pParse->nErr || pParse->pNewTrigger==0 ) goto triggerfinish_cleanup;
@@ -419,7 +419,7 @@ void sqlite3DropTrigger(Parse *pParse, SrcList *pName){
const char *zDb;
const char *zName;
int nName;
sqlite *db = pParse->db;
sqlite3 *db = pParse->db;
if( sqlite3_malloc_failed ) goto drop_trigger_cleanup;
if( SQLITE_OK!=sqlite3ReadSchema(pParse) ){
@@ -463,7 +463,7 @@ static Table *tableOfTrigger(sqlite3 *db, Trigger *pTrigger){
void sqlite3DropTriggerPtr(Parse *pParse, Trigger *pTrigger, int nested){
Table *pTable;
Vdbe *v;
sqlite *db = pParse->db;
sqlite3 *db = pParse->db;
int iDb;
iDb = pTrigger->iDb;