Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix MVU failure due to sys.format_datetime, sys.format_numeric and sys.format functions #2023

Merged
merged 3 commits into from
Nov 16, 2023
Merged

Fix MVU failure due to sys.format_datetime, sys.format_numeric and sys.format functions #2023

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a3feec6
Fix MVU failure due to sys.format_datetime function
basasairohan Nov 16, 2023
3d609ed
Update upgrade script to catch the error when sys.format_datetime doe…
basasairohan Nov 16, 2023
d235468
Use separate blocks for all the functions
basasairohan Nov 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
135 changes: 73 additions & 62 deletions contrib/babelfishpg_tsql/sql/upgrades/babelfishpg_tsql--3.3.0--3.4.0.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4144,84 +4144,95 @@ CREATE OR REPLACE FUNCTION sys.babelfish_fts_rewrite(IN phrase text) RETURNS TEX
'babelfishpg_tsql', 'babelfish_fts_rewrite'
LANGUAGE C IMMUTABLE PARALLEL SAFE;

-- Rename function for dependencies
ALTER FUNCTION sys.format_datetime(anyelement, NVARCHAR, VARCHAR, VARCHAR) RENAME TO format_datetime_deprecated_3_4_0;
ALTER FUNCTION sys.format_numeric(anyelement, NVARCHAR, VARCHAR, VARCHAR, int) RENAME TO format_numeric_deprecated_3_4_0;
ALTER FUNCTION sys.FORMAT(anyelement, NVARCHAR, VARCHAR) RENAME TO format_deprecated_3_4_0;

CREATE OR REPLACE FUNCTION sys.format_datetime(IN value anyelement, IN format_pattern sys.NVARCHAR,IN culture sys.VARCHAR, IN data_type sys.VARCHAR DEFAULT '') RETURNS sys.nvarchar
AS 'babelfishpg_tsql', 'format_datetime' LANGUAGE C IMMUTABLE PARALLEL UNSAFE;
GRANT EXECUTE ON FUNCTION sys.format_datetime(IN anyelement, IN sys.NVARCHAR, IN sys.VARCHAR, IN sys.VARCHAR) TO PUBLIC;

CREATE OR REPLACE FUNCTION sys.format_numeric(IN value anyelement, IN format_pattern sys.NVARCHAR,IN culture sys.VARCHAR, IN data_type sys.VARCHAR DEFAULT '', IN e_position INT DEFAULT -1) RETURNS sys.nvarchar
AS 'babelfishpg_tsql', 'format_numeric' LANGUAGE C IMMUTABLE PARALLEL UNSAFE;
GRANT EXECUTE ON FUNCTION sys.format_numeric(IN anyelement, IN sys.NVARCHAR, IN sys.VARCHAR, IN sys.VARCHAR, IN INT) TO PUBLIC;

CREATE OR REPLACE FUNCTION sys.FORMAT(IN arg anyelement, IN p_format_pattern sys.NVARCHAR, IN p_culture sys.VARCHAR default 'en-us')
RETURNS sys.NVARCHAR
AS
$BODY$
DO $$
DECLARE
arg_type regtype;
v_temp_integer INTEGER;
exception_message text;
BEGIN
arg_type := pg_typeof(arg);
-- Rename function for dependencies
ALTER FUNCTION sys.format_datetime(anyelement, NVARCHAR, VARCHAR, VARCHAR) RENAME TO format_datetime_deprecated_3_4_0;
ALTER FUNCTION sys.format_numeric(anyelement, NVARCHAR, VARCHAR, VARCHAR, int) RENAME TO format_numeric_deprecated_3_4_0;
ALTER FUNCTION sys.FORMAT(anyelement, NVARCHAR, VARCHAR) RENAME TO format_deprecated_3_4_0;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Separate out these three in different blocks


CREATE OR REPLACE FUNCTION sys.format_datetime(IN value anyelement, IN format_pattern sys.NVARCHAR,IN culture sys.VARCHAR, IN data_type sys.VARCHAR DEFAULT '') RETURNS sys.nvarchar
AS 'babelfishpg_tsql', 'format_datetime' LANGUAGE C IMMUTABLE PARALLEL UNSAFE;
GRANT EXECUTE ON FUNCTION sys.format_datetime(IN anyelement, IN sys.NVARCHAR, IN sys.VARCHAR, IN sys.VARCHAR) TO PUBLIC;

CREATE OR REPLACE FUNCTION sys.format_numeric(IN value anyelement, IN format_pattern sys.NVARCHAR,IN culture sys.VARCHAR, IN data_type sys.VARCHAR DEFAULT '', IN e_position INT DEFAULT -1) RETURNS sys.nvarchar
AS 'babelfishpg_tsql', 'format_numeric' LANGUAGE C IMMUTABLE PARALLEL UNSAFE;
GRANT EXECUTE ON FUNCTION sys.format_numeric(IN anyelement, IN sys.NVARCHAR, IN sys.VARCHAR, IN sys.VARCHAR, IN INT) TO PUBLIC;

CREATE OR REPLACE FUNCTION sys.FORMAT(IN arg anyelement, IN p_format_pattern sys.NVARCHAR, IN p_culture sys.VARCHAR default 'en-us')
RETURNS sys.NVARCHAR
AS
$BODY$
DECLARE
arg_type regtype;
v_temp_integer INTEGER;
BEGIN
arg_type := pg_typeof(arg);

