Fix a compilation issue in the "userauth" extension. Also fix a few test

script errors that occur with SQLITE_USER_AUTHENTICATION=1 builds.
flame4 · Sep 19, 2018 · 4c98ab8 · 4c98ab8
1 parent c6ecdc6
commit 4c98ab8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/ext/userauth/userauth.c b/ext/userauth/userauth.c
@@ -210,7 +210,7 @@ int sqlite3_user_authenticate(
   db->auth.nAuthPW = nPW;
   rc = sqlite3UserAuthCheckLogin(db, "main", &authLevel);
   db->auth.authLevel = authLevel;
-  sqlite3ExpirePreparedStatements(db);
+  sqlite3ExpirePreparedStatements(db, 0);
   if( rc ){
     return rc;           /* OOM error, I/O error, etc. */
   }

diff --git a/test/alterauth.test b/test/alterauth.test
@@ -24,7 +24,7 @@ set testprefix alterauth
 set ::auth [list]
 proc xAuth {type args} {
   if {$type == "SQLITE_ALTER_TABLE"} {
-    lappend ::auth [concat $type $args]
+    lappend ::auth [concat $type [lrange $args 0 3]]
   }
   return SQLITE_OK
 }

diff --git a/test/auth.test b/test/auth.test
@@ -2598,7 +2598,8 @@ do_test auth-8.2 {
 # invocation with no column name specified, compilation fails.
 #
 set ::authargs [list]
-proc auth {op a b c d} {
+proc auth {op args} {
+  foreach {a b c d} $args break
   lappend ::authargs $op $a $b $c $d
   if {$op == "SQLITE_READ"} { return "SQLITE_DENY" }
   return "SQLITE_OK"

diff --git a/test/releasetest.tcl b/test/releasetest.tcl
@@ -136,6 +136,7 @@ array set ::Configs [strip_comments {
     -DSQLITE_ENABLE_STAT4
     -DSQLITE_ENABLE_RBU
     -DSQLITE_MAX_ATTACHED=125
+    -DSQLITE_USER_AUTHENTICATION=1
     -DLONGDOUBLE_TYPE=double
     --enable-session
   }

diff --git a/test/view.test b/test/view.test
@@ -682,7 +682,8 @@ do_test view-25.1 {
   }
   proc authLogDelete {code arg1 arg2 arg3 arg4 args} {
     if {$code=="SQLITE_DELETE" && [string match sqlite_stat* $arg1]} {
-      lappend ::log [list $code $arg1 $arg2 $arg3 $arg4 $args]
+      # lappend ::log [list $code $arg1 $arg2 $arg3 $arg4 $args]
+      lappend ::log [list $code $arg1 $arg2 $arg3 $arg4]
     }
     return SQLITE_OK
   }
@@ -692,8 +693,8 @@ do_test view-25.1 {
   set log
 } {}
 
-set res [list {SQLITE_DELETE sqlite_stat1 {} main {} {}}]
-ifcapable stat4 { lappend res {SQLITE_DELETE sqlite_stat4 {} main {} {}} }
+set res [list {SQLITE_DELETE sqlite_stat1 {} main {}}]
+ifcapable stat4 { lappend res {SQLITE_DELETE sqlite_stat4 {} main {}} }
 do_test view-25.2 {
   set log ""
   db eval {DROP TABLE t25;}