fixed test 8 db and started a test 9 for multi-threading

6 files changed, 114 insertions, 5 deletions

diff --git a/tests/GNUmakefile b/tests/GNUmakefile
index 1a70297..c84d19b 100644
--- a/tests/GNUmakefile
+++ b/tests/GNUmakefile
@@ -23,7 +23,8 @@ TEST_CPP_BINS = \
 	test5$(EXE) \
 	test6$(EXE) \
 	test7$(EXE) \
-	test8$(EXE)
+	test8$(EXE) \
+	test9$(EXE)
 
 TEST_BINS = \
 	testc$(EXE)
@@ -48,6 +49,7 @@ test5$(EXE): $(TOPDIR)/src/libsqlite3xx.a
 test6$(EXE): $(TOPDIR)/src/libsqlite3xx.a
 test7$(EXE): $(TOPDIR)/src/libsqlite3xx.a
 test8$(EXE): $(TOPDIR)/src/libsqlite3xx.a
+test9$(EXE): $(TOPDIR)/src/libsqlite3xx.a
 
 # disabled tests
 #-@./exec_test test6 "STL iterators" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
@@ -63,3 +65,4 @@ local_test:
 	@./exec_test test4 "type conversion of bind parameters" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
 	@./exec_test test5 "PRAGMAs outside a transaction" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
 	@./exec_test test8 "ticket #14: to conversion fails with SQLITE_NULL" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
+	@./exec_test test9 "ticket #5: support in mult-threaded enironment" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
diff --git a/tests/Makefile.W32 b/tests/Makefile.W32
index 4de73ed..d2f8ec7 100644
--- a/tests/Makefile.W32
+++ b/tests/Makefile.W32
@@ -22,7 +22,8 @@ TEST_CPP_BINS = \
 	test5.exe \
 	test6.exe \
 	test7.exe \
-	test8.exe
+	test8.exe \
+	test9.exe
 
 TEST_BINS = \
 	testc.exe
@@ -39,6 +40,7 @@ test5.exe: test5.obj
 test6.exe: test6.obj
 test7.exe: test7.obj
 test8.exe: test8.obj
+test9.exe: test9.obj
 
 local_all:
 
@@ -62,3 +64,4 @@ local_test: $(CPP_BINS) $(BINS)
 	@exec_test.cmd test4 "type conversion of bind parameters" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
 	@exec_test.cmd test5 "PRAGMAs outside a transaction" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
 	@exec_test.cmd test8 "ticket #14: to conversion fails with SQLITE_NULL" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
+	@exec_test.cmd test9 "ticket #5: support in mult-threaded enironment" "$(PLATFORM)" "$(LINUX_DIST)" "$(LINUX_REV)"
diff --git a/tests/test8.MUST b/tests/test8.MUST
index 089025e..c470aa6 100644
--- a/tests/test8.MUST
+++ b/tests/test8.MUST
@@ -1,5 +1,5 @@
 creating DB..
-connection object is sqlite3xx::connection(test3.db)
+connection object is sqlite3xx::connection(test8.db)
 starting transaction..
 create table..
 insert some data..
