Further work on the new API. All the functions to execute queries are there

now. (CVS 1427)

FossilOrigin-Name: fc94575d77f9865e1553bb70c2e3eda2a0b8669e

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.11 2004/05/21 01:47:27 danielk1977 Exp $
+# $Id: capi2.test,v 1.12 2004/05/21 10:08:55 danielk1977 Exp $
 #
 
 set testdir [file dirname $argv0]
@@ -57,7 +57,7 @@ do_test capi2-1.9 {
   list $N $VALUES $COLNAMES
 } {0 {} {}}
 do_test capi2-1.10 {
-  sqlite_finalize $VM
+  sqlite3_finalize $VM
 } {}
 
 # Check to make sure that the "tail" of a multi-statement SQL script
@@ -84,7 +84,7 @@ do_test capi2-2.3 {
   lappend r $n $val $colname
 } {SQLITE_DONE 2 {} {name rowid text INTEGER}}
 do_test capi2-2.4 {
-  sqlite_finalize $VM
+  sqlite3_finalize $VM
 } {}
 do_test capi2-2.5 {
   set VM [sqlite3_prepare $DB $SQL -1 SQL]
@@ -97,7 +97,7 @@ do_test capi2-2.6 {
   lappend r $n $val $colname
 } {SQLITE_DONE 2 {} {name rowid text INTEGER}}
 do_test capi2-2.7 {
-  sqlite_finalize $VM
+  sqlite3_finalize $VM
 } {}
 do_test capi2-2.8 {
   set VM [sqlite3_prepare $DB $SQL -1 SQL]
@@ -149,7 +149,7 @@ do_test capi2-3.7 {
   list [sqlite_step $VM N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_ROW 1 {{}} {5/0 NUMERIC}}
 do_test capi2-3.8 {
-  sqlite_finalize $VM
+  sqlite3_finalize $VM
 } {}
 do_test capi2-3.9 {
   execsql {CREATE UNIQUE INDEX i1 ON t1(a)}
@@ -165,11 +165,11 @@ do_test capi2-3.10 {
 } {SQLITE_DONE 0 {} {}}
 do_test capi2-3.10b {db changes} {1}
 do_test capi2-3.11 {
-  sqlite_finalize $VM
+  sqlite3_finalize $VM
 } {}
 do_test capi2-3.11b {db changes} {1}
 do_test capi2-3.12 {
-  list [catch {sqlite_finalize $VM} msg] [set msg]
+  list [catch {sqlite3_finalize $VM} msg] [set msg]
 } {1 {(21) library routine called out of sequence}}
 do_test capi2-3.13 {
   set VM [sqlite3_prepare $DB {INSERT INTO t1 VALUES(1,3,4)} -1 TAIL]
@@ -177,7 +177,7 @@ do_test capi2-3.13 {
 } {SQLITE_ERROR 0 {} {}}
 do_test capi2-3.13b {db changes} {0}
 do_test capi2-3.14 {
-  list [catch {sqlite_finalize $VM} msg] [set msg]
+  list [catch {sqlite3_finalize $VM} msg] [set msg]
 } {1 {(19) column a is not unique}}
 do_test capi2-3.15 {
   set VM [sqlite3_prepare $DB {CREATE TABLE t2(a NOT NULL, b)} -1 TAIL]
@@ -187,14 +187,14 @@ do_test capi2-3.16 {
   list [sqlite_step $VM N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_DONE 0 {} {}}
 do_test capi2-3.17 {
-  list [catch {sqlite_finalize $VM} msg] [set msg]
+  list [catch {sqlite3_finalize $VM} msg] [set msg]
 } {0 {}}
 do_test capi2-3.18 {
   set VM [sqlite3_prepare $DB {INSERT INTO t2 VALUES(NULL,2)} -1 TAIL]
   list [sqlite_step $VM N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_ERROR 0 {} {}}
 do_test capi2-3.19 {
-  list [catch {sqlite_finalize $VM} msg] [set msg]
+  list [catch {sqlite3_finalize $VM} msg] [set msg]
 } {1 {(19) t2.a may not be NULL}}
 
 # Two or more virtual machines exists at the same time.
@@ -218,7 +218,7 @@ do_test capi2-4.5 {
   execsql {SELECT * FROM t2 ORDER BY a}
 } {2 3}
 do_test capi2-4.6 {
-  list [catch {sqlite_finalize $VM2} msg] [set msg]
+  list [catch {sqlite3_finalize $VM2} msg] [set msg]
 } {0 {}}  
 do_test capi2-4.7 {
   list [sqlite_step $VM3 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
@@ -227,7 +227,7 @@ do_test capi2-4.8 {
   execsql {SELECT * FROM t2 ORDER BY a}
 } {2 3 3 4}
 do_test capi2-4.9 {
-  list [catch {sqlite_finalize $VM3} msg] [set msg]
+  list [catch {sqlite3_finalize $VM3} msg] [set msg]
 } {0 {}}  
 do_test capi2-4.10 {
   list [sqlite_step $VM1 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
@@ -236,7 +236,7 @@ do_test capi2-4.11 {
   execsql {SELECT * FROM t2 ORDER BY a}
 } {1 2 2 3 3 4}
 do_test capi2-4.12 {
-  list [catch {sqlite_finalize $VM1} msg] [set msg]
+  list [catch {sqlite3_finalize $VM1} msg] [set msg]
 } {0 {}}  
 
 # Interleaved SELECTs
@@ -266,13 +266,13 @@ do_test capi2-5.7 {
   list [sqlite_step $VM3 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_DONE 2 {} {a b {} {}}}
 do_test capi2-5.8 {
-  list [catch {sqlite_finalize $VM3} msg] [set msg]
+  list [catch {sqlite3_finalize $VM3} msg] [set msg]
 } {0 {}}  
 do_test capi2-5.9 {
   list [sqlite_step $VM1 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_ROW 2 {1 2} {a b {} {}}}
 do_test capi2-5.10 {
-  list [catch {sqlite_finalize $VM1} msg] [set msg]
+  list [catch {sqlite3_finalize $VM1} msg] [set msg]
 } {0 {}}  
 do_test capi2-5.11 {
   list [sqlite_step $VM2 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
@@ -281,7 +281,7 @@ do_test capi2-5.12 {
   list [sqlite_step $VM2 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_ROW 2 {1 2} {a b {} {}}}
 do_test capi2-5.11 {
-  list [catch {sqlite_finalize $VM2} msg] [set msg]
+  list [catch {sqlite3_finalize $VM2} msg] [set msg]
 } {0 {}}  
 
 # Check for proper SQLITE_BUSY returns.
@@ -341,7 +341,7 @@ do_test capi2-6.13 {
 do_test capi2-6.14 {
   list [sqlite_step $VM1 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_ROW 1 6 {x counter}}
-# puts [list [catch {sqlite_finalize $VM1} msg] [set msg]]; exit
+# puts [list [catch {sqlite3_finalize $VM1} msg] [set msg]]; exit
 do_test capi2-6.15 {
   execsql {SELECT * FROM t1}
 } {1 2 3}
@@ -391,7 +391,7 @@ do_test capi2-6.28 {
   list [sqlite_step $VM1 N VALUE COLNAME] [set N] [set VALUE] [set COLNAME]
 } {SQLITE_ROW 1 13 {x counter}}
 do_test capi2-6.99 {
-  list [catch {sqlite_finalize $VM1} msg] [set msg]
+  list [catch {sqlite3_finalize $VM1} msg] [set msg]
 } {0 {}}
 catchsql {ROLLBACK}
 
@@ -458,7 +458,7 @@ do_test capi2-7.12 {
 #
 do_test capi2-8.1 {
   set VM1 [sqlite3_prepare $DB {SELECT * FROM t2} -1 TAIL]
-  sqlite_finalize $VM1
+  sqlite3_finalize $VM1
 } {}
   
 # Tickets #384 and #385 - make sure the TAIL argument to sqlite3_prepare
@@ -467,7 +467,7 @@ do_test capi2-8.1 {
 do_test capi2-9.1 {
   set VM1 [sqlite3_prepare $DB {SELECT * FROM t2} -1 DUMMY]
   sqlite_step $VM1
-  sqlite_finalize $VM1
+  sqlite3_finalize $VM1
 } {}
 
 db2 close