diff --git a/src/common/backend/parser/parse_func.cpp b/src/common/backend/parser/parse_func.cpp
index 0e6eef448..01e825e80 100644
--- a/src/common/backend/parser/parse_func.cpp
+++ b/src/common/backend/parser/parse_func.cpp
@@ -1964,11 +1964,19 @@ static void unify_hypothetical_args(ParseState *pstate,
          * Select common type, giving preference to the aggregated argument's
          * type (we'd rather coerce the direct argument once than coerce all
          * the aggregated values).
+         * 
+         * In A compatibility, we always coerce the direct argument to the type 
+         * of the aggregated values. So that even if they are not in the same 
+         * type category, we can still do the coercing.
          */
-        commontype = select_common_type(pstate,
-                                        list_make2(args[aargpos], args[i]),
-                                        "WITHIN GROUP",
-                                        NULL);
+        if (DB_IS_CMPT(A_FORMAT)) {
+            commontype = getBaseType(exprType(args[aargpos]));
+        } else {
+            commontype = select_common_type(pstate,
+                                            list_make2(args[aargpos], args[i]),
+                                            "WITHIN GROUP",
+                                            NULL);
+        }
 
         /*
          * Perform the coercions.  We don't need to worry about NamedArgExprs
diff --git a/src/test/regress/expected/aggregates_hypothetical.out b/src/test/regress/expected/aggregates_hypothetical.out
index 9e4c06ed2..f6c4060f4 100644
--- a/src/test/regress/expected/aggregates_hypothetical.out
+++ b/src/test/regress/expected/aggregates_hypothetical.out
@@ -21,6 +21,12 @@ select cume_dist(3,0.2) within group (order by c1,c2) from test_aggregate;
  .357142857142857
 (1 row)
 
+select cume_dist(3,.05) within group (order by c1,c3) from test_aggregate;
+    cume_dist     
+------------------
+ .214285714285714
+(1 row)
+
 --percent_rank
 select percent_rank(3,0.2) within group (order by c1,c2) from test_aggregate;
    percent_rank   
@@ -28,6 +34,12 @@ select percent_rank(3,0.2) within group (order by c1,c2) from test_aggregate;
  .230769230769231
 (1 row)
 
+select percent_rank(3,.05) within group (order by c1,c3) from test_aggregate;
+   percent_rank   
+------------------
+ .153846153846154
+(1 row)
+
 --dense_rank
 select dense_rank(4,0.2) within group (order by c1,c2) from test_aggregate;
  dense_rank 
@@ -35,6 +47,12 @@ select dense_rank(4,0.2) within group (order by c1,c2) from test_aggregate;
           6
 (1 row)
 
+select dense_rank(3,.05) within group (order by c1,c3) from test_aggregate;
+ dense_rank 
+------------
+          3
+(1 row)
+
 --rank
 select rank(4,0.2) within group (order by c1,c2) from test_aggregate;
  rank 
@@ -42,6 +60,12 @@ select rank(4,0.2) within group (order by c1,c2) from test_aggregate;
     7
 (1 row)
 
+select rank(3,.05) within group (order by c1,c3) from test_aggregate;
+ rank 
+------
+    3
+(1 row)
+
 -- divide by zero check
 select percent_rank(0) within group (order by x) from generate_series(1,0) x;
  percent_rank 
@@ -69,12 +93,12 @@ LINE 1: select rank(x) within group (order by x) from generate_serie...
                     ^
 DETAIL:  Direct arguments of an ordered-set aggregate must use only grouped columns.
 -- enable_aggr_coerce_type = off,  type conversion test
---error
 select cume_dist(3) within group (order by c3) from test_aggregate;
-ERROR:  WITHIN GROUP types character varying and integer cannot be matched
-LINE 1: select cume_dist(3) within group (order by c3) from test_agg...
-                         ^
-CONTEXT:  referenced column: cume_dist
+    cume_dist     
+------------------
+ .571428571428571
+(1 row)
+
 --error 
 select cume_dist('a') within group (order by c1) from test_aggregate;
 ERROR:  invalid input syntax for integer: "a"
@@ -101,12 +125,12 @@ select cume_dist('1') within group (order by c1) from test_aggregate;
  .142857142857143
 (1 row)
 
---error boolean
 select rank(1) within group (order by x) from (values (true),(false)) v(x);
-ERROR:  WITHIN GROUP types boolean and integer cannot be matched
-LINE 1: select rank(1) within group (order by x) from (values (true)...
-                    ^
-CONTEXT:  referenced column: rank
+ rank 
+------
+    2
+(1 row)
+
 -- enable_aggr_coerce_type = on,  type conversion test
 set enable_aggr_coerce_type = on;
 --success
@@ -151,4 +175,253 @@ select rank(1) within group (order by x) from (values (true),(false)) v(x);
 
 set enable_aggr_coerce_type = off;
 drop table test_aggregate;
+create table employees
+(empno number,salary number,commission_pct varchar2(20));
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls first) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls last) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls first) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls last) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc, commission_pct) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+ rank 
+------
+    1
+(1 row)
+
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+ dense_rank 
+------------
+          1
+(1 row)
+
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+ dense_rank 
+------------
+          1
+(1 row)
+
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+ dense_rank 
+------------
+          1
+(1 row)
+
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+ dense_rank 
+------------
+          1
+(1 row)
+
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+ dense_rank 
+------------
+          1
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls first) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls last) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls first) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls last) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc, commission_pct) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+ percent_rank 
+--------------
+            0
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls first) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls last) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls first) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls last) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary desc, commission_pct) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+ cume_dist 
+-----------
+         1
+(1 row)
+
+drop table employees;
 drop schema aggregate CASCADE;
diff --git a/src/test/regress/sql/aggregates_hypothetical.sql b/src/test/regress/sql/aggregates_hypothetical.sql
index 4d58ab9fd..7784ef7d8 100644
--- a/src/test/regress/sql/aggregates_hypothetical.sql
+++ b/src/test/regress/sql/aggregates_hypothetical.sql
@@ -19,15 +19,19 @@ insert into test_aggregate values(1,0.1,'1','2024-09-01 09:22:00'),
 
 --cume_dist 
 select cume_dist(3,0.2) within group (order by c1,c2) from test_aggregate;
+select cume_dist(3,.05) within group (order by c1,c3) from test_aggregate;
 
 --percent_rank
 select percent_rank(3,0.2) within group (order by c1,c2) from test_aggregate;
+select percent_rank(3,.05) within group (order by c1,c3) from test_aggregate;
 
 --dense_rank
 select dense_rank(4,0.2) within group (order by c1,c2) from test_aggregate;
+select dense_rank(3,.05) within group (order by c1,c3) from test_aggregate;
 
 --rank
 select rank(4,0.2) within group (order by c1,c2) from test_aggregate;
+select rank(3,.05) within group (order by c1,c3) from test_aggregate;
 
 -- divide by zero check
 select percent_rank(0) within group (order by x) from generate_series(1,0) x;
@@ -42,7 +46,6 @@ select rank(x) within group (order by x) from generate_series(1,5) x;
 
 -- enable_aggr_coerce_type = off,  type conversion test
 
---error
 select cume_dist(3) within group (order by c3) from test_aggregate;
 
 --error 
@@ -57,7 +60,6 @@ select cume_dist('2024-12-12') within group (order by c4) from test_aggregate;
 --success
 select cume_dist('1') within group (order by c1) from test_aggregate;
 
---error boolean
 select rank(1) within group (order by x) from (values (true),(false)) v(x);
 
 -- enable_aggr_coerce_type = on,  type conversion test
@@ -84,4 +86,53 @@ select rank(1) within group (order by x) from (values (true),(false)) v(x);
 
 set enable_aggr_coerce_type = off;
 drop table test_aggregate;
+
+create table employees
+(empno number,salary number,commission_pct varchar2(20));
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls first) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls last) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls first) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls last) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc, commission_pct) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+SELECT RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+SELECT dense_rank(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls first) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls last) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls first) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls last) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc, commission_pct) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+SELECT PERCENT_RANK(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls first) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct desc nulls last) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls first) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary, commission_pct asc nulls last) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary desc, commission_pct) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls first, commission_pct) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary desc nulls last, commission_pct) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary asc, commission_pct) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls first, commission_pct) FROM employees;
+SELECT CUME_DIST(15500, .05) WITHIN GROUP (ORDER BY salary asc nulls last, commission_pct) FROM employees;
+
+drop table employees;
 drop schema aggregate CASCADE;