diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_961.sql b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_961.sql
index 210c3721369c4a882a6729a37914b99ec2d46a4d..848014625db9b28b705d2afd5af2601dcbca127d 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_961.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_maindb/rollback-post_catalog_maindb_92_961.sql
@@ -1,112 +1,9 @@
---- DROP
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_name_index;
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_refoid_index;
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_oid_index;
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_name_index;
-DROP TYPE IF EXISTS pg_catalog.gs_dependencies;
-DROP TABLE IF EXISTS pg_catalog.gs_dependencies;
-DROP TYPE IF EXISTS pg_catalog.gs_dependencies_obj;
-DROP TABLE IF EXISTS pg_catalog.gs_dependencies_obj;
-
-DECLARE
-    cnt int;
-BEGIN
-    select count(*) into cnt from pg_type where oid = 4408;
-    if cnt = 1 then
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedin() CASCADE;
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedout() CASCADE;
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedrecv() CASCADE;
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedsend() CASCADE;
-    end if;
-END;
-/
-DROP TYPE IF EXISTS pg_catalog.undefined CASCADE;
-DROP TYPE IF EXISTS pg_catalog._undefined CASCADE;
---- CREATE
 declare
-    dependencies_exist int:=0;
     dependencies_obj_exist int:=0;
 begin
