additional condition to handle other datatype typmod if common type i…

…s numeric

Signed-off-by: yashneet vinayak <[email protected]>

contrib/babelfishpg_tsql/src/pltsql_coerce.c

@@ -2053,7 +2053,7 @@ tsql_select_common_typmod_hook(ParseState *pstate, List *exprs, Oid common_type)
 			if (typmod == -1 && (*pltsql_protocol_plugin_ptr))
 				typmod = (*pltsql_protocol_plugin_ptr)->get_numeric_typmod_from_exp(NULL, expr);
 
-			if (typmod == -1)
+			if (typmod == -1 || getBaseType(type) != NUMERICOID)
 				continue;
 
 			scale = (typmod - VARHDRSZ) & 0xffff;

test/JDBC/expected/BABEL-CASE_EXPR-before-16_5-or-15_9-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/BABEL-CASE_EXPR-before-16_6-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/BABEL-CASE_EXPR-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-CASE_EXPR-before-16_5-or-15_9-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-CASE_EXPR-before-16_6-vu-verify.out

@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/BABEL-CASE_EXPR-vu-verify.out

@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-before-16_5-or-15_9-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,10 @@ numeric
 ~~END~~
 
 
+
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-before-16_6-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/expected/non_default_server_collation/japanese_ci_as/BABEL-CASE_EXPR-vu-verify.out

@@ -14308,9 +14308,9 @@ ORDER BY value;
 GO
 ~~START~~
 numeric
-1.2300000000
-4.5600000000
-7.8900000000
+1.23
+4.56
+7.89
 ~~END~~
 
 
@@ -14365,6 +14365,9 @@ numeric
 ~~END~~
 
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/input/BABEL-CASE_EXPR-before-16_5-or-15_9-vu-verify.sql

@@ -8199,6 +8199,9 @@ SELECT CAST(4.56 AS NUMERIC(5,2))
 ORDER BY value;
 GO
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/input/BABEL-CASE_EXPR-before-16_6-vu-verify.sql

@@ -8200,6 +8200,9 @@ SELECT CAST(4.56 AS NUMERIC(5,2))
 ORDER BY value;
 GO
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL

test/JDBC/input/BABEL-CASE_EXPR-vu-verify.sql

@@ -8200,6 +8200,9 @@ SELECT CAST(4.56 AS NUMERIC(5,2))
 ORDER BY value;
 GO
 
+-- TODO FIX: While calculating for money and smallmoney
+-- babelfish is calculating it same as numeric logic
+-- which is different from TSQL.
 -- Test Case 81: UNION with MONEY type
 SELECT CAST(1.23 AS DECIMAL(10,2)) AS value
 UNION ALL