Refactored DbBindableLong to be more appropriately named DbBindableInt32

engine/server/application/LoginServer/src/shared/TaskChangeStationId.h

@@ -36,8 +36,8 @@ class TaskChangeStationId : public DB::TaskRequest
 	  public:
 		ChangeStationIdQuery();
 
-		DB::BindableLong         destination_station_id; //lint !e1925 // public data member
-		DB::BindableLong         source_station_id; //lint !e1925 // public data member
+		DB::BindableInt32         destination_station_id; //lint !e1925 // public data member
+		DB::BindableInt32         source_station_id; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();

engine/server/application/LoginServer/src/shared/TaskClaimRewards.cpp

@@ -33,11 +33,11 @@ namespace TaskClaimRewardsNamespace
 		bool getResult() const;
 		
 	private:
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableNetworkId character_id;
-		DB::BindableLong cluster_id;
+		DB::BindableInt32 cluster_id;
 		DB::BindableString<255> event_id;
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	private: //disable
 		ConsumeEventQuery();
@@ -58,11 +58,11 @@ namespace TaskClaimRewardsNamespace
 		bool getResult() const;
 		
 	private:
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableNetworkId character_id;
-		DB::BindableLong cluster_id;
+		DB::BindableInt32 cluster_id;
 		DB::BindableString<255> item_id;
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	private: //disable
 		ClaimItemQuery();
@@ -83,12 +83,12 @@ namespace TaskClaimRewardsNamespace
 		bool getResult() const;
 
 	private:
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableNetworkId character_id;
-		DB::BindableLong cluster_id;
+		DB::BindableInt32 cluster_id;
 		DB::BindableString<255> item_id;
-		DB::BindableLong count_adjustment;
-		DB::BindableLong result;
+		DB::BindableInt32 count_adjustment;
+		DB::BindableInt32 result;
 
 	private: //disable
 		UpdateFeatureIdTransactionQuery();
@@ -102,7 +102,7 @@ namespace TaskClaimRewardsNamespace
 		GetFeatureIdTransactionsQuery(StationId stationId, NetworkId const & characterId, uint32 clusterId);
 
 		DB::BindableString<255> item_id;
-		DB::BindableLong count;
+		DB::BindableInt32 count;
 
 		virtual void getSQL(std::string &sql);
 		virtual bool bindParameters();
@@ -110,9 +110,9 @@ namespace TaskClaimRewardsNamespace
 		virtual QueryMode getExecutionMode() const;
 
 	private:
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableNetworkId character_id;
-		DB::BindableLong cluster_id;
+		DB::BindableInt32 cluster_id;
 
 	private:  //disable
 		GetFeatureIdTransactionsQuery(const GetFeatureIdTransactionsQuery&);

engine/server/application/LoginServer/src/shared/TaskCreateCharacter.h

@@ -33,12 +33,12 @@ class TaskCreateCharacter : public DB::TaskRequest
 	  public:
 		CreateCharacterQuery();
 
-		DB::BindableLong         cluster_id; //lint !e1925 // public data member
-		DB::BindableLong         station_id; //lint !e1925 // public data member
+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         station_id; //lint !e1925 // public data member
 		DB::BindableString<127>  character_name; //lint !e1925 // public data member
 		DB::BindableNetworkId    character_id; //lint !e1925 // public data member
-		DB::BindableLong         template_id; //lint !e1925 // public data member
-		DB::BindableLong         character_type; //lint !e1925 // public data member
+		DB::BindableInt32         template_id; //lint !e1925 // public data member
+		DB::BindableInt32         character_type; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();

engine/server/application/LoginServer/src/shared/TaskDeleteCharacter.h

@@ -35,9 +35,9 @@ class TaskDeleteCharacter : public DB::TaskRequest
 	  public:
 		DeleteCharacterQuery();
 
-		DB::BindableLong cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member
 		DB::BindableNetworkId character_id; //lint !e1925 // public data member
-		DB::BindableLong station_id; //lint !e1925 // public data member
+		DB::BindableInt32 station_id; //lint !e1925 // public data member
 
 		virtual void getSQL(std::string &sql);
 		virtual bool bindParameters();

engine/server/application/LoginServer/src/shared/TaskEnableCharacter.h

@@ -35,10 +35,10 @@ class TaskEnableCharacter : public DB::TaskRequest
 	  public:
 		EnableCharacterQuery();
 
-		DB::BindableLong station_id; //lint !e1925 // public data member : suppressed because this is a private inner class
+		DB::BindableInt32 station_id; //lint !e1925 // public data member : suppressed because this is a private inner class
 		DB::BindableNetworkId character_id; //lint !e1925 // public data member : suppressed because this is a private inner class
 		DB::BindableBool enabled; //lint !e1925 // public data member : suppressed because this is a private inner class
-		DB::BindableLong result; //lint !e1925 // public data member : suppressed because this is a private inner class 
+		DB::BindableInt32 result; //lint !e1925 // public data member : suppressed because this is a private inner class
 
 
 		virtual void getSQL(std::string &sql);

engine/server/application/LoginServer/src/shared/TaskGetAccountForPurge.cpp

@@ -32,9 +32,9 @@ namespace TaskGetAccountForPurgeNamespace
 		StationId getAccount() const;
 
 	private:
-		DB::BindableLong m_account;
-		DB::BindableLong m_min_age;
-		DB::BindableLong m_purge_phase;
+		DB::BindableInt32 m_account;
+		DB::BindableInt32 m_min_age;
+		DB::BindableInt32 m_purge_phase;
 
 	private: //disable
 		GetAccountForPurgeQuery(const GetAccountForPurgeQuery&);

engine/server/application/LoginServer/src/shared/TaskGetAvatarList.h

