modify:can be delete userkey and timerelease datas when delete table

Author: xengine-qyt

XEngine_Source/MQCore_DBModule/DBModule_MQUser/DBModule_MQUser.cpp

@@ -519,13 +519,23 @@ BOOL CDBModule_MQUser::DBModule_MQUser_KeyDelete(XENGINE_DBUSERKEY* pSt_UserKey)
 	TCHAR tszSQLStatement[1024];
 	memset(tszSQLStatement, '\0', sizeof(tszSQLStatement));
 
-	if (_tcslen(pSt_UserKey->tszKeyName) <= 0)
+	if ((_tcslen(pSt_UserKey->tszKeyName) > 0) && (_tcslen(pSt_UserKey->tszUserName) > 0))
+	{
+		_stprintf_s(tszSQLStatement, _T("DELETE FROM `UserKey` WHERE tszKeyUser = '%s' AND tszKeyName = '%s'"), pSt_UserKey->tszUserName, pSt_UserKey->tszKeyName);
+	}
+	else if ((_tcslen(pSt_UserKey->tszKeyName) > 0) && (_tcslen(pSt_UserKey->tszUserName) <= 0))
+	{
+		_stprintf_s(tszSQLStatement, _T("DELETE FROM `UserKey` WHERE tszKeyName = '%s'"), pSt_UserKey->tszKeyName);
+	}
+	else if ((_tcslen(pSt_UserKey->tszKeyName) <= 0) && (_tcslen(pSt_UserKey->tszUserName) > 0))
 	{
 		_stprintf_s(tszSQLStatement, _T("DELETE FROM `UserKey` WHERE tszKeyUser = '%s'"), pSt_UserKey->tszUserName);
 	}
 	else
 	{
-		_stprintf_s(tszSQLStatement, _T("DELETE FROM `UserKey` WHERE tszKeyUser = '%s' AND tszKeyName = '%s'"), pSt_UserKey->tszUserName, pSt_UserKey->tszKeyName);
+		DBModule_IsErrorOccur = TRUE;
+		DBModule_dwErrorCode = ERROR_XENGINE_MQCORE_DATABASE_PARAMENT;
+		return FALSE;
 	}
 
 	if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLStatement))
@@ -730,7 +740,21 @@ BOOL CDBModule_MQUser::DBModule_MQUser_TimeDelete(XENGINE_DBTIMERELEASE* pSt_DBI
 	TCHAR tszSQLQuery[2048];
 	memset(tszSQLQuery, '\0', sizeof(tszSQLQuery));
 
-	_stprintf_s(tszSQLQuery, _T("DELETE FROM `UserTime` WHERE nIDMsg = %lld"), pSt_DBInfo->nIDMsg);
+	if (pSt_DBInfo->nIDMsg > 0)
+	{
+		_stprintf_s(tszSQLQuery, _T("DELETE FROM `UserTime` WHERE nIDMsg = %lld"), pSt_DBInfo->nIDMsg);
+	}
+	else if (_tcslen(pSt_DBInfo->tszQueueName) > 0)
+	{
+		_stprintf_s(tszSQLQuery, _T("DELETE FROM `UserTime` WHERE tszQueueName = '%s'"), pSt_DBInfo->tszQueueName);
+	}
+	else
+	{
+		DBModule_IsErrorOccur = TRUE;
+		DBModule_dwErrorCode = ERROR_XENGINE_MQCORE_DATABASE_PARAMENT;
+		return FALSE;
+	}
+
 	if (!DataBase_MySQL_Execute(xhDBSQL, tszSQLQuery))
 	{
 		DBModule_IsErrorOccur = TRUE;

XEngine_Source/XEngine_MQServiceApp/MQService_TCPTask.cpp

@@ -522,10 +522,17 @@ BOOL MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCTSTR lpszC
 			pSt_ProtocolHdr->unOperatorCode = XENGINE_COMMUNICATION_PROTOCOL_OPERATOR_CODE_MQ_REPDELETE;
 			//清理所有者
 			XENGINE_DBTOPICOWNER st_DBOwner;
+			XENGINE_DBUSERKEY st_UserKey;
+			XENGINE_DBTIMERELEASE st_DBInfo;
+
 			memset(&st_DBOwner, '\0', sizeof(XENGINE_DBTOPICOWNER));
+			memset(&st_UserKey, '\0', sizeof(XENGINE_DBUSERKEY));
+			memset(&st_DBInfo, '\0', sizeof(XENGINE_DBTIMERELEASE));
 
 			_tcscpy(st_DBOwner.tszUserName, tszUserName);
 			_tcscpy(st_DBOwner.tszQueueName, st_MQProtocol.tszMQKey);
+			_tcscpy(st_UserKey.tszKeyName, st_MQProtocol.tszMQKey);
+			_tcscpy(st_DBInfo.tszQueueName, st_MQProtocol.tszMQKey);
 
 			if (!DBModule_MQUser_OwnerDelete(&st_DBOwner))
 			{
@@ -541,6 +548,8 @@ BOOL MessageQueue_TCP_Handle(XENGINE_PROTOCOLHDR* pSt_ProtocolHdr, LPCTSTR lpszC
 			//清楚数据库
 			SessionModule_Notify_Destory(st_MQProtocol.tszMQKey);
 			DBModule_MQData_DeleteTable(st_MQProtocol.tszMQKey);
+			DBModule_MQUser_KeyDelete(&st_UserKey);
+			DBModule_MQUser_TimeDelete(&st_DBInfo);
 			if (pSt_ProtocolHdr->byIsReply || (XENGINE_MQAPP_NETTYPE_HTTP == nNetType))
 			{
 				pSt_ProtocolHdr->wReserve = 0;