Index: metastore/scripts/upgrade/oracle/015-HIVE-5700.oracle.sql =================================================================== --- metastore/scripts/upgrade/oracle/015-HIVE-5700.oracle.sql (revision 1586207) +++ metastore/scripts/upgrade/oracle/015-HIVE-5700.oracle.sql (working copy) @@ -1,15 +1,6 @@ -- Normalize the date partition column values as best we can. No schema changes. -CREATE FUNCTION hive13_to_date(date_str IN VARCHAR2) -RETURN DATE -IS dt DATE; -BEGIN - dt := TO_DATE(date_str, 'YYYY-MM-DD'); - RETURN dt; -EXCEPTION - WHEN others THEN RETURN null; -END; -/ +CREATE FUNCTION hive13_to_date(date_str IN VARCHAR2) RETURN DATE IS dt DATE; BEGIN dt := TO_DATE(date_str, 'YYYY-MM-DD'); RETURN dt; EXCEPTION WHEN others THEN RETURN null; END;/ MERGE INTO PARTITION_KEY_VALS USING ( Index: metastore/scripts/upgrade/postgres/015-HIVE-5700.postgres.sql =================================================================== --- metastore/scripts/upgrade/postgres/015-HIVE-5700.postgres.sql (revision 1586207) +++ metastore/scripts/upgrade/postgres/015-HIVE-5700.postgres.sql (working copy) @@ -1,17 +1,8 @@ SELECT '< HIVE-5700 enforce single date format for partition column storage >'; -- Normalize the date partition column values as best we can. No schema changes. +CREATE FUNCTION hive13_to_date(date_str text) RETURNS DATE AS $$ DECLARE dt DATE; BEGIN dt := date_str::DATE; RETURN dt; EXCEPTION WHEN others THEN RETURN null; END; $$ LANGUAGE plpgsql; -CREATE FUNCTION hive13_to_date(date_str text) RETURNS DATE AS $$ -DECLARE dt DATE; -BEGIN - dt := date_str::DATE; - RETURN dt; -EXCEPTION - WHEN others THEN RETURN null; -END; -$$ LANGUAGE plpgsql; - UPDATE "PARTITION_KEY_VALS" SET "PART_KEY_VAL" = COALESCE(TO_CHAR(hive13_to_date(src."PART_KEY_VAL"),'YYYY-MM-DD'), src."PART_KEY_VAL") FROM "PARTITION_KEY_VALS" src