Skip to content

Fix MySQL search_RMTObject and search_RMCObject end-to-end #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
patrickoshaughnessey wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Fix MySQL search_RMTObject and search_RMCObject end-to-end #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c3b5458
Fix stored procedure bugs blocking object creation and deletion
patrickoshaughnessey Feb 15, 2026
bafc45a
Merge upstream MetaversalCorp/MSF_Map_Db main
patrickoshaughnessey Apr 21, 2026
a260654
Fix OUT parameter shadowing in set_RMCObject_RMTObject_Open
patrickoshaughnessey Apr 21, 2026
5195b24
Correct call_RMRoot_Event_RMCObject_Close and revert superfluous _Ope…
patrickoshaughnessey Apr 22, 2026
90982e3
Merge upstream MetaversalCorp/MSF_Map_Db main (post-PR #1 merge)
patrickoshaughnessey Apr 22, 2026
a5d84a3
Fix swapped d22/d23 in call_RMTMatrix_Relative ELSE branch
patrickoshaughnessey May 5, 2026
cd350b5
Merge fix/rmtobject-validate-type-args into main
patrickoshaughnessey May 7, 2026
c970cb2
Merge fix/relative-d22-d23-swap into main
patrickoshaughnessey May 7, 2026
160f6ad
Fix MySQL search_RMTObject and search_RMCObject end-to-end
patrickoshaughnessey May 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions MySQL/Procedures/RMCObject/search_RMCObject.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,13 @@ CREATE PROCEDURE search_RMCObject
IN dX DOUBLE,
IN dY DOUBLE,
IN dZ DOUBLE,
IN sText VARCHAR (48)
IN sText VARCHAR (48),
OUT nResult BIGINT
)
BEGIN
DECLARE MVO_RMCOBJECT_TYPE_SATELLITE INT DEFAULT 15;

DECLARE bError INT;
DECLARE bError INT DEFAULT 0;
DECLARE bCommit INT DEFAULT 0;
DECLARE nError INT DEFAULT 0;

Expand All @@ -62,7 +63,7 @@ BEGIN

IF bError = 0
THEN
SET sText = TRIM (IFNULL (sText, ''));
SET sText = TRIM(IFNULL(sText, ''));

IF sText <> ''
THEN
Expand All @@ -85,7 +86,7 @@ BEGIN
POW(4.0, o.Type_bType - 7) AS dFactor,
-1 AS dDistance
FROM RMCObject AS o
WHERE o.Name_wsRMCObjectId LIKE CONCAT(sText, '%')
WHERE o.Name_wsRMCObjectId LIKE CONCAT(sText, '%') COLLATE utf8mb4_unicode_ci
AND o.Type_bType BETWEEN bType + 1 AND MVO_RMCOBJECT_TYPE_SATELLITE
ORDER BY POW(4.0, o.Type_bType - 7) * (-1) DESC, o.Name_wsRMCObjectId
LIMIT 10;
Expand Down Expand Up @@ -164,7 +165,7 @@ BEGIN

DROP TEMPORARY TABLE Error;

SET nError = bCommit - bError - 1;
SET nResult = bCommit - 1 - nError;
END$$
DELIMITER ;

Expand Down
2 changes: 1 addition & 1 deletion MySQL/Procedures/RMTMatrix/call_RMTMatrix_Relative.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,8 +91,8 @@ BEGIN

mr.d20,
mr.d21,
mr.d23,
mr.d22,
mr.d23,

mr.d30,
mr.d31,
Expand Down
14 changes: 9 additions & 5 deletions MySQL/Procedures/RMTObject/search_RMTObject.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,15 @@ CREATE PROCEDURE search_RMTObject
IN dX DOUBLE,
IN dY DOUBLE,
IN dZ DOUBLE,
IN sText VARCHAR (48)
IN sText VARCHAR (48),
OUT nResult BIGINT
)
BEGIN
DECLARE MVO_RMTOBJECT_TYPE_COMMUNITY INT DEFAULT 9;

DECLARE bError INT;
DECLARE bError INT DEFAULT 0;
DECLARE bCommit INT DEFAULT 0;
DECLARE nError INT;
DECLARE nError INT DEFAULT 0;

DECLARE bType TINYINT UNSIGNED;
DECLARE dRange DOUBLE;
Expand Down Expand Up @@ -75,7 +76,7 @@ BEGIN

IF bError = 0
THEN
SET sText = TRIM (IFNULL (sText, ''));
SET sText = TRIM(IFNULL(sText, ''));

IF sText <> ''
THEN
Expand All @@ -98,7 +99,7 @@ BEGIN
FROM RMTObject AS o
JOIN RMTMatrix AS m ON m.bnMatrix = o.ObjectHead_Self_twObjectIx

WHERE o.Name_wsRMTObjectId LIKE CONCAT(sText, '%')
WHERE o.Name_wsRMTObjectId LIKE CONCAT(sText, '%') COLLATE utf8mb4_unicode_ci
AND o.Type_bType BETWEEN bType + 1 AND MVO_RMTOBJECT_TYPE_COMMUNITY
ORDER BY POW (4.0, o.Type_bType - 7) * ArcLength (dRadius, dX, dY, dZ, m.d03, m.d13, m.d23), o.Name_wsRMTObjectId
LIMIT 10;
Expand Down Expand Up @@ -179,6 +180,9 @@ BEGIN

DROP TEMPORARY TABLE Error;
DROP TEMPORARY TABLE Result;

SET nResult = bCommit - 1 - nError;

END$$

DELIMITER ;
Expand Down
2 changes: 1 addition & 1 deletion SQL_Server/Procedures/RMTMatrix/call_RMTMatrix_Relative.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ BEGIN

@d20 = mr.d20,
@d21 = mr.d21,
@d23 = mr.d23,
@d22 = mr.d22,
@d23 = mr.d23,

@d30 = mr.d30,
@d31 = mr.d31,
Expand Down