From 5ed62d6db19ee7374fbf2fb4b70d45c945e78c75 Mon Sep 17 00:00:00 2001
From: Sahil Bansal <sahilbansal@sahilba-ltmu7pt.internal.salesforce.com>
Date: Mon, 7 Oct 2024 16:00:39 -0700
Subject: [PATCH 1/3] testing

---
 .../com/force/formula/impl/formulaTestV2.xml  | 42 +++++++++++++++++
 .../com/force/formula/impl/formulaTestV2.xml  | 45 ++++++++++++++++++-
 pom.xml                                       |  4 +-
 3 files changed, 88 insertions(+), 3 deletions(-)

diff --git a/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml b/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml
index 9fd0c38b..860f8d57 100644
--- a/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml
+++ b/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml
@@ -1,6 +1,48 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <formula-test xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="formulaTestV2.xsd">
+
+    <testcase testName="testABCD"
+              fieldName="testABCD"
+              dataType="Boolean"
+              formula="if(ISBLANK(a__c),FALSE, VALUE(a__c) == VALUE(b__c) &amp;&amp; VALUE(c__c) == VALUE(d__c))"
+              executionPaths="formula,sql,formulaNullAsNull,sqlNullAsNull">
+        <referenceField fieldName="a" dataType="Text"/>
+        <referenceField fieldName="b" dataType="Text"/>
+        <referenceField fieldName="c" dataType="Text"/>
+        <referenceField fieldName="d" dataType="Text"/>
+        <testData input="null,1,1,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,null,1,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,1,null,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,1,1,null" expectedOutput="false,false,false,false"/>
+        <testData input="1,1,null,null" expectedOutput="false,false,false,false"/>
+        <testData input="1,null,1,null" expectedOutput="false,false,false,false"/>
+        <testData input="null,1,1,null" expectedOutput="false,false,false,false"/>
+        <testData input="1,null,null,1" expectedOutput="false,false,false,false"/>
+        <testData input="null,1,null,1" expectedOutput="false,false,false,false"/>
+        <testData input="null,null,1,1" expectedOutput="false,false,false,false"/>
+        <testData input="null,null,null,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,null,null,null" expectedOutput="false,false,false,false"/>
+        <testData input="null,1,null,null" expectedOutput="false,false,false,false"/>
+        <testData input="null,null,1,null" expectedOutput="false,false,false,false"/>
+        <testData input="null,null,null,null" expectedOutput="false,false,false,false"/>
+        <testData input=",1,1,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,,1,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,1,,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,1,1," expectedOutput="false,false,false,false"/>
+        <testData input="1,1,," expectedOutput="false,false,false,false"/>
+        <testData input="1,,1," expectedOutput="false,false,false,false"/>
+        <testData input=",1,1," expectedOutput="false,false,false,false"/>
+        <testData input="1,,,1" expectedOutput="false,false,false,false"/>
+        <testData input=",1,,1" expectedOutput="false,false,false,false"/>
+        <testData input=",,1,1" expectedOutput="false,false,false,false"/>
+        <testData input=",,,1" expectedOutput="false,false,false,false"/>
+        <testData input="1,,," expectedOutput="false,false,false,false"/>
+        <testData input=",1,," expectedOutput="false,false,false,false"/>
+        <testData input=",,1," expectedOutput="false,false,false,false"/>
+        <testData input=",,," expectedOutput="false,false,false,false"/>
+    </testcase>
+
     <testcase testName="testDateTimeValueWithInvalidString"
               fieldName="testDateTimeValueWithInvalidString"
               dataType="DateOnly"
