Add support for the extra parameter on the sqlite3_set_authorizer() callback

and support for failing an ATTACH with an authentication-required database
using bad credentials.  The extension is now feature complete, but much
testing and bug-fixing remains.

FossilOrigin-Name: 596e728b0eb19a34c888e33d4d37978ca2bf1e00

diff --git a/ext/userauth/user-auth.txt b/ext/userauth/user-auth.txt
index 85083d01c2112d014bcc768041733afb9e4bd6ec..8b64617c3664268c1a2272b4f50059cc290f8f73 100644 (file)
--- a/ext/userauth/user-auth.txt
+++ b/ext/userauth/user-auth.txt
@@ -1,5 +1,12 @@
-Activate the user authentication logic by compiling SQLite with 
-the -DSQLITE_USER_AUTHENTICATION compile-time option.
+Activate the user authentication logic by including the
+ext/userauth/userauth.c source code file in the build and
+adding the -DSQLITE_USER_AUTHENTICATION compile-time option.
+The ext/userauth/sqlite3userauth.h header file is available to
+applications to define the interface.
+
+When using the SQLite amalgamation, it is sufficient to append
+the ext/userauth/userauth.c source file onto the end of the
+amalgamation.
 
 The following new APIs are available when user authentication is
 activated:
@@ -31,12 +38,16 @@ activated:
      sqlite3 *db,           /* Database connection */
      const char *zUsername  /* Username to remove */
    );
-   
+
+With this extension, a database can be marked as requiring authentication.
+By default a database does not require authentication.
+
 The sqlite3_open(), sqlite3_open16(), and sqlite3_open_v2() interfaces
 work as before: they open a new database connection.  However, if the
-database being opened requires authentication, then the database
-connection will be unusable until after sqlite3_user_authenticate()
-has been called successfully [1c].  The sqlite3_user_authenticate() call
+database being opened requires authentication, then attempts to prepare
+SQL statements (using sqlite3_prepare_v2(), for example) will fail
+with an SQLITE_AUTH error until after sqlite3_user_authenticate()
+has been called successfully.  The sqlite3_user_authenticate() call
 will return SQLITE_OK if the authentication credentials are accepted
 and SQLITE_ERROR if not.
 
@@ -67,13 +78,13 @@ connection is treated as if it was authenticated as an admin user.
 When ATTACH-ing new database files to a connection, each newly attached
 database that is an authentication-required database is checked using
 the same username and password as supplied to the main database.  If that
-check fails, then the ATTACH-ed database is unreadable [1g].
+check fails, then the ATTACH command fails with an SQLITE_AUTH error.
 
 The sqlite3_user_add() interface can be used (by an admin user only)
 to create a new user.  When called on a no-authentication-required
 database and when A is true, the sqlite3_user_add(D,U,P,N,A) routine
 converts the database into an authentication-required database and
-logs the database connection D in using user U with password P,N.
+logs in the database connection D as user U with password P,N.
 To convert a no-authentication-required database into an authentication-
 required database, the isAdmin parameter must be true.  If
 sqlite3_user_add(D,U,P,N,A) is called on a no-authentication-required
@@ -98,17 +109,17 @@ The sqlite3_user_delete() interface can be used (by an admin user only)
 to delete a user.  The currently logged-in user cannot be deleted,
 which guarantees that there is always an admin user and hence that
 the database cannot be converted into a no-authentication-required
-database [3].
+database.
 
 The sqlite3_user_change() interface can be used to change a users
 login credentials or admin privilege.  Any user can change their own
-login credentials [1b].  Only an admin user can change another users login
+password.  Only an admin user can change another users login
 credentials or admin privilege setting.  No user may change their own 
 admin privilege setting.
 
 The sqlite3_set_authorizer() callback is modified to take a 7th parameter
 which is the username of the currently logged in user, or NULL for a
-no-authentication-required database [1d].
+no-authentication-required database.
 
 -----------------------------------------------------------------------------
 Implementation notes:
@@ -133,8 +144,8 @@ The sqlite_user.pw field is encoded by a built-in SQL function
 "sqlite_crypt(X,Y)".  The two arguments are both BLOBs.  The first argument
 is the plaintext password supplied to the sqlite3_user_authenticate()
 interface.  The second argument is the sqlite_user.pw value and is supplied
-so that the function can extra the "salt" used by the password encoder.
-the result of sqlite_crypt(X,Y) is another blob which is the value that
+so that the function can extract the "salt" used by the password encoder.
+The result of sqlite_crypt(X,Y) is another blob which is the value that
 ends up being stored in sqlite_user.pw.  To verify credentials X supplied
 by the sqlite3_user_authenticate() routine, SQLite runs:
 
@@ -145,9 +156,9 @@ password X, sqlite_crypt(X,NULL) is run.  A new random salt is selected
 when the second argument is NULL.
 
 The built-in version of of sqlite_crypt() uses a simple Ceasar-cypher
-which prevents passwords from being revealed by search the raw database
-for ASCII text, but is otherwise trivally broken.  To truly secure the
-passwords, the database should be encrypted using the SQLite Encryption
+which prevents passwords from being revealed by searching the raw database
+for ASCII text, but is otherwise trivally broken.  For better password
+security, the database should be encrypted using the SQLite Encryption
 Extension or similar technology.  Or, the application can use the
 sqlite3_create_function() interface to provide an alternative
 implementation of sqlite_crypt() that computes a stronger password hash,

diff --git a/manifest b/manifest
index ad8259c2fcace52c5692a05d48136d9c6c08bd11..12328063d0c0a13d5df076406b8b865fa0704d2b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Reorder\sparameters\son\sthe\ssqlite3_user_*()\sinterfaces\sfor\sconsistency.\nAdd\sthe\sfirst\sTCL\stest\scases.
-D 2014-09-11T00:27:53.371
+C Add\ssupport\sfor\sthe\sextra\sparameter\son\sthe\ssqlite3_set_authorizer()\scallback\nand\ssupport\sfor\sfailing\san\sATTACH\swith\san\sauthentication-required\sdatabase\nusing\sbad\scredentials.\s\sThe\sextension\sis\snow\sfeature\scomplete,\sbut\smuch\ntesting\sand\sbug-fixing\sremains.
+D 2014-09-11T13:44:52.150
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -145,7 +145,7 @@ F ext/rtree/sqlite3rtree.h 83349d519fe5f518b3ea025d18dd1fe51b1684bd
 F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F ext/userauth/sqlite3userauth.h 19cb6f0e31316d0ee4afdfb7a85ef9da3333a220
