fix inconsistent formatting issue in convert function from money to v…

…archar Signed-off-by: Rohit Bhagat <[email protected]>
babelfish-for-postgresql · Jan 1, 2025 · 2cc8918 · 2cc8918
1 parent 40cc725
commit 2cc8918
Show file tree

Hide file tree

Showing 50 changed files with 484 additions and 23 deletions.
diff --git a/contrib/babelfishpg_tsql/sql/sys_function_helpers.sql b/contrib/babelfishpg_tsql/sql/sys_function_helpers.sql
@@ -9849,9 +9849,9 @@ BEGIN
 		END IF;
 	WHEN 'sys.money'::regtype THEN
 		IF v_style = -1 THEN
-			RETURN sys.babelfish_try_conv_money_to_string(typename, arg::numeric(19,4)::pg_catalog.money);
+			RETURN sys.babelfish_try_conv_money_to_string(typename, arg::numeric(19,4));
 		ELSE
-			RETURN sys.babelfish_try_conv_money_to_string(typename, arg::numeric(19,4)::pg_catalog.money, p_style);
+			RETURN sys.babelfish_try_conv_money_to_string(typename, arg::numeric(19,4), p_style);
 		END IF;
 	ELSE
 		RETURN CAST(arg AS sys.VARCHAR);
@@ -9939,7 +9939,7 @@ LANGUAGE plpgsql
 STABLE;
 
 CREATE OR REPLACE FUNCTION sys.babelfish_try_conv_money_to_string(IN p_datatype TEXT,
-														IN p_moneyval PG_CATALOG.MONEY,
+														IN p_moneyval NUMERIC,
 														IN p_style NUMERIC DEFAULT 0)
 RETURNS TEXT
 AS
@@ -9966,17 +9966,17 @@ BEGIN
 		v_integral_digits := v_digits;
 	END IF;
 	IF (v_style = 0) THEN
-		v_format := (pow(10, v_integral_digits)-1)::TEXT || 'D99';
-		v_result := to_char(v_moneyval, v_format);
+		v_format := (pow(10, v_integral_digits)-10)::TEXT || 'D99';
+		v_result := pg_catalog.btrim(to_char(v_moneyval, v_format));
 	ELSIF (v_style = 1) THEN
-		IF (v_moneysign::SMALLINT = 1) THEN
-			v_result := substring(p_moneyval::TEXT, 2);
+		IF (v_moneysign::SMALLINT = -1) THEN
+			v_result := substring(p_moneyval::PG_CATALOG.MONEY::TEXT, 1, 1) || substring(p_moneyval::PG_CATALOG.MONEY::TEXT, 3);
 		ELSE
-			v_result := substring(p_moneyval::TEXT, 1, 1) || substring(p_moneyval::TEXT, 3);
+			v_result := substring(p_moneyval::PG_CATALOG.MONEY::TEXT, 2);
 		END IF;
 	ELSIF (v_style = 2) THEN
-		v_format := (pow(10, v_integral_digits)-1)::TEXT || 'D9999';
-		v_result := to_char(v_moneyval, v_format);
+		v_format := (pow(10, v_integral_digits)-10)::TEXT || 'D9999';
+		v_result := pg_catalog.btrim(to_char(v_moneyval, v_format));
 	ELSE
 		RAISE invalid_parameter_value;
 	END IF;

diff --git a/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--5.0.0--5.1.0.sql b/contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--5.0.0--5.1.0.sql
@@ -3,6 +3,36 @@
 -- add 'sys' to search path for the convenience
 SELECT set_config('search_path', 'sys, '||current_setting('search_path'), false);
 
+-- Drops an object if it does not have any dependent objects.
+-- Is a temporary procedure for use by the upgrade script. Will be dropped at the end of the upgrade.
+-- Please have this be one of the first statements executed in this upgrade script. 
+CREATE OR REPLACE PROCEDURE babelfish_drop_deprecated_object(object_type varchar, schema_name varchar, object_name varchar) AS
+$$
+DECLARE
+    error_msg text;
+    query1 text;
+    query2 text;
+BEGIN
+
+    query1 := pg_catalog.format('alter extension babelfishpg_tsql drop %s %s.%s', object_type, schema_name, object_name);
+    query2 := pg_catalog.format('drop %s %s.%s', object_type, schema_name, object_name);
+
+    execute query1;
+    execute query2;
+EXCEPTION
+    when object_not_in_prerequisite_state then --if 'alter extension' statement fails
+        GET STACKED DIAGNOSTICS error_msg = MESSAGE_TEXT;
+        raise warning '%', error_msg;
+    when dependent_objects_still_exist then --if 'drop view' statement fails
+        GET STACKED DIAGNOSTICS error_msg = MESSAGE_TEXT;
+        raise warning '%', error_msg;
+    when undefined_function then --if 'Deprecated function does not exist'
+        GET STACKED DIAGNOSTICS error_msg = MESSAGE_TEXT;
+        raise warning '%', error_msg;
+end
+$$
+LANGUAGE plpgsql;
+
 CREATE OR REPLACE FUNCTION sys.babelfish_update_server_collation_name() RETURNS VOID
 LANGUAGE C
 AS 'babelfishpg_common', 'babelfish_update_server_collation_name';
