From f715698f7b13f872043c31b2507eb8add77a6e91 Mon Sep 17 00:00:00 2001
From: Vadim <mazurashuvadim@gmail.com>
Date: Tue, 10 Jul 2018 17:04:48 +0300
Subject: [PATCH 1/2] Merge 1868: revert changes to default one, add new change
 set with fixes

# Conflicts:
#	libreplan-business/src/main/resources/db.changelog-1.4.xml
#	libreplan-business/src/main/resources/db.changelog.xml
---
 .../src/main/resources/db.changelog-1.4.1.xml | 33 +++++++++++++++++++
 .../src/main/resources/db.changelog-1.4.xml   | 17 ++++++----
 .../src/main/resources/db.changelog.xml       |  1 +
 3 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 libreplan-business/src/main/resources/db.changelog-1.4.1.xml

diff --git a/libreplan-business/src/main/resources/db.changelog-1.4.1.xml b/libreplan-business/src/main/resources/db.changelog-1.4.1.xml
new file mode 100644
index 000000000..0d3ac2124
--- /dev/null
+++ b/libreplan-business/src/main/resources/db.changelog-1.4.1.xml
@@ -0,0 +1,33 @@
+<?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">
+
+    <changeSet id="change-primary-key" author="vmazurashu">
+        <sql>
+            ALTER TABLE limits ADD tmp_id BIGINT;
+            UPDATE limits SET tmp_id = id;
+            ALTER TABLE limits DROP CONSTRAINT limits_pkey;
+            ALTER TABLE limits DROP COLUMN id;
+            ALTER TABLE limits RENAME COLUMN tmp_id TO id;
+        </sql>
+        <addPrimaryKey columnNames="id"
+                       constraintName="limits_pkey"
+                       tableName="limits" />
+    </changeSet>
+
+    <changeSet id="update-values" author="vmazurashu">
+        <sql>
+            UPDATE limits SET value = 0;
+        </sql>
+    </changeSet>
+    <changeSet id="update-unique-constraint" author="vmazurashu">
+        <dropUniqueConstraint constraintName="type"
+                             tableName="limits"/>
+
+        <addUniqueConstraint constraintName="limits_type"
+                             columnNames="type"
+                             deferrable="false"
+                             disabled="false"
+                             initiallyDeferred="false"
+                             tableName="limits"/>
+    </changeSet>
+</databaseChangeLog>
\ No newline at end of file
diff --git a/libreplan-business/src/main/resources/db.changelog-1.4.xml b/libreplan-business/src/main/resources/db.changelog-1.4.xml
index 160694554..a92cccb40 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.4.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.4.xml
@@ -2,7 +2,7 @@
 <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">
+    http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-2.0.xsd">
 
     <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>
@@ -24,7 +24,12 @@
         <addColumn tableName="configuration">
             <column name="automatic_budget_enabled" type="BOOLEAN" />
         </addColumn>
-        <addDefaultValue tableName="configuration" columnName="automatic_budget_enabled" defaultValueBoolean="FALSE" />
+        <addDefaultValue tableName="configuration" columnName="automatic_budget_enabled"
+                         defaultValueBoolean="FALSE" />
+        <addNotNullConstraint tableName="configuration"
+                              columnName="automatic_budget_enabled"
+                              defaultNullValue="FALSE"
+                              columnDataType="BOOLEAN" />
     </changeSet>
 
     <changeSet id="add-automatic_budget_type_of_work_hours-to-configuration" author="ltilve">
@@ -42,7 +47,7 @@
 
     <changeSet id="adding-limits" author="vova/jeroen">
         <createTable tableName="limits">
-            <column name="id" type="BIGINT">
+            <column name="id" type="BIGINT" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false" primaryKeyName="limits_pkey"/>
             </column>
 
@@ -52,15 +57,15 @@
 
         </createTable>
         <addUniqueConstraint
-                constraintName="limits_type_uc"
+                constraintName="type"
                 columnNames="type"
                 deferrable="false"
                 disabled="false"
                 initiallyDeferred="false"
                 tableName="limits"/>
         <sql>
-            INSERT INTO limits VALUES(1, 'users', 0);
-            INSERT INTO limits VALUES(2, 'workers+machines', 0);
+            INSERT INTO limits VALUES(0, 'users', 5);
+            INSERT INTO limits VALUES(1, 'workers+machines', 10);
         </sql>
     </changeSet>
 