-F ext/userauth/user-auth.txt a0340e6219f0b70fde57502c8f6b1c5fdb23023e
+F ext/userauth/user-auth.txt 527aaec593ae34dcaf543324623c8351a5d33d3f
 F ext/userauth/userauth.c a66cd3abcc3b2c10b3999ab49f900d561e8ddd33
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
@@ -166,15 +166,15 @@ F sqlite3.1 3d8b83c91651f53472ca17599dae3457b8b89494
 F sqlite3.pc.in 48fed132e7cb71ab676105d2a4dc77127d8c1f3a
 F src/alter.c ba266a779bc7ce10e52e59e7d3dc79fa342e8fdb
 F src/analyze.c 79383a54fee3b7f1fb03dd4c8c8115583f506de5
-F src/attach.c 3801129015ef59d76bf23c95ef9b0069d18a0c52
-F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
+F src/attach.c cc9b30041dfcd24be0a47986c87c384515c54449
+F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
 F src/btree.c b1c1cd1cc3ae2e433a23b9a6c9ab53805707d8cd
 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
 F src/btreeInt.h e0ecb5dba292722039a7540beb3fc448103273cc
-F src/build.c 3a61555d469de2e0f5bcd1ac4d58a2a19ab093d5
+F src/build.c 4c7aac1ddda782c6f1cad84aeabec6e8d0be7495
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
 F src/complete.c 535183afb3c75628b78ce82612931ac7cdf26f14
 F src/ctime.c 16cd19215d9fd849ee2b7509b092f2e0bbd6a958
@@ -221,7 +221,7 @@ F src/pcache.c 2048affdb09a04478b5fc6e64cb1083078d369be
 F src/pcache.h 9b559127b83f84ff76d735c8262f04853be0c59a
 F src/pcache1.c dab8ab930d4a73b99768d881185994f34b80ecaa
 F src/pragma.c 3b7b1a5e90804006f44c65464c7032ee6a1d24e3
-F src/prepare.c 10dd9833d7aa992baf84b8640224853576119d84
+F src/prepare.c f82c009a763e739c6bdf02a270ccfda9e54f783c
 F src/printf.c e74925089a85e3c9f0e315595f41c139d3d118c2
 F src/random.c d10c1f85b6709ca97278428fd5db5bbb9c74eece
 F src/resolve.c 0d1621e45fffe4b4396477cf46e41a84b0145ffb
@@ -231,11 +231,11 @@ F src/shell.c 7d26b6526fb9daab994265446b751fb86fd9d675
 F src/sqlite.h.in 577876beef2264a0b031c0d744c81855983088f9
 F src/sqlite3.rc 992c9f5fb8285ae285d6be28240a7e8d3a7f2bad
 F src/sqlite3ext.h 1f40357fb9b12a80c5a3b2b109fd249b009213d4
-F src/sqliteInt.h fdc23ef0c5475888d0e532204a7451507ce17206
+F src/sqliteInt.h cb44c24e5c5d52f33bb9e78bfcc9c703b1d178c4
 F src/sqliteLimit.h 164b0e6749d31e0daa1a4589a169d31c0dec7b3d
 F src/status.c 7ac05a5c7017d0b9f0b4bcd701228b784f987158
 F src/table.c 4e28a53e66bad8d014a510ef0205f5497c712b08
-F src/tclsqlite.c 8d6d6833c0053f0b3b1aeb1c5c7a7eeff0ad4d3f
+F src/tclsqlite.c c67d310c833046cccc192125d64ad422ab882684
 F src/test1.c 523cd70ded28db71af9a30ec184cbe0957de9575
 F src/test2.c 98049e51a17dc62606a99a9eb95ee477f9996712
 F src/test3.c 1c0e5d6f080b8e33c1ce8b3078e7013fdbcd560c
@@ -336,9 +336,9 @@ F test/attach2.test 0ec5defa340363de6cd50fd595046465e9aaba2d
 F test/attach3.test 359eb65d00102cdfcef6fa4e81dc1648f8f80b27
 F test/attach4.test 53bf502f17647c6d6c5add46dda6bac8b6f4665c
 F test/attachmalloc.test 3a4bfca9545bfe906a8d2e622de10fbac5b711b0
-F test/auth.test 5bdf154eb28c0e4bbc0473f335858c0d96171768
-F test/auth2.test c3b415b76c033bedb81292118fb7c01f5f10cbcd
-F test/auth3.test a4755e6a2a2fea547ffe63c874eb569e60a28eb5
+F test/auth.test 855233ef26eb3601b6886567ea4e326c72959360
+F test/auth2.test 264c6af53cad9aba5218c68bbe18036e39007bfa
+F test/auth3.test 5cfa94ed90c6617c42b7ba4b133fd79678b251c7
 F test/autoinc.test c58912526998a39e11f66b533e23cfabea7f25b7
 F test/autoindex1.test 762ff3f8e25d852aae55c6462ca166a80c0cde61
 F test/autoindex2.test 60d2fc6f38364308ce73a9beb01b47ded38697de
@@ -479,7 +479,7 @@ F test/fallocate.test 3e979af17dfa7e5e9dda5eba1a696c04fa9d47f7
 F test/filectrl.test 14fa712e42c4cb791e09dfd58a6a03efb47ef13a
 F test/filefmt.test cb34663f126cbc2d358af552dcaf5c72769b0146
 F test/fkey1.test e1d1fa84cde579185ea01358436839703e415a5b
-F test/fkey2.test 32ca728bcb854feed72d1406ea375fe423eebff2
+F test/fkey2.test 1db212cda86b0d3ce72714001f7b6381c321341c
 F test/fkey3.test 76d475c80b84ee7a5d062e56ccb6ea68882e2b49
 F test/fkey4.test 86446017011273aad8f9a99c1a65019e7bd9ca9d
 F test/fkey5.test 8a1fde4e7721ae00b05b3178888833726ca2df8d
@@ -577,7 +577,7 @@ F test/fts3sort.test ed34c716a11cc2009a35210e84ad5f9c102362ca
 F test/fts3tok1.test c551043de056b0b1582a54e878991f57bad074bc
 F test/fts3tok_err.test 52273cd193b9036282f7bacb43da78c6be87418d
 F test/fts3varint.test 752c08ed5d32c5d7dc211b056f4ed68a76b7e36e
-F test/fts4aa.test 0c3152322c7f0b548cc942ad763eaba0da87ccca
+F test/fts4aa.test 10aac8e9d62c7357590acfabe3fad01e9a9ce1cb
 F test/fts4check.test 74d77f6cdb768ac49df5afda575cef14ae3d239a
 F test/fts4content.test 2e7252557d6d24afa101d9ba1de710d6140e6d06
 F test/fts4docid.test e33c383cfbdff0284685604d256f347a18fdbf01