@@ -40,6 +70,133 @@ $$;
  * final behaviour.
  */
 
+CREATE OR REPLACE FUNCTION sys.babelfish_conv_to_varchar(IN typename TEXT,
+														IN arg anyelement,
+														IN p_style NUMERIC DEFAULT -1)
+RETURNS sys.VARCHAR
+AS
+$BODY$
+DECLARE
+	v_style SMALLINT;
+BEGIN
+	v_style := floor(p_style)::SMALLINT;
+
+	CASE pg_typeof(arg)
+	WHEN 'date'::regtype THEN
+		IF v_style = -1 THEN
+			RETURN sys.babelfish_try_conv_date_to_string(typename, arg);
+		ELSE
+			RETURN sys.babelfish_try_conv_date_to_string(typename, arg, p_style);
+		END IF;
+	WHEN 'time'::regtype THEN
+		IF v_style = -1 THEN
+			RETURN sys.babelfish_try_conv_time_to_string(typename, 'TIME', arg);
+		ELSE
+			RETURN sys.babelfish_try_conv_time_to_string(typename, 'TIME', arg, p_style);
+		END IF;
+	WHEN 'sys.datetime'::regtype THEN
+		IF v_style = -1 THEN
+			RETURN sys.babelfish_try_conv_datetime_to_string(typename, 'DATETIME', arg::timestamp);
+		ELSE
+			RETURN sys.babelfish_try_conv_datetime_to_string(typename, 'DATETIME', arg::timestamp, p_style);
+		END IF;
+	WHEN 'float'::regtype THEN
+		IF v_style = -1 THEN
+			RETURN sys.babelfish_try_conv_float_to_string(typename, arg);
+		ELSE
+			RETURN sys.babelfish_try_conv_float_to_string(typename, arg, p_style);
+		END IF;
+	WHEN 'sys.money'::regtype THEN
+		IF v_style = -1 THEN
+			RETURN sys.babelfish_try_conv_money_to_string(typename, arg::numeric(19,4));
+		ELSE
+			RETURN sys.babelfish_try_conv_money_to_string(typename, arg::numeric(19,4), p_style);
+		END IF;
+	ELSE
+		RETURN CAST(arg AS sys.VARCHAR);
+	END CASE;
+END;
+$BODY$
+LANGUAGE plpgsql
+STABLE;
+
+DO $$
+DECLARE
+    exception_message text;
+BEGIN
+    ALTER FUNCTION sys.babelfish_try_conv_money_to_string(TEXT, PG_CATALOG.MONEY, NUMERIC) RENAME TO babelfish_try_conv_money_to_string_deprecated_in_5_1_0;
+EXCEPTION WHEN OTHERS THEN
+    GET STACKED DIAGNOSTICS
+    exception_message = MESSAGE_TEXT;
+    RAISE WARNING '%', exception_message;
+END;
+$$;
+
+CREATE OR REPLACE FUNCTION sys.babelfish_try_conv_money_to_string(IN p_datatype TEXT,
+														IN p_moneyval NUMERIC,
+														IN p_style NUMERIC DEFAULT 0)
+RETURNS TEXT
+AS
+$BODY$
+DECLARE
+	v_style SMALLINT;
+	v_format VARCHAR COLLATE "C";
+	v_moneyval NUMERIC(19,4) := p_moneyval::NUMERIC(19,4);
+	v_moneysign NUMERIC(19,4) := sign(v_moneyval);
+	v_moneyabs NUMERIC(19,4) := abs(v_moneyval);
+	v_digits SMALLINT;
+	v_integral_digits SMALLINT;
+	v_decimal_digits SMALLINT;
+	v_res_length SMALLINT;
+	MASK_REGEXP CONSTANT VARCHAR COLLATE "C" := '^\s*(?:character varying)\s*\(\s*(\d+|MAX)\s*\)\s*$';
+	v_result TEXT;
+BEGIN
+	v_style := floor(p_style)::SMALLINT;
+	v_digits := length(v_moneyabs::TEXT);
+	v_decimal_digits := scale(v_moneyabs);
+	IF (v_decimal_digits > 0) THEN
+		v_integral_digits := v_digits - v_decimal_digits - 1;
+	ELSE
+		v_integral_digits := v_digits;
+	END IF;
+	IF (v_style = 0) THEN
+		v_format := (pow(10, v_integral_digits)-10)::TEXT || 'D99';
+		v_result := pg_catalog.btrim(to_char(v_moneyval, v_format));
+	ELSIF (v_style = 1) THEN
+		IF (v_moneysign::SMALLINT = -1) THEN
+			v_result := substring(p_moneyval::PG_CATALOG.MONEY::TEXT, 1, 1) || substring(p_moneyval::PG_CATALOG.MONEY::TEXT, 3);
+		ELSE
+			v_result := substring(p_moneyval::PG_CATALOG.MONEY::TEXT, 2);
+		END IF;
+	ELSIF (v_style = 2) THEN
+		v_format := (pow(10, v_integral_digits)-10)::TEXT || 'D9999';
+		v_result := pg_catalog.btrim(to_char(v_moneyval, v_format));
+	ELSE
+		RAISE invalid_parameter_value;
+	END IF;
+	v_res_length := substring(p_datatype COLLATE "C", MASK_REGEXP)::SMALLINT;
+	IF v_res_length IS NULL THEN
+		RETURN v_result;
+	ELSE
+		RETURN rpad(v_result, v_res_length, ' ');
+	END IF;
+EXCEPTION
+	WHEN invalid_parameter_value THEN
+		RAISE USING MESSAGE := pg_catalog.format('%s is not a valid style number when converting from MONEY to a character string.', v_style),
+					DETAIL := 'Use of incorrect "style" parameter value during conversion process.',
+					HINT := 'Change "style" parameter to the proper value and try again.';
+END;
+$BODY$
+LANGUAGE plpgsql
+STABLE
+RETURNS NULL ON NULL INPUT;
+
+CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'babelfish_try_conv_money_to_string_deprecated_in_5_1_0'); 
+
+-- Drops the temporary procedure used by the upgrade script.
+-- Please have this be one of the last statements executed in this upgrade script.
+DROP PROCEDURE sys.babelfish_drop_deprecated_object(varchar, varchar, varchar);
+
 -- After upgrade, always run analyze for all babelfish catalogs.
 CALL sys.analyze_babelfish_catalogs();
 -- Reset search_path to not affect any subsequent scripts