diff --git a/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml b/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
index ce4a4d49..0d6b99bb 100644
--- a/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
+++ b/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
@@ -1,6 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <formula-test xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="/com/force/formula/impl/formulaTestV2.xsd">
+
+   <testcase testName="testABCD"
+             fieldName="testABCD"
+             dataType="Boolean"
+             formula="if(ISBLANK(a__c),FALSE, VALUE(a__c) == VALUE(b__c) &amp;&amp; VALUE(c__c) == VALUE(d__c))"
+             executionPaths="formula,sql,formulaNullAsNull,sqlNullAsNull">
+      <referenceField fieldName="a" dataType="Text"/>
+      <referenceField fieldName="b" dataType="Text"/>
+      <referenceField fieldName="c" dataType="Text"/>
+      <referenceField fieldName="d" dataType="Text"/>
+      <testData input="null,1,1,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,null,1,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,1,null,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,1,1,null" expectedOutput="false,false,false,false"/>
+      <testData input="1,1,null,null" expectedOutput="false,false,false,false"/>
+      <testData input="1,null,1,null" expectedOutput="false,false,false,false"/>
+      <testData input="null,1,1,null" expectedOutput="false,false,false,false"/>
+      <testData input="1,null,null,1" expectedOutput="false,false,false,false"/>
+      <testData input="null,1,null,1" expectedOutput="false,false,false,false"/>
+      <testData input="null,null,1,1" expectedOutput="false,false,false,false"/>
+      <testData input="null,null,null,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,null,null,null" expectedOutput="false,false,false,false"/>
+      <testData input="null,1,null,null" expectedOutput="false,false,false,false"/>
+      <testData input="null,null,1,null" expectedOutput="false,false,false,false"/>
+      <testData input="null,null,null,null" expectedOutput="false,false,false,false"/>
+      <testData input=",1,1,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,,1,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,1,,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,1,1," expectedOutput="false,false,false,false"/>
+      <testData input="1,1,," expectedOutput="false,false,false,false"/>
+      <testData input="1,,1," expectedOutput="false,false,false,false"/>
+      <testData input=",1,1," expectedOutput="false,false,false,false"/>
+      <testData input="1,,,1" expectedOutput="false,false,false,false"/>
+      <testData input=",1,,1" expectedOutput="false,false,false,false"/>
+      <testData input=",,1,1" expectedOutput="false,false,false,false"/>
+      <testData input=",,,1" expectedOutput="false,false,false,false"/>
+      <testData input="1,,," expectedOutput="false,false,false,false"/>
+      <testData input=",1,," expectedOutput="false,false,false,false"/>
+      <testData input=",,1," expectedOutput="false,false,false,false"/>
+      <testData input=",,," expectedOutput="false,false,false,false"/>
+   </testcase>
+
+   <!--
    <testcase testName="testDateTimeValueWithInvalidString"
              fieldName="testDateTimeValueWithInvalidString"
              dataType="DateOnly"
@@ -28794,5 +28837,5 @@
 					3.1415926535897931384626433832795,
 					3.141592653589793,
 					3.1415926535897931384626433832795"/>
-   </testcase>
+   </testcase> -->
 </formula-test>
diff --git a/pom.xml b/pom.xml
index b68dc697..4f162f97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -541,8 +541,8 @@
         <!-- <module>mysql-test</module> -->
         <!-- MYSQL tests having issues in handling regular expressions, so excluding these tests from maven build process-->
         <!-- These tests can be executed by using the "mysql" profile e.g. `mvn -P mysql clean verify -B` -->
-        <module>sqlserver-test</module>
-        <module>sqlite-test</module>
+        <!--<module>sqlserver-test</module>
+        <module>sqlite-test</module>-->
         <!-- <module>h2-test</module> -->
         <!-- Google spanner is having issues with connection in Jenkins, so excluding these tests from maven build process-->
         <!-- These tests can be executed by using the "google-spanner" profile e.g. `mvn -P google-spanner clean verify -B` -->

From aa0e55449ff1e0c701cde274c6d2db6c21a837f1 Mon Sep 17 00:00:00 2001
From: Sahil Bansal <sahilbansal@salesforce.com>
Date: Mon, 7 Oct 2024 22:22:56 -0700
Subject: [PATCH 2/3] testing

---
 .../com/force/formula/impl/formulaTestV2.xml  | 68 +++++++++----------
 .../com/force/formula/impl/formulaTestV2.xml  | 64 ++++++++---------
 2 files changed, 66 insertions(+), 66 deletions(-)

