Resolved conflict

This commit is contained in:
rajesh
2025-07-24 16:28:57 +05:30
106 changed files with 3023 additions and 1434 deletions

View File

@@ -2737,6 +2737,132 @@
</insert>
</changeSet>
<changeSet id="09-01-2025_PK_120129" author="Piyush Kag">
<addColumn tableName="application_signed_document">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="APPLICATION_FORM">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="APPLICATION_FORM_FIELD">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="BENEFICIARY">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="CALL">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="COMPANY">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="FLOW_DATA">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="FLOW_EDGES">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="FORM">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="FORM_FIELD">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="FORM_TEMPLATE">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="hub">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="LOGIN_ATTEMPT">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="LOOKUP_DATA">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="PROTOCOL">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="REGION">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="ROLE">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="s3_path_configuration">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="SAML_RESPONSE">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="user_company_delegation">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
<addColumn tableName="GEPAFIN_USER">
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</addColumn>
</changeSet>
<changeSet id="08-04-2025_PK_160730" author="Piyush kag">
<sqlFile dbms="postgresql"
@@ -2836,4 +2962,57 @@
</addColumn>
</changeSet>
<changeSet id="05-06-2025_RK_191738" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/updated_form_field_05_06_2025.sql"/>
</changeSet>
<changeSet id="06-06-2025_RK_180524" author="Rajesh Khore">
<createTable tableName="ndganag">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints primaryKey="true" primaryKeyName="ndganag_pkey" nullable="false"/>
</column>
<column name="ndg" type="VARCHAR(255)" />
<column name="company_name" type="VARCHAR(255)"/>
<column name="vat_number" type="VARCHAR(255)" />
<column name="codice_fiscale" type="VARCHAR(255)" />
<column name="json" type="TEXT"/>
<column name="is_deleted" type="BOOLEAN"/>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addColumn tableName="application">
<column name="pec_email" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
<changeSet id="27-06-2025_RK_155914" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_technical_evaluation_rejected.sql"/>
</changeSet>
<changeSet id="02-07_2025_RK_162833" author="Rajesh Khore">
<addColumn tableName="application">
<column name="vat_number" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
<changeSet id="02-07-2025_RK_152053" author="Rajesh Khore">
<addColumn tableName="call">
<column name="allow_multiple_applications" type="BOOLEAN" defaultValueBoolean="false"></column>
</addColumn>
</changeSet>
<changeSet id="08-07-2025_RK_152945" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_assigned_application_view_08_07_2025.sql"/>
<sqlFile dbms="postgresql"
path="db/dump/update_application_form_view_08_07_2025.sql"/>
</changeSet>
<changeSet id="23-07-2025_RK_121816" author="Rajesh Khore">
<sqlFile dbms="postgresql" path="db/dump/update_application_form_view_23_07_2025.sql"/>
</changeSet>
</databaseChangeLog>