@@ -785,7 +785,7 @@ F test/rowhash.test 0bc1d31415e4575d10cacf31e1a66b5cc0f8be81
 F test/rowid.test b78b30afb9537a73788ca1233a23a32190a3bb1f
 F test/rtree.test 0c8d9dd458d6824e59683c19ab2ffa9ef946f798
 F test/run-wordcount.sh 891e89c4c2d16e629cd45951d4ed899ad12afc09
-F test/savepoint.test 6c53f76dffe5df0dd87646efe3e7aa159c36e07b
+F test/savepoint.test 51d3900dc071a7c2ad4248578a5925631b476313
 F test/savepoint2.test 9b8543940572a2f01a18298c3135ad0c9f4f67d7
 F test/savepoint3.test e328085853b14898d78ceea00dfe7db18bb6a9ec
 F test/savepoint4.test c8f8159ade6d2acd9128be61e1230f1c1edc6cc0
@@ -1068,7 +1068,7 @@ F test/veryquick.test 57ab846bacf7b90cf4e9a672721ea5c5b669b661
 F test/view.test f311691d696a5cc27e3c1b875cec1b0866b4ccd9
 F test/vtab1.test b631d147b198cfd7903ab5fed028eb2a3d321dc6
 F test/vtab2.test 7bcffc050da5c68f4f312e49e443063e2d391c0d
-F test/vtab3.test baad99fd27217f5d6db10660522e0b7192446de1
+F test/vtab3.test b45f47d20f225ccc9c28dc915d92740c2dee311e
 F test/vtab4.test 942f8b8280b3ea8a41dae20e7822d065ca1cb275
 F test/vtab5.test 889f444970393c73f1e077e2bdc5d845e157a391
 F test/vtab6.test 5f5380c425e52993560ab4763db4f826d2ba7b09
@@ -1140,7 +1140,7 @@ F test/with2.test ee227a663586aa09771cafd4fa269c5217eaf775
 F test/withM.test e97f2a8c506ab3ea9eab94e6f6072f6cc924c991
 F test/without_rowid1.test 7862e605753c8d25329f665fa09072e842183151
 F test/without_rowid2.test af260339f79d13cb220288b67cd287fbcf81ad99
-F test/without_rowid3.test eac3d5c8a1924725b58503a368f2cbd24fd6c8a0
+F test/without_rowid3.test 1081aabf60a1e1123b7f9a8f6ae19954351843b0
 F test/without_rowid4.test 4e08bcbaee0399f35d58b5581881e7a6243d458a
 F test/without_rowid5.test b4a639a367f04d382d20e8f44fc1be4f2d57d107
 F test/wordcount.c 9915e06cb33d8ca8109b8700791afe80d305afda
@@ -1197,7 +1197,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 4eaaa7fa87aa912d24f8b35440ab60310dc08310
-R b62ab47ef5a1f118b5c6bf446676036b
+P 2f6d8f32eef526b5912f42ab467e3c7812480d8b
+R 8b68610f4a9d73b92fb9d68a3359baf2
 U drh
-Z 388f9ca2f5e0d91d315989cc617a17a1
+Z 6a1c7f3384e27f9ad12e8ea277382ab2

diff --git a/manifest.uuid b/manifest.uuid
index 2679d57ef95138b062910aa3de8cc4c5ac75dff8..1b3da62f364bcdb76c7a194ee2f55d8851ae6958 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-2f6d8f32eef526b5912f42ab467e3c7812480d8b
\ No newline at end of file
+596e728b0eb19a34c888e33d4d37978ca2bf1e00
\ No newline at end of file

diff --git a/src/attach.c b/src/attach.c
index 89050fd9dc1f5eea8f892a386e4d24e667661052..5763e631ad88c110db91a8de3146d2abfd2de020 100644 (file)
--- a/src/attach.c
+++ b/src/attach.c
@@ -207,6 +207,15 @@ static void attachFunc(
     rc = sqlite3Init(db, &zErrDyn);
     sqlite3BtreeLeaveAll(db);
   }
