From 443c1d93ea7847355e78bd524955d9051bca96d0 Mon Sep 17 00:00:00 2001
From: Alexander Sulfrian <alex@spline.inf.fu-berlin.de>
Date: Sun, 25 Jan 2015 19:08:16 +0100
Subject: Rename table columns.

"to" is a reserved word in postgres and so it could not used as column
name.
---
 DefaultRecipient.sopm             | 6 +++---
 Kernel/System/DefaultRecipient.pm | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/DefaultRecipient.sopm b/DefaultRecipient.sopm
index 2f4e56a..4b4b087 100644
--- a/DefaultRecipient.sopm
+++ b/DefaultRecipient.sopm
@@ -24,9 +24,9 @@
       <Column Name="id" Required="true" PrimaryKey="true" AutoIncrement="true" Type="BIGINT"/>
       <Column Name="title" Required="true" Size="250" Type="VARCHAR"/>
       <Column Name="remove_to" Required="true" Type="SMALLINT"/>
-      <Column Name="to" Required="false" Size="255" Type="VARCHAR"/>
-      <Column Name="cc" Required="false" Size="255" Type="VARCHAR"/>
-      <Column Name="bcc" Required="false" Size="255" Type="VARCHAR"/>
+      <Column Name="to_addr" Required="false" Size="255" Type="VARCHAR"/>
+      <Column Name="cc_addr" Required="false" Size="255" Type="VARCHAR"/>
+      <Column Name="bcc_addr" Required="false" Size="255" Type="VARCHAR"/>
       <Column Name="comments" Required="false" Size="250" Type="VARCHAR"/>
       <Column Name="create_time" Required="true" Type="DATE"/>
       <Column Name="create_by" Required="true" Type="INTEGER"/>
diff --git a/Kernel/System/DefaultRecipient.pm b/Kernel/System/DefaultRecipient.pm
index fec60fd..1c052cf 100644
--- a/Kernel/System/DefaultRecipient.pm
+++ b/Kernel/System/DefaultRecipient.pm
@@ -47,7 +47,7 @@ sub Add {
     # insert new DefaultRecipient
     return if !$DBObject->Do(
         SQL => 'INSERT INTO default_recipient '
-             . '(title, remove_to, to, cc, bcc, comments, '
+             . '(title, remove_to, to_addr, cc_addr, bcc_addr, comments, '
              . ' create_time, create_by, change_time, change_by) '
              . 'VALUES (?, ?, ?, ?, ?, ?, '
              . 'current_timestamp, ?, current_timestamp, ?)',
@@ -105,7 +105,7 @@ sub Update {
     # insert new DefaultRecipient
     return if !$DBObject->Do(
         SQL => 'UPDATE default_recipient SET title = ?, remove_to = ?, '
-             . 'to = ?, cc = ?, bcc = ?, comments = ?, '
+             . 'to_addr = ?, cc_addr = ?, bcc_addr = ?, comments = ?, '
              . 'change_by = ?, change_time = current_timestamp '
              . 'WHERE id = ?',
         Bind => [
@@ -140,7 +140,7 @@ sub Get {
 
     # get RrsponseChangeDefaultTO obejct
     return if !$DBObject->Prepare(
-        SQL => 'SELECT id, title, remove_to, to, cc, bcc, '
+        SQL => 'SELECT id, title, remove_to, to_addr, cc_addr, bcc_addr, '
              . 'comments, create_time, create_by, change_time, change_by '
              . 'FROM default_recipient WHERE id = ?',
         Bind  => [ \$Param{ID} ],
-- 
cgit v1.2.3-1-g7c22