Merge pull request #1215 from RumbleDB/ghislainfourny-patch-1

Fix bug in multiplication and addition native SQL
RumbleDB · Jan 17, 2023 · 1cdfc73 · 1cdfc73
2 parents 5464cf1 + 6bea610
commit 1cdfc73
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/org/rumbledb/runtime/arithmetics/AdditiveOperationIterator.java b/src/main/java/org/rumbledb/runtime/arithmetics/AdditiveOperationIterator.java
@@ -438,7 +438,7 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 rightResult.getResultingType().isNumeric()
         ) {
             if (!rightResult.getResultingType().isSubtypeOf(BuiltinTypesCatalogue.doubleItem)) {
-                rightQuery = "(CAST (" + leftQuery + " AS DOUBLE))";
+                rightQuery = "(CAST (" + rightQuery + " AS DOUBLE))";
             }
             resultType = BuiltinTypesCatalogue.doubleItem;
         } else if (
@@ -456,7 +456,7 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 rightResult.getResultingType().isNumeric()
         ) {
             if (!rightResult.getResultingType().isSubtypeOf(BuiltinTypesCatalogue.floatItem)) {
-                rightQuery = "(CAST (" + leftQuery + " AS FLOAT))";
+                rightQuery = "(CAST (" + rightQuery + " AS FLOAT))";
             }
             resultType = BuiltinTypesCatalogue.floatItem;
         } else if (

diff --git a/src/main/java/org/rumbledb/runtime/arithmetics/MultiplicativeOperationIterator.java b/src/main/java/org/rumbledb/runtime/arithmetics/MultiplicativeOperationIterator.java
@@ -560,7 +560,7 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 rightResult.getResultingType().isNumeric()
         ) {
             if (!rightResult.getResultingType().isSubtypeOf(BuiltinTypesCatalogue.doubleItem)) {
-                rightQuery = "(CAST (" + leftQuery + " AS DOUBLE))";
+                rightQuery = "(CAST (" + rightQuery + " AS DOUBLE))";
             }
             resultType = BuiltinTypesCatalogue.doubleItem;
         } else if (
@@ -578,7 +578,7 @@ public NativeClauseContext generateNativeQuery(NativeClauseContext nativeClauseC
                 rightResult.getResultingType().isNumeric()
         ) {
             if (!rightResult.getResultingType().isSubtypeOf(BuiltinTypesCatalogue.floatItem)) {
-                rightQuery = "(CAST (" + leftQuery + " AS FLOAT))";
+                rightQuery = "(CAST (" + rightQuery + " AS FLOAT))";
             }
             resultType = BuiltinTypesCatalogue.floatItem;
         } else if (