diff --git a/test/JDBC/expected/BABEL-1531.out b/test/JDBC/expected/BABEL-1531.out
@@ -2,21 +2,21 @@ SELECT CONVERT(varchar(50), CAST($23.12 AS money), 0);
 GO
 ~~START~~
 varchar
- 23.12                                            
+23.12                                             
 ~~END~~
 
 SELECT CONVERT(varchar(50), CAST($23.12 AS money), 2);
 GO
 ~~START~~
 varchar
- 23.1200                                          
+23.1200                                           
 ~~END~~
 
 SELECT CONVERT(varchar(50), CAST($23.12 as money));
 GO
 ~~START~~
 varchar
- 23.12                                            
+23.12                                             
 ~~END~~
 
 SELECT CONVERT(float, CAST($23.12 as money));
@@ -53,6 +53,6 @@ SELECT CONVERT(varchar(50), @mon);
 GO
 ~~START~~
 varchar
- 23.12                                            
+23.12                                             
 ~~END~~
 
diff --git a/test/JDBC/expected/BABEL-3486-vu-verify.out b/test/JDBC/expected/BABEL-3486-vu-verify.out
@@ -1316,7 +1316,7 @@ SELECT * FROM BABEL_3486_vu_prepare_v54
 GO
 ~~START~~
 varchar
- 5.00                         
+5.00                          
 ~~END~~
 
 DROP VIEW BABEL_3486_vu_prepare_v54
@@ -1326,7 +1326,7 @@ EXEC BABEL_3486_vu_prepare_p54
 GO
 ~~START~~
 varchar
- 5.00                         
+5.00                          
 ~~END~~
 
 DROP PROCEDURE BABEL_3486_vu_prepare_p54