diff --git a/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml b/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml
index 860f8d57..c14eb684 100644
--- a/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml
+++ b/impl/src/test/resources/com/force/formula/impl/formulaTestV2.xml
@@ -2,46 +2,46 @@
 <formula-test xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
               xsi:noNamespaceSchemaLocation="formulaTestV2.xsd">
 
-    <testcase testName="testABCD"
+    <!--<testcase testName="testABCD"
               fieldName="testABCD"
               dataType="Boolean"
-              formula="if(ISBLANK(a__c),FALSE, VALUE(a__c) == VALUE(b__c) &amp;&amp; VALUE(c__c) == VALUE(d__c))"
-              executionPaths="formula,sql,formulaNullAsNull,sqlNullAsNull">
+              formula="IF(ISBLANK(a__c),false,AND((VALUE(a__c)==VALUE(b__c)),(VALUE(c__c)==VALUE(d__c))))"
+              executionPaths="sql,sqlNullAsNull">
         <referenceField fieldName="a" dataType="Text"/>
         <referenceField fieldName="b" dataType="Text"/>
         <referenceField fieldName="c" dataType="Text"/>
         <referenceField fieldName="d" dataType="Text"/>
-        <testData input="null,1,1,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,null,1,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,1,null,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,1,1,null" expectedOutput="false,false,false,false"/>
-        <testData input="1,1,null,null" expectedOutput="false,false,false,false"/>
-        <testData input="1,null,1,null" expectedOutput="false,false,false,false"/>
-        <testData input="null,1,1,null" expectedOutput="false,false,false,false"/>
-        <testData input="1,null,null,1" expectedOutput="false,false,false,false"/>
-        <testData input="null,1,null,1" expectedOutput="false,false,false,false"/>
-        <testData input="null,null,1,1" expectedOutput="false,false,false,false"/>
-        <testData input="null,null,null,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,null,null,null" expectedOutput="false,false,false,false"/>
-        <testData input="null,1,null,null" expectedOutput="false,false,false,false"/>
-        <testData input="null,null,1,null" expectedOutput="false,false,false,false"/>
-        <testData input="null,null,null,null" expectedOutput="false,false,false,false"/>
-        <testData input=",1,1,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,,1,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,1,,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,1,1," expectedOutput="false,false,false,false"/>
-        <testData input="1,1,," expectedOutput="false,false,false,false"/>
-        <testData input="1,,1," expectedOutput="false,false,false,false"/>
-        <testData input=",1,1," expectedOutput="false,false,false,false"/>
-        <testData input="1,,,1" expectedOutput="false,false,false,false"/>
-        <testData input=",1,,1" expectedOutput="false,false,false,false"/>
-        <testData input=",,1,1" expectedOutput="false,false,false,false"/>
-        <testData input=",,,1" expectedOutput="false,false,false,false"/>
-        <testData input="1,,," expectedOutput="false,false,false,false"/>
-        <testData input=",1,," expectedOutput="false,false,false,false"/>
-        <testData input=",,1," expectedOutput="false,false,false,false"/>
-        <testData input=",,," expectedOutput="false,false,false,false"/>
-    </testcase>
+        <testData input="null,1,1,1" expectedOutput="false,false"/>
+        <testData input="1,null,1,1" expectedOutput="false,false"/>
+        <testData input="1,1,null,1" expectedOutput="false,false"/>
+        <testData input="1,1,1,null" expectedOutput="false,false"/>
+        <testData input="1,1,null,null" expectedOutput="false,false"/>
+        <testData input="1,null,1,null" expectedOutput="false,false"/>
+        <testData input="null,1,1,null" expectedOutput="false,false"/>
+        <testData input="1,null,null,1" expectedOutput="false,false"/>
+        <testData input="null,1,null,1" expectedOutput="false,false"/>
+        <testData input="null,null,1,1" expectedOutput="false,false"/>
+        <testData input="null,null,null,1" expectedOutput="false,false"/>
+        <testData input="1,null,null,null" expectedOutput="false,false"/>
+        <testData input="null,1,null,null" expectedOutput="false,false"/>
+        <testData input="null,null,1,null" expectedOutput="false,false"/>
+        <testData input="null,null,null,null" expectedOutput="false,false"/>
+        <testData input=",1,1,1" expectedOutput="false,false"/>
+        <testData input="1,,1,1" expectedOutput="false,false"/>
+        <testData input="1,1,,1" expectedOutput="false,false"/>
+        <testData input="1,1,1," expectedOutput="false,false"/>
+        <testData input="1,1,," expectedOutput="false,false"/>
+        <testData input="1,,1," expectedOutput="false,false"/>
+        <testData input=",1,1," expectedOutput="false,false"/>
+        <testData input="1,,,1" expectedOutput="false,false"/>
+        <testData input=",1,,1" expectedOutput="false,false"/>
+        <testData input=",,1,1" expectedOutput="false,false"/>
+        <testData input=",,,1" expectedOutput="false,false"/>
+        <testData input="1,,," expectedOutput="false,false"/>
+        <testData input=",1,," expectedOutput="false,false"/>
+        <testData input=",,1," expectedOutput="false,false"/>
+        <testData input=",,," expectedOutput="false,false"/>
+    </testcase>-->
 
     <testcase testName="testDateTimeValueWithInvalidString"
               fieldName="testDateTimeValueWithInvalidString"