diff --git a/libreplan-business/src/main/resources/db.changelog.xml b/libreplan-business/src/main/resources/db.changelog.xml
index 99bc85a99..54ff3a809 100644
--- a/libreplan-business/src/main/resources/db.changelog.xml
+++ b/libreplan-business/src/main/resources/db.changelog.xml
@@ -11,6 +11,7 @@
     <include file="db.changelog-1.2.xml"/>
     <include file="db.changelog-1.3.xml"/>
     <include file="db.changelog-1.4.xml"/>
+    <include file="db.changelog-1.4.1.xml"/>
     <include file="db.changelog-1.5.xml"/>
     <include file="db.changelog-1.6.xml"/>
 </databaseChangeLog>

From 8091c8540dc9097c41119f40e026ad094830cbeb Mon Sep 17 00:00:00 2001
From: vmazurashu <mazurashuvadim@gmail.com>
Date: Wed, 11 Jul 2018 11:02:37 +0300
Subject: [PATCH 2/2] #1868: revert changes to default one, add new change set
 with fixes

---
 .../src/main/resources/db.changelog-1.4.1.xml    |  8 +++++---
 .../src/main/resources/db.changelog-1.4.xml      | 16 ++++++++--------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/libreplan-business/src/main/resources/db.changelog-1.4.1.xml b/libreplan-business/src/main/resources/db.changelog-1.4.1.xml
index 0d3ac2124..ba2da318d 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.4.1.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.4.1.xml
@@ -1,5 +1,7 @@
 <?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">
         <sql>
@@ -11,7 +13,7 @@
         </sql>
         <addPrimaryKey columnNames="id"
                        constraintName="limits_pkey"
-                       tableName="limits" />
+                       tableName="limits"/>
     </changeSet>
 
     <changeSet id="update-values" author="vmazurashu">
@@ -21,7 +23,7 @@
     </changeSet>
     <changeSet id="update-unique-constraint" author="vmazurashu">
         <dropUniqueConstraint constraintName="type"
-                             tableName="limits"/>
+                              tableName="limits"/>
 
         <addUniqueConstraint constraintName="limits_type"
                              columnNames="type"
diff --git a/libreplan-business/src/main/resources/db.changelog-1.4.xml b/libreplan-business/src/main/resources/db.changelog-1.4.xml
index a92cccb40..50cb0a94c 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.4.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.4.xml
@@ -2,12 +2,12 @@
 <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">
+    http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
 
     <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>
         <addColumn tableName="criterion">
-            <column name="id_cost_category" type="BIGINT" />
+            <column name="id_cost_category" type="BIGINT"/>
         </addColumn>
     </changeSet>
 
@@ -16,20 +16,20 @@
         <addForeignKeyConstraint constraintName="cost_category_fkey"
                                  baseTableName="criterion" baseColumnNames="id_cost_category"
                                  referencedTableName="cost_category" referencedColumnNames="id"
-                                 onDelete="SET NULL" />
+                                 onDelete="SET NULL"/>
     </changeSet>
 
     <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>
         <addColumn tableName="configuration">
-            <column name="automatic_budget_enabled" type="BOOLEAN" />
+            <column name="automatic_budget_enabled" type="BOOLEAN"/>
         </addColumn>
         <addDefaultValue tableName="configuration" columnName="automatic_budget_enabled"
-                         defaultValueBoolean="FALSE" />
+                         defaultValueBoolean="FALSE"/>
         <addNotNullConstraint tableName="configuration"
                               columnName="automatic_budget_enabled"
                               defaultNullValue="FALSE"
-                              columnDataType="BOOLEAN" />
+                              columnDataType="BOOLEAN"/>
     </changeSet>
 
     <changeSet id="add-automatic_budget_type_of_work_hours-to-configuration" author="ltilve">
@@ -38,11 +38,11 @@
             configuration table.
         </comment>
         <addColumn tableName="configuration">
-            <column name="automatic_budget_type_of_work_hours" type="BIGINT" />
+            <column name="automatic_budget_type_of_work_hours" type="BIGINT"/>
         </addColumn>
         <addForeignKeyConstraint constraintName="automatic_budget_type_of_work_hours_fkey"
                                  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 id="adding-limits" author="vova/jeroen">