Changed BindInteger and BindString to BindValue

4 files changed, 33 insertions, 52 deletions

diff --git a/src/account-server/dalstorage.cpp b/src/account-server/dalstorage.cpp
index 6d5cf3f4..d27413d9 100644
--- a/src/account-server/dalstorage.cpp
+++ b/src/account-server/dalstorage.cpp
@@ -209,7 +209,7 @@ Account *DALStorage::getAccount(const std::string &userName)
     sql << "SELECT * FROM " << ACCOUNTS_TBL_NAME << " WHERE username = ?";
     if (mDb->prepareSql(sql.str()))
     {
-        mDb->bindString(1, userName);
+        mDb->bindValue(1, userName);
     }
     return getAccountBySQL();
 }
@@ -224,7 +224,7 @@ Account *DALStorage::getAccount(int accountID)
     sql << "SELECT * FROM " << ACCOUNTS_TBL_NAME << " WHERE id = ?";
     if (mDb->prepareSql(sql.str()))
     {
-        mDb->bindInteger(1, accountID);
+        mDb->bindValue(1, accountID);
     }
     return getAccountBySQL();
 }
@@ -382,7 +382,7 @@ Character *DALStorage::getCharacter(int id, Account *owner)
     sql << "SELECT * FROM " << CHARACTERS_TBL_NAME << " WHERE id = ?";
     if (mDb->prepareSql(sql.str()))
     {
-        mDb->bindInteger(1, id);
+        mDb->bindValue(1, id);
     }
     return getCharacterBySQL(owner);
 }
@@ -393,7 +393,7 @@ Character *DALStorage::getCharacter(const std::string &name)
     sql << "SELECT * FROM " << CHARACTERS_TBL_NAME << " WHERE name = ?";
     if (mDb->prepareSql(sql.str()))
     {
-        mDb->bindString(1, name);
+        mDb->bindValue(1, name);
     }
     return getCharacterBySQL(NULL);
 }
@@ -445,7 +445,7 @@ bool DALStorage::doesUserNameExist(const std::string &name)
 
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, name);
+            mDb->bindValue(1, name);
         }
         const dal::RecordSet &accountInfo = mDb->processSql();
 
@@ -476,7 +476,7 @@ bool DALStorage::doesEmailAddressExist(const std::string &email)
             << " WHERE UPPER(email) = UPPER(?)";
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, email);
+            mDb->bindValue(1, email);
         }
         const dal::RecordSet &accountInfo = mDb->processSql();
 
@@ -506,7 +506,7 @@ bool DALStorage::doesCharacterNameExist(const std::string& name)
         sql << "SELECT COUNT(name) FROM " << CHARACTERS_TBL_NAME << " WHERE name = ?";
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, name);
+            mDb->bindValue(1, name);
         }
         const dal::RecordSet &accountInfo = mDb->processSql();
 
@@ -718,9 +718,9 @@ void DALStorage::addAccount(Account *account)
 
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, account->getName());
-            mDb->bindString(2, account->getPassword());
-            mDb->bindString(3, account->getEmail());
+            mDb->bindValue(1, account->getName());
+            mDb->bindValue(2, account->getPassword());
+            mDb->bindValue(3, account->getEmail());
         }
 
         mDb->processSql();
@@ -984,7 +984,7 @@ void DALStorage::addGuild(Guild* guild)
         << " (name) VALUES (?)";
     if (mDb->prepareSql(insertSql.str()))
     {
-        mDb->bindString(1, guild->getName());
+        mDb->bindValue(1, guild->getName());
     }
     //mDb->execSql(insertSql.str());
     mDb->processSql();
@@ -995,7 +995,7 @@ void DALStorage::addGuild(Guild* guild)
 
     if (mDb->prepareSql(selectSql.str()))
     {
-        mDb->bindString(1, guild->getName());
+        mDb->bindValue(1, guild->getName());
     }
     //const dal::RecordSet& guildInfo = mDb->execSql(selectSql.str());
     const dal::RecordSet& guildInfo = mDb->processSql();
@@ -1165,8 +1165,8 @@ std::string DALStorage::getQuestVar(int id, const std::string &name)
                 << " WHERE owner_id = ? AND name = ?";
         if (mDb->prepareSql(query.str()))
         {
-            mDb->bindInteger(1, id);
-            mDb->bindString(2, name);
+            mDb->bindValue(1, id);
+            mDb->bindValue(2, name);
         }
         const dal::RecordSet &info = mDb->processSql();
 
@@ -1467,7 +1467,7 @@ void DALStorage::storeLetter(Letter *letter)
             << "?)";
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, letter->getContents());
+            mDb->bindValue(1, letter->getContents());
         }
 
         mDb->processSql();