diff --git a/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml b/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
index 0d6b99bb..2caaa214 100644
--- a/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
+++ b/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
@@ -5,42 +5,42 @@
    <testcase testName="testABCD"
              fieldName="testABCD"
              dataType="Boolean"
-             formula="if(ISBLANK(a__c),FALSE, VALUE(a__c) == VALUE(b__c) &amp;&amp; VALUE(c__c) == VALUE(d__c))"
-             executionPaths="formula,sql,formulaNullAsNull,sqlNullAsNull">
+             formula="IF(ISBLANK(a__c),false,AND((VALUE(a__c)==VALUE(b__c)),(VALUE(c__c)==VALUE(d__c))))"
+             executionPaths="sql,sqlNullAsNull">
       <referenceField fieldName="a" dataType="Text"/>
       <referenceField fieldName="b" dataType="Text"/>
       <referenceField fieldName="c" dataType="Text"/>
       <referenceField fieldName="d" dataType="Text"/>
-      <testData input="null,1,1,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,null,1,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,1,null,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,1,1,null" expectedOutput="false,false,false,false"/>
-      <testData input="1,1,null,null" expectedOutput="false,false,false,false"/>
-      <testData input="1,null,1,null" expectedOutput="false,false,false,false"/>
-      <testData input="null,1,1,null" expectedOutput="false,false,false,false"/>
-      <testData input="1,null,null,1" expectedOutput="false,false,false,false"/>
-      <testData input="null,1,null,1" expectedOutput="false,false,false,false"/>
-      <testData input="null,null,1,1" expectedOutput="false,false,false,false"/>
-      <testData input="null,null,null,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,null,null,null" expectedOutput="false,false,false,false"/>
-      <testData input="null,1,null,null" expectedOutput="false,false,false,false"/>
-      <testData input="null,null,1,null" expectedOutput="false,false,false,false"/>
-      <testData input="null,null,null,null" expectedOutput="false,false,false,false"/>
-      <testData input=",1,1,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,,1,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,1,,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,1,1," expectedOutput="false,false,false,false"/>
-      <testData input="1,1,," expectedOutput="false,false,false,false"/>
-      <testData input="1,,1," expectedOutput="false,false,false,false"/>
-      <testData input=",1,1," expectedOutput="false,false,false,false"/>
-      <testData input="1,,,1" expectedOutput="false,false,false,false"/>
-      <testData input=",1,,1" expectedOutput="false,false,false,false"/>
-      <testData input=",,1,1" expectedOutput="false,false,false,false"/>
-      <testData input=",,,1" expectedOutput="false,false,false,false"/>
-      <testData input="1,,," expectedOutput="false,false,false,false"/>
-      <testData input=",1,," expectedOutput="false,false,false,false"/>
-      <testData input=",,1," expectedOutput="false,false,false,false"/>
-      <testData input=",,," expectedOutput="false,false,false,false"/>
+      <testData input="null,1,1,1" expectedOutput="false,false"/>
+      <testData input="1,null,1,1" expectedOutput="false,false"/>
+      <testData input="1,1,null,1" expectedOutput="false,false"/>
+      <testData input="1,1,1,null" expectedOutput="false,false"/>
+      <testData input="1,1,null,null" expectedOutput="false,false"/>
+      <testData input="1,null,1,null" expectedOutput="false,false"/>
+      <testData input="null,1,1,null" expectedOutput="false,false"/>
+      <testData input="1,null,null,1" expectedOutput="false,false"/>
+      <testData input="null,1,null,1" expectedOutput="false,false"/>
+      <testData input="null,null,1,1" expectedOutput="false,false"/>
+      <testData input="null,null,null,1" expectedOutput="false,false"/>
+      <testData input="1,null,null,null" expectedOutput="false,false"/>
+      <testData input="null,1,null,null" expectedOutput="false,false"/>
+      <testData input="null,null,1,null" expectedOutput="false,false"/>
+      <testData input="null,null,null,null" expectedOutput="false,false"/>
+      <testData input=",1,1,1" expectedOutput="false,false"/>
+      <testData input="1,,1,1" expectedOutput="false,false"/>
+      <testData input="1,1,,1" expectedOutput="false,false"/>
+      <testData input="1,1,1," expectedOutput="false,false"/>
+      <testData input="1,1,," expectedOutput="false,false"/>
+      <testData input="1,,1," expectedOutput="false,false"/>
+      <testData input=",1,1," expectedOutput="false,false"/>
+      <testData input="1,,,1" expectedOutput="false,false"/>
+      <testData input=",1,,1" expectedOutput="false,false"/>
+      <testData input=",,1,1" expectedOutput="false,false"/>
+      <testData input=",,,1" expectedOutput="false,false"/>
+      <testData input="1,,," expectedOutput="false,false"/>
+      <testData input=",1,," expectedOutput="false,false"/>
+      <testData input=",,1," expectedOutput="false,false"/>
+      <testData input=",,," expectedOutput="false,false"/>
    </testcase>
 
    <!--

