Resolve Conflicts
This commit is contained in:
@@ -1961,6 +1961,17 @@
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="02-12-2024_1" author="Rajesh Khore">
|
||||
<sql dbms="postgresql">select
|
||||
setval('gepafin_schema.system_email_template_id_seq', (select
|
||||
max(id)+1
|
||||
from gepafin_schema.system_email_template), false)
|
||||
</sql>
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/insert_system_email_template_for_user_28_11_2024.sql"/>
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/insert_system_email_template_for_reset_password_28_11_2024.sql"/>
|
||||
</changeSet>
|
||||
<changeSet id="03-12-2024_1" author="Piyush">
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_03_12_2024_1.sql"/>
|
||||
@@ -1970,19 +1981,20 @@
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
|
||||
</changeSet>
|
||||
<!-- <changeSet id="19-12-2024_1" author="Nisha Kashyap">-->
|
||||
<!-- <addColumn tableName="USER_WITH_COMPANY">-->
|
||||
<!-- <column name="contact_name" type="VARCHAR(255)"/>-->
|
||||
<!-- <column name="contact_email" type="VARCHAR(255)"/>-->
|
||||
<!-- <column name="PEC" type="VARCHAR(255)"/>-->
|
||||
<!-- <column name="EMAIL" type="VARCHAR(255)"/>-->
|
||||
<!-- <column name="JSON" type="TEXT"/>-->
|
||||
<!-- </addColumn>-->
|
||||
<!-- <dropColumn tableName="COMPANY" columnName="contact_name"/>-->
|
||||
<!-- <dropColumn tableName="COMPANY" columnName="contact_email"/>-->
|
||||
<!-- <dropColumn tableName="COMPANY" columnName="PEC"/>-->
|
||||
<!-- <dropColumn tableName="COMPANY" columnName="EMAIL"/>-->
|
||||
<!--</changeSet>-->
|
||||
|
||||
<changeSet id="19-12-2024_4" author="Nisha Kashyap">
|
||||
<addColumn tableName="USER_WITH_COMPANY">
|
||||
<column name="contact_name" type="VARCHAR(255)"/>
|
||||
<column name="contact_email" type="VARCHAR(255)"/>
|
||||
<column name="PEC" type="VARCHAR(255)"/>
|
||||
<column name="EMAIL" type="VARCHAR(255)"/>
|
||||
<column name="JSON" type="TEXT"/>
|
||||
</addColumn>
|
||||
<dropColumn tableName="COMPANY" columnName="contact_name"/>
|
||||
<dropColumn tableName="COMPANY" columnName="contact_email"/>
|
||||
<dropColumn tableName="COMPANY" columnName="PEC"/>
|
||||
<dropColumn tableName="COMPANY" columnName="EMAIL"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="04-12-2024_3" author="Piyush">
|
||||
<addColumn tableName="hub">
|
||||
@@ -2042,7 +2054,7 @@
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="19-12-2024_1" author="Nisha kashyap">
|
||||
<changeSet id="19-12-2024_1" author="Nisha Kashyap">
|
||||
<!-- Insert data for Intructor manager role -->
|
||||
<insert tableName="role">
|
||||
<column name="role_name" value="instructor manager"/>
|
||||
@@ -2081,6 +2093,11 @@
|
||||
<column name="closing_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="03-01-2025_RK_191100" author="Rajesh Khore">
|
||||
<addColumn tableName="application_evaluation">
|
||||
<column name="ACTIVE_DAYS" type="INTEGER"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="13-12-2024_1" author="Piyush Kag">
|
||||
<createTable tableName="notification">
|
||||
@@ -2139,6 +2156,13 @@
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_json_template_for_notification_31_12_2024.sql"/>
|
||||
</changeSet>
|
||||
<changeSet id="03-01-2024_NK_125210" author="Nisha Kashyap">
|
||||
<sql>
|
||||
TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
|
||||
</sql>
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_form_field_data_03_01_2025.sql"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="07-01-2025_NK_063910" author="Nisha Kashyap">
|
||||
<createTable tableName="expiration_config">
|
||||
|
||||
Reference in New Issue
Block a user