From 98d682a9d3a67be78e99209d401ce0d593521a82 Mon Sep 17 00:00:00 2001
From: Doug Dew <ddew@salesforce.com>
Date: Thu, 23 Jan 2025 15:54:03 -0600
Subject: [PATCH 1/2] add guard to CHR function

---
 docs/coverage/pom.xml                                         | 2 +-
 .../src/main/java/com/force/formula/commands/FunctionChr.java | 2 +-
 impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml | 4 ++--
 pom.xml                                                       | 3 ++-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docs/coverage/pom.xml b/docs/coverage/pom.xml
index 3296f12f..ca57a2e8 100644
--- a/docs/coverage/pom.xml
+++ b/docs/coverage/pom.xml
@@ -57,12 +57,12 @@
     <profile>
       <id>db-tests</id>
       <dependencies>
+        <!-- Rely on core for tests of oracle
         <dependency>
           <groupId>com.salesforce.formula</groupId>
           <artifactId>formula-engine-oracle-test</artifactId>
           <version>${project.version}</version>
         </dependency>
-        <!--
         <dependency>
           <groupId>com.salesforce.formula</groupId>
           <artifactId>formula-engine-sqlserver-test</artifactId>
diff --git a/impl/src/main/java/com/force/formula/commands/FunctionChr.java b/impl/src/main/java/com/force/formula/commands/FunctionChr.java
index 1229ca54..58e1d3bb 100644
--- a/impl/src/main/java/com/force/formula/commands/FunctionChr.java
+++ b/impl/src/main/java/com/force/formula/commands/FunctionChr.java
@@ -34,7 +34,7 @@ public FormulaCommand getCommand(FormulaAST node, FormulaContext context) {
 
     @Override
     public SQLPair getSQL(FormulaAST node, FormulaContext context, String[] args, String[] guards, TableAliasRegistry registry) {
-        String guard = SQLPair.generateGuard(guards, args[0] + "<1");
+        String guard = SQLPair.generateGuard(guards, args[0] + "<1 OR " + args[0] + ">1114111");
         return new SQLPair(String.format(getSqlHooks(context).sqlChr(), args[0]), guard);
     }
 
diff --git a/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml b/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml
index 5d909439..8639318b 100644
--- a/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml
+++ b/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml
@@ -6,10 +6,10 @@
     <JsOutput highPrec="true" nullAsNull="true">(context.record.customnumber__c&amp;&amp;context.record.customnumber__c.toNumber()&gt;0?String.fromCodePoint(Math.trunc(context.record.customnumber__c.toNumber())):null)</JsOutput>
     <SqlOutput nullAsNull="false">
        <Sql>CHR(TRUNC(COALESCE($!s0s!$.customnumber__c, 0))::integer)</Sql>
-       <Guard>COALESCE($!s0s!$.customnumber__c, 0)&lt;1</Guard>
+       <Guard>COALESCE($!s0s!$.customnumber__c, 0)&lt;1 OR COALESCE($!s0s!$.customnumber__c, 0)&gt;1114111</Guard>
     </SqlOutput>
     <SqlOutput nullAsNull="true">
        <Sql>CHR(TRUNC($!s0s!$.customnumber__c)::integer)</Sql>
-       <Guard>$!s0s!$.customnumber__c&lt;1</Guard>
+       <Guard>$!s0s!$.customnumber__c&lt;1 OR $!s0s!$.customnumber__c&gt;1114111</Guard>
     </SqlOutput>
 </testCase>
diff --git a/pom.xml b/pom.xml
index eeda381f..b1960182 100644
--- a/pom.xml
+++ b/pom.xml
@@ -537,7 +537,8 @@
         <module>api</module>
         <module>impl</module>
         <module>test-utils</module>
-        <module>oracle-test</module>
+        <!-- Oracle tests run from within core -->
+        <!--<module>oracle-test</module>-->
         <!-- <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` -->

From 1ea27ef78e8c55748ac5150f82f275271b79d7f8 Mon Sep 17 00:00:00 2001
From: Doug Dew <ddew@salesforce.com>
Date: Thu, 23 Jan 2025 18:45:23 -0600
Subject: [PATCH 2/2] Improve guard

---
 .../src/main/java/com/force/formula/commands/FunctionChr.java | 2 +-
 impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/impl/src/main/java/com/force/formula/commands/FunctionChr.java b/impl/src/main/java/com/force/formula/commands/FunctionChr.java
index 58e1d3bb..f55f0efe 100644
--- a/impl/src/main/java/com/force/formula/commands/FunctionChr.java
+++ b/impl/src/main/java/com/force/formula/commands/FunctionChr.java
@@ -34,7 +34,7 @@ public FormulaCommand getCommand(FormulaAST node, FormulaContext context) {
 
     @Override
     public SQLPair getSQL(FormulaAST node, FormulaContext context, String[] args, String[] guards, TableAliasRegistry registry) {
-        String guard = SQLPair.generateGuard(guards, args[0] + "<1 OR " + args[0] + ">1114111");
+        String guard = SQLPair.generateGuard(guards, "(" + args[0] + "<1 OR " + args[0] + ">1114111)");
         return new SQLPair(String.format(getSqlHooks(context).sqlChr(), args[0]), guard);
     }
 
diff --git a/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml b/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml
index 8639318b..0b9ed254 100644
--- a/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml
+++ b/impl/src/test/goldfiles/FormulaFields/v2/postgres/testChr.xml
@@ -6,10 +6,10 @@
     <JsOutput highPrec="true" nullAsNull="true">(context.record.customnumber__c&amp;&amp;context.record.customnumber__c.toNumber()&gt;0?String.fromCodePoint(Math.trunc(context.record.customnumber__c.toNumber())):null)</JsOutput>
     <SqlOutput nullAsNull="false">
        <Sql>CHR(TRUNC(COALESCE($!s0s!$.customnumber__c, 0))::integer)</Sql>
-       <Guard>COALESCE($!s0s!$.customnumber__c, 0)&lt;1 OR COALESCE($!s0s!$.customnumber__c, 0)&gt;1114111</Guard>
+       <Guard>(COALESCE($!s0s!$.customnumber__c, 0)&lt;1 OR COALESCE($!s0s!$.customnumber__c, 0)&gt;1114111)</Guard>
     </SqlOutput>
     <SqlOutput nullAsNull="true">
        <Sql>CHR(TRUNC($!s0s!$.customnumber__c)::integer)</Sql>
-       <Guard>$!s0s!$.customnumber__c&lt;1 OR $!s0s!$.customnumber__c&gt;1114111</Guard>
+       <Guard>($!s0s!$.customnumber__c&lt;1 OR $!s0s!$.customnumber__c&gt;1114111)</Guard>
     </SqlOutput>
 </testCase>