Merge branch 'develop' into rm_valid_target_types

Author: Anish9901

db/sql/45_msar_type_casting.sql

@@ -1873,17 +1873,11 @@ $$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
 -- msar.cast_to_uuid
 
 CREATE OR REPLACE FUNCTION msar.cast_to_uuid(text)
-RETURNS uuid
-AS $$
-BEGIN
-  RETURN $1::uuid;
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+RETURNS uuid AS $$
+  SELECT $1::uuid;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;
 
 CREATE OR REPLACE FUNCTION msar.cast_to_uuid(uuid)
-RETURNS uuid
-AS $$
-BEGIN
-  RETURN $1::uuid;
-END;
-$$ LANGUAGE plpgsql RETURNS NULL ON NULL INPUT;
+RETURNS uuid AS $$
+  SELECT $1::uuid;
+$$ LANGUAGE SQL IMMUTABLE RETURNS NULL ON NULL INPUT;