-    select count(*) into dependencies_exist from pg_catalog.pg_class where oid = 7111;
-    if dependencies_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_name_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_refoid_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies;
-    end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7111, 7112, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        refobjpos int NOT NULL,
-        refobjoid oid NOT NULL,
-        objectname text
-    );
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8004;
-    CREATE INDEX pg_catalog.gs_dependencies_name_index ON pg_catalog.gs_dependencies USING BTREE(schemaname name_ops, packagename name_ops, refobjpos int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8006;
-    CREATE INDEX pg_catalog.gs_dependencies_refoid_index ON pg_catalog.gs_dependencies USING BTREE(refobjoid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies TO PUBLIC;
-
     select count(*) into dependencies_obj_exist from pg_catalog.pg_class where oid = 7169;
     if dependencies_obj_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_oid_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_name_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies_obj;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies_obj;
+        ALTER TABLE  pg_catalog.gs_dependencies_obj ALTER COLUMN type SET NOT NULL;
     end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7169, 7170, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies_obj(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        type int NOT NULL,
-        name text,
-        objnode pg_node_tree
-    ) WITH OIDS;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8008;
-    CREATE INDEX pg_catalog.gs_dependencies_obj_name_index ON pg_catalog.gs_dependencies_obj USING BTREE(schemaname name_ops, packagename name_ops, type int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8007;
-    CREATE UNIQUE INDEX pg_catalog.gs_dependencies_obj_oid_index ON pg_catalog.gs_dependencies_obj USING BTREE(oid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies_obj TO PUBLIC;
 end;
-/
-
-DROP TYPE IF EXISTS pg_catalog.undefined CASCADE;
-DROP TYPE IF EXISTS pg_catalog._undefined CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 4408, 0, u;
-CREATE TYPE pg_catalog.undefined;
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedin() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5704;
-CREATE FUNCTION pg_catalog.undefinedin(cstring) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedin';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedout() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5707;
-CREATE FUNCTION pg_catalog.undefinedout(undefined) RETURNS cstring LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedout';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedrecv() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5710;
-CREATE FUNCTION pg_catalog.undefinedrecv(internal) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedrecv';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedsend() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5709;
-CREATE FUNCTION pg_catalog.undefinedsend(undefined) RETURNS bytea LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedsend';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
-CREATE TYPE pg_catalog.undefined(
-    INPUT=undefinedin,
-    OUTPUT=undefinedout,
-    RECEIVE=undefinedrecv,
-    SEND=undefinedsend,
-    PASSEDBYVALUE=false,
-    INTERNALLENGTH=-2,
-    CATEGORY='W',
-    PREFERRED=false,
-    ALIGNMENT=char,
-    STORAGE=plain
-);
-COMMENT ON TYPE pg_catalog.undefined IS 'undefined objects at PLSQL compilation time';
-COMMENT ON FUNCTION PG_CATALOG.undefinedin() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedout() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedrecv() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedsend() IS 'I/O';
+/
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_961.sql b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_961.sql
index 210c3721369c4a882a6729a37914b99ec2d46a4d..848014625db9b28b705d2afd5af2601dcbca127d 100644
--- a/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_961.sql
+++ b/src/include/catalog/upgrade_sql/rollback_catalog_otherdb/rollback-post_catalog_otherdb_92_961.sql
@@ -1,112 +1,9 @@
---- DROP
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_name_index;
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_refoid_index;
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_oid_index;
-DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_name_index;
-DROP TYPE IF EXISTS pg_catalog.gs_dependencies;
-DROP TABLE IF EXISTS pg_catalog.gs_dependencies;
-DROP TYPE IF EXISTS pg_catalog.gs_dependencies_obj;
-DROP TABLE IF EXISTS pg_catalog.gs_dependencies_obj;
-
-DECLARE
-    cnt int;
-BEGIN
-    select count(*) into cnt from pg_type where oid = 4408;
-    if cnt = 1 then
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedin() CASCADE;
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedout() CASCADE;
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedrecv() CASCADE;
-            DROP FUNCTION IF EXISTS pg_catalog.undefinedsend() CASCADE;
-    end if;
-END;
-/
-DROP TYPE IF EXISTS pg_catalog.undefined CASCADE;
-DROP TYPE IF EXISTS pg_catalog._undefined CASCADE;
---- CREATE
 declare
-    dependencies_exist int:=0;
     dependencies_obj_exist int:=0;
 begin
-    select count(*) into dependencies_exist from pg_catalog.pg_class where oid = 7111;
-    if dependencies_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_name_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_refoid_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies;
-    end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7111, 7112, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        refobjpos int NOT NULL,
-        refobjoid oid NOT NULL,
-        objectname text
-    );
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8004;
-    CREATE INDEX pg_catalog.gs_dependencies_name_index ON pg_catalog.gs_dependencies USING BTREE(schemaname name_ops, packagename name_ops, refobjpos int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8006;
-    CREATE INDEX pg_catalog.gs_dependencies_refoid_index ON pg_catalog.gs_dependencies USING BTREE(refobjoid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies TO PUBLIC;
-
     select count(*) into dependencies_obj_exist from pg_catalog.pg_class where oid = 7169;
     if dependencies_obj_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_oid_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_name_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies_obj;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies_obj;
+        ALTER TABLE  pg_catalog.gs_dependencies_obj ALTER COLUMN type SET NOT NULL;
     end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7169, 7170, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies_obj(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        type int NOT NULL,
-        name text,
-        objnode pg_node_tree
-    ) WITH OIDS;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8008;
-    CREATE INDEX pg_catalog.gs_dependencies_obj_name_index ON pg_catalog.gs_dependencies_obj USING BTREE(schemaname name_ops, packagename name_ops, type int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8007;
-    CREATE UNIQUE INDEX pg_catalog.gs_dependencies_obj_oid_index ON pg_catalog.gs_dependencies_obj USING BTREE(oid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies_obj TO PUBLIC;
 end;
-/
-
-DROP TYPE IF EXISTS pg_catalog.undefined CASCADE;
-DROP TYPE IF EXISTS pg_catalog._undefined CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 4408, 0, u;
-CREATE TYPE pg_catalog.undefined;
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedin() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5704;
-CREATE FUNCTION pg_catalog.undefinedin(cstring) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedin';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedout() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5707;
-CREATE FUNCTION pg_catalog.undefinedout(undefined) RETURNS cstring LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedout';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedrecv() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5710;
-CREATE FUNCTION pg_catalog.undefinedrecv(internal) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedrecv';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedsend() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5709;
-CREATE FUNCTION pg_catalog.undefinedsend(undefined) RETURNS bytea LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedsend';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
-CREATE TYPE pg_catalog.undefined(
-    INPUT=undefinedin,
-    OUTPUT=undefinedout,
-    RECEIVE=undefinedrecv,
-    SEND=undefinedsend,
-    PASSEDBYVALUE=false,
-    INTERNALLENGTH=-2,
-    CATEGORY='W',
-    PREFERRED=false,
-    ALIGNMENT=char,
-    STORAGE=plain
-);
-COMMENT ON TYPE pg_catalog.undefined IS 'undefined objects at PLSQL compilation time';
-COMMENT ON FUNCTION PG_CATALOG.undefinedin() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedout() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedrecv() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedsend() IS 'I/O';
+/
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_961.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_961.sql
index 6392564b5529574af5e40de8be1352713b3324cd..8bcf77c55284c85b0a205ff7a4a61fa8fc263bc0 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_961.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_maindb/upgrade-post_catalog_maindb_92_961.sql
@@ -1,87 +1,14 @@
 declare
-    dependencies_exist int:=0;
     dependencies_obj_exist int:=0;
 begin
-    select count(*) into dependencies_exist from pg_catalog.pg_class where oid = 7111;
-    if dependencies_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_name_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_refoid_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies;
-    end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7111, 7112, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        refobjpos int NOT NULL,
-        refobjoid oid NOT NULL,
-        objectname text
-    );
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8004;
-    CREATE INDEX pg_catalog.gs_dependencies_name_index ON pg_catalog.gs_dependencies USING BTREE(schemaname name_ops, packagename name_ops, refobjpos int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8006;
-    CREATE INDEX pg_catalog.gs_dependencies_refoid_index ON pg_catalog.gs_dependencies USING BTREE(refobjoid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies TO PUBLIC;
-
     select count(*) into dependencies_obj_exist from pg_catalog.pg_class where oid = 7169;
     if dependencies_obj_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_oid_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_name_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies_obj;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies_obj;
+        ALTER TABLE  pg_catalog.gs_dependencies_obj ALTER COLUMN type SET NOT NULL;
     end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7169, 7170, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies_obj(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        type int NOT NULL,
-        name text,
-        objnode pg_node_tree
-    ) WITH OIDS;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8008;
-    CREATE INDEX pg_catalog.gs_dependencies_obj_name_index ON pg_catalog.gs_dependencies_obj USING BTREE(schemaname name_ops, packagename name_ops, type int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8007;
-    CREATE UNIQUE INDEX pg_catalog.gs_dependencies_obj_oid_index ON pg_catalog.gs_dependencies_obj USING BTREE(oid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies_obj TO PUBLIC;
 end;
 /
 
-DROP TYPE IF EXISTS pg_catalog.undefined CASCADE;
-DROP TYPE IF EXISTS pg_catalog._undefined CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 4408, 0, u;
-CREATE TYPE pg_catalog.undefined;
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedin() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5704;
-CREATE FUNCTION pg_catalog.undefinedin(cstring) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedin';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedout() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5707;
-CREATE FUNCTION pg_catalog.undefinedout(undefined) RETURNS cstring LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedout';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedrecv() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5710;
-CREATE FUNCTION pg_catalog.undefinedrecv(internal) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedrecv';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedsend() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5709;
-CREATE FUNCTION pg_catalog.undefinedsend(undefined) RETURNS bytea LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedsend';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
-CREATE TYPE pg_catalog.undefined(
-    INPUT=undefinedin,
-    OUTPUT=undefinedout,
-    RECEIVE=undefinedrecv,
-    SEND=undefinedsend,
-    PASSEDBYVALUE=false,
-    INTERNALLENGTH=-2,
-    CATEGORY='W',
-    PREFERRED=false,
-    ALIGNMENT=char,
-    STORAGE=plain
-);
-COMMENT ON TYPE pg_catalog.undefined IS 'undefined objects at PLSQL compilation time';
 COMMENT ON FUNCTION PG_CATALOG.undefinedin() IS 'I/O';
 COMMENT ON FUNCTION PG_CATALOG.undefinedout() IS 'I/O';
 COMMENT ON FUNCTION PG_CATALOG.undefinedrecv() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedsend() IS 'I/O';
+COMMENT ON FUNCTION PG_CATALOG.undefinedsend() IS 'I/O';
\ No newline at end of file
diff --git a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_961.sql b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_961.sql
index 6392564b5529574af5e40de8be1352713b3324cd..8bcf77c55284c85b0a205ff7a4a61fa8fc263bc0 100644
--- a/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_961.sql
+++ b/src/include/catalog/upgrade_sql/upgrade_catalog_otherdb/upgrade-post_catalog_otherdb_92_961.sql
@@ -1,87 +1,14 @@
 declare
-    dependencies_exist int:=0;
     dependencies_obj_exist int:=0;
 begin
-    select count(*) into dependencies_exist from pg_catalog.pg_class where oid = 7111;
-    if dependencies_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_name_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_refoid_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies;
-    end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7111, 7112, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        refobjpos int NOT NULL,
-        refobjoid oid NOT NULL,
-        objectname text
-    );
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8004;
-    CREATE INDEX pg_catalog.gs_dependencies_name_index ON pg_catalog.gs_dependencies USING BTREE(schemaname name_ops, packagename name_ops, refobjpos int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8006;
-    CREATE INDEX pg_catalog.gs_dependencies_refoid_index ON pg_catalog.gs_dependencies USING BTREE(refobjoid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies TO PUBLIC;
-
     select count(*) into dependencies_obj_exist from pg_catalog.pg_class where oid = 7169;
     if dependencies_obj_exist != 0 then
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_oid_index;
-        DROP INDEX IF EXISTS pg_catalog.gs_dependencies_obj_name_index;
-        DROP TYPE IF EXISTS pg_catalog.gs_dependencies_obj;
-        DROP TABLE IF EXISTS pg_catalog.gs_dependencies_obj;
+        ALTER TABLE  pg_catalog.gs_dependencies_obj ALTER COLUMN type SET NOT NULL;
     end if;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 7169, 7170, 0, 0;
-    CREATE TABLE IF NOT EXISTS pg_catalog.gs_dependencies_obj(
-        schemaname name NOCOMPRESS NOT NULL,
-        packagename name NOCOMPRESS NOT NULL,
-        type int NOT NULL,
-        name text,
-        objnode pg_node_tree
-    ) WITH OIDS;
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8008;
-    CREATE INDEX pg_catalog.gs_dependencies_obj_name_index ON pg_catalog.gs_dependencies_obj USING BTREE(schemaname name_ops, packagename name_ops, type int4_ops);
-    SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 8007;
-    CREATE UNIQUE INDEX pg_catalog.gs_dependencies_obj_oid_index ON pg_catalog.gs_dependencies_obj USING BTREE(oid oid_ops);
-    GRANT SELECT ON TABLE pg_catalog.gs_dependencies_obj TO PUBLIC;
 end;
 /
 
-DROP TYPE IF EXISTS pg_catalog.undefined CASCADE;
-DROP TYPE IF EXISTS pg_catalog._undefined CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_TYPE, 4408, 0, u;
-CREATE TYPE pg_catalog.undefined;
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedin() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5704;
-CREATE FUNCTION pg_catalog.undefinedin(cstring) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedin';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedout() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5707;
-CREATE FUNCTION pg_catalog.undefinedout(undefined) RETURNS cstring LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedout';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedrecv() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5710;
-CREATE FUNCTION pg_catalog.undefinedrecv(internal) RETURNS undefined LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedrecv';
-
-DROP FUNCTION IF EXISTS pg_catalog.undefinedsend() CASCADE;
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_PROC, 5709;
-CREATE FUNCTION pg_catalog.undefinedsend(undefined) RETURNS bytea LANGUAGE INTERNAL IMMUTABLE STRICT as 'undefinedsend';
-
-SET LOCAL inplace_upgrade_next_system_object_oids = IUO_CATALOG, false, true, 0, 0, 0, 0;
-CREATE TYPE pg_catalog.undefined(
-    INPUT=undefinedin,
-    OUTPUT=undefinedout,
-    RECEIVE=undefinedrecv,
-    SEND=undefinedsend,
-    PASSEDBYVALUE=false,
-    INTERNALLENGTH=-2,
-    CATEGORY='W',
-    PREFERRED=false,
-    ALIGNMENT=char,
-    STORAGE=plain
-);
-COMMENT ON TYPE pg_catalog.undefined IS 'undefined objects at PLSQL compilation time';
 COMMENT ON FUNCTION PG_CATALOG.undefinedin() IS 'I/O';
 COMMENT ON FUNCTION PG_CATALOG.undefinedout() IS 'I/O';
 COMMENT ON FUNCTION PG_CATALOG.undefinedrecv() IS 'I/O';
-COMMENT ON FUNCTION PG_CATALOG.undefinedsend() IS 'I/O';
+COMMENT ON FUNCTION PG_CATALOG.undefinedsend() IS 'I/O';
\ No newline at end of file