@@ -37,13 +37,13 @@ class TaskGetAvatarList : public DB::TaskRequest
 	class GetCharactersQuery : public DB::Query
 	{
 	public:
-		DB::BindableLong station_id; //lint !e1925 // public data member
-		DB::BindableLong cluster_group_id; //lint !e1925 // public data member
+		DB::BindableInt32 station_id; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_group_id; //lint !e1925 // public data member
 		DB::BindableString<128> character_name; //lint !e1925 // public data member
-		DB::BindableLong object_template_id; //lint !e1925 // public data member
+		DB::BindableInt32 object_template_id; //lint !e1925 // public data member
 		DB::BindableNetworkId object_id; //lint !e1925 // public data member
-		DB::BindableLong cluster_id; //lint !e1925 // public data member
-		DB::BindableLong character_type; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32 character_type; //lint !e1925 // public data member
 
 		GetCharactersQuery();
 

engine/server/application/LoginServer/src/shared/TaskGetClusterList.h

@@ -31,20 +31,20 @@ class TaskGetClusterList : public DB::TaskRequest
 	class GetClustersQuery : public DB::Query
 	{
 	  public:
-		DB::BindableLong group_id; //lint !e1925 // public data member
+		DB::BindableInt32 group_id; //lint !e1925 // public data member
 				
-		DB::BindableLong cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member
 		DB::BindableString<255> cluster_name; //lint !e1925 // public data member
 		DB::BindableString<255> address; //lint !e1925 // public data member
-		DB::BindableLong port; //lint !e1925 // public data member
+		DB::BindableInt32 port; //lint !e1925 // public data member
 		DB::BindableBool secret; //lint !e1925 // public data member
 		DB::BindableBool locked; //lint !e1925 // public data member
 		DB::BindableBool not_recommended; //lint !e1925 // public data member
-		DB::BindableLong maxCharacterPerAccount; //lint !e1925 // public data member
-		DB::BindableLong online_player_limit; //lint !e1925 // public data member
-		DB::BindableLong online_free_trial_limit; //lint !e1925 // public data member
+		DB::BindableInt32 maxCharacterPerAccount; //lint !e1925 // public data member
+		DB::BindableInt32 online_player_limit; //lint !e1925 // public data member
+		DB::BindableInt32 online_free_trial_limit; //lint !e1925 // public data member
 		DB::BindableBool free_trial_can_create_char; //lint !e1925 // public data member
-		DB::BindableLong online_tutorial_limit; //lint !e1925 // public data member
+		DB::BindableInt32 online_tutorial_limit; //lint !e1925 // public data member
 
 		GetClustersQuery();
 

engine/server/application/LoginServer/src/shared/TaskGetValidationData.cpp

@@ -26,10 +26,10 @@ namespace TaskGetValidationDataNamespace
 	public:
 		GetValidationDataQuery();
 
-		DB::BindableLong station_id; //lint !e1925 // public data member
-		DB::BindableLong cluster_id; //lint !e1925 // public data member
-		DB::BindableLong character_type_id; //lint !e1925 // public data member
-		DB::BindableLong num_open_slots; //lint !e1925 // public data member
+		DB::BindableInt32 station_id; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32 character_type_id; //lint !e1925 // public data member
+		DB::BindableInt32 num_open_slots; //lint !e1925 // public data member
 
 		virtual void getSQL(std::string &sql);
 		virtual bool bindParameters();
@@ -46,7 +46,7 @@ namespace TaskGetValidationDataNamespace
 	public:
 		GetCompletedTutorialQuery(StationId stationId);
 
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableBool completed_tutorial;
 
 		virtual void getSQL(std::string &sql);
@@ -74,9 +74,9 @@ namespace TaskGetValidationDataNamespace
 		NetworkId const getCharacterId() const;
 
 	private:
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableString<100> event_id;
-		DB::BindableLong cluster_id;
+		DB::BindableInt32 cluster_id;
 		DB::BindableNetworkId character_id;
 
 	private: //disable
@@ -100,9 +100,9 @@ namespace TaskGetValidationDataNamespace
 		NetworkId const getCharacterId() const;
 
 	private:
-		DB::BindableLong station_id;
+		DB::BindableInt32 station_id;
 		DB::BindableString<100> item_id;
-		DB::BindableLong cluster_id;
+		DB::BindableInt32 cluster_id;
 		DB::BindableNetworkId character_id;
 
 	private: //disable
@@ -116,8 +116,8 @@ namespace TaskGetValidationDataNamespace
 	public:
 		IsClusterAtLimitQuery();
 
-		DB::BindableLong         cluster_id; //lint !e1925 // public data member
-		DB::BindableLong         result; //lint !e1925 // public data member
+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         result; //lint !e1925 // public data member
 
 		virtual void getSQL(std::string &sql);
 		virtual bool bindParameters();

engine/server/application/LoginServer/src/shared/TaskMapAccount.h

@@ -34,8 +34,8 @@ class TaskMapAccount : public DB::TaskRequest
 	  public:
         MapAccountQuery();
 
-		DB::BindableLong parentID; //lint !e1925 // public data member
-		DB::BindableLong childID; //lint !e1925 // public data member
+		DB::BindableInt32 parentID; //lint !e1925 // public data member
+		DB::BindableInt32 childID; //lint !e1925 // public data member
 
 		virtual void getSQL(std::string &sql);
 		virtual bool bindParameters();

engine/server/application/LoginServer/src/shared/TaskRegisterNewCluster.h

@@ -34,7 +34,7 @@ class TaskRegisterNewCluster : public DB::TaskRequest
 	  public:
 		RegisterClusterQuery();
 
-		DB::BindableLong cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member
 		DB::BindableString<255> cluster_name; //lint !e1925 // public data member
 		DB::BindableString<255> address; //lint !e1925 // public data member
 

engine/server/application/LoginServer/src/shared/TaskRenameCharacter.h

@@ -35,7 +35,7 @@ class TaskRenameCharacter : public DB::TaskRequest
 	  public:
 		RenameCharacterQuery();
 
-		DB::BindableLong         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
 		DB::BindableNetworkId    character_id; //lint !e1925 // public data member
 		DB::BindableString<127>  new_name; //lint !e1925 // public data member
 

engine/server/application/LoginServer/src/shared/TaskRestoreCharacter.h

@@ -33,13 +33,13 @@ class TaskRestoreCharacter : public DB::TaskRequest
 	  public:
 		RestoreCharacterQuery();
 
-		DB::BindableLong         cluster_id; //lint !e1925 // public data member
-		DB::BindableLong         station_id; //lint !e1925 // public data member
+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         station_id; //lint !e1925 // public data member
 		DB::BindableString<127>  character_name; //lint !e1925 // public data member
 		DB::BindableNetworkId    character_id; //lint !e1925 // public data member
-		DB::BindableLong         template_id; //lint !e1925 // public data member
-		DB::BindableLong         character_type; //lint !e1925 // public data member
-		DB::BindableLong         result; //lint !e1925 // public data member
+		DB::BindableInt32         template_id; //lint !e1925 // public data member
+		DB::BindableInt32         character_type; //lint !e1925 // public data member
+		DB::BindableInt32         result; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();

engine/server/application/LoginServer/src/shared/TaskSetPurgeStatus.cpp

@@ -29,8 +29,8 @@ namespace TaskSetPurgeStatusNamespace
 		virtual QueryMode getExecutionMode() const;
 
 	private:
-		DB::BindableLong m_account;
-		DB::BindableLong m_purge_phase;
+		DB::BindableInt32 m_account;
+		DB::BindableInt32 m_purge_phase;
 
 	private: //disable
 		SetPurgeStatusQuery(const SetPurgeStatusQuery&);

engine/server/application/LoginServer/src/shared/TaskToggleCharacterDisable.h

@@ -35,9 +35,9 @@ class TaskToggleCharacterDisable : public DB::TaskRequest
 	  public:
 		ToggleCharacterDisableQuery();
 
-		DB::BindableLong cluster_id; //lint !e1925 // public data member : suppressed because this is a private inner class
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member : suppressed because this is a private inner class
 		DB::BindableNetworkId character_id; //lint !e1925 // public data member : suppressed because this is a private inner class
-		DB::BindableLong station_id; //lint !e1925 // public data member : suppressed because this is a private inner class
+		DB::BindableInt32 station_id; //lint !e1925 // public data member : suppressed because this is a private inner class
 		DB::BindableBool enabled_flag; //lint !e1925 // public data member : suppressed because this is a private inner class 
 
 

engine/server/application/LoginServer/src/shared/TaskToggleCompletedTutorial.h

@@ -34,7 +34,7 @@ class TaskToggleCompletedTutorial : public DB::TaskRequest
 	  public:
 		ToggleCompletedTutorialQuery();
 
-		DB::BindableLong station_id; //lint !e1925 // public data member : suppressed because this is a private inner class
+		DB::BindableInt32 station_id; //lint !e1925 // public data member : suppressed because this is a private inner class
 		DB::BindableBool completed_flag; //lint !e1925 // public data member : suppressed because this is a private inner class 
 
 		virtual void getSQL(std::string &sql);

engine/server/application/LoginServer/src/shared/TaskUpgradeAccount.h

@@ -36,10 +36,10 @@ class TaskUpgradeAccount : public DB::TaskRequest
 	public:
 		SetCharacterTypeQuery();
 
-		DB::BindableLong         cluster_id; //lint !e1925 // public data member
-		DB::BindableLong         station_id; //lint !e1925 // public data member
+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         station_id; //lint !e1925 // public data member
 		DB::BindableNetworkId    character; //lint !e1925 // public data member
-		DB::BindableLong         character_type; //lint !e1925 // public data member
+		DB::BindableInt32         character_type; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();
@@ -56,9 +56,9 @@ class TaskUpgradeAccount : public DB::TaskRequest
 	public:
 		QueryJediQuery();
 
-		DB::BindableLong         station_id; //lint !e1925 // public data member
-		DB::BindableLong         character_type; //lint !e1925 // public data member
-		DB::BindableLong         result; //lint !e1925 // public data member
+		DB::BindableInt32         station_id; //lint !e1925 // public data member
+		DB::BindableInt32         character_type; //lint !e1925 // public data member
+		DB::BindableInt32         result; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();
@@ -76,8 +76,8 @@ class TaskUpgradeAccount : public DB::TaskRequest
 	  public:
 		AddJediQuery();
 
-		DB::BindableLong         cluster_id; //lint !e1925 // public data member
-		DB::BindableLong         station_id; //lint !e1925 // public data member
+		DB::BindableInt32         cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32         station_id; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();
@@ -140,10 +140,10 @@ public:
 	public:
 		GetOnlyOpenCharacterSlotsQuery();
 
-		DB::BindableLong station_id; //lint !e1925 // public data member
-		DB::BindableLong cluster_id; //lint !e1925 // public data member
-		DB::BindableLong character_type_id; //lint !e1925 // public data member
-		DB::BindableLong num_open_slots; //lint !e1925 // public data member
+		DB::BindableInt32 station_id; //lint !e1925 // public data member
+		DB::BindableInt32 cluster_id; //lint !e1925 // public data member
+		DB::BindableInt32 character_type_id; //lint !e1925 // public data member
+		DB::BindableInt32 num_open_slots; //lint !e1925 // public data member
 
 		virtual void getSQL(std::string &sql);
 		virtual bool bindParameters();

engine/server/application/StationPlayersCollector/src/shared/TaskUpdateSPCharacterProfileData.h

@@ -44,11 +44,11 @@ class TaskUpdateSPCharacterProfileData : public DB::TaskRequest
 		DB::BindableDouble              cash_balance;
 		DB::BindableDouble              bank_balance;
 		DB::BindableString<500>         objectTemplateName;
-		DB::BindableLong                stationId;
+		DB::BindableInt32                stationId;
 		DB::BindableNetworkId           containedBy;
-		DB::BindableLong                createTime;
-		DB::BindableLong                playedTime;
-		DB::BindableLong                numLots;
+		DB::BindableInt32                createTime;
+		DB::BindableInt32                playedTime;
+		DB::BindableInt32                numLots;
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();

engine/server/library/codegen/make_queries.pl

@@ -126,7 +126,7 @@ sub writeHeader
 
 		$i++;
 	}
-	$newText.="\tDB::BindableLong\t\t\t m_numItems;\n";
+	$newText.="\tDB::BindableInt32\t\t\t m_numItems;\n";
 	$newText.="};\n";
 	$newText.="\n";
 

engine/server/library/codegen/make_schema_h.pl

@@ -128,7 +128,7 @@ sub parseTable
 	    }   
 	    if ($tablename eq "Object")
 	    {
-		$decl{$tablename}.="\n\tDB::BindableLong container_level;\n";
+		$decl{$tablename}.="\n\tDB::BindableInt32 container_level;\n";
 	    }
 
 	    $decl{$tablename}.="\n\tvirtual void copy(const DB::Row &rhs)\n";
