Merge pull request #124 from aminroosta/tmpnam

remove references to "tmpnam"

Author: aminroosta

tests/boost_optional.cc

@@ -26,21 +26,10 @@ void select(database& db, bool should_be_null) {
 	};
 }
 
-struct TmpFile {
-	string fname;
-
-	TmpFile(): fname(tmpnam(nullptr)) {}
-
-	~TmpFile() {
-		remove(fname.c_str());
-	}
-};
-
 int main() {
 	try {
 		// creates a database file 'dbfile.db' if it does not exists.
-		TmpFile file;
-		database db(file.fname);
+		database db(":memory:");
 
 		db << "drop table if exists test";
 		db <<

tests/flags.cc

@@ -10,12 +10,8 @@ struct TmpFile
 {
 	string fname;
 
-	TmpFile(): fname(tmpnam(nullptr)) {}
-
-	~TmpFile()
-	{
-		remove(fname.c_str());
-	}
+	TmpFile(): fname("./flags.db") { }
+	~TmpFile() { remove(fname.c_str()); }
 };
 
 #if __BYTE_ORDER == __BIG_ENDIAN

tests/shared_connection.cc

@@ -6,21 +6,10 @@
 using namespace  sqlite;
 using namespace std;
 
-struct TmpFile {
-	string fname;
-
-	TmpFile(): fname(tmpnam(nullptr)) {}
-
-	~TmpFile() {
-		remove(fname.c_str());
-	}
-};
-
 int main() {
 	try {
 
-		TmpFile file;
-		database db(file.fname);
+		database db(":memory:");
 
 		{
 

tests/simple_examples.cc

@@ -5,24 +5,11 @@
 using namespace  sqlite;
 using namespace std;
 
-struct TmpFile
-{
-	string fname;
-
-	TmpFile(): fname(tmpnam(nullptr)) {}
-
-	~TmpFile()
-	{
-		remove(fname.c_str());
-	}
-};
-
 int main()
 {
 	try
 	{
-		TmpFile file;
-		database db(file.fname);
+		database db(":memory:");
 
 		db << "CREATE TABLE foo (a integer, b string);";
 		db << "INSERT INTO foo VALUES (?, ?)" << 1 << "hello";

tests/sqlcipher.cc

@@ -10,12 +10,8 @@ struct TmpFile
 {
 	string fname;
 
-	TmpFile(): fname(tmpnam(nullptr)) {}
-
-	~TmpFile()
-	{
-		remove(fname.c_str());
-	}
+	TmpFile(): fname("./sqlcipher.db") { }
+	~TmpFile() { remove(fname.c_str()); }
 };
 
 int main()

tests/trycatchblocks.cc

@@ -1,91 +1,84 @@
-#include <iostream>
-#include <string>
-#include <cstdio>
-#include <cstdlib>
-#include <sqlite_modern_cpp.h>
-
-using namespace sqlite;
-using std::string;
-
-struct TmpFile
-{
-    string fname;
-
-    TmpFile(): fname(tmpnam(nullptr)) {}
-
-    ~TmpFile()
-    {
-        remove(fname.c_str());
-    }
-};
-
-
-class DBInterface {
-    database db;
-
-public:
-    DBInterface( const string& fileName ) : db( fileName )
-    {
-    }
-
-    void LogRequest( const string& username, const string& ip, const string& request ) 
-    {
-        try {
-            auto timestamp = std::to_string( time( nullptr ) );
-
-            db  <<
-                "create table if not exists log_request ("
-                "   _id integer primary key autoincrement not null,"
-                "   username text,"
-                "   timestamp text,"
-                "   ip text,"
-                "   request text"
-                ");";
-            db  << "INSERT INTO log_request (username, timestamp, ip, request) VALUES (?,?,?,?);" 
-                << username
-                << timestamp
-                << ip
-                << request;
-        } catch ( const std::exception& e ) {
-            std::cout << e.what() << std::endl;
-        }
-    }
-
-    bool TestData( void ) {
-        try {
-            string username, timestamp, ip, request;
-
-            db  << "select username, timestamp, ip, request from log_request where username = ?"
-                << "test"
-                >> std::tie(username, timestamp, ip, request);
-                    
-            if ( username == "test" && ip == "127.0.0.1" && request == "hello world" ) {
-                return true;
-            }
-        } catch ( const std::exception& e ) {
-            std::cout << e.what() << std::endl;
-        }
-
-        return false;
-    }
-};
-
-int main( void ) 
-{
-    // --------------------------------------------------------------------------
-    // -- Test if writing to disk works properly from within a catch block.
-    // --------------------------------------------------------------------------
-    try {
-        throw "hello";
-    }
-    catch ( ... ) {
-        TmpFile tmpF;
-        DBInterface interf( tmpF.fname );
-        interf.LogRequest( "test", "127.0.0.1", "hello world" );
-        if ( !interf.TestData() ) {
-            exit( EXIT_FAILURE );
-        }
-    }
-
-    exit( EXIT_SUCCESS );
-}
+#include <iostream>
+#include <string>
+#include <cstdio>
+#include <cstdlib>
+#include <sqlite_modern_cpp.h>
+
+using namespace sqlite;
+using std::string;
+
+struct TmpFile {
+    string fname;
+
+    TmpFile(): fname("./trycatchblocks.db") {}
+    ~TmpFile() { remove(fname.c_str()); }
+};
+
+
+class DBInterface {
+    database db;
+
+public:
+    DBInterface( const string& fileName ) : db( fileName ) { }
+
+    void LogRequest( const string& username, const string& ip, const string& request ) 
+    {
+        try {
+            auto timestamp = std::to_string( time( nullptr ) );
+
+            db  <<
+                "create table if not exists log_request ("
+                "   _id integer primary key autoincrement not null,"
+                "   username text,"
+                "   timestamp text,"
+                "   ip text,"
+                "   request text"
+                ");";
+            db  << "INSERT INTO log_request (username, timestamp, ip, request) VALUES (?,?,?,?);" 
+                << username
+                << timestamp
+                << ip
+                << request;
+        } catch ( const std::exception& e ) {
+            std::cout << e.what() << std::endl;
+        }
+    }
+
+    bool TestData( void ) {
+        try {
+            string username, timestamp, ip, request;
+
+            db  << "select username, timestamp, ip, request from log_request where username = ?"
+                << "test"
+                >> std::tie(username, timestamp, ip, request);
+                    
+            if ( username == "test" && ip == "127.0.0.1" && request == "hello world" ) {
+                return true;
+            }
+        } catch ( const std::exception& e ) {
+            std::cout << e.what() << std::endl;
+        }
+
+        return false;
+    }
+};
+
+int main( void ) 
+{
+    // --------------------------------------------------------------------------
+    // -- Test if writing to disk works properly from within a catch block.
+    // --------------------------------------------------------------------------
+    try {
+        throw "hello";
+    }
+    catch ( ... ) {
+        TmpFile tmpF;
+        DBInterface interf(tmpF.fname);
+        interf.LogRequest( "test", "127.0.0.1", "hello world" );
+        if ( !interf.TestData() ) {
+            exit( EXIT_FAILURE );
+        }
+    }
+
+    exit( EXIT_SUCCESS );
+}