Added Disconnect function and disconnect option on setGlobalDB

Author: David-Maisonave

SQLiteDLLConnect.cpp

@@ -103,5 +103,4 @@ namespace SQLite_DLL
 		va_end(ap);
 		return r;
 	}
-
 }

sqlite3pp.cpp

@@ -304,10 +304,16 @@ namespace sqlite3pp
 	  SQLITEDLLCONNECT sqlite3_free(data);
 	  return execute(msql.get());
   }
+
   int database::executef(char const* sql, const char* name)
   {
-	  std::shared_ptr<char> msql(SQLITEDLLCONNECT sqlite3_vmprintf(sql, (char*)name), SQLITEDLLCONNECT sqlite3_free);
-	return execute(msql.get());
+#ifdef SQLITE_MANAGE_CODE
+	  SQLite_DLL::RunTimeConnect runTimeConnect;
+#endif
+	  char* str = SQLITE_DLLCONNECT sqlite3_mprintf(sql, (char*)name);
+	  int returnValue = execute(str);
+	  SQLITEDLLCONNECT sqlite3_free(str);
+	  return returnValue;
   }
 
   int database::set_busy_timeout(int ms)

sqlite3pp.h

@@ -75,8 +75,10 @@ SQLITE_EXTENSION_INIT1
 #ifdef SQLITE_MANAGE_CODE // [David Maisonave changes] -- Used for run time level connection to SQLite3.dll
 #include "SQLiteDLLConnect.h"
 #define SQLITEDLLCONNECT SQLiteDLLConnect::
+#define SQLITE_DLLCONNECT runTimeConnect.
 #else
 #define SQLITEDLLCONNECT
+#define SQLITE_DLLCONNECT
 #endif
 
 namespace sqlite3pp

sqlite3pp_ez.cpp

@@ -1,12 +1,11 @@
 /*
 	GNU General Public License
 
-	Copyright (C) 2021 David Maisonave (www.axter.com) 
+	Copyright (C) 2025 David Maisonave (www.axter.com) 
 	The sqlite3pp_ez source code is free software. You can redistribute it and/or modify it under the terms of the GNU General Public License.
 	This source code 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 General Public License for more details.
 
 	For usage examples see  https://github.com/David-Maisonave/sqlite3pp_EZ
-							or sqlite3pp_ez.h
 */
 #include <windows.h>
 #include <stringapiset.h>
@@ -349,13 +348,16 @@ namespace sqlite3pp
 		bIsGlblDbOpen = false;
 	}
 
-	database& setGlobalDB( const std::string& db_filename, ActionIfDatabaseOpen actionifopen)
+	database& setGlobalDB( const std::string& db_filename, ActionIfDatabaseOpen actionifopen, bool disconnectExistingConnection)
 	{
-		return setGlobalDB(to_wstring(db_filename), actionifopen);
+		return setGlobalDB(to_wstring(db_filename), actionifopen, disconnectExistingConnection);
 	}
 
