From 20e6c4bc862e58f48509bd975e01cdb356ccc770 Mon Sep 17 00:00:00 2001
From: Sriharsha Chintalapani <harsha@getcollate.io>
Date: Thu, 20 Jan 2022 12:35:51 -0800
Subject: [PATCH] fix upgrade

---
 .../mysql/v002__create_db_connection_info.sql |   2 +-
 .../mysql/v003__create_db_connection_info.sql | 215 ++++++++++++------
 .../metadata/ingestion/sink/elasticsearch.py  |   1 +
 3 files changed, 144 insertions(+), 74 deletions(-)

diff --git a/bootstrap/sql/mysql/v002__create_db_connection_info.sql b/bootstrap/sql/mysql/v002__create_db_connection_info.sql
index e8885ab884d..65625799d3e 100644
--- a/bootstrap/sql/mysql/v002__create_db_connection_info.sql
+++ b/bootstrap/sql/mysql/v002__create_db_connection_info.sql
@@ -1,5 +1,5 @@
 -- DBT models are no longer a separate entity
-DROP TABLE dbt_model_entity;
+DROP TABLE IF EXISTS dbt_model_entity;
 DELETE FROM entity_relationship WHERE fromEntity='dbtmodel' OR toEntity='dbtmodel';
 
 --
diff --git a/bootstrap/sql/mysql/v003__create_db_connection_info.sql b/bootstrap/sql/mysql/v003__create_db_connection_info.sql
index ee01b771203..4653083756c 100644
--- a/bootstrap/sql/mysql/v003__create_db_connection_info.sql
+++ b/bootstrap/sql/mysql/v003__create_db_connection_info.sql
@@ -10,8 +10,6 @@ CREATE TABLE IF NOT EXISTS webhook_entity (
 
 UPDATE change_event
 SET json = JSON_SET(json, '$.timestamp', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.dateTime', '%Y-%m-%dT%T.%fZ')));
-UPDATE change_event
-SET json = JSON_REMOVE(json, '$.dateTime');
 
 ALTER TABLE change_event
 DROP INDEX dateTime,
@@ -19,246 +17,314 @@ DROP COLUMN dateTime,
 ADD COLUMN eventTime BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.timestamp') NOT NULL AFTER username,
 ADD INDEX (eventTime);
 
+UPDATE change_event
+SET json = JSON_REMOVE(json, '$.dateTime');
+
 --
 -- Update to add deleted fields to data entities and change updatedAt field to unix epoch time milliseconds
 --
-UPDATE dbservice_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
-
 ALTER TABLE dbservice_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE dbservice_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE dbservice_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE messaging_service_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE messaging_service_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE messaging_service_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE messaging_service_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE dashboard_service_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE dashboard_service_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE dashboard_service_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE dashboard_service_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE pipeline_service_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE pipeline_service_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE pipeline_service_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE pipeline_service_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE storage_service_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE storage_service_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE storage_service_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE storage_service_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE database_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE database_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE database_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE database_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE table_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE table_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE table_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE table_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE table_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE metric_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE metric_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE metric_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE report_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE report_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE report_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE report_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE dashboard_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE dashboard_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE dashboard_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE dashboard_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE ml_model_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE ml_model_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE ml_model_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE ml_model_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE pipeline_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE pipeline_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE pipeline_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE pipeline_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE topic_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE topic_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE topic_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE, '$.retentionSize', 2147483647);
+
+ALTER TABLE topic_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE chart_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE chart_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE chart_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE chart_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE location_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE location_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE location_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE location_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE bot_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE bot_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE bot_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE bot_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE policy_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE policy_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE policy_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE policy_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE ingestion_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE ingestion_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE ingestion_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE ingestion_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE team_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE team_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE team_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE team_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE role_entity
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE role_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE role_entity
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE role_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE tag_category
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE tag_category
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE tag_category
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE tag_category
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
 ADD INDEX (deleted);
 
-UPDATE tag
-SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE tag
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE tag
+SET json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE tag
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 ADD COLUMN deleted BOOLEAN GENERATED ALWAYS AS (JSON_EXTRACT(json, '$.deleted')),
@@ -277,13 +343,16 @@ UPDATE entity_relationship
 SET relation = 10 WHERE fromEntity = 'dashboard' AND toEntity = 'chart' AND relation = 0;
 
 -- Remove user.deactivated field and use deleted instead
-UPDATE user_entity
-SET json = JSON_REMOVE(user_entity.json, '$.deactivated'),
-json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')));
 
 ALTER TABLE user_entity
 DROP COLUMN updatedAt,
-DROP INDEX updatedAt,
+DROP INDEX updatedAt;
+
+UPDATE user_entity
+SET json = JSON_REMOVE(user_entity.json, '$.deactivated'),
+json = JSON_SET(json, '$.updatedAt', UNIX_TIMESTAMP(STR_TO_DATE(json ->> '$.updatedAt', '%Y-%m-%dT%T.%fZ')), '$.deleted', FALSE);
+
+ALTER TABLE user_entity
 ADD COLUMN updatedAt BIGINT UNSIGNED GENERATED ALWAYS AS (json ->> '$.updatedAt') NOT NULL AFTER json,
 ADD INDEX(updatedAt),
 DROP COLUMN deactivated,
diff --git a/ingestion/src/metadata/ingestion/sink/elasticsearch.py b/ingestion/src/metadata/ingestion/sink/elasticsearch.py
index cdd9d927b19..c7529cbbc5b 100644
--- a/ingestion/src/metadata/ingestion/sink/elasticsearch.py
+++ b/ingestion/src/metadata/ingestion/sink/elasticsearch.py
@@ -489,6 +489,7 @@ class ElasticsearchSink(Sink[Entity]):
             for version in entity_versions.versions:
                 version_json = json.loads(version)
                 updatedAt = version_json["updatedAt"]
+                print(updatedAt)
                 change_description = ChangeDescription(
                     updatedBy=version_json["updatedBy"], updatedAt=updatedAt
                 )