@@ -216,11 +216,11 @@ sub startup {

       ]

     },

     {

-      table => 'issue_message',

+      table => 'pull_request_message',

       primary_key => 'row_id',

       join => [

-        'left join user as __user on issue_message.user = __user.row_id',

-        'left join pull_request as __pull_request on issue_message.pull_request = __pull_request.row_id'

+        'left join user as __user on pull_request_message.user = __user.row_id',

+        'left join pull_request as __pull_request on pull_request_message.pull_request = __pull_request.row_id'

       ]

     }

   ];

@@ -185,18 +185,10 @@ EOS

     die $error;

   }

-  # Rename pull_request_message to issue_message

+  # Create pull_request_message table

   eval {

     my $sql = <<"EOS";

-alter table pull_request_message rename to issue_message

-EOS

-    $dbi->execute($sql);

-  };

-

-  # Create issue_message table

-  eval {

-    my $sql = <<"EOS";

-create table issue_message (

+create table pull_request_message (

   row_id integer primary key autoincrement,

   pull_request integer not null default 0,

   number integer not null default 0,

@@ -206,21 +198,21 @@ EOS

     $dbi->execute($sql);

   };

-  # Create issue_message columns

-  my @issue_message_columns = (

+  # Create pull_request_message columns

+  my @pull_request_message_columns = (

     "message not null default ''",

     "create_time integer default 0",

     "update_time integer default 0",

     "user integer not null default 0"

   );

-  for my $column (@issue_message_columns) {

-    eval { $dbi->execute("alter table issue_message add column $column") };

+  for my $column (@pull_request_message_columns) {

+    eval { $dbi->execute("alter table pull_request_message add column $column") };

   }

-  # Check issue_message table

-  eval { $dbi->select([qw/row_id pull_request number message create_time update_time user/], table => 'issue_message') };

+  # Check pull_request_message table

+  eval { $dbi->select([qw/row_id pull_request number message create_time update_time user/], table => 'pull_request_message') };

   if ($@) {

-    my $error = "Can't create issue_message table properly: $@";

+    my $error = "Can't create pull_request_message table properly: $@";

     die $error;

   }

 }

@@ -126,7 +126,7 @@

             )->value;

             # Get pull request message number

-            my $number = app->dbi->model('issue_message')->select(

+            my $number = app->dbi->model('pull_request_message')->select(

               'max(number)',

               where => {pull_request => $new_pull_request_row_id},

               append => 'group by number'

@@ -137,7 +137,7 @@

             my $new_number = $number + 1;

             # New pull request message

-            my $new_issue_message_params = {

+            my $new_pull_request_message_params = {

               pull_request => $new_pull_request_row_id,

               number => $new_number,

               message => $message,

@@ -146,7 +146,7 @@

               user => $session_user_row_id

             };

-            app->dbi->model('issue_message')->insert($new_issue_message_params);

+            app->dbi->model('pull_request_message')->insert($new_pull_request_message_params);

           });

           $self->redirect_to("/$base_user_id/$base_project_id/pull/$new_pull_request_row_id");

@@ -180,7 +180,7 @@

   my $end_commit = $git->get_commit($target_rep_info, $target_branch);

   # Pull request first message 

-  my $issue_message_first = app->dbi->model('issue_message')->select(

+  my $pull_request_message_first = app->dbi->model('pull_request_message')->select(

     [

       {__MY__ => '*'},

       {__user => ['id']}

@@ -308,14 +308,14 @@

         </ul>

         <div class="pull-comment">

           <div class="pull-comment-header">

-            <b><%= $issue_message_first->{'__open_user.id'} %></b>

+            <b><%= $pull_request_message_first->{'__open_user.id'} %></b>

             <span style="color:#767676">

               commented

-              <%= $api->age_string($issue_message_first->{update_time}) %>

+              <%= $api->age_string($pull_request_message_first->{update_time}) %>

             </span>

           </div>

           <div class="pull-comment-body">

-            <%= $issue_message_first->{message} %>

+            <%= $pull_request_message_first->{message} %>

           </div>

         </div>