+#ifdef SQLITE_USER_AUTHENTICATION
+  if( rc==SQLITE_OK ){
+    u8 newAuth = 0;
+    rc = sqlite3UserAuthCheckLogin(db, zName, &newAuth);
+    if( newAuth<db->auth.authLevel ){
+      rc = SQLITE_AUTH;
+    }
+  }
+#endif
   if( rc ){
     int iDb = db->nDb - 1;
     assert( iDb>=2 );

diff --git a/src/auth.c b/src/auth.c
index d38bb836a784fbfab6ab7b03d4e6dd43edc41fa7..1680c9a7c2f8a5c84429abc75d0e84be0e0ec936 100644 (file)
--- a/src/auth.c
+++ b/src/auth.c
@@ -73,7 +73,7 @@ int sqlite3_set_authorizer(
   void *pArg
 ){
   sqlite3_mutex_enter(db->mutex);
-  db->xAuth = xAuth;
+  db->xAuth = (sqlite3_xauth)xAuth;
   db->pAuthArg = pArg;
   sqlite3ExpirePreparedStatements(db);
   sqlite3_mutex_leave(db->mutex);
@@ -108,7 +108,11 @@ int sqlite3AuthReadCol(
   char *zDb = db->aDb[iDb].zName; /* Name of attached database */
   int rc;                         /* Auth callback return code */
 
-  rc = db->xAuth(db->pAuthArg, SQLITE_READ, zTab,zCol,zDb,pParse->zAuthContext);
+  rc = db->xAuth(db->pAuthArg, SQLITE_READ, zTab,zCol,zDb,pParse->zAuthContext
+#ifdef SQLITE_USER_AUTHENTICATION
+                 ,db->auth.zAuthUser
+#endif
+                );
   if( rc==SQLITE_DENY ){
     if( db->nDb>2 || iDb!=0 ){
       sqlite3ErrorMsg(pParse, "access to %s.%s.%s is prohibited",zDb,zTab,zCol);
@@ -208,7 +212,11 @@ int sqlite3AuthCheck(
   if( db->xAuth==0 ){
     return SQLITE_OK;
   }
-  rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext);
+  rc = db->xAuth(db->pAuthArg, code, zArg1, zArg2, zArg3, pParse->zAuthContext
+#ifdef SQLITE_USER_AUTHENTICATION
+                 ,db->auth.zAuthUser
+#endif
+                );
   if( rc==SQLITE_DENY ){
     sqlite3ErrorMsg(pParse, "not authorized");
     pParse->rc = SQLITE_AUTH;

diff --git a/src/build.c b/src/build.c
index f745164e54ea6b32832c5c156e53c8baded56643..c94c5a1310ff363ff42f3072a67fda7e83564f86 100644 (file)
--- a/src/build.c
+++ b/src/build.c
@@ -2075,7 +2075,7 @@ int sqlite3ViewGetColumnNames(Parse *pParse, Table *pTable){
   int nErr = 0;     /* Number of errors encountered */
   int n;            /* Temporarily holds the number of cursors assigned */
   sqlite3 *db = pParse->db;  /* Database connection for malloc errors */
-  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
+  sqlite3_xauth xAuth;       /* Saved xAuth pointer */
 
   assert( pTable );
 

diff --git a/src/prepare.c b/src/prepare.c
index c6752548ff685f7e3190f2ef586f8881c14abad2..c57fda0026314e2a291c60fcac5b5efd562c8ca3 100644 (file)
--- a/src/prepare.c
+++ b/src/prepare.c
@@ -328,7 +328,7 @@ static int sqlite3InitOne(sqlite3 *db, int iDb, char **pzErrMsg){
         db->aDb[iDb].zName, zMasterName);
 #ifndef SQLITE_OMIT_AUTHORIZATION
     {
-      int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
+      sqlite3_xauth xAuth;
       xAuth = db->xAuth;
       db->xAuth = 0;
 #endif

diff --git a/src/sqliteInt.h b/src/sqliteInt.h
index 9ef4e362086effe1003ac280c845f1658fee134b..a9f200145741c6166b41074f8dbf46ba764c13c4 100644 (file)
--- a/src/sqliteInt.h
+++ b/src/sqliteInt.h
@@ -1012,9 +1012,19 @@ int sqlite3UserAuthTable(const char*);
 int sqlite3UserAuthCheckLogin(sqlite3*,const char*,u8*);
 void sqlite3CryptFunc(sqlite3_context*,int,sqlite3_value**);
 
-
 #endif /* SQLITE_USER_AUTHENTICATION */
 
+/*
+** typedef for the authorization callback function.
+*/
+#ifdef SQLITE_USER_AUTHENTICATION
+  typedef int (*sqlite3_xauth)(void*,int,const char*,const char*,const char*,
+                               const char*, const char*);
+#else
+  typedef int (*sqlite3_xauth)(void*,int,const char*,const char*,const char*,
+                               const char*);
+#endif
+
 
 /*
 ** Each database connection is an instance of the following structure.
@@ -1083,8 +1093,7 @@ struct sqlite3 {
   } u1;
   Lookaside lookaside;          /* Lookaside malloc configuration */
 #ifndef SQLITE_OMIT_AUTHORIZATION
-  int (*xAuth)(void*,int,const char*,const char*,const char*,const char*);
-                                /* Access authorization function */
+  sqlite3_xauth xAuth;          /* Access authorization function */
   void *pAuthArg;               /* 1st argument to the access auth function */
 #endif
 #ifndef SQLITE_OMIT_PROGRESS_CALLBACK

diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 945fd9598274d764a38bff914c3ece7c991a986d..756d0daa5a914287f55b0faeb431caf6d0a40b03 100644 (file)
--- a/src/tclsqlite.c
+++ b/src/tclsqlite.c
@@ -872,6 +872,9 @@ static int auth_callback(
   const char *zArg2,
   const char *zArg3,
   const char *zArg4
+#ifdef SQLITE_USER_AUTHENTICATION
+  ,const char *zArg5
+#endif
 ){
   const char *zCode;
   Tcl_DString str;
@@ -924,6 +927,9 @@ static int auth_callback(
   Tcl_DStringAppendElement(&str, zArg2 ? zArg2 : "");
   Tcl_DStringAppendElement(&str, zArg3 ? zArg3 : "");
   Tcl_DStringAppendElement(&str, zArg4 ? zArg4 : "");
+#ifdef SQLITE_USER_AUTHENTICATION
+  Tcl_DStringAppendElement(&str, zArg5 ? zArg5 : "");
+#endif  
   rc = Tcl_GlobalEval(pDb->interp, Tcl_DStringValue(&str));
   Tcl_DStringFree(&str);
   zReply = rc==TCL_OK ? Tcl_GetStringResult(pDb->interp) : "SQLITE_DENY";
@@ -1700,8 +1706,11 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
         pDb->zAuth = 0;
       }
       if( pDb->zAuth ){
+        typedef int (*sqlite3_auth_cb)(
+           void*,int,const char*,const char*,
+           const char*,const char*);
         pDb->interp = interp;
-        sqlite3_set_authorizer(pDb->db, auth_callback, pDb);
+        sqlite3_set_authorizer(pDb->db,(sqlite3_auth_cb)auth_callback,pDb);
       }else{
         sqlite3_set_authorizer(pDb->db, 0, 0);
       }

diff --git a/test/auth.test b/test/auth.test
index 43e53ef2e35d6059382b1d37bea21507659a1af2..f3c2fa79e8bb5a060457a93c410d8cfa8db06698 100644 (file)
--- a/test/auth.test
+++ b/test/auth.test
@@ -36,7 +36,7 @@ proc_real proc {name arguments script} {
 do_test auth-1.1.1 {
   db close
   set ::DB [sqlite3 db test.db]
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -61,7 +61,7 @@ do_test auth-1.2 {
   execsql {SELECT name FROM sqlite_master}
 } {}
 do_test auth-1.3.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -82,7 +82,7 @@ do_test auth-1.4 {
 
 ifcapable tempdb {
   do_test auth-1.5 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
         return SQLITE_DENY
       }
@@ -94,7 +94,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {}
   do_test auth-1.7.1 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -112,7 +112,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.9 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -124,7 +124,7 @@ do_test auth-1.10 {
   execsql {SELECT name FROM sqlite_master}
 } {}
 do_test auth-1.11 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -139,7 +139,7 @@ do_test auth-1.12 {
 
 ifcapable tempdb {
   do_test auth-1.13 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
         return SQLITE_IGNORE
       }
@@ -151,7 +151,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {}
   do_test auth-1.15 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -165,7 +165,7 @@ ifcapable tempdb {
   } {}
   
   do_test auth-1.17 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -181,7 +181,7 @@ ifcapable tempdb {
 
 do_test auth-1.19.1 {
   set ::authargs {}
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TEMP_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -198,7 +198,7 @@ do_test auth-1.20 {
 } {t2}
 
 do_test auth-1.21.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -214,7 +214,7 @@ do_test auth-1.22 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.23.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -232,7 +232,7 @@ do_test auth-1.24 {
 
 ifcapable tempdb {
   do_test auth-1.25 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -245,7 +245,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.27 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -260,7 +260,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.29 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="t2"} {
       return SQLITE_DENY
     }
@@ -272,7 +272,7 @@ do_test auth-1.30 {
   execsql {SELECT * FROM t2}
 } {}
 do_test auth-1.31 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="t2"} {
       return SQLITE_IGNORE
     }
@@ -284,7 +284,7 @@ do_test auth-1.32 {
   execsql {SELECT * FROM t2}
 } {}
 do_test auth-1.33 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="t1"} {
       return SQLITE_IGNORE
     }
@@ -297,7 +297,7 @@ do_test auth-1.34 {
 } {1 2 3}
 
 do_test auth-1.35.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_DENY
     }
@@ -313,7 +313,7 @@ ifcapable attach {
   execsql {DETACH DATABASE two}
 }
 do_test auth-1.36 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_IGNORE
     }
@@ -322,7 +322,7 @@ do_test auth-1.36 {
   catchsql {SELECT * FROM t2}
 } {0 {1 {} 3}}
 do_test auth-1.37 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_IGNORE
     }
@@ -331,7 +331,7 @@ do_test auth-1.37 {
   catchsql {SELECT * FROM t2 WHERE b=2}
 } {0 {}}
 do_test auth-1.38 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="a"} {
       return SQLITE_IGNORE
     }
@@ -340,7 +340,7 @@ do_test auth-1.38 {
   catchsql {SELECT * FROM t2 WHERE b=2}
 } {0 {{} 2 3}}
 do_test auth-1.39 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_IGNORE
     }
@@ -349,7 +349,7 @@ do_test auth-1.39 {
   catchsql {SELECT * FROM t2 WHERE b IS NULL}
 } {0 {1 {} 3}}
 do_test auth-1.40 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_DENY
     }
@@ -359,7 +359,7 @@ do_test auth-1.40 {
 } {1 {access to t2.b is prohibited}}
   
 do_test auth-1.41 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_UPDATE" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_DENY
     }
@@ -371,7 +371,7 @@ do_test auth-1.42 {
   execsql {SELECT * FROM t2}
 } {11 2 3}
 do_test auth-1.43 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_UPDATE" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_DENY
     }
@@ -383,7 +383,7 @@ do_test auth-1.44 {
   execsql {SELECT * FROM t2}
 } {11 2 3}
 do_test auth-1.45 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_UPDATE" && $arg1=="t2" && $arg2=="b"} {
       return SQLITE_IGNORE
     }
@@ -396,7 +396,7 @@ do_test auth-1.46 {
 } {11 2 33}
 
 do_test auth-1.47 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="t2"} {
       return SQLITE_DENY
     }
@@ -408,7 +408,7 @@ do_test auth-1.48 {
   execsql {SELECT * FROM t2}
 } {11 2 33}
 do_test auth-1.49 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="t2"} {
       return SQLITE_IGNORE
     }
@@ -424,7 +424,7 @@ do_test auth-1.50.2 {
 } {}
 
 do_test auth-1.51 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_SELECT"} {
       return SQLITE_DENY
     }
@@ -433,7 +433,7 @@ do_test auth-1.51 {
   catchsql {SELECT * FROM t2}
 } {1 {not authorized}}
 do_test auth-1.52 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_SELECT"} {
       return SQLITE_IGNORE
     }
@@ -442,7 +442,7 @@ do_test auth-1.52 {
   catchsql {SELECT * FROM t2}
 } {0 {}}
 do_test auth-1.53 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_SELECT"} {
       return SQLITE_OK
     }