diff --git a/test/JDBC/expected/babel_function.out b/test/JDBC/expected/babel_function.out
@@ -188,7 +188,7 @@ select CONVERT(varchar(10), CAST(4936.56 AS MONEY), 0);
 GO
 ~~START~~
 varchar
- 4936.56  
+4936.56   
 ~~END~~
 
 select CONVERT(varchar(10), CAST(4936.56 AS MONEY), 1);
@@ -202,7 +202,7 @@ select CONVERT(varchar(10), CAST(4936.56 AS MONEY), 2);
 GO
 ~~START~~
 varchar
- 4936.5600
+4936.5600 
 ~~END~~
 
 
@@ -311,7 +311,7 @@ select TRY_CONVERT(varchar(10), CAST(4936.56 AS MONEY), 0);
 GO
 ~~START~~
 varchar
- 4936.56  
+4936.56   
 ~~END~~
 
 

diff --git a/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/babel_function.out b/test/JDBC/expected/non_default_server_collation/chinese_prc_ci_as/babel_function.out
@@ -188,7 +188,7 @@ select CONVERT(varchar(10), CAST(4936.56 AS MONEY), 0);
 GO
 ~~START~~
 varchar
- 4936.56  
+4936.56   
 ~~END~~
 
 select CONVERT(varchar(10), CAST(4936.56 AS MONEY), 1);
@@ -202,7 +202,7 @@ select CONVERT(varchar(10), CAST(4936.56 AS MONEY), 2);
 GO
 ~~START~~
 varchar
- 4936.5600
+4936.5600 
 ~~END~~
 
 
@@ -311,7 +311,7 @@ select TRY_CONVERT(varchar(10), CAST(4936.56 AS MONEY), 0);
 GO
 ~~START~~
 varchar
- 4936.56  
+4936.56   
 ~~END~~
 
 

diff --git a/test/JDBC/expected/test_conv_money_to_varchar-vu-cleanup.out b/test/JDBC/expected/test_conv_money_to_varchar-vu-cleanup.out
@@ -0,0 +1,11 @@
+DROP VIEW test_conv_string_to_date_v1
+GO
+
+DROP PROCEDURE test_conv_string_to_date_p1
+GO
+
+DROP FUNCTION test_conv_string_to_date_f1
+GO
+
+DROP TABLE test_conv_money_to_varchar_t1
+GO
diff --git a/test/JDBC/expected/test_conv_money_to_varchar-vu-prepare.out b/test/JDBC/expected/test_conv_money_to_varchar-vu-prepare.out
@@ -0,0 +1,39 @@
+CREATE TABLE test_conv_money_to_varchar_t1(val money)
+GO
+
+INSERT INTO test_conv_money_to_varchar_t1 VALUES (1234), (0), (123.12), (0.12456)
+GO
+~~ROW COUNT: 4~~
+
+
+CREATE VIEW test_conv_string_to_date_v1 as (
+    SELECT val,
+        val_convert = '$' + CONVERT(VARCHAR, val) ,
+        val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0),
+        val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1),
+        val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2)
+    FROM test_conv_money_to_varchar_t1
+);
+GO
+
+CREATE PROCEDURE test_conv_string_to_date_p1 as (
+    SELECT val,
+        val_convert = '$' + CONVERT(VARCHAR, val) ,
+        val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0),
+        val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1),
+        val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2)
+    FROM test_conv_money_to_varchar_t1
+);
+GO
+
+CREATE FUNCTION test_conv_string_to_date_f1()
+RETURNS TABLE AS
+RETURN (
+    SELECT val,
+        val_convert = '$' + CONVERT(VARCHAR, val) ,
+        val_convert_style_0 = '$' + CONVERT(VARCHAR, val, 0),
+        val_convert_style_1 = '$' + CONVERT(VARCHAR, val, 1),
+        val_convert_style_2 = '$' + CONVERT(VARCHAR, val, 2)
+    FROM test_conv_money_to_varchar_t1
+);
+GO
-Original file line number
+Diff line change
@@ Expand Up / @@ -1316,7 +1316,7 @@ SELECT * FROM BABEL_3486_vu_prepare_v54 @@
     GO
     ~~START~~
     varchar
-.00
+.00
     ~~END~~
     DROP VIEW BABEL_3486_vu_prepare_v54
@@ Expand All / @@ -1326,7 +1326,7 @@ EXEC BABEL_3486_vu_prepare_p54 @@
     GO
     ~~START~~
     varchar
-.00
+.00
     ~~END~~
     DROP PROCEDURE BABEL_3486_vu_prepare_p54
@@ Expand Down @@