The sqlite TCL command no longer returns the hex address of the sqlite3*

structure. Instead there is a new command in testfixture to find that information. (CVS 2852) FossilOrigin-Name: 70b228575e045bc56013aab945334203ceb31d8b
2025-08-01 06:27:03 +03:00 · 2006-01-03 00:33:50 +00:00
parent 88f474a938
commit dddca28608
27 changed files with 162 additions and 131 deletions
--- a/test/alter.test
+++ b/test/alter.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is testing the ALTER TABLE statement.
 #
-# $Id: alter.test,v 1.11 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: alter.test,v 1.12 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -144,7 +144,8 @@ do_test alter-1.5 {
 ifcapable tempdb {
  do_test alter-1.6 {
    db close
-    set DB [sqlite3 db test.db]
+    sqlite3 db test.db
+    set DB [sqlite3_connection_pointer db]
    execsql {
      CREATE TEMP TABLE objlist(type, name, tbl_name);
      INSERT INTO objlist SELECT type, name, tbl_name FROM sqlite_master;
--- a/test/alter2.test
+++ b/test/alter2.test
@ -13,7 +13,7 @@
 # file format change that may be used in the future to implement
 # "ALTER TABLE ... ADD COLUMN".
 #
-# $Id: alter2.test,v 1.4 2005/03/10 12:52:47 drh Exp $
+# $Id: alter2.test,v 1.5 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -250,8 +250,7 @@ do_test alter2-4.3 {
  sqlite3_errcode $::DB
 } {SQLITE_ERROR}
 do_test alter2-4.4 {
-  db close
-  set ::DB [sqlite3 db test.db]
+  set ::DB [sqlite3_connection_pointer db]
  catchsql {
    SELECT * FROM sqlite_master;
  }
@ -284,7 +283,8 @@ do_test alter2-5.3 {
 do_test alter2-6.1 {
  db close
  set_file_format 2
-  set ::DB [sqlite3 db test.db]
+  sqlite3 db test.db
+  set ::DB [sqlite3_connection_pointer db]
  get_file_format
 } {2}
 do_test alter2-6.2 {
--- a/test/attach2.test
+++ b/test/attach2.test
@ -12,7 +12,7 @@
 # focus of this script is testing the ATTACH and DETACH commands
 # and related functionality.
 #
-# $Id: attach2.test,v 1.34 2005/12/30 16:28:02 danielk1977 Exp $
+# $Id: attach2.test,v 1.35 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -129,8 +129,7 @@ do_test attach2-2.12 {
 # Ticket #574:  Make sure it works using the non-callback API
 #
 do_test attach2-3.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  set rc [catch {sqlite3_prepare $DB "ATTACH 'test2.db' AS t2" -1 TAIL} VM]
  if {$rc} {lappend rc $VM}
  sqlite3_step $VM
--- a/test/autoinc.test
+++ b/test/autoinc.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is testing the AUTOINCREMENT features.
 #
-# $Id: autoinc.test,v 1.8 2005/11/14 22:29:06 drh Exp $
+# $Id: autoinc.test,v 1.9 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -512,7 +512,8 @@ do_test autoinc-8.1 {
  catch {db2 close}
  catch {db close}
  file delete -force test.db
-  set DB [sqlite3 db test.db]
+  sqlite3 db test.db
+  set DB [sqlite3_connection_pointer db]
  set STMT [sqlite3_prepare $DB {
     CREATE TABLE t1(
       x INTEGER PRIMARY KEY AUTOINCREMENT
--- a/test/bind.test
+++ b/test/bind.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_bind API.
 #
-# $Id: bind.test,v 1.35 2005/12/09 20:54:35 drh Exp $
+# $Id: bind.test,v 1.36 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -35,8 +35,7 @@ proc sqlite_step {stmt N VALS COLS} {
 }

 do_test bind-1.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  execsql {CREATE TABLE t1(a,b,c);}
  set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES(:1,?,:abc)} -1 TAIL]
  set TAIL
--- a/test/bindxfer.test
+++ b/test/bindxfer.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the sqlite_transfer_bindings() API.
 #
-# $Id: bindxfer.test,v 1.1 2005/04/22 02:38:39 drh Exp $
+# $Id: bindxfer.test,v 1.2 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -35,8 +35,7 @@ proc sqlite_step {stmt VALS COLS} {
 }

 do_test bindxfer-1.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  execsql {CREATE TABLE t1(a,b,c);}
  set VM1 [sqlite3_prepare $DB {SELECT ?, ?, ?} -1 TAIL]
  set TAIL
--- a/test/blob.test
+++ b/test/blob.test
@ -10,7 +10,7 @@
 #***********************************************************************
 # This file implements regression tests for SQLite library.
 #
-# $Id: blob.test,v 1.4 2005/08/23 11:17:59 drh Exp $
+# $Id: blob.test,v 1.5 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -104,7 +104,8 @@ do_test blob-2.4 {

 # Try to bind a blob value to a prepared statement.
 do_test blob-3.0 {
-  set DB [sqlite3 db2 test.db]
+  sqlite3 db2 test.db
+  set DB [sqlite3_connection_pointer db2]
  set STMT [sqlite3_prepare $DB "DELETE FROM t1 WHERE a = ?" -1 DUMMY]
  sqlite3_bind_blob $STMT 1 "\x12\x34\x56" 3
  sqlite3_step $STMT
--- a/test/capi2.test
+++ b/test/capi2.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the callback-free C/C++ API.
 #
-# $Id: capi2.test,v 1.26 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: capi2.test,v 1.27 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -48,8 +48,7 @@ proc get_column_names {STMT} {
 # Check basic functionality
 #
 do_test capi2-1.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  execsql {CREATE TABLE t1(a,b,c)}
  set VM [sqlite3_prepare $DB {SELECT name, rowid FROM sqlite_master} -1 TAIL]
  set TAIL
--- a/test/capi3.test
+++ b/test/capi3.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script testing the callback-free C/C++ API.
 #
-# $Id: capi3.test,v 1.35 2005/12/16 01:06:18 drh Exp $
+# $Id: capi3.test,v 1.36 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -51,8 +51,7 @@ proc utf8 {str} {
 # capi3-6.*: Test that sqlite3_close fails if there are outstanding VMs.
 #

-db close
-set DB [sqlite3 db test.db]
+set DB [sqlite3_connection_pointer db]

 do_test capi3-1.0 {
  sqlite3_get_autocommit $DB
@ -463,7 +462,8 @@ set ::ENC [execsql {pragma encoding}]
 db close

 do_test capi3-6.0 {
-  set DB [sqlite3_open test.db]
+  sqlite3 db test.db
+  set DB [sqlite3_connection_pointer db]
  sqlite3_key $DB xyzzy
  set sql {SELECT a FROM t1 order by rowid}
  set STMT [sqlite3_prepare $DB $sql -1 TAIL]
@ -482,6 +482,7 @@ do_test capi3-6.3 {
 do_test capi3-6.4 {
  sqlite3_close $DB
 } {SQLITE_OK}
+db close

 if {![sqlite3 -has-codec]} {
  # Test what happens when the library encounters a newer file format.
@ -610,7 +611,8 @@ foreach {code english} $code2english {
 if {[info command sqlite_malloc_stat]!=""} {
 set sqlite_malloc_fail 1
 do_test capi3-10-1 {
-  set ::DB [sqlite3 db test.db]
+  sqlite3 db test.db
+  set DB [sqlite3_connection_pointer db]
  sqlite_malloc_fail 1
  catchsql {
    select * from sqlite_master;
@ -631,7 +633,8 @@ sqlite_malloc_fail 0
 # The following tests - capi3-11.* - test that a COMMIT or ROLLBACK
 # statement issued while there are still outstanding VMs that are part of
 # the transaction fails.
-set DB [sqlite3 db test.db]
+sqlite3 db test.db
+set DB [sqlite3_connection_pointer db]
 sqlite_register_test_function $DB func
 do_test capi3-11.1 {
  execsql {
--- a/test/capi3b.test
+++ b/test/capi3b.test
@ -13,16 +13,16 @@
 # particular the behavior of sqlite3_step() when trying to commit
 # with lock contention.
 #
-# $Id: capi3b.test,v 1.2 2004/09/03 00:27:57 drh Exp $
+# $Id: capi3b.test,v 1.3 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl


-db close
-set DB [sqlite3 db test.db]
-set DB2 [sqlite3 db2 test.db]
+set DB [sqlite3_connection_pointer db]
+sqlite3 db2 test.db
+set DB2 [sqlite3_connection_pointer db2]

 # Create some data in the database
 #
--- a/test/delete.test
+++ b/test/delete.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the DELETE FROM statement.
 #
-# $Id: delete.test,v 1.20 2005/10/05 11:35:09 drh Exp $
+# $Id: delete.test,v 1.21 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -277,7 +277,8 @@ do_test delete-8.0 {
 db close
 catch {file attributes test.db -permissions 0444}
 catch {file attributes test.db -readonly 1}
-set ::DB [sqlite3 db test.db]
+sqlite3 db test.db
+set ::DB [sqlite3_connection_pointer db]
 do_test delete-8.1 {
  catchsql {
    DELETE FROM t3;
--- a/test/delete2.test
+++ b/test/delete2.test
@ -29,7 +29,7 @@
 # The solution to the problem was to detect that the table is locked
 # before the index entry is deleted.
 #
-# $Id: delete2.test,v 1.4 2004/11/22 10:02:23 danielk1977 Exp $
+# $Id: delete2.test,v 1.5 2006/01/03 00:33:50 drh Exp $
 #

 set testdir [file dirname $argv0]
@ -38,8 +38,7 @@ source $testdir/tester.tcl
 # Create a table that has an index.
 #
 do_test delete2-1.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  execsql {
    CREATE TABLE q(s string, id string, constraint pk_q primary key(id));
    BEGIN;
--- a/test/enc2.test
+++ b/test/enc2.test
@ -13,7 +13,7 @@
 # various suported unicode encodings (UTF-8, UTF-16, UTF-16le and
 # UTF-16be).
 #
-# $Id: enc2.test,v 1.24 2005/12/14 20:11:31 drh Exp $
+# $Id: enc2.test,v 1.25 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -71,7 +71,7 @@ proc run_test_script {t enc} {

 # Open the database and pull out a (the) row.
 do_test $t.1 {
-  set DB [sqlite3 db test.db]
+  sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
  execsql {SELECT * FROM t1}
 } {one I 1}

@ -190,7 +190,7 @@ proc test_collate {enc lhs rhs} {
 }

 file delete -force test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-5.0 {
  execsql {
    CREATE TABLE t5(a);
@ -219,7 +219,7 @@ do_test enc2-5.3 {

 db close
 file delete -force test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 execsql {pragma encoding = 'UTF-16LE'}
 do_test enc2-5.4 {
  execsql {
@ -249,7 +249,7 @@ do_test enc2-5.7 {

 db close
 file delete -force test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 execsql {pragma encoding = 'UTF-16BE'}
 do_test enc2-5.8 {
  execsql {
@ -297,7 +297,7 @@ db close
 file delete -force test.db

 do_test enc2-5.15 {
-  set ::DB [sqlite3 db test.db]
+  sqlite3 db test.db; set ::DB [sqlite3_connection_pointer db]
  add_test_collate_needed $::DB
  set ::sqlite_last_needed_collation
 } {}
@ -316,7 +316,7 @@ proc test_function {enc arg} {
 }

 file delete -force test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 execsql {pragma encoding = 'UTF-8'}
 do_test enc2-6.0 {
  execsql {
@ -331,7 +331,7 @@ do_test enc2-6.1 {
  }
 } {{UTF-8 sqlite}}
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-6.2 {
  add_test_function $DB 0 1 0
  execsql {
@ -339,7 +339,7 @@ do_test enc2-6.2 {
  }
 } {{UTF-16LE sqlite}}
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-6.3 {
  add_test_function $DB 0 0 1
  execsql {
@ -349,7 +349,7 @@ do_test enc2-6.3 {

 db close
 file delete -force test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 execsql {pragma encoding = 'UTF-16LE'}
 do_test enc2-6.3 {
  execsql {
@ -364,7 +364,7 @@ do_test enc2-6.4 {
  }
 } {{UTF-16LE sqlite}}
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-6.5 {
  add_test_function $DB 0 1 0
  execsql {
@ -372,7 +372,7 @@ do_test enc2-6.5 {
  }
 } {{UTF-16LE sqlite}}
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-6.6 {
  add_test_function $DB 0 0 1
  execsql {
@ -382,7 +382,7 @@ do_test enc2-6.6 {

 db close
 file delete -force test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 execsql {pragma encoding = 'UTF-16BE'}
 do_test enc2-6.7 {
  execsql {
@ -397,7 +397,7 @@ do_test enc2-6.8 {
  }
 } {{UTF-16BE sqlite}}
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-6.9 {
  add_test_function $DB 0 1 0
  execsql {
@ -405,7 +405,7 @@ do_test enc2-6.9 {
  }
 } {{UTF-16LE sqlite}}
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test enc2-6.10 {
  add_test_function $DB 0 0 1
  execsql {
--- a/test/func.test
+++ b/test/func.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing built-in functions.
 #
-# $Id: func.test,v 1.42 2005/11/14 22:29:06 drh Exp $
+# $Id: func.test,v 1.43 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -295,8 +295,7 @@ do_test func-9.1 {
 # the user-defined SQL function APIs that are not used by the built-in
 # functions.
 #
-db close
-set ::DB [sqlite3 db test.db]
+set ::DB [sqlite3_connection_pointer db]
 sqlite_register_test_function $::DB testfunc
 do_test func-10.1 {
  catchsql {
@ -441,8 +440,7 @@ do_test func-13.6 {

 # Test that auxilary data is preserved between calls for SQL variables.
 do_test func-13.7 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  set sql "SELECT test_auxdata( ? , a ) FROM t4;"
  set STMT [sqlite3_prepare $DB $sql -1 TAIL]
  sqlite3_bind_text $STMT 1 hello -1
--- a/test/interrupt.test
+++ b/test/interrupt.test
@ -11,13 +11,12 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this script is the sqlite_interrupt() API.
 #
-# $Id: interrupt.test,v 1.11 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: interrupt.test,v 1.12 2006/01/03 00:33:50 drh Exp $


 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
-db close
-set DB [sqlite3 db test.db]
+set DB [sqlite3_connection_pointer db]

 # Compute a checksum on the entire database.
 #
--- a/test/misc4.test
+++ b/test/misc4.test
@ -13,7 +13,7 @@
 # This file implements tests for miscellanous features that were
 # left out of other test files.
 #
-# $Id: misc4.test,v 1.20 2005/09/08 10:37:01 drh Exp $
+# $Id: misc4.test,v 1.21 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -22,8 +22,7 @@ source $testdir/tester.tcl
 # a rollback.  Then try to execute the prepared statement.
 #
 do_test misc4-1.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  execsql {
    CREATE TABLE t1(x);
    INSERT INTO t1 VALUES(1);
--- a/test/misuse.test
+++ b/test/misuse.test
@ -13,7 +13,7 @@
 # This file implements tests for the SQLITE_MISUSE detection logic.
 # This test file leaks memory and file descriptors.
 #
-# $Id: misuse.test,v 1.10 2005/01/24 10:26:00 danielk1977 Exp $
+# $Id: misuse.test,v 1.11 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -41,7 +41,7 @@ do_test misuse-1.1 {
  db close
  catch {file delete -force test2.db}
  catch {file delete -force test2.db-journal}
-  set ::DB [sqlite3 db test2.db]
+  sqlite3 db test2.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    CREATE TABLE t1(a,b);
    INSERT INTO t1 VALUES(1,2);
@ -89,7 +89,7 @@ do_test misuse-1.6 {
 #
 do_test misuse-2.1 {
  db close
-  set ::DB [sqlite3 db test2.db]
+  sqlite3 db test2.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    SELECT * FROM t1
  }
@ -121,7 +121,7 @@ do_test misuse-2.5 {
 #
 do_test misuse-3.1 {
  db close
-  set ::DB [sqlite3 db test2.db]
+  sqlite3 db test2.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    SELECT * FROM t1
  }
@ -155,7 +155,7 @@ do_test misuse-3.5 {
 # VMs. The sqlite3_close call would return SQLITE_BUSY.
 do_test misuse-4.1 {
  db close
-  set ::DB [sqlite3 db test2.db]
+  sqlite3 db test2.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    SELECT * FROM t1
  }
@ -188,7 +188,7 @@ do_test misuse-4.5 {
 #
 do_test misuse-5.1 {
  db close
-  set ::DB [sqlite3 db test2.db]
+  sqlite3 db test2.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    SELECT * FROM t1
  }
--- a/test/pragma.test
+++ b/test/pragma.test
@ -12,7 +12,7 @@
 #
 # This file implements tests for the PRAGMA command.
 #
-# $Id: pragma.test,v 1.36 2005/05/22 20:30:39 drh Exp $
+# $Id: pragma.test,v 1.37 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -38,7 +38,7 @@ source $testdir/tester.tcl
 #
 db close
 file delete test.db
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]

 ifcapable pager_pragmas {
 do_test pragma-1.1 {
@ -109,7 +109,7 @@ do_test pragma-1.8 {
 } {123 123 2}
 do_test pragma-1.9.1 {
  db close
-  set ::DB [sqlite3 db test.db]
+  sqlite3 db test.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    PRAGMA cache_size;
    PRAGMA default_cache_size;
@ -144,7 +144,7 @@ do_test pragma-1.11 {
 } {123 123 2}
 do_test pragma-1.12 {
  db close
-  set ::DB [sqlite3 db test.db]
+  sqlite3 db test.db; set ::DB [sqlite3_connection_pointer db]
  execsql {
    PRAGMA cache_size;
    PRAGMA default_cache_size;
@ -462,7 +462,7 @@ do_test pragma-8.1.6 {
 # to reload the schema. This has to be done using the C-API test functions,
 # because the TCL API accounts for SCHEMA_ERROR and retries the query.
 do_test pragma-8.1.7 {
-  set ::DB2 [sqlite3 db2 test.db]
+  sqlite3 db2 test.db; set ::DB2 [sqlite3_connection_pointer db2]
  execsql {
    SELECT * FROM t4;
  } db2
@ -504,7 +504,7 @@ do_test pragma-8.1.13 {
 # And check that modifying the schema-version in an attached database
 # forces the second connection to reload the schema.
 do_test pragma-8.1.14 {
-  set ::DB2 [sqlite3 db2 test.db]
+  sqlite3 db2 test.db; set ::DB2 [sqlite3_connection_pointer db2]
  execsql {
    ATTACH 'test2.db' AS aux;
    SELECT * FROM aux.t1;
--- a/test/rollback.test
+++ b/test/rollback.test
@ -13,13 +13,12 @@
 # caused by an ON CONFLICT ROLLBACK clause aborts any other pending
 # statements.
 #
-# $Id: rollback.test,v 1.2 2005/01/12 13:04:55 danielk1977 Exp $
+# $Id: rollback.test,v 1.3 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl

-db close
-set DB [sqlite3 db test.db]
+set DB [sqlite3_connection_pointer db]

 do_test rollback-1.1 {
  execsql {
--- a/test/safety.test
+++ b/test/safety.test
@ -13,14 +13,13 @@
 # functions.  Those routines are not strictly necessary - they are
 # designed to detect misuse of the library.
 #
-# $Id: safety.test,v 1.1 2005/01/11 15:28:33 drh Exp $
+# $Id: safety.test,v 1.2 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl

 do_test safety-1.1 {
-  db close
-  set DB [sqlite3 db test.db]
+  set DB [sqlite3_connection_pointer db]
  db eval {CREATE TABLE t1(a)}
  sqlite_set_magic $DB SQLITE_MAGIC_BUSY
  catchsql {
--- a/test/tester.tcl
+++ b/test/tester.tcl
@ -11,7 +11,7 @@
 # This file implements some common TCL routines used for regression
 # testing the SQLite library
 #
-# $Id: tester.tcl,v 1.55 2005/12/30 16:28:02 danielk1977 Exp $
+# $Id: tester.tcl,v 1.56 2006/01/03 00:33:50 drh Exp $

 # Make sure tclsqlite3 was compiled correctly.  Abort now with an
 # error message if not.
@ -61,7 +61,8 @@ if {[sqlite3 -has-codec] && [info command sqlite_orig]==""} {
 catch {db close}
 file delete -force test.db
 file delete -force test.db-journal
-set ::DB [sqlite3 db ./test.db]
+sqlite3 db ./test.db
+set ::DB [sqlite3_connection_pointer db]
 if {[info exists ::SETUP_SQL]} {
  db eval $::SETUP_SQL
 }
--- a/test/trace.test
+++ b/test/trace.test
@ -12,7 +12,7 @@
 #
 # This file implements tests for the "sqlite3_trace()" API.
 #
-# $Id: trace.test,v 1.5 2005/08/29 23:00:05 drh Exp $
+# $Id: trace.test,v 1.6 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -53,7 +53,7 @@ do_test trace-1.5 {
 # happens on each execution.
 #
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test trace-2.1 {
  set STMT [sqlite3_prepare $DB {INSERT INTO t1 VALUES(2,3)} -1 TAIL]
  db trace trace_proc
@ -116,7 +116,7 @@ do_test trace-3.5 {
 # happens on each execution.
 #
 db close
-set DB [sqlite3 db test.db]
+sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
 do_test trace-4.1 {
  set STMT [sqlite3_prepare $DB {INSERT INTO t2 VALUES(2,3)} -1 TAIL]
  db trace trace_proc
--- a/test/vacuum.test
+++ b/test/vacuum.test
@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is testing the VACUUM statement.
 #
-# $Id: vacuum.test,v 1.35 2005/03/29 03:11:00 danielk1977 Exp $
+# $Id: vacuum.test,v 1.36 2006/01/03 00:33:50 drh Exp $

 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@ -217,7 +217,7 @@ do_test vacuum-3.1 {
 #
 do_test vacuum-4.1 {
  db close
-  set DB [sqlite3 db test.db]
+  sqlite3 db test.db; set DB [sqlite3_connection_pointer db]
  set VM [sqlite3_prepare $DB {VACUUM} -1 TAIL]
  sqlite3_step $VM
 } {SQLITE_DONE}