diff --git a/tests/test8.cpp b/tests/test8.cpp
index 427ca71..c4a5ae8 100644
--- a/tests/test8.cpp
+++ b/tests/test8.cpp
@@ -32,11 +32,11 @@ using namespace sqlite3xx;
 using namespace std;
 
 int main( ) {
-	(void)unlink( "test3.db" );
+	(void)unlink( "test8.db" );
 
 	try {
 		cout << "creating DB.." << endl;
-		connection c( "test3.db" );
+		connection c( "test8.db" );
 		cout << "connection object is " << c << endl;
 
 		cout << "starting transaction.." << endl;
diff --git a/tests/test9.MUST b/tests/test9.MUST
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/tests/test9.MUST
diff --git a/tests/test9.cpp b/tests/test9.cpp
new file mode 100644
index 0000000..b0d36b1
--- /dev/null
+++ b/tests/test9.cpp
@@ -0,0 +1,103 @@
+/*
+ *  sqlite3xx - sqlite3 C++ layer, following the ideas of libpqxx
+ *  Copyright (C) 2009  Andreas Baumann
+ *
+ *  This copyrighted material is made available to anyone wishing to use,
+ *  modify, copy, or redistribute it subject to the terms and conditions of
+ *  the GNU Lesser General Public License, as published by the Free Software
+ *  Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY  or FITNESS FOR A PARTICULAR PURPOSE.
+ *  See the GNU Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public License
+ *  along with this distribution; if not, write to:
+ *  Free Software Foundation, Inc.
+ *  51 Franklin Street, Fifth Floor
+ *  Boston, MA  02110-1301  USA
+ *
+ */
+
+#include <iostream>
+#include <cassert>
+#include "sqlite3xx/sqlite3xx"
+/* test needs 'unlink' from 'unistd.h' */
+#if !defined _WIN32
+#include <unistd.h>
+#endif /* !defined _WIN32 */
+
+using namespace sqlite3xx;
+using namespace std;
+
+int main( ) {
+	(void)unlink( "test9.db" );
+}
+	
+/*
+	try {
+		cout << "creating DB.." << endl;
+		connection c( "test9.db" );
+		cout << "connection object is " << c << endl;
+
+		cout << "starting transaction.." << endl;
+		work wc( c, "create" );
+
+		cout << "create table.." << endl;
+		wc.exec( "create table a( i integer, d double, s text, t text )" );
+		wc.commit( );
+
+		work wi( c, "insert" );
+		cout << "insert some data.." << endl;
+		c.prepare( "ins", "insert into a( i, d, s, t ) values( NULL, NULL, NULL, ? )" )
+			( "text", sqlite3xx::prepare::treat_direct );
+		result r = wi.prepared( "ins" )( "bla" ).exec( );
+		cout << "inserted " << r.affected_rows( ) << " rows." << endl;
+		r = wi.prepared( "ins" )( "blu" ).exec( );
+		cout << "inserted " << r.affected_rows( ) << " rows." << endl;
+		r = wi.prepared( "ins" )( "bli" ).exec( );
+		cout << "inserted " << r.affected_rows( ) << " rows." << endl;
+		wi.commit( );
+
+		work wq( c, "query" );
+		cout << "querying.." << endl;
+		c.prepare( "qry", "select * from a" );
+
+		r = wq.prepared( "qry" ).exec( );
+		cout << "found " << r.size( ) << " records.." << endl;
+		cout << "found " << r.columns( ) << " columns.." << endl;
+		for( result::size_type i = 0; i < r.columns( ); i++ ) {
+			cout << "column " << i << ": "  << r.column_type( i ) << endl;
+		}
+		assert( r.size( ) == 2 );
+
+	        for( result::size_type i = 0; i < r.size( ); i++ ) {
+			cout << "i: " << i << endl;
+
+			// by field number
+			cout << "(by col number) i: " << r[i][0] << " d: " << r[i][1] << " s: " << r[i][2] << " t: " << r[i][3] << endl;
+
+			// associative array
+			cout << "(by col name) i: " << r[i]["i"] << " d: " << r[i]["d"] << " s: " << r[i]["s"] << " t: " << r[i]["t"] << endl;
+
+			// map to variables of a given type
+			int value_i;
+			double value_d;
+			string value_s;
+			string value_t;
+			r[i]["i"].to( value_i );
+			r[i]["d"].to( value_d );
+			r[i]["s"].to( value_s );
+			r[i]["t"].to( value_t );
+			cout << "(mapping) i: " << value_i << " d: " << value_d << " s: " << value_s << " t: " << value_t << endl;
+		}
+		assert( r.size( ) == 3 );
+		wq.commit( );
+
+		cout << "end." << endl;
+	} catch( sql_error& e ) {
+		cerr << e.msg( ) << ": " << e.query( ) << endl;
+	}
+}
+*/
\ No newline at end of file