RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

#1868: revert changes to default one, add new change set with fixes

Browse source
This commit is contained in:
vmazurashu 2018-07-11 11:02:37 +03:00
parent f715698f7b
commit 8091c8540d
2 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libreplan-business/src/main/resources/db.changelog-1.4.1.xml
View file

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?> <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd"> <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<changeSet id="change-primary-key" author="vmazurashu"> <changeSet id="change-primary-key" author="vmazurashu">
<sql> <sql>
@ -11,7 +13,7 @@
</sql> </sql>
<addPrimaryKey columnNames="id" <addPrimaryKey columnNames="id"
constraintName="limits_pkey" constraintName="limits_pkey"
tableName="limits" /> tableName="limits"/>
</changeSet> </changeSet>
<changeSet id="update-values" author="vmazurashu"> <changeSet id="update-values" author="vmazurashu">
@ -21,7 +23,7 @@
</changeSet> </changeSet>
<changeSet id="update-unique-constraint" author="vmazurashu"> <changeSet id="update-unique-constraint" author="vmazurashu">
<dropUniqueConstraint constraintName="type" <dropUniqueConstraint constraintName="type"
tableName="limits"/> tableName="limits"/>
<addUniqueConstraint constraintName="limits_type" <addUniqueConstraint constraintName="limits_type"
columnNames="type" columnNames="type"

16
libreplan-business/src/main/resources/db.changelog-1.4.xml
View file

@ -2,12 +2,12 @@
<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" <databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd"> http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
<changeSet id="add-id_cost_category-column-to-criterion-table" author="ltilve"> <changeSet id="add-id_cost_category-column-to-criterion-table" author="ltilve">
<comment>Add column to criterion table to store the relationship with cost category</comment> <comment>Add column to criterion table to store the relationship with cost category</comment>
<addColumn tableName="criterion"> <addColumn tableName="criterion">
<column name="id_cost_category" type="BIGINT" /> <column name="id_cost_category" type="BIGINT"/>
</addColumn> </addColumn>
</changeSet> </changeSet>
@ -16,20 +16,20 @@
<addForeignKeyConstraint constraintName="cost_category_fkey" <addForeignKeyConstraint constraintName="cost_category_fkey"
baseTableName="criterion" baseColumnNames="id_cost_category" baseTableName="criterion" baseColumnNames="id_cost_category"
referencedTableName="cost_category" referencedColumnNames="id" referencedTableName="cost_category" referencedColumnNames="id"
onDelete="SET NULL" /> onDelete="SET NULL"/>
</changeSet> </changeSet>
<changeSet id="add-new-column-automatic_budget_enabled" author="ltilve"> <changeSet id="add-new-column-automatic_budget_enabled" author="ltilve">
<comment>Add new column automatic_budget_enabled with default value FALSE to configuration table</comment> <comment>Add new column automatic_budget_enabled with default value FALSE to configuration table</comment>
<addColumn tableName="configuration"> <addColumn tableName="configuration">
<column name="automatic_budget_enabled" type="BOOLEAN" /> <column name="automatic_budget_enabled" type="BOOLEAN"/>
</addColumn> </addColumn>
<addDefaultValue tableName="configuration" columnName="automatic_budget_enabled" <addDefaultValue tableName="configuration" columnName="automatic_budget_enabled"
defaultValueBoolean="FALSE" /> defaultValueBoolean="FALSE"/>
<addNotNullConstraint tableName="configuration" <addNotNullConstraint tableName="configuration"
columnName="automatic_budget_enabled" columnName="automatic_budget_enabled"
defaultNullValue="FALSE" defaultNullValue="FALSE"
columnDataType="BOOLEAN" /> columnDataType="BOOLEAN"/>
</changeSet> </changeSet>
<changeSet id="add-automatic_budget_type_of_work_hours-to-configuration" author="ltilve"> <changeSet id="add-automatic_budget_type_of_work_hours-to-configuration" author="ltilve">
@ -38,11 +38,11 @@
configuration table. configuration table.
</comment> </comment>
<addColumn tableName="configuration"> <addColumn tableName="configuration">
<column name="automatic_budget_type_of_work_hours" type="BIGINT" /> <column name="automatic_budget_type_of_work_hours" type="BIGINT"/>
</addColumn> </addColumn>
<addForeignKeyConstraint constraintName="automatic_budget_type_of_work_hours_fkey" <addForeignKeyConstraint constraintName="automatic_budget_type_of_work_hours_fkey"
baseTableName="configuration" baseColumnNames="automatic_budget_type_of_work_hours" baseTableName="configuration" baseColumnNames="automatic_budget_type_of_work_hours"
referencedTableName="type_of_work_hours" referencedColumnNames="id" /> referencedTableName="type_of_work_hours" referencedColumnNames="id"/>
</changeSet> </changeSet>
<changeSet id="adding-limits" author="vova/jeroen"> <changeSet id="adding-limits" author="vova/jeroen">