Resolve Conflicts
This commit is contained in:
@@ -1716,10 +1716,25 @@
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_system_email_template_for_notification_mail_04_11_2024_1.sql"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="05-11-2024_4" author="Harish Bagora">
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_system_email_template_for_notification_mail_05_11_2024_4.sql"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="13-11-2024_1" author="Rajesh Khore">
|
||||
<dropNotNullConstraint tableName="application_amendment_request" columnName="is_email"/>
|
||||
<dropNotNullConstraint tableName="application_amendment_request" columnName="is_notification"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="13-11-2024_2" author="Harish Bagora">
|
||||
<addColumn tableName="beneficiary_preferred_call">
|
||||
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="15-11-2024_1" author="Nisha Kashyap">
|
||||
<createTable tableName="email_log">
|
||||
<column autoIncrement="true" name="id" type="INTEGER">
|
||||
@@ -1759,19 +1774,6 @@
|
||||
path="db/dump/updated_hub_data_for_email_service_config_15-11-2024.sql"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="13-11-2024_1" author="Rajesh Khore">
|
||||
<dropNotNullConstraint tableName="application_amendment_request" columnName="is_email"/>
|
||||
<dropNotNullConstraint tableName="application_amendment_request" columnName="is_notification"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="13-11-2024_2" author="Harish Bagora">
|
||||
<addColumn tableName="beneficiary_preferred_call">
|
||||
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="18-11-2024_1" author="Nisha Kashyap">
|
||||
<addColumn tableName="email_log">
|
||||
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false"></column>
|
||||
@@ -1801,6 +1803,59 @@
|
||||
<column name="end_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="20-11-2024_1" author="Piyush">
|
||||
<createTable tableName="user_action">
|
||||
<column autoIncrement="true" name="id" type="INTEGER">
|
||||
<constraints nullable="false" primaryKey="true" primaryKeyName="pk_user_action"/>
|
||||
</column>
|
||||
<column name="user_id" type="INTEGER"/>
|
||||
<column name="action_type" type="TEXT"/>
|
||||
<column name="request_body" type="TEXT"/>
|
||||
<column name="login_attempt_id" type="INTEGER"/>
|
||||
<column name="ip_address" type="TEXT"/>
|
||||
<column name="action_context" type="TEXT"/>
|
||||
<column name="method_type" type="TEXT"/>
|
||||
<column name="hub_id" type="INTEGER"/>
|
||||
<column name="url" type="TEXT"/>
|
||||
<column name="response" type="TEXT"/>
|
||||
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
|
||||
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
|
||||
</createTable>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="20-11-2024_2" author="Piyush">
|
||||
<createTable tableName="version_history">
|
||||
<column autoIncrement="true" name="id" type="INTEGER">
|
||||
<constraints nullable="false" primaryKey="true" primaryKeyName="pk_version_history"/>
|
||||
</column>
|
||||
<column name="old_data" type="LONGTEXT"/>
|
||||
<column name="new_data" type="LONGTEXT"/>
|
||||
<column name="table_name" type="TEXT"/>
|
||||
<column name="action_type" type="TEXT"/>
|
||||
<column name="record_id" type="INTEGER"/>
|
||||
<column name="user_id" type="INTEGER"/>
|
||||
<column name="user_action_id" type="INTEGER">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
|
||||
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
|
||||
</createTable>
|
||||
|
||||
<addForeignKeyConstraint baseTableName="version_history"
|
||||
baseColumnNames="user_action_id"
|
||||
referencedTableName="user_action"
|
||||
referencedColumnNames="id"
|
||||
onDelete="CASCADE"
|
||||
constraintName="fk_version_history_user_action"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="20-11-2024_3" author="Piyush">
|
||||
<addColumn tableName="login_attempt">
|
||||
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
|
||||
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="21-11-2024_1" author="Rajesh Khore">
|
||||
<addColumn tableName="communication">
|
||||
<column name="sender_user_id" type="INTEGER"></column>
|
||||
@@ -1814,9 +1869,27 @@
|
||||
<where>role_type = 'ROLE_PRE_INSTRUCTOR'</where>
|
||||
</update>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="22-11-2024_1" author="Rajesh Khore">
|
||||
<addColumn tableName="application_evaluation">
|
||||
<column name="MOTIVATION" type="TEXT"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="22-11-2024_2" author="Piyush">
|
||||
<addColumn tableName="user_action">
|
||||
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="22-11-2024_3" author="Piyush">
|
||||
<addColumn tableName="version_history">
|
||||
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
|
||||
<constraints nullable="false"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
</databaseChangeLog>
|
||||
|
||||
Reference in New Issue
Block a user