From c32c8b1d42b07fb8233570c37ea5e61992654ee3 Mon Sep 17 00:00:00 2001
From: Sahil Bansal <sahilbansal@salesforce.com>
Date: Mon, 7 Oct 2024 22:32:24 -0700
Subject: [PATCH 3/3] removing --

---
 .../test/resources/com/force/formula/impl/formulaTestV2.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml b/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
index 2caaa214..e16e9937 100644
--- a/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
+++ b/oracle-test/src/test/resources/com/force/formula/impl/formulaTestV2.xml
@@ -16215,7 +16215,7 @@
 					-1.234,
 					-1.234,
 					-1.234"/>
-      <testData input="--1234"
+      <testData input="-1234"
                 expectedOutput="Error: com.force.formula.impl.InvalidNumericValueException,
 					null,
 					Error: com.force.formula.impl.InvalidNumericValueException,
@@ -16337,7 +16337,7 @@
 					1,
 					1,
 					1"/>
-      <testData input="--1234" expectedOutput="0,
+      <testData input="-1234" expectedOutput="0,
 					0,
 					0,
 					0"/>
@@ -27948,7 +27948,7 @@
    <testcase testName="testConstDoubleNegation"
              fieldName="testConstDoubleNegation"
              dataType="Double"
-             formula="customnumber__c -- 2 + customnumber__c - (2-4) + customnumber__c - (-2)"
+             formula="customnumber__c - 2 + customnumber__c - (2-4) + customnumber__c - (-2)"
              executionPaths="formula,sql,formulaNullAsNull,sqlNullAsNull">
       <referenceField fieldName="customnumber" dataType="Double"/>
       <testData input="" expectedOutput="6,