Changeset 129 for trunk/src/sql_Database.cpp

Timestamp:

11/18/09 04:40:30 (3 years ago)

Author:

mercyful

Message:

$ Build 438/Sql Alpha
+ Removed all SQLite Code and References.
+ Updated the SQL Wrapper, and all Automake files to now link in and also Detect MySql? in the configure scripts.
+ Added detection for OpenSSL, not in use yet, but will add encryption for passwords.

and anything else of intertest once everything is moved over to the SQL Backend.

This is still an interm develop update release, the MySql? backend
is still a WIP, and the Husky SMAPI Library will be removed shortly.

Files:

• trunk/src/sql_Database.cpp (modified) (12 diffs)

trunk/src/sql_Database.cpp

@@ -1 @@
-/*
+/**
  **     Database.cpp
  **
- **     Published / author: 2005-08-12 / grymse@alhem.net
+ **     Published / author: 2001-02-15 / grymse@alhem.net
  **/
 
 /*
-Copyright (C) 2001-2006  Anders Hedstrom
+Copyright (C) 2001  Anders Hedstrom
 
 This program is made available under the terms of the GNU GPL.
@@ -37 +37 @@
 #include <string>
 #include <map>
+#ifdef WIN32
+#include <config-win.h>
+#include <mysql.h>
+#else
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sqlite3.h>
+#include <mysql/mysql.h>
 #include <stdarg.h>
+#endif
 
 #include "sql_IError.h"
@@ -47 +52 @@
 
 
-#ifdef SQLITEW_NAMESPACE
-namespace SQLITEW_NAMESPACE {
+#ifdef MYSQLW_NAMESPACE
+namespace MYSQLW_NAMESPACE {
 #endif
 
@@ -72 +77 @@
 
 
+Database::Database(const std::string& h,const std::string& u,const std::string& p,const std::string& d,IError *e)
+:host(h)
+,user(u)
+,password(p)
+,database(d)
+,m_errhandler(e)
+,m_embedded(false)
+,m_mutex(m_mutex)
+,m_b_use_mutex(false)
+{
+}
+
+
+Database::Database(Mutex& m,const std::string& h,const std::string& u,const std::string& p,const std::string& d,IError *e)
+:host(h)
+,user(u)
+,password(p)
+,database(d)
+,m_errhandler(e)
+,m_embedded(false)
+,m_mutex(m)
+,m_b_use_mutex(true)
+{
+}
+
+
 Database::~Database()
 {
@@ -77 +108 @@
         {
                 OPENDB *p = *it;
-                sqlite3_close(p -> db);
+                mysql_close(&p -> mysql);
         }
         while (m_opendbs.size())
@@ -93 +124 @@
 
 
+void Database::OnMyInit(OPENDB *odb)
+{
+        // using embedded server (libmysqld)
+        if (m_embedded)
+        {
+                mysql_options(&odb -> mysql, MYSQL_READ_DEFAULT_GROUP, "test_libmysqld_CLIENT");
+        }
+}
+
+
 void Database::RegErrHandler(IError *p)
 {
@@ -124 +165 @@
                         return NULL;
                 }
-                int rc = sqlite3_open(database.c_str(), &odb -> db);
-                if (rc)
-                {
-                        error("Can't open database: %s\n", sqlite3_errmsg(odb -> db));
-                        sqlite3_close(odb -> db);
+                if (!mysql_init(&odb -> mysql))
+                {
+                        error("mysql_init() failed - list size %d",m_opendbs.size());
                         delete odb;
                         return NULL;
                 }
+                // use callback to set mysql_options() before connect, etc
+                this -> OnMyInit(odb);
+                if (m_embedded)
+                {
+                        if (!mysql_real_connect(&odb -> mysql,NULL,NULL,NULL,database.c_str(),0,NULL,0) )
+                        {
+                                error("mysql_real_connect(NULL,NULL,NULL,%s,0,NULL,0) failed - list size %d",database.c_str(),m_opendbs.size());
+                                delete odb;
+                                return NULL;
+                        }
+                }
+                else
+                {
+                        if (!mysql_real_connect(&odb -> mysql,host.c_str(),user.c_str(),password.c_str(),database.c_str(),0,NULL,0) )
+                        {
+                                error("mysql_real_connect(%s,%s,***,%s,0,NULL,0) failed - list size %d",host.c_str(),user.c_str(),database.c_str(),m_opendbs.size());
+                                delete odb;
+                                return NULL;
+                        }
+                }
                 odb -> busy = true;
                 m_opendbs.push_back(odb);
@@ -137 +196 @@
         else
         {
+                if (mysql_ping(&odb -> mysql))
+                {
+                        error("mysql_ping() failed when reusing an old connection from the connection pool");
+                }
                 odb -> busy = true;
         }
@@ -189 +252 @@
 
 
-void Database::error(Query& q,const std::string& msg)
-{
-        if (m_errhandler)
-        {
-                m_errhandler -> error(*this, q, msg);
-        }
-}
-
-
 bool Database::Connected()
 {
@@ -205 +259 @@
                 return false;
         }
+        int ping_result = mysql_ping(&odb -> mysql);
+        if (ping_result)
+        {
+                error("mysql_ping() failed");
+        }
         freedb(odb);
-        return true;
+        return ping_result ? false : true;
 }
 
@@ -279 +338 @@
                 case '\\':
                 case 34:
-                        str2 += '\'';
+                        str2 += '\\';
                 default:
+                        str2 += str[i];
+                }
+        }
+        return str2;
+}
+
+
+std::string Database::unsafestr(const std::string& str)
+{
+        std::string str2;
+        for (size_t i = 0; i < str.size(); i++)
+        {
+                if (str[i] == '\\')
+                {
+                        i++;
+                }
+                if (i < str.size())
+                {
                         str2 += str[i];
                 }
@@ -346 +423 @@
 }
 
-
-#ifdef SQLITEW_NAMESPACE
-} // namespace SQLITEW_NAMESPACE {
-#endif
-
+// Added Michael Griffin 11/15/09
+// Custom for Inserting Clean Char *
+char *Database::strip_escape(OPENDB *qodb, char* Oldstr) {
+        
+  char* Newstr = NULL;
+  int ilen=0;
+    
+  if(!Oldstr)
+        return NULL;
+    
+  Newstr = new char[((2 * strlen(Oldstr))+1)];
+        
+  ilen=mysql_real_escape_string(&qodb -> mysql,
+                             (char *)Newstr, 
+                             (char *)Oldstr, 
+                             (long unsigned int)strlen((char *)Oldstr)); 
+                                 
+  Newstr[ilen] = 0;                              
+  return (Newstr);
+}
+
+
+#ifdef MYSQLW_NAMESPACE
+} // namespace MYSQLW_NAMESPACE {
+#endif
+