@@ -1493,7 +1493,7 @@ void DALStorage::storeLetter(Letter *letter)
 
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, letter->getContents());
+            mDb->bindValue(1, letter->getContents());
         }
         mDb->processSql();
         //mDb->execSql(sql.str());
@@ -1659,9 +1659,9 @@ void DALStorage::SyncDatabase(void)
 //                mDb->execSql(sql.str());
                 if (mDb->prepareSql(sql.str()))
                 {
-                    mDb->bindString(1, name);
-                    mDb->bindString(2, desc);
-                    mDb->bindString(3, eff);
+                    mDb->bindValue(1, name);
+                    mDb->bindValue(2, desc);
+                    mDb->bindValue(3, eff);
                 }
                 mDb->processSql();
                 if (mDb->getModifiedRows() == 0)
@@ -1675,9 +1675,9 @@ void DALStorage::SyncDatabase(void)
                     //mDb->execSql(sql.str());
                     if (mDb->prepareSql(sql.str()))
                     {
-                        mDb->bindString(1, name);
-                        mDb->bindString(2, desc);
-                        mDb->bindString(3, eff);
+                        mDb->bindValue(1, name);
+                        mDb->bindValue(2, desc);
+                        mDb->bindValue(3, eff);
                     }
                     mDb->processSql();
                 }
@@ -1745,7 +1745,7 @@ void DALStorage::addTransaction(const Transaction &trans)
 //        mDb->execSql(sql.str());
         if (mDb->prepareSql(sql.str()))
         {
-            mDb->bindString(1, trans.mMessage);
+            mDb->bindValue(1, trans.mMessage);
         }
         mDb->processSql();
     }
diff --git a/src/dal/dataprovider.h b/src/dal/dataprovider.h
index 65de8ee5..90169ee8 100644
--- a/src/dal/dataprovider.h
+++ b/src/dal/dataprovider.h
@@ -190,25 +190,18 @@ class DataProvider
         virtual const RecordSet& processSql() = 0;
 
         /**
-         * Bind String
+         * Bind Value (String)
          * @param place - which parameter to bind to
          * @param value - the string to bind
          */
-        virtual void bindString(int place, const std::string &value) = 0;
+        virtual void bindValue(int place, const std::string &value) = 0;
 
         /**
-         * Bind Integer
+         * Bind Value (Integer)
          * @param place - which parameter to bind to
          * @param value - the integer to bind
          */
-        virtual void bindInteger(int place, int value) = 0;
-
-        /**
-         * Bind Float
-         * @param place - which parameter to bind to
-         * @param value - the float to bind
-         */
-        virtual void bindFloat(int place, float value) = 0;
+        virtual void bindValue(int place, int value) = 0;
 
     protected:
         std::string mDbName;  /**< the database name */
diff --git a/src/dal/sqlitedataprovider.cpp b/src/dal/sqlitedataprovider.cpp
index accf979b..6abfb59c 100644
--- a/src/dal/sqlitedataprovider.cpp
+++ b/src/dal/sqlitedataprovider.cpp
@@ -416,19 +416,14 @@ const RecordSet& SqLiteDataProvider::processSql()
     return mRecordSet;
 }
 
-void SqLiteDataProvider::bindString(int place, const std::string &value)
+void SqLiteDataProvider::bindValue(int place, const std::string &value)
 {
     sqlite3_bind_text(mStmt, place, value.c_str(), value.size(), SQLITE_STATIC);
 }
 
-void SqLiteDataProvider::bindInteger(int place, int value)
+void SqLiteDataProvider::bindValue(int place, int value)
 {
     sqlite3_bind_int(mStmt, place, value);
 }
 
-void SqLiteDataProvider::bindFloat(int place, float value)
-{
-    sqlite3_bind_double(mStmt, place, value);
-}
-
 } // namespace dal
diff --git a/src/dal/sqlitedataprovider.h b/src/dal/sqlitedataprovider.h
index 3f1951d2..e446c9c0 100644
--- a/src/dal/sqlitedataprovider.h
+++ b/src/dal/sqlitedataprovider.h
@@ -159,25 +159,18 @@ class SqLiteDataProvider: public DataProvider
         const RecordSet& processSql();
 
         /**
-         * Bind String
+         * Bind Value (String)
          * @param place - which parameter to bind to
          * @param value - the string to bind
          */
-        void bindString(int place, const std::string &value);
+        void bindValue(int place, const std::string &value);
 
         /**
-         * Bind Integer
+         * Bind Value (Integer)
          * @param place - which parameter to bind to
          * @param value - the integer to bind
          */
-        void bindInteger(int place, int value);
-
-        /**
-         * Bind Float
-         * @param place - which parameter to bind to
-         * @param value - the float to bind
-         */
-        void bindFloat(int place, float value);
+        void bindValue(int place, int value);
 
     private: