Fixed bug with get

Author: David-Maisonave

sqlite3pp.cpp

@@ -546,8 +546,28 @@ namespace sqlite3pp
   }
 
   char const* query::rows::get( int idx, char const* ) const
-  {
-	  return reinterpret_cast<char const*>(SQLITEDLLCONNECT sqlite3_column_text( stmt_, idx ));
+  { // [David Maisonave changes] -- Fixed bug when using types other than SQLITE_TEXT.
+	  int type = SQLITEDLLCONNECT sqlite3_column_type(stmt_, idx);
+	  if (type == SQLITE_TEXT)
+		return reinterpret_cast<char const*>(SQLITEDLLCONNECT sqlite3_column_text( stmt_, idx ));
+	  if (type == SQLITE_INTEGER)
+	  {
+		  int number = SQLITEDLLCONNECT sqlite3_column_int(stmt_, idx);
+		  std::string str_number = std::to_string(number);
+		  return str_number.c_str();
+	  }
+	  if (type == SQLITE_FLOAT)
+	  {
+		  double number = SQLITEDLLCONNECT sqlite3_column_double(stmt_, idx);
+		  std::string str_number = std::to_string(number);
+		  return str_number.c_str();
+	  }
+	  if (type == SQLITE_BLOB)
+	  {
+		  const char* value = reinterpret_cast<char const*>(SQLITEDLLCONNECT sqlite3_column_blob(stmt_, idx));
+		  return value;
+	  }
+	  return "";
   }
 
   std::string query::rows::get( int idx, std::string ) const

sqlite3pp_ez.cpp

@@ -938,7 +938,7 @@ namespace sqlite3pp
 		using StrType = std::string;
 		static StrType getTableName() { return  "sqlite_master"; }
 		static StrType getColumnNames() { return  "type, name, tbl_name, rootpage, sql"; }
-		static StrType getSelecColumnNames() { return  "type, name, tbl_name, rootpage, sql"; }
+		static StrType getSelectColumnNames() { return  "type, name, tbl_name, rootpage, sql"; }
 		template<class T> void getStreamData(T q) { q.getter() >> type >> name >> tbl_name >> rootpage >> sql; }
 		static int getColumnCount() { return 5; }
 	public:
@@ -1316,7 +1316,7 @@ namespace sqlite3pp
 		//		The pragma should return columns (cid, name, type, notnull, dflt_value, pk)
 		const char* CommentSection = "////////////////////////////////////////////////////////////////////////////////////////////";
 		if (QueryStr.empty())
-			QueryStr = "SELECT * FROM \"" + TableName + "\"";
+			QueryStr = "SELECT * FROM '" + TableName + "'";
 		std::shared_ptr < sqlite3pp::query> qry(sql_base::CreateQuery(m_db, QueryStr));
 		if (!qry)
 			return false;
@@ -1374,7 +1374,7 @@ namespace sqlite3pp
 			myfile << std::endl;
 
 			if (!m_options.m.exclude_comments)
-				myfile << "\n\t// getTableName, getColumnNames, getSelecColumnNames, and getStreamData are required for sqlite3pp::Table template class" << std::endl;
+				myfile << "\n\t// getTableName, getColumnNames, getSelectColumnNames, and getStreamData are required for sqlite3pp::Table template class" << std::endl;
 
 			// Create getTableName member function. Needed for sqlite3pp::Table template class
 			myfile << "\tstatic StrType getTableName() { return " << m_options.s.str_pre << "\"" << TableName << "\" " << m_options.s.str_post << "; }" << std::endl;
@@ -1385,10 +1385,10 @@ namespace sqlite3pp
 				myfile << c.second << c.first;
 			myfile << "\"" << m_options.s.str_post << "; }" << std::endl;
 
-			// Create getSelecColumnNames member function. Needed for sqlite3pp::Table template class
-			myfile << "\tstatic StrType getSelecColumnNames() { return " << m_options.s.str_pre << "\"";
+			// Create getSelectColumnNames member function. Needed for sqlite3pp::Table template class
+			myfile << "\tstatic StrType getSelectColumnNames() { return " << m_options.s.str_pre << "\"";
 			for (auto& c : columns_with_comma)
-				myfile << c.second << "\\\"" << c.first << "\\\"";
+				myfile << c.second << "'" << c.first << "'";
 			myfile << "\"" << m_options.s.str_post << "; }" << std::endl;
 
 			// Create GetValues member function. Needed for sqlite3pp::Table template class

sqlite3pp_ez.h

@@ -299,8 +299,8 @@ namespace sqlite3pp
 		void Insert(const DataType &d) { push_back(d); Insert(ValueArg(d.GetValues()), T_STR()); }
 		void UpdateDb(const DataType &d) { UpdateDb(ValueArg(d.GetValues()), T_STR()); }
 		void DeleteAll(){ DeleteAll(T_STR()); }
-		std::string CreateSelectQueryStr(WhereClauseArg whereclausearg, std::string) { return "SELECT " + T::getSelecColumnNames() + " FROM \"" + T::getTableName() + "\" " + to_string(whereclausearg.get_Str().c_str()); }
-		std::wstring CreateSelectQueryStr(WhereClauseArg whereclausearg, std::wstring) { return L"SELECT " + T::getSelecColumnNames() + L" FROM \"" + T::getTableName() + L"\" " + to_wstring(whereclausearg.get_Str().c_str()); }
+		std::string CreateSelectQueryStr(WhereClauseArg whereclausearg, std::string) { return "SELECT " + T::getSelectColumnNames() + " FROM '" + T::getTableName() + "' " + to_string(whereclausearg.get_Str().c_str()); }
+		std::wstring CreateSelectQueryStr(WhereClauseArg whereclausearg, std::wstring) { return L"SELECT " + T::getSelectColumnNames() + L" FROM '" + T::getTableName() + L"' " + to_wstring(whereclausearg.get_Str().c_str()); }
 		void ReQuery()
 		{
 			m_VectType.clear();