Added 8 byte integer support for varargs database queries

Author: ccw808

Server/mods/deathmatch/logic/CDatabaseConnectionSqlite.cpp

@@ -264,7 +264,7 @@ bool CDatabaseConnectionSqlite::QueryInternal ( const SString& strQuery, CRegist
                     case SQLITE_NULL:
                         break;
                     case SQLITE_INTEGER:
-                        cell.nVal = sqlite3_column_int ( pStmt, i );
+                        cell.nVal = sqlite3_column_int64 ( pStmt, i );
                         break;
                     case SQLITE_FLOAT:
                         cell.fVal = (float)sqlite3_column_double ( pStmt, i );
@@ -499,6 +499,13 @@ SString InsertQueryArgumentsSqlite ( const char* szQuery, va_list vl )
                 }
                 break;
 
+                case SQLITE_INTEGER64:
+                {
+                    long long int llValue = va_arg( vl, long long int );
+                    strParsedQuery += SString( "%" PRId64, llValue );
+                }
+                break;
+
                 case SQLITE_FLOAT:
                 {
                     double fValue = va_arg( vl, double );

Server/mods/deathmatch/logic/CDatabaseTypeMySql.cpp

@@ -390,6 +390,13 @@ SString InsertQueryArgumentsMySql ( const char* szQuery, va_list vl )
                 }
                 break;
 
+                case SQLITE_INTEGER64:
+                {
+                    long long int llValue = va_arg( vl, long long int );
+                    strParsedQuery += SString( "%" PRId64, llValue );
+                }
+                break;
+
                 case SQLITE_FLOAT:
                 {
                     double fValue = va_arg( vl, double );

Server/mods/deathmatch/logic/CRegistry.cpp

@@ -450,6 +450,13 @@ bool CRegistry::Query ( CRegistryResult* pResult, const char* szQuery, va_list v
                 }
                 break;
 
+                case SQLITE_INTEGER64:
+                {
+                    long long int llValue = va_arg( vl, long long int );
+                    strParsedQuery += SString( "%" PRId64, llValue );
+                }
+                break;
+
                 case SQLITE_FLOAT:
                 {
                     double fValue = va_arg( vl, double );

Server/mods/deathmatch/logic/CRegistry.h

@@ -22,6 +22,9 @@ typedef CAutoRefedPointer < struct CRegistryResultData > CRegistryResult;
 #include <string>
 #include "../../../vendor/sqlite/sqlite3.h"
 
+// Only used for identifying 8 byte integers in varargs list
+#define SQLITE_INTEGER64 10
+
 class CRegistry
 {
     friend class CRegistryManager;
@@ -113,6 +116,22 @@ struct CRegistryResultCell
                                     return *this;
                                 }
 
+                                template< class T >
+                                void GetNumber( T& outValue ) const
+                                {
+                                    outValue = GetNumber< T >();
+                                }
+
+                                template< class T >
+                                T GetNumber( void ) const
+                                {
+                                    if ( nType == SQLITE_INTEGER )
+                                        return static_cast< T >( nVal );
+                                    if ( nType == SQLITE_FLOAT )
+                                        return static_cast< T >( fVal );
+                                    return 0;
+                                }
+
     int                         nType;      // Type identifier, SQLITE_*
     int                         nLength;    // Length in bytes if nType == SQLITE_BLOB or SQLITE_TEXT
                                             //    (includes zero terminator if TEXT)