@@ -462,7 +462,7 @@ do_test auth-1.55 {
 } {11 2 33 7 8 9}
 
 do_test auth-1.63 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
        return SQLITE_DENY
     }
@@ -474,7 +474,7 @@ do_test auth-1.64 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.65 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="t2"} {
        return SQLITE_DENY
     }
@@ -488,7 +488,7 @@ do_test auth-1.66 {
 
 ifcapable tempdb {
   do_test auth-1.67 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
          return SQLITE_DENY
       }
@@ -500,7 +500,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.69 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="t1"} {
          return SQLITE_DENY
       }
@@ -514,7 +514,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.71 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
        return SQLITE_IGNORE
     }
@@ -526,7 +526,7 @@ do_test auth-1.72 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.73 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="t2"} {
        return SQLITE_IGNORE
     }
@@ -540,7 +540,7 @@ do_test auth-1.74 {
 
 ifcapable tempdb {
   do_test auth-1.75 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
          return SQLITE_IGNORE
       }
@@ -552,7 +552,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.77 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="t1"} {
          return SQLITE_IGNORE
       }
@@ -569,7 +569,7 @@ ifcapable tempdb {
 # Omit these if the library was compiled with views omitted.
 ifcapable view {
 do_test auth-1.79 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_VIEW"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4] 
       return SQLITE_DENY
@@ -585,7 +585,7 @@ do_test auth-1.81 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.82 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_VIEW"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4] 
       return SQLITE_IGNORE
@@ -603,7 +603,7 @@ do_test auth-1.84 {
 
 ifcapable tempdb {
   do_test auth-1.85 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_VIEW"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4] 
         return SQLITE_DENY
@@ -619,7 +619,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.88 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_VIEW"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4] 
         return SQLITE_IGNORE
@@ -637,7 +637,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.91 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -649,7 +649,7 @@ do_test auth-1.92 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.93 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -663,7 +663,7 @@ do_test auth-1.94 {
 
 ifcapable tempdb {
   do_test auth-1.95 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
         return SQLITE_DENY
       }
@@ -675,7 +675,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.97 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
         return SQLITE_IGNORE
       }
@@ -689,7 +689,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.99 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -704,7 +704,7 @@ do_test auth-1.100 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 v2}
 do_test auth-1.101 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_VIEW"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -720,7 +720,7 @@ do_test auth-1.103 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 v2}
 do_test auth-1.104 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -732,7 +732,7 @@ do_test auth-1.105 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 v2}
 do_test auth-1.106 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_VIEW"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -748,7 +748,7 @@ do_test auth-1.108 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 v2}
 do_test auth-1.109 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_VIEW"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -767,7 +767,7 @@ do_test auth-1.111 {
 
 ifcapable tempdb {
   do_test auth-1.112 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
         return SQLITE_DENY
       }
@@ -782,7 +782,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 v1}
   do_test auth-1.114 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_VIEW"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -798,7 +798,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 v1}
   do_test auth-1.117 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
         return SQLITE_IGNORE
       }
@@ -810,7 +810,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 v1}
   do_test auth-1.119 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_VIEW"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -826,7 +826,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 v1}
   do_test auth-1.122 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_VIEW"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_OK
@@ -849,7 +849,7 @@ ifcapable tempdb {
 #
 ifcapable trigger&&tempdb {
 do_test auth-1.125 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -869,7 +869,7 @@ do_test auth-1.127 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.128 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -885,7 +885,7 @@ do_test auth-1.129 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.130 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -905,7 +905,7 @@ do_test auth-1.132 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.133 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -921,7 +921,7 @@ do_test auth-1.134 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.135 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -944,7 +944,7 @@ do_test auth-1.136.2 {
   }
 } {r2}
 do_test auth-1.136.3 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     lappend ::authargs $code $arg1 $arg2 $arg3 $arg4
     return SQLITE_OK
   }
