diff --git a/metastore/scripts/upgrade/derby/058-HIVE-21560.derby.sql b/metastore/scripts/upgrade/derby/058-HIVE-21560.derby.sql
index e69de29bb2..d9f79b5220 100644
--- a/metastore/scripts/upgrade/derby/058-HIVE-21560.derby.sql
+++ b/metastore/scripts/upgrade/derby/058-HIVE-21560.derby.sql
@@ -0,0 +1,9 @@
+-- HIVE-21560
+ALTER TABLE TBLS ADD COLUMN NEW_VIEW_EXPANDED_TEXT CLOB;
+UPDATE TBLS SET NEW_VIEW_EXPANDED_TEXT = CAST(VIEW_EXPANDED_TEXT AS CLOB);
+ALTER TABLE TBLS DROP COLUMN VIEW_EXPANDED_TEXT;
+RENAME COLUMN TBLS.NEW_VIEW_EXPANDED_TEXT TO VIEW_EXPANDED_TEXT;
+ALTER TABLE TBLS ADD COLUMN NEW_VIEW_ORIGINAL_TEXT CLOB;
+UPDATE TBLS SET NEW_VIEW_ORIGINAL_TEXT = CAST(VIEW_ORIGINAL_TEXT AS CLOB);
+ALTER TABLE TBLS DROP COLUMN VIEW_ORIGINAL_TEXT;
+RENAME COLUMN TBLS.NEW_VIEW_ORIGINAL_TEXT TO VIEW_EXPANDED_TEXT;
\ No newline at end of file
diff --git a/standalone-metastore/metastore-server/src/main/resources/package.jdo b/standalone-metastore/metastore-server/src/main/resources/package.jdo
index 117a2f825e..4f2e523f3d 100644
--- a/standalone-metastore/metastore-server/src/main/resources/package.jdo
+++ b/standalone-metastore/metastore-server/src/main/resources/package.jdo
@@ -207,10 +207,10 @@
-
+
-
+
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql
index cff37c0468..a6e35a6922 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-3.2.0.derby.sql
@@ -76,7 +76,7 @@ CREATE TABLE "APP"."COLUMNS" ("SD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(256), "
CREATE TABLE "APP"."ROLES" ("ROLE_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "ROLE_NAME" VARCHAR(128));
-CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "OWNER_TYPE" VARCHAR(10), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N');
+CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "OWNER_TYPE" VARCHAR(10), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" CLOB, "VIEW_ORIGINAL_TEXT" CLOB, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N');
CREATE TABLE "APP"."PARTITION_KEYS" ("TBL_ID" BIGINT NOT NULL, "PKEY_COMMENT" VARCHAR(4000), "PKEY_NAME" VARCHAR(128) NOT NULL, "PKEY_TYPE" VARCHAR(767) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL);
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
index 02ff4aed8f..b6e3aed444 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/hive-schema-4.0.0.derby.sql
@@ -76,7 +76,7 @@ CREATE TABLE "APP"."COLUMNS" ("SD_ID" BIGINT NOT NULL, "COMMENT" VARCHAR(256), "
CREATE TABLE "APP"."ROLES" ("ROLE_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "OWNER_NAME" VARCHAR(128), "ROLE_NAME" VARCHAR(128));
-CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "OWNER_TYPE" VARCHAR(10), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" LONG VARCHAR, "VIEW_ORIGINAL_TEXT" LONG VARCHAR, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N', "WRITE_ID" BIGINT DEFAULT 0);
+CREATE TABLE "APP"."TBLS" ("TBL_ID" BIGINT NOT NULL, "CREATE_TIME" INTEGER NOT NULL, "DB_ID" BIGINT, "LAST_ACCESS_TIME" INTEGER NOT NULL, "OWNER" VARCHAR(767), "OWNER_TYPE" VARCHAR(10), "RETENTION" INTEGER NOT NULL, "SD_ID" BIGINT, "TBL_NAME" VARCHAR(256), "TBL_TYPE" VARCHAR(128), "VIEW_EXPANDED_TEXT" CLOB, "VIEW_ORIGINAL_TEXT" CLOB, "IS_REWRITE_ENABLED" CHAR(1) NOT NULL DEFAULT 'N', "WRITE_ID" BIGINT DEFAULT 0);
CREATE TABLE "APP"."PARTITION_KEYS" ("TBL_ID" BIGINT NOT NULL, "PKEY_COMMENT" VARCHAR(4000), "PKEY_NAME" VARCHAR(128) NOT NULL, "PKEY_TYPE" VARCHAR(767) NOT NULL, "INTEGER_IDX" INTEGER NOT NULL);
diff --git a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.0-to-3.2.0.derby.sql b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.0-to-3.2.0.derby.sql
index 7bccd601c7..993beb6e42 100644
--- a/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.0-to-3.2.0.derby.sql
+++ b/standalone-metastore/metastore-server/src/main/sql/derby/upgrade-3.1.0-to-3.2.0.derby.sql
@@ -25,6 +25,16 @@ RENAME COLUMN "APP"."PARTITION_PARAMS"."PARAM_VALUE_CLOB" TO "PARAM_VALUE";
ALTER TABLE "APP"."DBS" ADD COLUMN CREATE_TIME INTEGER;
ALTER TABLE "APP"."CTLGS" ADD COLUMN CREATE_TIME INTEGER;
+-- HIVE-21560
+ALTER TABLE TBLS ADD COLUMN NEW_VIEW_EXPANDED_TEXT CLOB;
+UPDATE TBLS SET NEW_VIEW_EXPANDED_TEXT = CAST(VIEW_EXPANDED_TEXT AS CLOB);
+ALTER TABLE TBLS DROP COLUMN VIEW_EXPANDED_TEXT;
+RENAME COLUMN TBLS.NEW_VIEW_EXPANDED_TEXT TO VIEW_EXPANDED_TEXT;
+ALTER TABLE TBLS ADD COLUMN NEW_VIEW_ORIGINAL_TEXT CLOB;
+UPDATE TBLS SET NEW_VIEW_ORIGINAL_TEXT = CAST(VIEW_ORIGINAL_TEXT AS CLOB);
+ALTER TABLE TBLS DROP COLUMN VIEW_ORIGINAL_TEXT;
+RENAME COLUMN TBLS.NEW_VIEW_ORIGINAL_TEXT TO VIEW_EXPANDED_TEXT;
+
-- This needs to be the last thing done. Insert any changes above this line.
UPDATE "APP".VERSION SET SCHEMA_VERSION='3.2.0', VERSION_COMMENT='Hive release version 3.2.0' where VER_ID=1;