From aa7f135b0e93212ef9c8cadf90aa68e2e72c48c0 Mon Sep 17 00:00:00 2001
From: Vova Perebykivskiy <vova@libreplan-enterprise.com>
Date: Fri, 4 Dec 2015 14:44:34 +0200
Subject: [PATCH] Fix merge conflicts.

---
 .../src/main/resources/db.changelog-1.5.xml   | 50 ++++++++++++++-----
 1 file changed, 38 insertions(+), 12 deletions(-)

diff --git a/libreplan-business/src/main/resources/db.changelog-1.5.xml b/libreplan-business/src/main/resources/db.changelog-1.5.xml
index 32ab6d30c..f969c70b6 100644
--- a/libreplan-business/src/main/resources/db.changelog-1.5.xml
+++ b/libreplan-business/src/main/resources/db.changelog-1.5.xml
@@ -1,28 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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
+                   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="adding-email_template_table" author="vova/jeroen">
         <createTable tableName="email_template">
-            <column name="id" type="int" autoIncrement="true">
+            <column name="id" type="BIGINT" autoIncrement="true">
                 <constraints primaryKey="true" nullable="false" primaryKeyName="email_templates_pkey"/>
             </column>
             <column name="type" type="int"/>
             <column name="language" type="int"/>
             <column name="content" type="varchar(2048)"/>
+            <column name="subject" type="varchar(1024)"/>
         </createTable>
-        <addUniqueConstraint 
-          constraintName="email_template_type_lang_key" 
-          columnNames="type,language" 
-          deferrable="false" 
-          disabled="false" 
-          initiallyDeferred="false" 
-          tableName="email_template"
-        />
+
+        <addUniqueConstraint
+                constraintName="email_template_type_language"
+                columnNames="type, language"
+                deferrable="false"
+                disabled="false"
+                initiallyDeferred="false"
+                tableName="email_template"
+                />
+        <createIndex tableName="email_template" indexName="language_index">
+            <column name="language"></column>
+        </createIndex>
+        <createIndex tableName="email_template" indexName="type_index">
+            <column name="type"></column>
+        </createIndex>
     </changeSet>
 
-</databaseChangeLog>
+    <changeSet id="adding-notification_notification_queue" author="vova">
+        <createTable tableName="notification_queue">
+            <column name="id" type="BIGINT" autoIncrement="true">
+                <constraints primaryKey="true" nullable="false" primaryKeyName="notification_queue_pkey"/>
+            </column>
+            <column name="type" type="int"/>
+            <column name="updated" type="timestamp with time zone"/>
+            <column name="resource" type="BIGINT"/>
+            <column name="task" type="BIGINT"/>
+            <column name="project" type="BIGINT"/>
+        </createTable>
+        <addUniqueConstraint
+                tableName="notification_queue"
+                columnNames="resource, task, project"
+                deferrable="false"
+                disabled="false"
+                initiallyDeferred="false"/>
+    </changeSet>
 
+</databaseChangeLog>
\ No newline at end of file