@@ -963,7 +963,7 @@ do_test auth-1.137 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 tx r2}
 do_test auth-1.138 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TEMP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -983,7 +983,7 @@ do_test auth-1.140 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1}
 do_test auth-1.141 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
       return SQLITE_DENY
     }
@@ -999,7 +999,7 @@ do_test auth-1.142 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1}
 do_test auth-1.143 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TEMP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1019,7 +1019,7 @@ do_test auth-1.145 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1}
 do_test auth-1.146 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
       return SQLITE_IGNORE
     }
@@ -1035,7 +1035,7 @@ do_test auth-1.147 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1}
 do_test auth-1.148 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_TEMP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1056,7 +1056,7 @@ do_test auth-1.150 {
 } {t1 r1}
 
 do_test auth-1.151 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -1068,7 +1068,7 @@ do_test auth-1.152 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 tx r2}
 do_test auth-1.153 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1084,7 +1084,7 @@ do_test auth-1.155 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 tx r2}
 do_test auth-1.156 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -1096,7 +1096,7 @@ do_test auth-1.157 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 tx r2}
 do_test auth-1.158 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1112,7 +1112,7 @@ do_test auth-1.160 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 tx r2}
 do_test auth-1.161 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1133,7 +1133,7 @@ do_test auth-1.163 {
 } {t2}
 
 do_test auth-1.164 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
       return SQLITE_DENY
     }
@@ -1145,7 +1145,7 @@ do_test auth-1.165 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1 r1}
 do_test auth-1.166 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TEMP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1161,7 +1161,7 @@ do_test auth-1.168 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1 r1}
 do_test auth-1.169 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
       return SQLITE_IGNORE
     }
@@ -1173,7 +1173,7 @@ do_test auth-1.170 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1 r1}
 do_test auth-1.171 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TEMP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1189,7 +1189,7 @@ do_test auth-1.173 {
   execsql {SELECT name FROM sqlite_temp_master}
 } {t1 r1}
 do_test auth-1.174 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_TEMP_TRIGGER"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1207,7 +1207,7 @@ do_test auth-1.176 {
 } ;# ifcapable trigger
 
 do_test auth-1.177 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_INDEX"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1223,7 +1223,7 @@ do_test auth-1.179 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.180 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -1235,7 +1235,7 @@ do_test auth-1.181 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.182 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_INDEX"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1251,7 +1251,7 @@ do_test auth-1.184 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.185 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_INSERT" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -1263,7 +1263,7 @@ do_test auth-1.186 {
   execsql {SELECT name FROM sqlite_master}
 } {t2}
 do_test auth-1.187 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_CREATE_INDEX"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1281,7 +1281,7 @@ do_test auth-1.189 {
 
 ifcapable tempdb {
   do_test auth-1.190 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_INDEX"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -1297,7 +1297,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.193 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
         return SQLITE_DENY
       }
@@ -1309,7 +1309,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.195 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_INDEX"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -1325,7 +1325,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.198 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_INSERT" && $arg1=="sqlite_temp_master"} {
         return SQLITE_IGNORE
       }
@@ -1337,7 +1337,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1}
   do_test auth-1.200 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_CREATE_TEMP_INDEX"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_OK
@@ -1355,7 +1355,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.203 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
       return SQLITE_DENY
     }
@@ -1367,7 +1367,7 @@ do_test auth-1.204 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 i2}
 do_test auth-1.205 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_INDEX"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1383,7 +1383,7 @@ do_test auth-1.207 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 i2}
 do_test auth-1.208 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && $arg1=="sqlite_master"} {
       return SQLITE_IGNORE
     }
@@ -1395,7 +1395,7 @@ do_test auth-1.209 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 i2}
 do_test auth-1.210 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_INDEX"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1411,7 +1411,7 @@ do_test auth-1.212 {
   execsql {SELECT name FROM sqlite_master}
 } {t2 i2}
 do_test auth-1.213 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DROP_INDEX"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1429,7 +1429,7 @@ do_test auth-1.215 {
 
 ifcapable tempdb {
   do_test auth-1.216 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
         return SQLITE_DENY
       }
@@ -1441,7 +1441,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 i1}
   do_test auth-1.218 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_INDEX"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -1457,7 +1457,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 i1}
   do_test auth-1.221 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DELETE" && $arg1=="sqlite_temp_master"} {
         return SQLITE_IGNORE
       }
@@ -1469,7 +1469,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 i1}
   do_test auth-1.223 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_INDEX"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -1485,7 +1485,7 @@ ifcapable tempdb {
     execsql {SELECT name FROM sqlite_temp_master}
   } {t1 i1}
   do_test auth-1.226 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DROP_TEMP_INDEX"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_OK