CASE
WHEN arg_type IN ('time'::regtype ) THEN
RETURN sys.format_datetime(arg, p_format_pattern, p_culture, 'time');
CASE
WHEN arg_type IN ('time'::regtype ) THEN
RETURN sys.format_datetime(arg, p_format_pattern, p_culture, 'time');

WHEN arg_type IN ('date'::regtype, 'sys.datetime'::regtype, 'sys.smalldatetime'::regtype, 'sys.datetime2'::regtype ) THEN
RETURN sys.format_datetime(arg::timestamp, p_format_pattern, p_culture);
WHEN arg_type IN ('date'::regtype, 'sys.datetime'::regtype, 'sys.smalldatetime'::regtype, 'sys.datetime2'::regtype ) THEN
RETURN sys.format_datetime(arg::timestamp, p_format_pattern, p_culture);

WHEN arg_type IN ('sys.tinyint'::regtype) THEN
RETURN sys.format_numeric(arg::SMALLINT, p_format_pattern, p_culture, 'tinyint');
WHEN arg_type IN ('sys.tinyint'::regtype) THEN
RETURN sys.format_numeric(arg::SMALLINT, p_format_pattern, p_culture, 'tinyint');

WHEN arg_type IN ('smallint'::regtype) THEN
RETURN sys.format_numeric(arg::SMALLINT, p_format_pattern, p_culture, 'smallint');
WHEN arg_type IN ('smallint'::regtype) THEN
RETURN sys.format_numeric(arg::SMALLINT, p_format_pattern, p_culture, 'smallint');

WHEN arg_type IN ('integer'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'integer');
WHEN arg_type IN ('integer'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'integer');

WHEN arg_type IN ('bigint'::regtype) THEN
WHEN arg_type IN ('bigint'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'bigint');

WHEN arg_type IN ('numeric'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'numeric');
WHEN arg_type IN ('numeric'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'numeric');

WHEN arg_type IN ('sys.decimal'::regtype) THEN
RETURN sys.format_numeric(arg::numeric, p_format_pattern, p_culture, 'numeric');
WHEN arg_type IN ('sys.decimal'::regtype) THEN
RETURN sys.format_numeric(arg::numeric, p_format_pattern, p_culture, 'numeric');

WHEN arg_type IN ('real'::regtype) THEN
IF(p_format_pattern LIKE 'R%') THEN
v_temp_integer := length(nullif((regexp_matches(arg::real::text, '(?<=\d*\.).*(?=[eE].*)')::text[])[1], ''));
ELSE v_temp_integer:= -1;
END IF;
WHEN arg_type IN ('real'::regtype) THEN
IF(p_format_pattern LIKE 'R%') THEN
v_temp_integer := length(nullif((regexp_matches(arg::real::text, '(?<=\d*\.).*(?=[eE].*)')::text[])[1], ''));
ELSE v_temp_integer:= -1;
END IF;

RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'real', v_temp_integer);
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'real', v_temp_integer);

WHEN arg_type IN ('float'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'float');
WHEN arg_type IN ('float'::regtype) THEN
RETURN sys.format_numeric(arg, p_format_pattern, p_culture, 'float');

WHEN pg_typeof(arg) IN ('sys.smallmoney'::regtype, 'sys.money'::regtype) THEN
RETURN sys.format_numeric(arg::numeric, p_format_pattern, p_culture, 'numeric');
ELSE
RAISE datatype_mismatch;
END CASE;
EXCEPTION
WHEN datatype_mismatch THEN
RAISE USING MESSAGE := format('Argument data type % is invalid for argument 1 of format function.', pg_typeof(arg)),
DETAIL := 'Invalid datatype.',
HINT := 'Convert it to valid datatype and try again.';
WHEN pg_typeof(arg) IN ('sys.smallmoney'::regtype, 'sys.money'::regtype) THEN
RETURN sys.format_numeric(arg::numeric, p_format_pattern, p_culture, 'numeric');
ELSE
RAISE datatype_mismatch;
END CASE;
EXCEPTION
WHEN datatype_mismatch THEN
RAISE USING MESSAGE := format('Argument data type % is invalid for argument 1 of format function.', pg_typeof(arg)),
DETAIL := 'Invalid datatype.',
HINT := 'Convert it to valid datatype and try again.';
END;
$BODY$
LANGUAGE plpgsql IMMUTABLE PARALLEL UNSAFE;
GRANT EXECUTE ON FUNCTION sys.FORMAT(IN anyelement, IN sys.NVARCHAR, IN sys.VARCHAR) TO PUBLIC;

-- === DROP deprecated functions (if exists)
CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'format_datetime_deprecated_3_4_0');
CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'format_numeric_deprecated_3_4_0');
CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'format_deprecated_3_4_0');

EXCEPTION WHEN OTHERS THEN
GET STACKED DIAGNOSTICS
exception_message = MESSAGE_TEXT;
RAISE WARNING '%', exception_message;
END;
$BODY$
LANGUAGE plpgsql IMMUTABLE PARALLEL UNSAFE;
GRANT EXECUTE ON FUNCTION sys.FORMAT(IN anyelement, IN sys.NVARCHAR, IN sys.VARCHAR) TO PUBLIC;

-- === DROP deprecated functions (if exists)
CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'format_datetime_deprecated_3_4_0');
CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'format_numeric_deprecated_3_4_0');
CALL sys.babelfish_drop_deprecated_object('function', 'sys', 'format_deprecated_3_4_0');
$$;

CREATE OR REPLACE FUNCTION sys.bbf_pivot()
RETURNS setof record
Expand Down
Loading