@@ -205,8 +205,8 @@ sub translateType
     my($dbtype)=@_;
   SWITCH:
     {
-	if ($dbtype eq "int") { $ctype="DB::BindableLong"; last SWITCH; }
-	if ($dbtype eq "number") { $ctype="DB::BindableLong"; last SWITCH; }
+	if ($dbtype eq "int") { $ctype="DB::BindableInt32"; last SWITCH; }
+	if ($dbtype eq "number") { $ctype="DB::BindableInt32"; last SWITCH; }
 	if ($dbtype eq "float") { $ctype="DB::BindableDouble"; last SWITCH; }
 	if ($dbtype eq "date") { $ctype="DB::BindableTimestamp"; last SWITCH; }
 	if ($dbtype eq "char(1)") { $ctype="DB::BindableBool"; last SWITCH; }
@@ -224,8 +224,8 @@ sub translateBufferType
     my($dbtype)=@_;
   SWITCH:
     {
-	if ($dbtype eq "int") { $ctype="DB::BindableLong"; last SWITCH; }
-	if ($dbtype eq "number") { $ctype="DB::BindableLong"; last SWITCH; }
+	if ($dbtype eq "int") { $ctype="DB::BindableInt32"; last SWITCH; }
+	if ($dbtype eq "number") { $ctype="DB::BindableInt32"; last SWITCH; }
 	if ($dbtype eq "float") { $ctype="DB::BindableDouble"; last SWITCH; }
 	if ($dbtype eq "date") { $ctype="DB::BindableTimestamp"; last SWITCH; }
 	if ($dbtype eq "char(1)") { $ctype="DB::BindableBool"; last SWITCH; }

engine/server/library/serverDatabase/src/shared/CharacterLocator.h

@@ -50,7 +50,7 @@ class CharacterLocator : public ObjectLocator
 		LocateCharacterQuery& operator=(const LocateCharacterQuery&); //disable
 
 	  public:
-		DB::BindableLong      object_count;
+		DB::BindableInt32      object_count;
 		DB::BindableNetworkId object_id;
 
 	  private:

engine/server/library/serverDatabase/src/shared/CharacterNameLocator.h

@@ -32,11 +32,11 @@ class CharacterNameLocator : public ObjectLocator
 	struct CharacterNameRow
 	{
 		DB::BindableNetworkId   character_id;
-		DB::BindableLong        character_station_id;
+		DB::BindableInt32        character_station_id;
 		DB::BindableString<127> character_name;
 		DB::BindableString<127> character_full_name;
-		DB::BindableLong        character_create_time;
-		DB::BindableLong        character_last_login_time;
+		DB::BindableInt32        character_create_time;
+		DB::BindableInt32        character_last_login_time;
 	};
 
 	class CharacterNameQuery : public DB::Query

engine/server/library/serverDatabase/src/shared/CharacterQueries.h

@@ -36,7 +36,7 @@ namespace DBQuery {
 			DB::BindableDouble x;
 			DB::BindableDouble y;
 			DB::BindableDouble z;
-			DB::BindableLong station_id;
+			DB::BindableInt32 station_id;
 		};
 		
 		GetCharacters() {}
@@ -76,7 +76,7 @@ namespace DBQuery {
 		virtual QueryMode getExecutionMode() const;
 
 	  private:
-		DB::BindableLong      station_id;
+		DB::BindableInt32      station_id;
 		DB::BindableNetworkId object_id;
 		DB::BindableString<127> character_name;
 		DB::BindableString<127> normalized_name;
@@ -105,7 +105,7 @@ namespace DBQuery {
 		DB::BindableNetworkId    object_id;
 		DB::BindableString<127>  character_name;
 		DB::BindableString<127>  normalized_name;
-		DB::BindableLong         result;
+		DB::BindableInt32         result;
 		
 	  private:
 		RenameCharacter                     (const RenameCharacter&); // disable

engine/server/library/serverDatabase/src/shared/DeleteCharacterCustomPersistStep.h

@@ -45,10 +45,10 @@ class DeleteCharacterCustomPersistStep : public CustomPersistStep
 		virtual QueryMode getExecutionMode() const;
 
 	  public:
-		DB::BindableLong         station_id;
+		DB::BindableInt32         station_id;
 		DB::BindableNetworkId    character_id;
-		DB::BindableLong         delete_minutes;
-		DB::BindableLong         result;
+		DB::BindableInt32         delete_minutes;
+		DB::BindableInt32         result;
 				
 	  private: // disable:
 		DeleteCharacterQuery(const DeleteCharacterQuery&);

engine/server/library/serverDatabase/src/shared/FixLoadWithCustomPersistStep.h

@@ -12,7 +12,7 @@
 
 #include "Unicode.h"
 #include "serverDatabase/CustomPersistStep.h"
-#include "sharedDatabaseInterface/DbBindableLong.h"
+#include "sharedDatabaseInterface/DbBindableInt32.h"
 #include "sharedDatabaseInterface/BindableNetworkId.h"
 #include "sharedDatabaseInterface/DbQuery.h"
 #include "sharedFoundation/NetworkId.h"
@@ -50,7 +50,7 @@ class FixLoadWithCustomPersistStep : public CustomPersistStep
 		FixLoadWithQuery &operator=(FixLoadWithQuery const &);
 		DB::BindableNetworkId topmost_object;
 		DB::BindableNetworkId starting_loadwith;
-		DB::BindableLong max_depth;
+		DB::BindableInt32 max_depth;
 	};
 	
   private:

engine/server/library/serverDatabase/src/shared/GetChunkQuery.h

@@ -41,10 +41,10 @@ namespace DBQuery {
 		GetChunkQuery& operator=(const GetChunkQuery&); //disable
 
 	  private:
-		DB::BindableLong object_count;
+		DB::BindableInt32 object_count;
 		DB::BindableString<50> scene_id;
-		DB::BindableLong node_x;
-		DB::BindableLong node_z;
+		DB::BindableInt32 node_x;
+		DB::BindableInt32 node_z;
 
 		std::string m_schema;
 	};

engine/server/library/serverDatabase/src/shared/GetGoldVersionNumberQuery.h

@@ -31,8 +31,8 @@ namespace DBQuery
 		int getMinVersionNumber();
 		
 	  private:
-		DB::BindableLong current_version_number;
-		DB::BindableLong min_version_number;
+		DB::BindableInt32 current_version_number;
+		DB::BindableInt32 min_version_number;
 
 	  private:
 		GetGoldVersionNumberQuery              (const GetGoldVersionNumberQuery &); // disable

engine/server/library/serverDatabase/src/shared/GetObjectIdsQuery.h

@@ -43,7 +43,7 @@ namespace DBQuery
 		GetOIDsQuery(const GetOIDsQuery&);
 		GetOIDsQuery& operator=(const GetOIDsQuery&);
 
-		DB::BindableLong        min_count;
+		DB::BindableInt32        min_count;
 		DB::BindableNetworkId   start_id;
 		DB::BindableNetworkId   end_id;
 	};

engine/server/library/serverDatabase/src/shared/GetTimestampQuery.h

@@ -30,7 +30,7 @@ namespace DBQuery
 		int getTimestamp();
 		
 	  private:
-		DB::BindableLong timestamp;
+		DB::BindableInt32 timestamp;
 
 	  private:
 		GetTimestampQuery(const GetTimestampQuery &); // disable

engine/server/library/serverDatabase/src/shared/GetVersionNumberQuery.h

@@ -31,8 +31,8 @@ namespace DBQuery
 		int getMinVersionNumber();
 		
 	  private:
-		DB::BindableLong current_version_number;
-		DB::BindableLong min_version_number;
+		DB::BindableInt32 current_version_number;
+		DB::BindableInt32 min_version_number;
 
 	  private:
 		GetVersionNumberQuery              (const GetVersionNumberQuery &); // disable

engine/server/library/serverDatabase/src/shared/LazyDeleteQuery.h

@@ -34,8 +34,8 @@ class LazyDeleteQuery : public DB::Query
 
   private:
 	DB::BindableVarrayString	m_object_ids;
-	DB::BindableLong			m_numItems;
-	DB::BindableLong			m_enableDatabaseLogging;
+	DB::BindableInt32			m_numItems;
+	DB::BindableInt32			m_enableDatabaseLogging;
 
   private:
 	LazyDeleteQuery(const LazyDeleteQuery&); //disable

engine/server/library/serverDatabase/src/shared/MoveToPlayerCustomPersistStep.h

@@ -12,7 +12,7 @@
 
 #include "Unicode.h"
 #include "serverDatabase/CustomPersistStep.h"
-#include "sharedDatabaseInterface/DbBindableLong.h"
+#include "sharedDatabaseInterface/DbBindableInt32.h"
 #include "sharedDatabaseInterface/BindableNetworkId.h"
 #include "sharedDatabaseInterface/DbQuery.h"
 #include "sharedFoundation/NetworkId.h"
@@ -52,7 +52,7 @@ class MoveToPlayerCustomPersistStep : public CustomPersistStep
 		MoveToPlayerQuery &operator=(MoveToPlayerQuery const &);
 		DB::BindableNetworkId object_id;
 		DB::BindableNetworkId target_player;
-		DB::BindableLong max_depth;
+		DB::BindableInt32 max_depth;
 		bool m_useBank;
 		bool m_useDatapad;
 	};

engine/server/library/serverDatabase/src/shared/PreloadListQuery.h

@@ -30,11 +30,11 @@ namespace DBQuery
 	  public:
 		DB::BindableString<50> scene_id;
 		DB::BindableNetworkId  object_id;
-		DB::BindableLong       chunk_x;
-		DB::BindableLong       chunk_z;
-		DB::BindableLong       preload_range;
-		DB::BindableLong       city_server_id;
-		DB::BindableLong       wilderness_server_id;
+		DB::BindableInt32       chunk_x;
+		DB::BindableInt32       chunk_z;
+		DB::BindableInt32       preload_range;
+		DB::BindableInt32       city_server_id;
+		DB::BindableInt32       wilderness_server_id;
 		
 	  public:
 		virtual bool bindParameters();

engine/server/library/serverDatabase/src/shared/SaveTimestampQuery.h

@@ -28,7 +28,7 @@ namespace DBQuery
 		virtual bool bindColumns();
 
 	  private:
-		DB::BindableLong timestamp;
+		DB::BindableInt32 timestamp;
 
 	  private:
 		SaveTimestampQuery(const SaveTimestampQuery &); // disable

engine/server/library/serverDatabase/src/shared/ScriptQueries.h

@@ -45,7 +45,7 @@ namespace DBQuery
 		struct ScriptRow
 		{
 			DB::BindableNetworkId object_id;
-			DB::BindableLong index;
+			DB::BindableInt32 index;
 			DB::BindableString<128> script_name;
 		};
 

engine/server/library/serverDatabase/src/shared/StructureQueries.h

@@ -35,7 +35,7 @@ namespace DBQuery {
 			DB::BindableDouble y;
 			DB::BindableDouble z;
 			DB::BindableNetworkId character_id;
-			DB::BindableLong deleted;
+			DB::BindableInt32 deleted;
 		};
 		
 		GetStructures() {}

engine/server/library/serverDatabase/src/shared/TaskCSTasks.h

@@ -44,7 +44,7 @@ class TaskGetCharactersForAccount:public DB::TaskRequest
 		
 	  public:
 		// input:
-		DB::BindableLong        station_id; //lint !e1925 public data member Suppresed because it's in a private inner class
+		DB::BindableInt32        station_id; //lint !e1925 public data member Suppresed because it's in a private inner class
 		DB::BindableNetworkId   character_id; //lint !e1925 public data member Suppresed because it's in a private inner class
 		
 		//output:
@@ -122,7 +122,7 @@ class TaskGetDeletedItems:public DB::TaskRequest
 	  public:
 		// input:
 		DB::BindableNetworkId        character_id; //lint !e1925 public data member Suppresed because it's in a private inner class
-		DB::BindableLong	     page_number;
+		DB::BindableInt32	     page_number;
 
 	  private:
 		CSGetDeletedItemsQuery(const CSGetDeletedItemsQuery&);
@@ -211,7 +211,7 @@ class TaskGetCharacterId:public DB::TaskRequest
 		struct CharacterIdRow
 		{
 			DB::BindableNetworkId characterId;
-			DB::BindableLong stationId;
+			DB::BindableInt32 stationId;
 			DB::BindableString<TaskGetCharacterId::MAX_NAME_LENGTH> characterName;
 		};
 
@@ -310,7 +310,7 @@ class TaskCsUndeleteItem : public DB::TaskRequest
 		private:
 		DB::BindableNetworkId characterId;
 		DB::BindableNetworkId itemId;
-		DB::BindableLong move;
+		DB::BindableInt32 move;
 	
 		private:
 		CsUndeleteItemQuery(const CsUndeleteItemQuery &); // disable

engine/server/library/serverDatabase/src/shared/TaskChangeStationId.h

@@ -36,8 +36,8 @@ class TaskChangeStationId : public DB::TaskRequest
 	  public:
 		ChangeStationIdQuery();
 
-		DB::BindableLong         destination_station_id; //lint !e1925 // public data member
-		DB::BindableLong         source_station_id; //lint !e1925 // public data member
+		DB::BindableInt32         destination_station_id; //lint !e1925 // public data member
+		DB::BindableInt32         source_station_id; //lint !e1925 // public data member
 
 		virtual void getSQL                (std::string &sql);
 		virtual bool bindParameters        ();

engine/server/library/serverDatabase/src/shared/TaskCheckCharacterName.h

@@ -44,7 +44,7 @@ class TaskCheckCharacterName : public DB::TaskRequest
 
 	  public:
 		DB::BindableString<127> character_name;
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 				
 	  private:   
 		CheckCharacterNameQuery(const CheckCharacterNameQuery&);

engine/server/library/serverDatabase/src/shared/TaskGetStructuresForPurge.cpp

@@ -35,7 +35,7 @@ namespace TaskGetStructuresForPurgeNamespace
 		NetworkId getOwnerId() const;
 		
 	private:
-		DB::BindableLong m_station_id;
+		DB::BindableInt32 m_station_id;
 		DB::BindableNetworkId m_structure_id;
 		DB::BindableNetworkId m_owner_id;
 
@@ -59,7 +59,7 @@ namespace TaskGetStructuresForPurgeNamespace
 		Unicode::String getVendorName() const;
 		
 	private:
-		DB::BindableLong m_station_id;
+		DB::BindableInt32 m_station_id;
 		DB::BindableNetworkId m_vendor_id;
 		DB::BindableNetworkId m_owner_id;
 		DB::BindableUnicode<128> m_vendor_name;

engine/server/library/serverDatabase/src/shared/WorldContainerLocator.h

@@ -58,8 +58,8 @@ class WorldContainerLocator : public ObjectLocator
 		
 	  private:
 		DB::BindableVarrayString	 container_ids;
-		DB::BindableLong             num_containers;
-		DB::BindableLong             num_objects_found;
+		DB::BindableInt32             num_containers;
+		DB::BindableInt32             num_objects_found;
 		std::string                  m_schema;
 
 	  private:

engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableInt32.h

@@ -0,0 +1 @@
+#include "../../src/shared/core/DbBindableInt32.h"

engine/shared/library/sharedDatabaseInterface/include/public/sharedDatabaseInterface/DbBindableLong.h

@@ -1 +0,0 @@
-#include "../../src/shared/core/DbBindableLong.h"

engine/shared/library/sharedDatabaseInterface/src/CMakeLists.txt

@@ -18,8 +18,8 @@ set(SHARED_SOURCES
 	shared/core/DbBindableDouble.h
 	shared/core/DbBindableInt64.cpp
 	shared/core/DbBindableInt64.h
-	shared/core/DbBindableLong.cpp
-	shared/core/DbBindableLong.h
+	shared/core/DbBindableInt32.cpp
+	shared/core/DbBindableInt32.h
 	shared/core/DbBindableString.cpp
 	shared/core/DbBindableString.h
 	shared/core/DbBindableUnicode.cpp

engine/shared/library/sharedDatabaseInterface/src/shared/core/Bindable.h

@@ -23,7 +23,7 @@
 #include "sharedDatabaseInterface/DbBindableBool.h"
 #include "sharedDatabaseInterface/DbBindableDouble.h"
 #include "sharedDatabaseInterface/DbBindableInt64.h"
-#include "sharedDatabaseInterface/DbBindableLong.h"
+#include "sharedDatabaseInterface/DbBindableInt32.h"
 #include "sharedDatabaseInterface/DbBindableString.h"
 #include "sharedDatabaseInterface/DbBindableUnicode.h"
 

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.cpp

@@ -1,12 +1,12 @@
 // ======================================================================
 //
-// DBBindableLong.cpp
+// DBBindableInt32.cpp
 // copyright (c) 2001 Sony Online Entertainment
 //
 // ======================================================================
 
 #include "sharedDatabaseInterface/FirstSharedDatabaseInterface.h"
-#include "sharedDatabaseInterface/DbBindableLong.h"
+#include "sharedDatabaseInterface/DbBindableInt32.h"
 
 #include <string>
 
@@ -14,15 +14,15 @@
 
 using namespace DB;
 
-BindableLong::BindableLong() : Bindable(), value(-999)
+BindableInt32::BindableInt32() : Bindable(), value(-999)
 {
 }
 
-BindableLong::BindableLong(int64_t _value) : Bindable(sizeof(value)), value(_value)
+BindableInt32::BindableInt32(int32_t _value) : Bindable(sizeof(value)), value(_value)
 {
 }
 
-void *BindableLong::getBuffer()
+void *BindableInt32::getBuffer()
 {
 	return &value; //lint !e1536 // exposing private member
 }
@@ -30,14 +30,14 @@ void *BindableLong::getBuffer()
 // ----------------------------------------------------------------------
 
 
-int64_t BindableLong::getValue() const
+int32_t BindableInt32::getValue() const
 {
 	return value;
 }
 
 // ----------------------------------------------------------------------
 
-BindableLong &BindableLong::operator=(int64_t rhs)
+BindableInt32 &BindableInt32::operator=(int32_t rhs)
 {
 	indicator=sizeof(value); 
 	value=rhs;
@@ -46,7 +46,7 @@ BindableLong &BindableLong::operator=(int64_t rhs)
 
 // ----------------------------------------------------------------------
 
-void BindableLong::setValue(int64_t rhs)
+void BindableInt32::setValue(int32_t rhs)
 {
 	indicator=sizeof(value); 
 	value=rhs;
@@ -54,7 +54,7 @@ void BindableLong::setValue(int64_t rhs)
 
 // ----------------------------------------------------------------------
 
-std::string BindableLong::outputValue() const
+std::string BindableInt32::outputValue() const
 {
 	char temp[255];
 	snprintf(temp,sizeof(temp),"%li",value);

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbBindableInt32.h

@@ -1,12 +1,12 @@
 // ======================================================================
 //
-// DBBindableLong.h
+// DBBindableInt32.h
 // copyright (c) 2001 Sony Online Entertainment
 //
 // ======================================================================
 
-#ifndef INCLUDED_DBBindableLong_H
-#define INCLUDED_DBBindableLong_H
+#ifndef INCLUDED_DBBindableInt32_H
+#define INCLUDED_DBBindableInt32_H
 
 // ======================================================================
 
@@ -19,15 +19,15 @@ namespace DB {
     /**
 	 * Represents a long in C++, bound to an INTEGER or NUMBER database column
      */
-	class BindableLong : public Bindable
+	class BindableInt32 : public Bindable
 	{
 		public:
-		BindableLong();
-		explicit BindableLong(int64_t _value);
+		BindableInt32();
+		explicit BindableInt32(int32_t _value);
 
-		int64_t getValue() const;
-		void setValue(const int64_t rhs);
-		BindableLong &operator=(const int64_t rhs);
+		int32_t getValue() const;
+		void setValue(const int32_t rhs);
+		BindableInt32 &operator=(const int32_t rhs);
 
 		// following alternate getValue's are provided for convenience, particularly in
 		// the auto-generated code:
@@ -37,76 +37,58 @@ namespace DB {
 		void getValue(uint16_t &buffer) const;
 		void getValue(int32_t &buffer) const;
 		void getValue(uint32_t &buffer) const;
-		void getValue(int64_t &buffer) const;
-		void getValue(uint64_t &buffer) const;
 		
 		void *getBuffer();
 
 		virtual std::string outputValue() const;
 		
 	  private:
-		int64_t value;
+		int32_t value;
 	}; //lint !e1721 !e1509 // no virtual destructor, unusual operator =
 
 }
 
 // ----------------------------------------------------------------------
 
-inline void DB::BindableLong::getValue(int8_t &buffer) const
+inline void DB::BindableInt32::getValue(int8_t &buffer) const
 {
 	buffer=static_cast<int8_t>(getValue());
 }
 
 // ----------------------------------------------------------------------
 
-inline void DB::BindableLong::getValue(uint8_t &buffer) const
+inline void DB::BindableInt32::getValue(uint8_t &buffer) const
 {
 	buffer=static_cast<uint8_t>(getValue());
 }
 // ----------------------------------------------------------------------
 
-inline void DB::BindableLong::getValue(int16_t &buffer) const
+inline void DB::BindableInt32::getValue(int16_t &buffer) const
 {
 	buffer=getValue();
 }
 
 // ----------------------------------------------------------------------
 
-inline void DB::BindableLong::getValue(uint16_t &buffer) const
+inline void DB::BindableInt32::getValue(uint16_t &buffer) const
 {
 	buffer=static_cast<uint16_t>(getValue());
 }
 
 // ----------------------------------------------------------------------
 
-inline void DB::BindableLong::getValue(int32_t &buffer) const
+inline void DB::BindableInt32::getValue(int32_t &buffer) const
 {
 	buffer=getValue();
 }
 
 // ----------------------------------------------------------------------
 
-inline void DB::BindableLong::getValue(uint32_t &buffer) const
+inline void DB::BindableInt32::getValue(uint32_t &buffer) const
 {
 	buffer=static_cast<uint32_t>(getValue());
 }
 
-// ----------------------------------------------------------------------
-
-inline void DB::BindableLong::getValue(int64_t &buffer) const
-{
-	buffer=getValue();
-}
-
-// ----------------------------------------------------------------------
-
-inline void DB::BindableLong::getValue(uint64_t &buffer) const
-{
-	buffer=static_cast<uint64_t>(getValue());
-}
-
-
-
 // ======================================================================
 
 #endif

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.cpp

@@ -181,13 +181,13 @@ void Query::setColArrayMode(size_t skipSize, size_t numElements)
 	impl->setColArrayMode(skipSize, numElements);
 }
 
-bool Query::bindCol(BindableLong &buffer)
+bool Query::bindCol(BindableInt32 &buffer)
 {
 	NOT_NULL(impl);
 	return impl->bindCol(buffer);
 }
 
-bool Query::bindParameter(BindableLong &buffer)
+bool Query::bindParameter(BindableInt32 &buffer)
 {
 	NOT_NULL(impl);
 	return impl->bindParameter(buffer);

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQuery.h

@@ -17,7 +17,7 @@ namespace DB {
 
     class Session;
 	class QueryImpl;
-	class BindableLong;
+	class BindableInt32;
 	class BindableVarray;
 	
     class Query
@@ -70,8 +70,8 @@ namespace DB {
  */
 			void setColArrayMode(size_t skipSize, size_t numElements);
 			
-			bool bindCol(BindableLong &buffer);
-			bool bindParameter(BindableLong &buffer);
+			bool bindCol(BindableInt32 &buffer);
+			bool bindParameter(BindableInt32 &buffer);
 			bool bindCol(BindableDouble &buffer);
 			bool bindParameter(BindableDouble &buffer);
 			bool bindCol(BindableStringBase &buffer);

engine/shared/library/sharedDatabaseInterface/src/shared/core/DbQueryImplementation.h

@@ -19,7 +19,7 @@ namespace DB
 	class BindableBool;
 	class BindableDouble;
 	class BindableInt64;
-	class BindableLong;
+	class BindableInt32;
 	class BindableStringBase;
 	class BindableUnicodeBase;
 	class BindableVarray;
@@ -54,8 +54,8 @@ namespace DB
 
 		virtual void setColArrayMode(size_t skipSize, size_t numElements)=0;
 		
-		virtual bool bindCol(BindableLong &buffer) =0;
-		virtual bool bindParameter(BindableLong &buffer) =0;
+		virtual bool bindCol(BindableInt32 &buffer) =0;
+		virtual bool bindParameter(BindableInt32 &buffer) =0;
 		virtual bool bindCol(BindableDouble &buffer) =0;
 		virtual bool bindParameter(BindableDouble &buffer) =0;
 		virtual bool bindCol(BindableStringBase &buffer) =0;

engine/shared/library/sharedDatabaseInterface/src/shared/queue/DbTestQuery.h

@@ -7,7 +7,7 @@
 class DBTestQuery : public DB::Query
 {
 public:
-	DB::BindableLong	value;
+	DB::BindableInt32	value;
 
 	DBTestQuery();
 	virtual void getSQL(std::string &sql);

engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.cpp

@@ -448,7 +448,7 @@ size_t DB::OCIQueryImpl::BindRec::getLengthSkipSize()
 	
 // ======================================================================
 
-bool DB::OCIQueryImpl::bindCol(BindableLong &buffer)
+bool DB::OCIQueryImpl::bindCol(BindableInt32 &buffer)
 {
 	BindRec *br=addBindRec(buffer);
 
@@ -478,7 +478,7 @@ bool DB::OCIQueryImpl::bindCol(BindableLong &buffer)
 
 // ----------------------------------------------------------------------
 
-bool DB::OCIQueryImpl::bindParameter(BindableLong &buffer)
+bool DB::OCIQueryImpl::bindParameter(BindableInt32 &buffer)
 {
 	BindRec *br=addBindRec(buffer);
 

engine/shared/library/sharedDatabaseInterface/src_oci/OciQueryImplementation.h

@@ -50,8 +50,8 @@ namespace DB
 
 		virtual void setColArrayMode(size_t skipSize, size_t numElements);
 
-		virtual bool bindCol(BindableLong &buffer);
-		virtual bool bindParameter(BindableLong &buffer);
+		virtual bool bindCol(BindableInt32 &buffer);
+		virtual bool bindParameter(BindableInt32 &buffer);
 		virtual bool bindCol(BindableDouble &buffer);
 		virtual bool bindParameter(BindableDouble &buffer);
 		virtual bool bindCol(BindableStringBase &buffer);

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskBrokenObjectCleanup.h

@@ -41,7 +41,7 @@ class TaskBrokenObjectCleanup : public DB::TaskRequest
 		virtual bool bindColumns();
 		virtual QueryMode getExecutionMode() const;
 
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	  private:
 		DataCleanupQuery(const DataCleanupQuery&);

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMarketAttributesCleanup.h

@@ -41,7 +41,7 @@ class TaskMarketAttributesCleanup : public DB::TaskRequest
 		virtual bool bindColumns();
 		virtual QueryMode getExecutionMode() const;
 
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	  private:
 		DataCleanupQuery(const DataCleanupQuery&);

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskMessagesCleanup.h

@@ -41,7 +41,7 @@ class TaskMessagesCleanup : public DB::TaskRequest
 		virtual bool bindColumns();
 		virtual QueryMode getExecutionMode() const;
 
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	  private:
 		DataCleanupQuery(const DataCleanupQuery&);

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskObjvarNameCleanup.h

@@ -41,7 +41,7 @@ class TaskObjvarNameCleanup : public DB::TaskRequest
 		virtual bool bindColumns();
 		virtual QueryMode getExecutionMode() const;
 
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	  private:
 		DataCleanupQuery(const DataCleanupQuery&);

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskOrphanedObjectCleanup.h

@@ -41,7 +41,7 @@ class TaskOrphanedObjectCleanup : public DB::TaskRequest
 		virtual bool bindColumns();
 		virtual QueryMode getExecutionMode() const;
 
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	  private:
 		DataCleanupQuery(const DataCleanupQuery&);

game/server/application/SwgDatabaseServer/src/shared/cleanup/TaskVendorObjectCleanup.h

@@ -41,7 +41,7 @@ class TaskVendorObjectCleanup : public DB::TaskRequest
 		virtual bool bindColumns();
 		virtual QueryMode getExecutionMode() const;
 
-		DB::BindableLong result;
+		DB::BindableInt32 result;
 
 	  private:
 		DataCleanupQuery(const DataCleanupQuery&);

game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.cpp

@@ -1033,7 +1033,7 @@ void SwgSnapshot::encodeComponents(const NetworkId &objectId, Archive::ByteStrea
 // ----------------------------------------------------------------------
 
 void
-SwgSnapshot::decodeLocation(Archive::ReadIterator &data, DB::BindableDouble &x, DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableLong &planet) const {
+SwgSnapshot::decodeLocation(Archive::ReadIterator &data, DB::BindableDouble &x, DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableInt32 &planet) const {
     Location temp;
     Archive::get(data, temp);
     Vector vec = temp.getCoordinates();
@@ -1047,7 +1047,7 @@ SwgSnapshot::decodeLocation(Archive::ReadIterator &data, DB::BindableDouble &x,
 // ----------------------------------------------------------------------
 
 void
-SwgSnapshot::encodeLocation(Archive::ByteStream &data, const DB::BindableDouble &x, const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableLong &planet) const {
+SwgSnapshot::encodeLocation(Archive::ByteStream &data, const DB::BindableDouble &x, const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableInt32 &planet) const {
     Location temp(Vector(static_cast<float>(x.getValue()), static_cast<float>(y.getValue()), static_cast<float>(z.getValue())), cell.getValue(), planet.getValue());
     Archive::put(data, temp);
 }

game/server/application/SwgDatabaseServer/src/shared/core/SwgSnapshot.h

@@ -419,7 +419,7 @@ protected:
 	void decodeVector           (Archive::ReadIterator &data, DB::BindableDouble &x,DB::BindableDouble &y, DB::BindableDouble &z) const;
 	void decodeMatchMakingId    (Archive::ReadIterator &data, DB::BufferString &column) const;
 	void decodeComponents       (NetworkId const & objectId, Archive::ReadIterator &data, bool isBaseline);
-	void decodeLocation         (Archive::ReadIterator &data, DB::BindableDouble &x,DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableLong &planet) const;
+	void decodeLocation         (Archive::ReadIterator &data, DB::BindableDouble &x,DB::BindableDouble &y, DB::BindableDouble &z, DB::BindableNetworkId &cell, DB::BindableInt32 &planet) const;
 	void decodeWaypoints        (const NetworkId &objectId, Archive::ReadIterator &data, bool isBaseline);
 	void decodeSingleWaypoint   (const NetworkId &objectId, Archive::ReadIterator &data, bool isBaseline);
 	void decodeQuests           (NetworkId const & networkId, Archive::ReadIterator &data, DB::BufferString &part1, DB::BufferString &part2, DB::BufferString &part3, DB::BufferString &part4) const;
@@ -439,7 +439,7 @@ protected:
 	void encodeVector           (Archive::ByteStream &data, const DB::BindableDouble &x, const DB::BindableDouble &y, const DB::BindableDouble &z) const;
 	void encodeMatchMakingId    (Archive::ByteStream &data, const DB::BufferString &column) const;
 	void encodeComponents       (const NetworkId &objectId, Archive::ByteStream &data) const;
-	void encodeLocation         (Archive::ByteStream &data, const DB::BindableDouble &x,const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableLong &planet) const;
+	void encodeLocation         (Archive::ByteStream &data, const DB::BindableDouble &x,const DB::BindableDouble &y, const DB::BindableDouble &z, const DB::BindableNetworkId &cell, const DB::BindableInt32 &planet) const;
 	void encodeWaypoints        (const NetworkId & objectId, Archive::ByteStream &data) const;
 	void encodeSingleWaypoint   (const NetworkId & objectId, Archive::ByteStream &data) const;
 	void encodeQuests           (Archive::ByteStream &data, DB::BufferString const &part1, DB::BufferString const &part2, DB::BufferString const &part3, DB::BufferString const &part4) const;

game/server/application/SwgDatabaseServer/src/shared/generated/ObjectQueries_h.template

@@ -45,7 +45,7 @@ public:
 private:
 	DB::BindableVarrayString	 m_object_ids;
 	DB::BindableVarrayString	 m_region_names;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class BattlefieldMarkerObjectQuerySelect : public DB::Query
@@ -95,7 +95,7 @@ private:
 	DB::BindableVarrayNumber	 m_time_last_checkeds;
 	DB::BindableVarrayString	 m_is_publics;
 	DB::BindableVarrayNumber	 m_city_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class BuildingObjectQuerySelect : public DB::Query
@@ -143,7 +143,7 @@ private:
 	DB::BindableVarrayString	 m_object_ids;
 	DB::BindableVarrayNumber	 m_cell_numbers;
 	DB::BindableVarrayString	 m_is_publics;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class CellObjectQuerySelect : public DB::Query
@@ -189,7 +189,7 @@ public:
 
 private:
 	DB::BindableVarrayString	 m_object_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class CityObjectQuerySelect : public DB::Query
@@ -274,7 +274,7 @@ private:
 	DB::BindableVarrayNumber	 m_ws_xs;
 	DB::BindableVarrayNumber	 m_ws_ys;
 	DB::BindableVarrayNumber	 m_ws_zs;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class CreatureObjectQuerySelect : public DB::Query
@@ -320,7 +320,7 @@ public:
 
 private:
 	DB::BindableVarrayString	 m_object_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class FactoryObjectQuerySelect : public DB::Query
@@ -366,7 +366,7 @@ public:
 
 private:
 	DB::BindableVarrayString	 m_object_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class GuildObjectQuerySelect : public DB::Query
@@ -419,7 +419,7 @@ private:
 	DB::BindableVarrayString	 m_hopper_resources;
 	DB::BindableVarrayNumber	 m_hopper_amounts;
 	DB::BindableVarrayString	 m_resource_types;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class HarvesterInstallationObjectQuerySelect : public DB::Query
@@ -471,7 +471,7 @@ private:
 	DB::BindableVarrayNumber	 m_activate_start_times;
 	DB::BindableVarrayNumber	 m_powers;
 	DB::BindableVarrayNumber	 m_power_rates;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class InstallationObjectQuerySelect : public DB::Query
@@ -518,7 +518,7 @@ public:
 private:
 	DB::BindableVarrayString	 m_object_ids;
 	DB::BindableVarrayNumber	 m_counts;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class IntangibleObjectQuerySelect : public DB::Query
@@ -569,7 +569,7 @@ private:
 	DB::BindableVarrayNumber	 m_items_per_containers;
 	DB::BindableVarrayNumber	 m_manufacture_times;
 	DB::BindableVarrayNumber	 m_draft_schematics;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class ManufactureSchematicObjectQuerySelect : public DB::Query
@@ -615,7 +615,7 @@ public:
 
 private:
 	DB::BindableVarrayString	 m_object_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class ManufactureInstallationObjectQuerySelect : public DB::Query
@@ -684,7 +684,7 @@ private:
 	DB::BindableVarrayNumber	 m_mission_types;
 	DB::BindableVarrayNumber	 m_target_appearances;
 	DB::BindableVarrayString	 m_target_names;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class MissionObjectQuerySelect : public DB::Query
@@ -731,7 +731,7 @@ public:
 private:
 	DB::BindableVarrayString	 m_object_ids;
 	DB::BindableVarrayString	 m_planet_names;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class PlanetObjectQuerySelect : public DB::Query
@@ -813,7 +813,7 @@ private:
 	DB::BindableVarrayString	 m_show_backpacks;
 	DB::BindableVarrayString	 m_show_helmets;
 	DB::BindableVarrayString	 m_collections2s;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class PlayerObjectQuerySelect : public DB::Query
@@ -888,7 +888,7 @@ private:
 	DB::BindableVarrayString	 m_task_description11s;
 	DB::BindableVarrayString	 m_task_title12s;
 	DB::BindableVarrayString	 m_task_description12s;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class PlayerQuestObjectQuerySelect : public DB::Query
@@ -937,7 +937,7 @@ private:
 	DB::BindableVarrayString	 m_resource_types;
 	DB::BindableVarrayNumber	 m_quantitys;
 	DB::BindableVarrayString	 m_sources;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class ResourceContainerObjectQuerySelect : public DB::Query
@@ -1034,7 +1034,7 @@ private:
 	DB::BindableVarrayNumber	 m_cargo_hold_contents_maximums;
 	DB::BindableVarrayNumber	 m_cargo_hold_contents_currents;
 	DB::BindableVarrayString	 m_cargo_hold_contentss;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class ShipObjectQuerySelect : public DB::Query
@@ -1080,7 +1080,7 @@ public:
 
 private:
 	DB::BindableVarrayString	 m_object_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class StaticObjectQuerySelect : public DB::Query
@@ -1139,7 +1139,7 @@ private:
 	DB::BindableVarrayNumber	 m_conditions;
 	DB::BindableVarrayString	 m_creator_ids;
 	DB::BindableVarrayNumber	 m_source_draft_schematics;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class TangibleObjectQuerySelect : public DB::Query
@@ -1189,7 +1189,7 @@ private:
 	DB::BindableVarrayString	 m_target_server_template_names;
 	DB::BindableVarrayString	 m_target_shared_template_names;
 	DB::BindableVarrayString	 m_waypoints;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class TokenObjectQuerySelect : public DB::Query
@@ -1235,7 +1235,7 @@ public:
 
 private:
 	DB::BindableVarrayString	 m_object_ids;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class UniverseObjectQuerySelect : public DB::Query
@@ -1282,7 +1282,7 @@ public:
 private:
 	DB::BindableVarrayString	 m_object_ids;
 	DB::BindableVarrayNumber	 m_boguss;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class VehicleObjectQuerySelect : public DB::Query
@@ -1340,7 +1340,7 @@ private:
 	DB::BindableVarrayNumber	 m_damage_radiuss;
 	DB::BindableVarrayNumber	 m_min_ranges;
 	DB::BindableVarrayNumber	 m_max_ranges;
-	DB::BindableLong			 m_numItems;
+	DB::BindableInt32			 m_numItems;
 };
 
 class WeaponObjectQuerySelect : public DB::Query

game/server/application/SwgDatabaseServer/src/shared/queries/BountyHunterTargetQuery.h

@@ -41,7 +41,7 @@ namespace DBQuery
 	  private:
 		DB::BindableVarrayString    m_object_ids;
 		DB::BindableVarrayString    m_target_ids;
-		DB::BindableLong            m_numItems;
+		DB::BindableInt32            m_numItems;
 	};
 
 	

game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesQuery.h

@@ -51,7 +51,7 @@ private:
 	DB::BindableVarrayNumber     m_status;
 	DB::BindableVarrayString     m_search_enabled;
 	DB::BindableVarrayNumber     m_entrance_charge;
-	DB::BindableLong             m_numItems;
+	DB::BindableInt32             m_numItems;
 };
 
 class AuctionLocationsQuerySelect : public DB::Query
@@ -114,7 +114,7 @@ private:
 	DB::BindableVarrayNumber    m_actives;
 	DB::BindableVarrayNumber    m_item_sizes;
 	DB::BindableVarrayNumber    m_object_template_ids;
-	DB::BindableLong            m_numItems;
+	DB::BindableInt32            m_numItems;
 };
 
 class MarketAuctionsQuerySelect : public DB::Query
@@ -165,7 +165,7 @@ private:
 	DB::BindableVarrayString    m_bidder_ids;
 	DB::BindableVarrayNumber    m_bids;
 	DB::BindableVarrayNumber    m_max_proxy_bids;
-	DB::BindableLong            m_numItems;
+	DB::BindableInt32            m_numItems;
 };
 
 class MarketAuctionBidsQuerySelect : public DB::Query
@@ -215,7 +215,7 @@ private:
 	DB::BindableVarrayString    m_item_ids;
 	DB::BindableVarrayString    m_attribute_names;
 	DB::BindableVarrayString    m_attribute_values;
-	DB::BindableLong            m_numItems;
+	DB::BindableInt32            m_numItems;
 };
 
 // ======================================================================

game/server/application/SwgDatabaseServer/src/shared/queries/CommoditiesSchema.h

@@ -23,14 +23,14 @@ struct AuctionLocationsRow : public DB::Row
 	DB::BindableNetworkId location_id;
 	DB::BindableString<256> location_name;
 	DB::BindableNetworkId owner_id;
-	DB::BindableLong sales_tax;
+	DB::BindableInt32 sales_tax;
 	DB::BindableNetworkId sales_tax_bank_id;
-	DB::BindableLong empty_date;
-	DB::BindableLong last_access_date;
-	DB::BindableLong inactive_date;
-	DB::BindableLong status;
+	DB::BindableInt32 empty_date;
+	DB::BindableInt32 last_access_date;
+	DB::BindableInt32 inactive_date;
+	DB::BindableInt32 status;
 	DB::BindableBool search_enabled;
-	DB::BindableLong entrance_charge;
+	DB::BindableInt32 entrance_charge;
 
 	virtual void copy(const DB::Row &rhs)
 	{
@@ -71,17 +71,17 @@ struct MarketAuctionsRow : public DB::Row
 	DB::BindableNetworkId    owner_id;
 	DB::BindableNetworkId    creator_id;
 	DB::BindableNetworkId    location_id;
-	DB::BindableLong         min_bid;
-	DB::BindableLong         buy_now_price;
-	DB::BindableLong         auction_timer;
+	DB::BindableInt32         min_bid;
+	DB::BindableInt32         buy_now_price;
+	DB::BindableInt32         auction_timer;
 	DB::BindableString<4000> oob;
 	DB::BindableUnicode<1024>user_description;
-	DB::BindableLong         category;
+	DB::BindableInt32         category;
 	DB::BindableUnicode<1024>item_name;
-	DB::BindableLong         item_timer;
-	DB::BindableLong         active;
-	DB::BindableLong         item_size;
-	DB::BindableLong         object_template_id;
+	DB::BindableInt32         item_timer;
+	DB::BindableInt32         active;
+	DB::BindableInt32         item_size;
+	DB::BindableInt32         object_template_id;
 
 	virtual void copy(const DB::Row &rhs)
 	{
@@ -155,7 +155,7 @@ struct MarketAuctionsRowUpdate : public DB::Row
 
 	DB::BindableNetworkId    item_id;
 	DB::BindableNetworkId    owner_id;
-	DB::BindableLong         active;
+	DB::BindableInt32         active;
 
 	virtual void copy(const DB::Row &rhs)
 	{
@@ -193,8 +193,8 @@ struct MarketAuctionBidsRow : public DB::Row
 
 	DB::BindableNetworkId item_id;
 	DB::BindableNetworkId bidder_id;
-	DB::BindableLong      bid;
-	DB::BindableLong      max_proxy_bid;
+	DB::BindableInt32      bid;
+	DB::BindableInt32      max_proxy_bid;
 
 	virtual void copy(const DB::Row &rhs)
 	{

game/server/application/SwgDatabaseServer/src/shared/queries/DeleteDemandLoadedContainerQuery.h

@@ -38,7 +38,7 @@ namespace DBQuery
 	  private:
 		DB::BindableVarrayString object_ids;
 		DB::BindableVarrayNumber reasons;
-		DB::BindableLong         num_items;
+		DB::BindableInt32         num_items;
 		
 	  private:
 		DeleteDemandLoadedContainerQuery(const DeleteDemandLoadedContainerQuery&);

game/server/application/SwgDatabaseServer/src/shared/queries/LocationQuery.h

@@ -32,9 +32,9 @@ namespace DBQuery
 		
 	  public:
 		DB::BindableNetworkId object_id;
-		DB::BindableLong list_id;
-		DB::BindableLong index;
-		DB::BindableLong action;
+		DB::BindableInt32 list_id;
+		DB::BindableInt32 index;
+		DB::BindableInt32 action;
 		DB::BindableUnicode<255> name;
 		DB::BindableString<50> scene;
 		DB::BindableDouble x;
@@ -55,8 +55,8 @@ namespace DBQuery
 		struct LocationRow
 		{
 			DB::BindableNetworkId object_id;
-			DB::BindableLong list_id;
-			DB::BindableLong index;
+			DB::BindableInt32 list_id;
+			DB::BindableInt32 index;
 			DB::BindableUnicode<255> name;
 			DB::BindableString<50> scene;
 			DB::BindableDouble x;

game/server/application/SwgDatabaseServer/src/shared/queries/ManufactureSchematicAttributeQuery.h

@@ -21,7 +21,7 @@ namespace DBSchema
 	struct ManufactureSchematicAttributeRow : public DB::Row
 	{
 		DB::BindableNetworkId object_id;
-		DB::BindableLong         action;
+		DB::BindableInt32         action;
 		DB::BindableString<500>  attribute_type;
 		DB::BindableDouble       value;
 

game/server/application/SwgDatabaseServer/src/shared/queries/MessageQuery.h

@@ -46,8 +46,8 @@ namespace DBQuery
 		DB::BindableVarrayNumber	m_call_times;
 		DB::BindableVarrayString	m_guaranteeds;
 		DB::BindableVarrayNumber	m_delivery_types;
-		DB::BindableLong			m_numItems;
-		DB::BindableLong			m_enableDatabaseLogging;
+		DB::BindableInt32			m_numItems;
+		DB::BindableInt32			m_enableDatabaseLogging;
 		
 	  private:
 		SaveMessageQuery(const SaveMessageQuery&); // disable
@@ -74,8 +74,8 @@ namespace DBQuery
 
 	  private:
 		DB::BindableVarrayString	m_message_ids;
-		DB::BindableLong			m_numItems;
-		DB::BindableLong			m_enableDatabaseLogging;
+		DB::BindableInt32			m_numItems;
+		DB::BindableInt32			m_enableDatabaseLogging;
 				
 	  private:
 		AckMessageQuery(const AckMessageQuery&); // disable
@@ -94,9 +94,9 @@ namespace DBQuery
 			DB::BindableNetworkId object_id;
 			DB::BindableString<50> method;
 			DB::BindableString<4000> packed_data;
-			DB::BindableLong call_time;
+			DB::BindableInt32 call_time;
 			DB::BindableBool guaranteed;
-			DB::BindableLong delivery_type;
+			DB::BindableInt32 delivery_type;
 		};
 
 	  public:

game/server/application/SwgDatabaseServer/src/shared/queries/ObjectVariableQueries.h

@@ -47,7 +47,7 @@ namespace DBQuery
 		DB::BindableVarrayNumber m_nameIds;
 		DB::BindableVarrayNumber m_types;
 		DB::BindableVarrayString m_values;
-		DB::BindableLong         m_numItems;
+		DB::BindableInt32         m_numItems;
 	};
 
 	class AddObjectVariableQuery : public GenericObjectVariableQuery
@@ -93,7 +93,7 @@ namespace DBQuery
 	  private:
 		DB::BindableVarrayString m_objectIds;
 		DB::BindableVarrayNumber m_nameIds;
-		DB::BindableLong         m_numItems;
+		DB::BindableInt32         m_numItems;
 	};
 
 	/** 

game/server/application/SwgDatabaseServer/src/shared/queries/ObjectsTableQuery.h

@@ -135,7 +135,7 @@ namespace DBQuery
 			DB::BindableVarrayString		m_objvar_19_values;
 			DB::BindableVarrayString		m_script_lists;
 
-			DB::BindableLong				m_numItems;
+			DB::BindableInt32				m_numItems;
 	};
 
 	class ObjectsTableQuerySelect : public DB::Query

game/server/application/SwgDatabaseServer/src/shared/queries/OfflineMoneyCustomPersistStep.cpp

@@ -49,7 +49,7 @@ namespace OfflineMoneyCustomPersistStepNamespace
 
 	private:
 		DB::BindableNetworkId m_sourceObject;
-		DB::BindableLong m_amount;
+		DB::BindableInt32 m_amount;
 		DB::BindableBool m_result;
 
 	private:

game/server/application/SwgDatabaseServer/src/shared/queries/PropertyListQuery.h

@@ -30,8 +30,8 @@ namespace DBSchema
 		};
 		
 		DB::BindableNetworkId object_id;
-		DB::BindableLong list_id;
-		DB::BindableLong operation;
+		DB::BindableInt32 list_id;
+		DB::BindableInt32 operation;
 		DB::BindableString<500> value; //TODO:  size
 
 		virtual void copy(const DB::Row &rhs)
@@ -67,9 +67,9 @@ namespace DBQuery
 		DB::BindableVarrayString	m_object_ids;
 		DB::BindableVarrayNumber	m_list_ids;
 		DB::BindableVarrayString	m_values;
-		DB::BindableLong			m_operations;
-		DB::BindableLong			m_numItems;
-		DB::BindableLong			m_enableDatabaseLogging;
+		DB::BindableInt32			m_operations;
+		DB::BindableInt32			m_numItems;
+		DB::BindableInt32			m_enableDatabaseLogging;
 
 		PropertyListQuery(const PropertyListQuery&);            // disable
 		PropertyListQuery& operator=(const PropertyListQuery&); // disable

game/server/application/SwgDatabaseServer/src/shared/queries/ResourceTypeQuery.h

@@ -45,7 +45,7 @@ namespace DBQuery
 		DB::BindableVarrayString    m_attributes;
 		DB::BindableVarrayString    m_fractal_seeds;
 		DB::BindableVarrayNumber    m_depleted_timestamps;
-		DB::BindableLong            m_numItems;
+		DB::BindableInt32            m_numItems;
 	};
 
 	

game/server/application/SwgDatabaseServer/src/shared/queries/SkillQuery.h

@@ -28,8 +28,8 @@ namespace DBSchema
 		};
 		
 		DB::BindableNetworkId object_id;
-		DB::BindableLong index;
-		DB::BindableLong operation;
+		DB::BindableInt32 index;
+		DB::BindableInt32 operation;
 		DB::BindableString<500> skill; //TODO:  size
 
 		virtual void copy(const DB::Row &rhs)

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetAuctionList.h

@@ -28,20 +28,20 @@ namespace DBSchema
 	struct AuctionRow : public DB::Row
 	{
 		DB::BindableNetworkId      creatorId;
-		DB::BindableLong           minBid;
-		DB::BindableLong           auctionTimer;
-		DB::BindableLong           buyNowPrice;
+		DB::BindableInt32           minBid;
+		DB::BindableInt32           auctionTimer;
+		DB::BindableInt32           buyNowPrice;
 		DB::BindableUnicode<1024>  userDescription;
 		DB::BindableString<4000>   oob;
 		DB::BindableNetworkId      locationId;
 		DB::BindableNetworkId      itemId;
-		DB::BindableLong           category;
-		DB::BindableLong           itemTimer;
+		DB::BindableInt32           category;
+		DB::BindableInt32           itemTimer;
 		DB::BindableUnicode<1024>  itemName;
 		DB::BindableNetworkId      ownerId;
-		DB::BindableLong           active;
-		DB::BindableLong           itemSize;
-		DB::BindableLong           itemTemplateId;
+		DB::BindableInt32           active;
+		DB::BindableInt32           itemSize;
+		DB::BindableInt32           itemTemplateId;
 
 		virtual void copy(const DB::Row &rhs)
 		{

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetBidList.h

@@ -27,8 +27,8 @@ namespace DBSchema
 	{
 		DB::BindableNetworkId       itemId;
 		DB::BindableNetworkId       bidderId;
-		DB::BindableLong            bid;
-		DB::BindableLong            maxProxyBid;
+		DB::BindableInt32            bid;
+		DB::BindableInt32            maxProxyBid;
 
 		virtual void copy(const DB::Row &rhs)
 		{

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskGetLocationList.h

@@ -28,14 +28,14 @@ namespace DBSchema
 		DB::BindableNetworkId        locationId;
 		DB::BindableNetworkId        ownerId;
 		DB::BindableString<256>      locationString;
-		DB::BindableLong             salesTax;
+		DB::BindableInt32             salesTax;
 		DB::BindableNetworkId        salesTaxBankId;
-		DB::BindableLong             emptyDate;
-		DB::BindableLong             lastAccessDate;
-		DB::BindableLong             inactiveDate;
-		DB::BindableLong             status;
+		DB::BindableInt32             emptyDate;
+		DB::BindableInt32             lastAccessDate;
+		DB::BindableInt32             inactiveDate;
+		DB::BindableInt32             status;
 		DB::BindableBool             searchEnabled;
-		DB::BindableLong             entranceCharge;
+		DB::BindableInt32             entranceCharge;
 
 		virtual void copy(const DB::Row &rhs)
 		{

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLoadObjvarNames.h

@@ -29,7 +29,7 @@ class TaskLoadObjvarNames : public DB::TaskRequest
   private:
 	struct ObjvarNameRow
 	{
-		DB::BindableLong name_id;
+		DB::BindableInt32 name_id;
 		DB::BindableString<500> name;
 	};
 

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskLocateStructure.h

@@ -42,10 +42,10 @@ class TaskLocateStructure:public DB::TaskRequest
 		DB::BindableNetworkId   item_id;
 
 		//output:
-		DB::BindableLong	x;
-		DB::BindableLong	z;
+		DB::BindableInt32	x;
+		DB::BindableInt32	z;
 		DB::BindableString<50>	sceneId;
-		DB::BindableLong	found;
+		DB::BindableInt32	found;
 
 	  private:
 		LocateStructureQuery(const LocateStructureQuery&);

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskMoveToPlayer.h

@@ -43,7 +43,7 @@ class TaskMoveToPlayer:public DB::TaskRequest
 		DB::BindableNetworkId   player;
 		
 		//output:
-		DB::BindableLong        result;
+		DB::BindableInt32        result;
 
 	  private:
 		MoveToPlayerQuery(const MoveToPlayerQuery&);

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreCharacter.h

@@ -43,10 +43,10 @@ class TaskRestoreCharacter:public DB::TaskRequest
 		DB::BindableNetworkId   character_id;
 		
 		//output:
-		DB::BindableLong        result;
+		DB::BindableInt32        result;
 		DB::BindableString<127> character_name;
-		DB::BindableLong        account;
-		DB::BindableLong        template_id;
+		DB::BindableInt32        account;
+		DB::BindableInt32        template_id;
 		
 	  private:
 		RestoreCharacterQuery(const RestoreCharacterQuery&);

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskRestoreHouse.h

@@ -42,7 +42,7 @@ class TaskRestoreHouse:public DB::TaskRequest
 		DB::BindableNetworkId   house_id;
 		
 		//output:
-		DB::BindableLong        result;
+		DB::BindableInt32        result;
 		
 	  private:
 		RestoreHouseQuery(const RestoreHouseQuery&);

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskSaveObjvarNames.h

@@ -39,7 +39,7 @@ class TaskSaveObjvarNames : public DB::TaskRequest
 		virtual QueryMode  getExecutionMode () const;
 
 	  public:
-		DB::BindableLong         name_id;
+		DB::BindableInt32         name_id;
 		DB::BindableString<500>  name;
 
 	  private:

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskUndeleteItem.h

@@ -42,7 +42,7 @@ class TaskUndeleteItem:public DB::TaskRequest
 		DB::BindableNetworkId   item_id;
 		
 		//output:
-		DB::BindableLong        result;
+		DB::BindableInt32        result;
 		
 	  private:
 		UndeleteItemQuery(const UndeleteItemQuery&);

game/server/application/SwgDatabaseServer/src/shared/tasks/TaskVerifyCharacter.h

@@ -47,7 +47,7 @@ class TaskVerifyCharacter:public DB::TaskRequest
 		
 	  public:
 		// input:
-		DB::BindableLong        station_id; //lint !e1925 public data member Suppresed because it's in a private inner class
+		DB::BindableInt32        station_id; //lint !e1925 public data member Suppresed because it's in a private inner class
 		DB::BindableNetworkId   character_id; //lint !e1925 public data member Suppresed because it's in a private inner class
 		DB::BindableString<50>  gold_schema; //lint !e1925 public data member Suppresed because it's in a private inner class
 		
@@ -59,7 +59,7 @@ class TaskVerifyCharacter:public DB::TaskRequest
 		DB::BindableDouble      x; //lint !e1925 public data member Suppresed because it's in a private inner class
 		DB::BindableDouble      y; //lint !e1925 public data member Suppresed because it's in a private inner class
 		DB::BindableDouble      z; //lint !e1925 public data member Suppresed because it's in a private inner class
-		DB::BindableLong        containment_flag;
+		DB::BindableInt32        containment_flag;
 		
 	  private:
 		VerifyCharacterQuery(const VerifyCharacterQuery&);