-	database& setGlobalDB( const std::wstring& db_filename_i, ActionIfDatabaseOpen actionifopen)
+	database& setGlobalDB( const std::wstring& db_filename_i, ActionIfDatabaseOpen actionifopen, bool disconnectExistingConnection)
 	{
+		if (disconnectExistingConnection && sql_base::bIsGlblDbOpen)
+			Disconnect();
+
 		const std::wstring& db_filename = Get_UpdatedPathCopy(db_filename_i);
 		if (sql_base::bIsGlblDbOpen)
 		{
@@ -374,6 +376,17 @@ namespace sqlite3pp
 		return sql_base::global_db;
 	}
 
+	database& setGlobalDB(const std::string& db_filename, bool disconnectExistingConnection)
+	{
+		return setGlobalDB(db_filename, AIO_SkipIfSameFile, disconnectExistingConnection);
+	}
+
+	database& setGlobalDB(const std::wstring& db_filename, bool disconnectExistingConnection)
+	{
+		return setGlobalDB(to_wstring(db_filename), AIO_SkipIfSameFile, disconnectExistingConnection);
+
+	}
+
 	database& getGlobalDB( )
 	{
 		if (!sql_base::bIsGlblDbOpen)
@@ -421,6 +434,15 @@ namespace sqlite3pp
 		return rc;
 	}
 
+	int Disconnect()
+	{
+		if (!sql_base::bIsGlblDbOpen)
+			return SQLITE_ERROR;
+		int returnValue = sql_base::global_db.disconnect();
+		sql_base::unset();
+		return returnValue;
+	}
+
 	int Attach( const char* cdb_filename, const char* name )
 	{
 		std::string db_filename = Get_UpdatedPathCopy(cdb_filename);
@@ -1126,10 +1148,13 @@ namespace sqlite3pp
 		V_COUT(DEBUG, "Calling CreateAllHeaders with Where Clause '" << AndWhereClause << "'.");
 		return CreateAllHeaders(m_options, AndWhereClause);
 	}
-	static const char TopHeaderCommnetsPrt1[] = "/* This file was automatically generated using [Sqlite3pp_EZ].\nSqlite3pp_EZ Copyright (C) 2021 David Maisonave (http::\\www.axter.com)";
+	static const char TopHeaderCommnetsPrt1[] = "/* This file was automatically generated using [Sqlite3pp_EZ].\nSqlite3pp_EZ Copyright (C) 2025 David Maisonave (http::\\www.axter.com)";
 	static const char TopHeaderCommnetsPrt2[] = "For more details see  https://github.com/David-Maisonave/sqlite3pp_EZ\n*/";
+	const std::vector<std::pair<std::string, std::string> > SQLiteClassBuilder::columns_dummy;
 
-	bool SQLiteClassBuilder::CreateHeaderPrefix(const std::string& TableName, std::ofstream &myfile, std::string& ClassName, std::string& HeaderUpper, std::string FirstColumnName, std::string LastColumnName, bool AppendToVect)
+	bool SQLiteClassBuilder::CreateHeaderPrefix(const std::string& TableName, std::ofstream &myfile, 
+		std::string& ClassName, std::string& HeaderUpper, std::string FirstColumnName, std::string LastColumnName, 
+		bool AppendToVect, const std::vector<std::pair<std::string, std::string> > &columns)
 	{
 		V_COUT(DEBUG, "Entering with arguments: '" << TableName << "', ofstream, '" << ClassName << "', '" << HeaderUpper << "', '" << FirstColumnName << "', '" << LastColumnName << "', " << AppendToVect);
 		std::ios_base::openmode openMode = m_AppendTableToHeader ? std::ios_base::out | std::ios_base::app : std::ios_base::out;
@@ -1168,7 +1193,38 @@ namespace sqlite3pp
 			myfile << "\t// Example #2\n\t\tfor (int i = 0; i < my_tbl.size(); ++i)\n\t\t\tstd::wcout << my_tbl[i].get_" << FirstColumnName << "() << std::endl;\n" << std::endl;
 
 			myfile << "\t// Example #3\n\t\tfor (auto r = my_tbl.begin(); r != my_tbl.end(); ++r)\n\t\t\tstd::wcout << r->get_" << LastColumnName << "() << std::endl;\n" << std::endl;
+			if (columns.size() > 0)
+			{
+				std::string outType = "std::cout";
+				for (auto& c : columns)
+					if (c.second == "Text")
+						outType = "std::wcout";
+				myfile << "\t// Example #4\n\t\tsqlite3pp::setGlobalDB(\"myDatabase.db\");" << std::endl;
+				myfile << "\t\tsqlite3pp::Table<" << ClassName << "> my_tbl;";
+
+				myfile << "\n\t\t// Example#4a -- (C++11) Range-based loop";
+				myfile << "\n\t\tfor(auto row : my_tbl)\n";
+				myfile << "\t\t\t" << outType;
+				for (auto& c : columns)
+					myfile << " << row.get_" << c.first << "()";
+				myfile << " << std::endl;" << std::endl;
+
+				myfile << "\n\t\t// Example#4b -- C++ style iteration";
+				myfile << "\n\t\tfor (auto row = my_tbl.begin(); row != my_tbl.end(); ++row) \n";
+				myfile << "\t\t\t" << outType;
+				for (auto& c : columns)
+					myfile << " << row->get_" << c.first << "()";
+				myfile << " << std::endl;" << std::endl;
+
+				myfile << "\n\t\t// Example#4c -- C style iteration";
+				myfile << "\n\t\tfor (int row = 0; row < my_tbl.size(); ++row) \n";
+				myfile << "\t\t\t" << outType;
+				for (auto& c : columns)
+					myfile << " << my_tbl[row].get_" << c.first << "()";
+				myfile << " << std::endl;" << std::endl;
+			}
 			myfile << TopHeaderCommnetsPrt2 << std::endl;
+			
 		}
 		// Add includes needed to support specified m_options.str_type
 		myfile << "#ifndef " << HeaderUpper << std::endl;
@@ -1337,7 +1393,7 @@ namespace sqlite3pp
 		}
 		std::ofstream myfile;
 		std::string ClassName, HeaderUpper;
-		if (!CreateHeaderPrefix(TableName, myfile, ClassName, HeaderUpper, FirstColumnName, LastColumnName))
+		if (!CreateHeaderPrefix(TableName, myfile, ClassName, HeaderUpper, FirstColumnName, LastColumnName, true, columns))
 			return false;
 		m_ClassNames.push_back(ClassName);
 		////////////////////////////////////////////////////////////////////////////////////////////