@@ -1503,7 +1503,7 @@ ifcapable tempdb {
 }
 
 do_test auth-1.229 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_PRAGMA"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1519,7 +1519,7 @@ do_test auth-1.231 {
   execsql2 {SELECT a FROM t2}
 } {a 11 a 7}
 do_test auth-1.232 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_PRAGMA"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1535,7 +1535,7 @@ do_test auth-1.234 {
   execsql2 {SELECT a FROM t2}
 } {a 11 a 7}
 do_test auth-1.235 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_PRAGMA"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1548,7 +1548,7 @@ do_test auth-1.236 {
   execsql2 {SELECT a FROM t2}
 } {t2.a 11 t2.a 7}
 do_test auth-1.237 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_PRAGMA"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1565,7 +1565,7 @@ do_test auth-1.239 {
 } {a 11 a 7}
 
 do_test auth-1.240 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_TRANSACTION"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1578,7 +1578,7 @@ do_test auth-1.241 {
   set ::authargs
 } {BEGIN {} {} {}}
 do_test auth-1.242 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_TRANSACTION" && $arg1!="BEGIN"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1618,7 +1618,7 @@ do_test auth-1.250 {
 ifcapable attach {
   do_test auth-1.251 {
     db authorizer ::auth
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_ATTACH"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       }
@@ -1644,7 +1644,7 @@ ifcapable attach {
   } {{} {} {} {}}
   do_test auth-1.253 {
     catchsql {DETACH DATABASE test1}
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_ATTACH"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -1660,7 +1660,7 @@ ifcapable attach {
   } {}
   do_test auth-1.255 {
     catchsql {DETACH DATABASE test1}
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_ATTACH"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -1675,7 +1675,7 @@ ifcapable attach {
     lindex [execsql {PRAGMA database_list}] 7
   } {}
   do_test auth-1.257 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DETACH"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_OK
@@ -1692,7 +1692,7 @@ ifcapable attach {
   } {}
   do_test auth-1.259 {
     execsql {ATTACH DATABASE ':memory:' AS test1}
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_DETACH"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -1710,7 +1710,7 @@ ifcapable attach {
     } {test1}
     } ;# ifcapable schema_pragmas
     do_test auth-1.261 {
-      proc auth {code arg1 arg2 arg3 arg4} {
+      proc auth {code arg1 arg2 arg3 arg4 args} {
         if {$code=="SQLITE_DETACH"} {
           set ::authargs [list $arg1 $arg2 $arg3 $arg4]
           return SQLITE_DENY
@@ -1735,7 +1735,7 @@ ifcapable attach {
     ifcapable altertable {
     
       do_test auth-1.263 {
-        proc auth {code arg1 arg2 arg3 arg4} {
+        proc auth {code arg1 arg2 arg3 arg4 args} {
           if {$code=="SQLITE_ALTER_TABLE"} {
             set ::authargs [list $arg1 $arg2 $arg3 $arg4]
             return SQLITE_OK
@@ -1753,7 +1753,7 @@ ifcapable attach {
         set authargs
       } {temp t1 {} {}}
       do_test auth-1.266 {
-        proc auth {code arg1 arg2 arg3 arg4} {
+        proc auth {code arg1 arg2 arg3 arg4 args} {
           if {$code=="SQLITE_ALTER_TABLE"} {
             set ::authargs [list $arg1 $arg2 $arg3 $arg4]
             return SQLITE_IGNORE
@@ -1771,7 +1771,7 @@ ifcapable attach {
         set authargs
       } {temp t1x {} {}}
       do_test auth-1.269 {
-        proc auth {code arg1 arg2 arg3 arg4} {
+        proc auth {code arg1 arg2 arg3 arg4 args} {
           if {$code=="SQLITE_ALTER_TABLE"} {
             set ::authargs [list $arg1 $arg2 $arg3 $arg4]
             return SQLITE_DENY
@@ -1804,7 +1804,7 @@ db authorizer {}
 catchsql {ALTER TABLE t1x RENAME TO t1}
 db authorizer ::auth
 do_test auth-1.272 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_ALTER_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_OK
@@ -1822,7 +1822,7 @@ do_test auth-1.274 {
   set authargs
 } {main t2 {} {}}
 do_test auth-1.275 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_ALTER_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_IGNORE
@@ -1840,7 +1840,7 @@ do_test auth-1.277 {
   set authargs
 } {main t2x {} {}}
 do_test auth-1.278 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_ALTER_TABLE"} {
       set ::authargs [list $arg1 $arg2 $arg3 $arg4]
       return SQLITE_DENY
@@ -1867,7 +1867,7 @@ ifcapable reindex {
 
 proc auth {code args} {
   if {$code=="SQLITE_REINDEX"} {
-    set ::authargs [concat $::authargs $args]
+    set ::authargs [concat $::authargs [lrange $args 0 3]]
   }
   return SQLITE_OK
 }
@@ -1950,7 +1950,7 @@ ifcapable tempdb {
   } {t3_idx2 {} temp {} t3_idx1 {} temp {} sqlite_autoindex_t3_1 {} temp {}}
   proc auth {code args} {
     if {$code=="SQLITE_REINDEX"} {
-      set ::authargs [concat $::authargs $args]
+      set ::authargs [concat $::authargs [lrange $args 0 3]]
       return SQLITE_DENY
     }
     return SQLITE_OK
@@ -1973,7 +1973,7 @@ ifcapable tempdb {
 ifcapable analyze {
   proc auth {code args} {
     if {$code=="SQLITE_ANALYZE"} {
-      set ::authargs [concat $::authargs $args]
+      set ::authargs [concat $::authargs [lrange $args 0 3]]
     }
     return SQLITE_OK
   }
@@ -2020,7 +2020,7 @@ ifcapable analyze {
 ifcapable {altertable} {
   do_test auth-1.300 {
     execsql {CREATE TABLE t5(x)}
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_ALTER_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_OK
@@ -2039,7 +2039,7 @@ ifcapable {altertable} {
     set authargs
   } {main t5 {} {}}
   do_test auth-1.303 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_ALTER_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_IGNORE
@@ -2058,7 +2058,7 @@ ifcapable {altertable} {
     set authargs
   } {main t5 {} {}}
   do_test auth-1.306 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_ALTER_TABLE"} {
         set ::authargs [list $arg1 $arg2 $arg3 $arg4]
         return SQLITE_DENY
@@ -2082,7 +2082,7 @@ ifcapable {altertable} {
 
 ifcapable {cte} {
   do_test auth-1.310 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_RECURSIVE"} {
         return SQLITE_DENY
       }
@@ -2117,7 +2117,7 @@ ifcapable {cte} {
 } ;# ifcapable cte
 
 do_test auth-2.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t3" && $arg2=="x"} {
       return SQLITE_DENY
     }
@@ -2137,7 +2137,7 @@ do_test auth-2.3 {
   catchsql {SELECT OID,y,z FROM t3}
 } {1 {access to t3.x is prohibited}}
 do_test auth-2.4 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t3" && $arg2=="x"} {
       return SQLITE_IGNORE
     }
@@ -2150,7 +2150,7 @@ do_test auth-2.5 {
   catchsql {SELECT rowid,y,z FROM t3}
 } {0 {{} 55 66}}
 do_test auth-2.6 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t3" && $arg2=="ROWID"} {
       return SQLITE_IGNORE
     }
@@ -2162,7 +2162,7 @@ do_test auth-2.7 {
   catchsql {SELECT ROWID,y,z FROM t3}
 } {0 {44 55 66}}
 do_test auth-2.8 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="ROWID"} {
       return SQLITE_IGNORE
     }
@@ -2181,7 +2181,7 @@ do_test auth-2.9.1 {
   #
   db cache flush
 
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="ROWID"} {
       return bogus
     }
@@ -2193,7 +2193,7 @@ do_test auth-2.9.2 {
   db errorcode
 } {1}
 do_test auth-2.10 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_SELECT"} {
       return bogus
     }
@@ -2202,7 +2202,7 @@ do_test auth-2.10 {
   catchsql {SELECT ROWID,b,c FROM t2}
 } {1 {authorizer malfunction}}
 do_test auth-2.11.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg2=="a"} {
       return SQLITE_IGNORE
     }
@@ -2211,7 +2211,7 @@ do_test auth-2.11.1 {
   catchsql {SELECT * FROM t2, t3}
 } {0 {{} 2 33 44 55 66 {} 8 9 44 55 66}}
 do_test auth-2.11.2 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_READ" && $arg2=="x"} {
       return SQLITE_IGNORE
     }
@@ -2224,7 +2224,7 @@ do_test auth-2.11.2 {
 #
 ifcapable trigger {
   do_test auth-3.1 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       return SQLITE_OK
     }
     execsql {
@@ -2237,7 +2237,7 @@ ifcapable trigger {
     }
   } {11 12 2 2 33 33 7 8 8 8 9 9}
   do_test auth-3.2 {
-    proc auth {code arg1 arg2 arg3 arg4} {
+    proc auth {code arg1 arg2 arg3 arg4 args} {
       if {$code=="SQLITE_READ" && $arg1=="t2" && $arg2=="c"} {
         return SQLITE_IGNORE
       }
@@ -2255,7 +2255,7 @@ ifcapable trigger {
 #
 ifcapable trigger {
 do_test auth-4.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     lappend ::authargs $code $arg1 $arg2 $arg3 $arg4
     return SQLITE_OK
   }
@@ -2340,7 +2340,7 @@ do_test auth-4.5 {
 # clause.
 #
 do_test auth-5.1 {
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     return SQLITE_OK
   }
   execsql {
@@ -2393,7 +2393,7 @@ ifcapable trigger {
   } {}
   set ::authargs [list]
   proc auth {args} {
-    eval lappend ::authargs $args
+    eval lappend ::authargs [lrange $args 0 4]
     return SQLITE_OK
   }
   do_test auth-5.3.2 {
@@ -2419,7 +2419,7 @@ do_test auth-6.1 {
 } {}
 set ::authargs [list]
 proc auth {args} {
-  eval lappend ::authargs $args
+  eval lappend ::authargs [lrange $args 0 4]
   return SQLITE_OK
 }
 do_test auth-6.2 {

diff --git a/test/auth2.test b/test/auth2.test
index 65e0591249c25a76a1793a5245ea8f657ac3daba..a9d64d08af837e4b2d7fc7c3e26b5a6b2e524029 100644 (file)
--- a/test/auth2.test
+++ b/test/auth2.test
@@ -31,7 +31,7 @@ do_test auth2-1.1 {
     INSERT INTO t1 VALUES(1,2,3);
   }
   set ::flist {}
-  proc auth {code arg1 arg2 arg3 arg4} {
+  proc auth {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_FUNCTION"} {
       lappend ::flist $arg2
       if {$arg2=="max"} {
@@ -80,7 +80,7 @@ sqlite3 db test.db
 sqlite3 db2 test.db
 proc auth {args} {
   global authargs
-  append authargs $args\n
+  append authargs [lrange $args 0 4]\n
   return SQLITE_OK
 }
 db auth auth

diff --git a/test/auth3.test b/test/auth3.test
index 21e2b3b65da5cef3bec9ec5e7b0467b64fc21f52..eef10b398f03f43d4b0b62b55cb94aac846c6dcc 100644 (file)
--- a/test/auth3.test
+++ b/test/auth3.test
@@ -30,7 +30,7 @@ if {[catch {db auth {}} msg]} {
 db cache size 0
 
 db authorizer ::auth
-proc auth {code arg1 arg2 arg3 arg4} {
+proc auth {code arg1 arg2 arg3 arg4 args} {
   if {$code=="SQLITE_DELETE"} {
     return $::authcode
   }

diff --git a/test/fkey2.test b/test/fkey2.test
index 4c8daa0b0282ade6f07c2ac38b1b9c1ed3a90f82..53b90dc91c21131f78025e0b978d1cd4e713b66e 100644 (file)
--- a/test/fkey2.test
+++ b/test/fkey2.test
@@ -1554,7 +1554,7 @@ ifcapable auth {
     }
   } {}
 
-  proc auth {args} {eval lappend ::authargs $args ; return SQLITE_OK}
+  proc auth {args} {eval lappend ::authargs [lrange $args 0 4]; return SQLITE_OK}
   db auth auth
 
   # An insert on the parent table must read the child key of any deferred

diff --git a/test/fts4aa.test b/test/fts4aa.test
index 88550c99f781cda98b75f32309a45cefa182deb1..e6c7f9336e417058518280366791a0ecf59edc22 100644 (file)
--- a/test/fts4aa.test
+++ b/test/fts4aa.test
@@ -170,7 +170,7 @@ foreach {q r} [array get fts4aa_res] {
 # Should get the same search results when an authorizer prevents
 # all PRAGMA statements.
 #
-proc no_pragma_auth {code arg1 arg2 arg3 arg4} {
+proc no_pragma_auth {code arg1 arg2 arg3 arg4 args} {
   if {$code=="SQLITE_PRAGMA"} {return SQLITE_DENY}
   return SQLITE_OK;
 }

diff --git a/test/savepoint.test b/test/savepoint.test
index 9f4571abefa4993d9157edcdf99418f424eaf77e..9362c8fe195ea4d0af4f27d2184468c5bee24a7c 100644 (file)
--- a/test/savepoint.test
+++ b/test/savepoint.test
@@ -561,7 +561,7 @@ do_test savepoint-8-2 {
 #
 ifcapable auth {
   proc auth {args} {
-    eval lappend ::authdata $args
+    eval lappend ::authdata [lrange $args 0 4]
     return SQLITE_OK
   }
   db auth auth
@@ -583,7 +583,7 @@ ifcapable auth {
   } {SQLITE_SAVEPOINT RELEASE sp1 {} {}}
 
   proc auth {args} {
-    eval lappend ::authdata $args
+    eval lappend ::authdata [lrange $args 0 4]
     return SQLITE_DENY
   }
   db auth auth

diff --git a/test/vtab3.test b/test/vtab3.test
index ebf8369d5df2a76db0777fbb925791f6302f2514..e8c6982a57c41c3b4f6fe17c9180931437d1502c 100644 (file)
--- a/test/vtab3.test
+++ b/test/vtab3.test
@@ -25,7 +25,7 @@ set ::auth_fail 0
 set ::auth_log [list]
 set ::auth_filter [list SQLITE_READ SQLITE_UPDATE SQLITE_SELECT SQLITE_PRAGMA]
 
-proc auth {code arg1 arg2 arg3 arg4} {
+proc auth {code arg1 arg2 arg3 arg4 args} {
   if {[lsearch $::auth_filter $code]>-1} {
     return SQLITE_OK
   }

diff --git a/test/without_rowid3.test b/test/without_rowid3.test
index c4c2d6f48312e00744e691de180686a1f341fac0..a0dc76d3f99221f075fd043fb12694d9b3b09ff0 100644 (file)
--- a/test/without_rowid3.test
+++ b/test/without_rowid3.test
@@ -1621,7 +1621,7 @@ ifcapable auth {
     }
   } {}
 
-  proc auth {args} {eval lappend ::authargs $args ; return SQLITE_OK}
+  proc auth {args} {eval lappend ::authargs [lrange $args 0 4]; return SQLITE_OK}
   db auth auth
 
   # An insert on the parent table must read the child key of any deferred