Prevent collation sequences and user functions from being deleted or changed while SQL statements are executing. (CVS 2275)

FossilOrigin-Name: cabab62bc10568d435806a7059fad7274f0dd4c8
This commit is contained in:
danielk1977
2005-01-25 04:27:54 +00:00
parent 86c4948198
commit 9636c4e102
7 changed files with 174 additions and 23 deletions
+74 -2
View File
@@ -1,4 +1,4 @@
# 2004 Jan 24
# 2005 Jan 24
#
# The author disclaims copyright to this source code. In place of
# a legal notice, here is a blessing:
@@ -13,7 +13,7 @@
# This file tests the various conditions under which an SQLITE_SCHEMA
# error should be returned.
#
# $Id: schema.test,v 1.2 2005/01/24 13:03:32 danielk1977 Exp $
# $Id: schema.test,v 1.3 2005/01/25 04:27:55 danielk1977 Exp $
#---------------------------------------------------------------------
# When any of the following types of SQL statements or actions are
@@ -31,6 +31,14 @@
#
# Note: Test cases schema-6.* are missing right now.
#
# Test cases schema-9.* and schema-10.* test some specific bugs
# that came up during development.
#
# Test cases schema-11.* test that it is impossible to delete or
# change a collation sequence or user-function while SQL statements
# are executing. Adding new collations or functions is allowed.
#
# Note: Test cases schema-11.* are also missing right now.
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -153,6 +161,26 @@ do_test schema-5.4 {
sqlite3_finalize $::STMT
} {SQLITE_SCHEMA}
#---------------------------------------------------------------------
# Tests 6.* check that prepared statements are invalidated when
# a user-function is deleted (but not when one is added).
do_test schema-6.1 {
set sql {SELECT * FROM abc;}
set ::STMT [sqlite3_prepare $::DB $sql -1 TAIL]
db function hello_function {}
sqlite3_step $::STMT
} {SQLITE_DONE}
do_test schema-6.2 {
sqlite3_reset $::STMT
} {SQLITE_OK}
do_test schema-6.3 {
sqlite_delete_function $::DB hello_function
sqlite3_step $::STMT
} {SQLITE_ERROR}
do_test schema-6.4 {
sqlite3_finalize $::STMT
} {SQLITE_SCHEMA}
#---------------------------------------------------------------------
# Tests 7.* check that prepared statements are invalidated when
# a collation sequence is deleted (but not when one is added).
@@ -255,5 +283,49 @@ do_test schema-10.5 {
db2 close
} {}
#---------------------------------------------------------------------
# Attempting to delete or replace a user-function or collation sequence
# while there are active statements returns an SQLITE_BUSY error.
#
# schema-11.1 - 11.4: User function.
# schema-11.5 - 11.8: Collation sequence.
#
do_test schema-11.1 {
db function tstfunc {}
set sql {SELECT * FROM abc}
set ::STMT [sqlite3_prepare $::DB $sql -1 TAIL]
sqlite3_step $::STMT
} {SQLITE_ROW}
do_test schema-11.2 {
sqlite_delete_function $::DB tstfunc
} {SQLITE_BUSY}
do_test schema-11.3 {
set rc [catch {
db function tstfunc {}
} msg]
list $rc $msg
} {1 {Unable to delete/modify user-function due to active statements}}
do_test schema-11.4 {
sqlite3_finalize $::STMT
} {SQLITE_OK}
do_test schema-11.5 {
db collate tstcollate {}
set sql {SELECT * FROM abc}
set ::STMT [sqlite3_prepare $::DB $sql -1 TAIL]
sqlite3_step $::STMT
} {SQLITE_ROW}
do_test schema-11.6 {
sqlite_delete_collation $::DB tstcollate
} {SQLITE_BUSY}
do_test schema-11.7 {
set rc [catch {
db collate tstcollate {}
} msg]
list $rc $msg
} {1 {Unable to delete/modify collation sequence due to active statements}}
do_test schema-11.8 {
sqlite3_finalize $::STMT
} {SQLITE_OK}
finish_test
+3 -3
View File
@@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this file is testing the SELECT statement.
#
# $Id: select2.test,v 1.23 2005/01/24 12:46:14 drh Exp $
# $Id: select2.test,v 1.24 2005/01/25 04:27:55 danielk1977 Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -71,7 +71,7 @@ ifcapable tclvar {
}
execsql {COMMIT}
}]
set result {}
list
} {}
puts "time with cache: $::t1"
}
@@ -86,7 +86,7 @@ do_test select2-2.0.2 {
}
execsql {COMMIT}
}]
set result {}
list
} {}
puts "time without cache: $t2"
ifcapable tclvar {