sqlite3pp_ez.h

@@ -1,7 +1,7 @@
 /*	sqlite3pp_ez.h
 	GNU General Public License
 	
-	Copyright (C) 2021 David Maisonave (www.axter.com)
+	Copyright (C) 2025 David Maisonave (www.axter.com)
 	The sqlite3pp_ez source code is free software. You can redistribute it and/or modify it under the terms of the GNU General Public License.
 	This source code 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 General Public License for more details.
 
@@ -12,7 +12,6 @@
 	This package contains all the files required to use SQLite3, SQLite3pp, and SQLite3pp_EZ.Only minor modifications have been made to SQLite3 C code and SQLite3pp where needed for UNICODE support.Then bulk of the sqlite3pp_EZ implementation is in sqlite3pp_EZ.h and sqlite3pp_EZ.cpp.
 
 	For usage examples see  https://github.com/David-Maisonave/sqlite3pp_EZ
-							or sqlite3pp_ez.h
 */
 
 #ifndef SQLITE3PP_EZ_H
@@ -81,14 +80,13 @@ namespace sqlite3pp
 		using Varchar = std::string;
 		using Text = sqlite3pp::TEXT;
 
-
-		friend database& setGlobalDB( const std::string& db_filename, ActionIfDatabaseOpen actionifopen);
-		friend database& setGlobalDB( const std::wstring& db_filename, ActionIfDatabaseOpen actionifopen);
+		friend database& setGlobalDB(const std::wstring& db_filename, ActionIfDatabaseOpen actionifopen, bool disconnectExistingConnection);
 		friend database& getGlobalDB();
 		friend int Execute( const std::string& sql );
 		friend int Execute( const std::wstring& sql );
 		friend int Connect(const char* db_filename, int flags, const char* vfs );
 		friend int Connect(const wchar_t* db_filename, int flags, const wchar_t* vfs );
+		friend int Disconnect();
 		friend int Attach( const char* db_filename, const char* name );
 		friend int Attach( const  wchar_t* db_filename, const  wchar_t* name );
 		friend int Detach();
@@ -419,13 +417,16 @@ namespace sqlite3pp
 	std::wostream& operator<<(std::wostream& os, const sqlite3pp::Date& t);
 	std::ostream& operator<<(std::ostream& os, const sqlite3pp::Date& t);
 
-	database& setGlobalDB(const std::string& db_filename, ActionIfDatabaseOpen actionifopen = AIO_SkipIfSameFile);
-	database& setGlobalDB(const std::wstring& db_filename, ActionIfDatabaseOpen actionifopen = AIO_SkipIfSameFile);
+	database& setGlobalDB(const std::string& db_filename, ActionIfDatabaseOpen actionifopen = AIO_SkipIfSameFile, bool disconnectExistingConnection = false);
+	database& setGlobalDB(const std::wstring& db_filename, ActionIfDatabaseOpen actionifopen = AIO_SkipIfSameFile, bool disconnectExistingConnection = false);
+	database& setGlobalDB(const std::string& db_filename,  bool disconnectExistingConnection);
+	database& setGlobalDB(const std::wstring& db_filename, bool disconnectExistingConnection);
 	database& getGlobalDB();
 	int Execute( const std::string& sql );
 	int Execute( const std::wstring& sql );
 	int Connect(const char* db_filename, int flags, const char* vfs = nullptr );
 	int Connect(const wchar_t* db_filename, int flags, const wchar_t* vfs = nullptr );
+	int Disconnect();
 	int Attach(const char* db_filename, const char* name );
 	int Attach(const wchar_t* db_filename, const  wchar_t* name );
 	int Detach();
@@ -504,7 +505,10 @@ namespace sqlite3pp
 			, const std::string &AndWhereClause
 		);
 		bool ProcessClassCreation(const std::string& ClassName, std::string QueryStr = "");
-		bool CreateHeaderPrefix(const std::string& TableName, std::ofstream &myfile, std::string& ClassName, std::string& HeaderUpper, std::string FirstColumnName = "", std::string LastColumnName = "", bool AppendToVect = true);
+		static const std::vector<std::pair<std::string, std::string> > columns_dummy;
+		bool CreateHeaderPrefix(const std::string& TableName, std::ofstream &myfile, 
+			std::string& ClassName, std::string& HeaderUpper, std::string FirstColumnName = "", std::string LastColumnName = "", 
+			bool AppendToVect = true, const std::vector<std::pair<std::string, std::string> >& columns = columns_dummy);
 	public:
 		// This constructor is best to use when creating a header for all tables in the constructor.  (Headers can also be created by calling CreateHeader or CreateAllHeaders)
 		SQLiteClassBuilder(const std::string& Db_filename