@@ -207,6 +207,14 @@ sub startup {

       join => [

         'left join user on pull_request.open_user = user.row_id'

       ]

+    },

+    {

+      table => 'pull_request_message',

+      primary_key => 'row_id',

+      join => [

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

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

+      ]

     }

   ];

   $dbi->create_model($_) for @$models;

@@ -202,13 +202,14 @@ EOS

     "message not null default ''",

     "create_time integer default 0",

     "update_time integer default 0",

+    "user integer not null default 0"

   );

   for my $column (@pull_request_message_columns) {

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

   }

   # Check pull_request_message table

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

+  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 pull_request_message table properly: $@";

     die $error;

@@ -3,15 +3,15 @@

   my $api = gitprep_api;

   # Parameters

-  my $user = param('user');

-  my $project = param('project');

+  my $user_id = param('user');

+  my $project_id = param('project');

   my $from_rev = param('rev1');

   my $rev = param('rev2');

   my $page = param('page') || 0;

   my $expand = param('expand');

   unless ($from_rev) {

-    $from_rev = app->manager->default_branch($user, $project);

+    $from_rev = app->manager->default_branch($user_id, $project_id);

   }

   # Git

@@ -25,8 +25,8 @@

       my $message = param('message');

       my $project_row_id = app->dbi->model('project')->select(

-        'row_id',

-        where => {user_id => $user, name => $project}

+        'project.row_id',

+        where => {'user.id' => $user_id, 'project.id' => $project_id}

       )->value;

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

@@ -34,7 +34,7 @@

       )->one;

       if ($pull_request) {

-        $self->redirect_to("/$user/$project/pulls/$pull_request->{row_id}");

+        $self->redirect_to("/$user_id/$project_id/pulls/$pull_request->{row_id}");

         return;

       }

       else {

@@ -42,32 +42,46 @@

         my $now_epoch = $now_tm->epoch;

         my $user_row_id = app->dbi->model('user')->select(

           'row_id',

-          where => {id => $user}

+          where => {id => $user_id}

         )->value;

-        my $new_pull_request_params = {

-          project => $project_row_id,

-          branch1 => $from_rev,

-          branch2 => $rev,

-          title => $title,

-          message => $message,

-          open => 1,

-          open_time => $now_epoch,

-          open_user => $user_row_id

-        };

-        

-        app->dbi->model('pull_request')->insert($new_pull_request_params);

-        

-        my $new_pull_request_row_id = app->dbi->model('pull_request')->select(

-          'row_id',

-          where => {

+        my $new_pull_request_row_id;

+        app->dbi->connector->txn(sub {

+          # New pull request

+          my $new_pull_request_params = {

             project => $project_row_id,

             branch1 => $from_rev,

-            branch2 => $rev

-          }

-        )->value;

+            branch2 => $rev,

+            title => $title,

+            open => 1,

+            open_time => $now_epoch,

+            open_user => $user_row_id

+          };

+          

+          app->dbi->model('pull_request')->insert($new_pull_request_params);

+          

+          $new_pull_request_row_id = app->dbi->model('pull_request')->select(

+            'row_id',

+            where => {

+              project => $project_row_id,

+              branch1 => $from_rev,

+              branch2 => $rev

+            }

+          )->value;

+          

+          # New pull request message

+          my $new_pull_request_message_params = {

+            pull_request => $new_pull_request_row_id,

+            message => $message,

+            create_time => $now_epoch,

+            update_time => $now_epoch,

+            user => $user_row_id

+          };

+          

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

+        });

-        $self->redirect_to("/$user/$project/pulls/$new_pull_request_row_id");

+        $self->redirect_to("/$user_id/$project_id/pull/$new_pull_request_row_id");

         return;

       }

@@ -75,7 +89,7 @@

   }

   # Commits

-  my $commits = $git->forward_commits(app->rep_info($user, $project), $from_rev, $rev);

+  my $commits = $git->forward_commits(app->rep_info($user_id, $project_id), $from_rev, $rev);

   my $commits_count = @$commits;

   my $commits_date = {};

   my $authors = {};

@@ -88,10 +102,10 @@

   my $authors_count = keys %$authors;

   # Start commit

-  my $start_commit = $git->separated_commit(app->rep_info($user, $project), $from_rev, $rev);

+  my $start_commit = $git->separated_commit(app->rep_info($user_id, $project_id), $from_rev, $rev);

   # End commit

-  my $end_commit = $git->get_commit(app->rep_info($user, $project), $rev);

+  my $end_commit = $git->get_commit(app->rep_info($user_id, $project_id), $rev);

   if (!$start_commit || !$end_commit) {

     $self->reply->not_found;

@@ -99,7 +113,7 @@

   }

   # Branches

-  my $branches = $git->branches(app->rep_info($user, $project));

+  my $branches = $git->branches(app->rep_info($user_id, $project_id));

   @$branches = sort { $a->{commit}{age} <=> $b->{commit}{age} } @$branches;

   # Variables

@@ -119,10 +133,10 @@

   if ($can_open_pull_request) {

     # Create working repository if it don't exist

-    $self->app->manager->create_work_rep($user, $project);

+    $self->app->manager->create_work_rep($user_id, $project_id);

     # Fetch repository

-    my $work_rep_info = app->work_rep_info($user, $project);

+    my $work_rep_info = app->work_rep_info($user_id, $project_id);

     my @git_fetch_cmd = $self->app->git->cmd($work_rep_info, 'fetch');

     Gitprep::Util::run_command(@git_fetch_cmd)

       or Carp::croak "Can't execute git fetch: @git_fetch_cmd";

@@ -152,13 +166,13 @@

     # Check merge automatically

     $merge_automatical = $self->app->manager->check_merge_automatical(

-      app->work_rep_info($user, $project),

+      app->work_rep_info($user_id, $project_id),

       $gitprep_tmp_branch_name,

       "origin/$rev"

     );

   }

-  layout 'common', title => "Comparing $from_rev...$rev \x{30fb} $user/$project";

+  layout 'common', title => "Comparing $from_rev...$rev \x{30fb} $user_id/$project_id";

 %>

@@ -179,7 +193,7 @@

     $('[name=base-branch]').on('keypress', function (e) {

       // Enter

       if (e.which == 13) {

-        var href = '<%= url_for("/$user/$project/compare/") %>' + $(this).val() + '...<%= $rev %>';

+        var href = '<%= url_for("/$user_id/$project_id/compare/") %>' + $(this).val() + '...<%= $rev %>';

         if (<%= $expand ? 1 : 0 %>) {

           href = href + '?expand=1';

         }

@@ -201,7 +215,7 @@

     $('[name=compare-branch]').on('keypress', function (e) {

       // Enter

       if (e.which == 13) {

-        var href = '<%= url_for("/$user/$project/compare/") %>' + '<%= $from_rev %>...' + $(this).val();

+        var href = '<%= url_for("/$user_id/$project_id/compare/") %>' + '<%= $from_rev %>...' + $(this).val();

         if (<%= $expand ? 1 : 0 %>) {

           href = href + '?expand=1';

         }

@@ -266,7 +280,7 @@

             % my $branch = $branches->[$i];

               <li>

                 <a style="border-top-left-radius:0px;border-top-right-radius:0px;"

-                  href="<%= url_with("/$user/$project/compare/$branch->{name}...$rev") %>">

+                  href="<%= url_with("/$user_id/$project_id/compare/$branch->{name}...$rev") %>">

                   <%= $branch->{name} %>

                 </a>

               </li>

@@ -295,7 +309,7 @@

           % my $branch = $branches->[$i];

             <li>

               <a style="border-top-left-radius:0px;border-top-right-radius:0px;"

-                href="<%= url_with("/$user/$project/compare/$from_rev...$branch->{name}") %>">

+                href="<%= url_with("/$user_id/$project_id/compare/$from_rev...$branch->{name}") %>">

                 <%= $branch->{name} %>

               </a>

             </li>

@@ -366,12 +380,12 @@

                 </span>

               </div>

               <div class="compare-commits-commit-title">

-                <a style="color:#333" href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">

+                <a style="color:#333" href="<%= url_for("/$user_id/$project_id/commit/$commit->{id}") %>">

                   <%= $commit->{title_short} %>

                 </a>

               </div>

               <div class="compare-commits-commit-id">

-                <a href="<%= url_for("/$user/$project/commit/$commit->{id}") %>">

+                <a href="<%= url_for("/$user_id/$project_id/commit/$commit->{id}") %>">

                   <%= substr($commit->{id}, 0, 7) %>

                 </a>

               </div>

@@ -391,7 +405,7 @@

         <b>

           <%= $from_rev %></b> is up to date with all commits from

           <b><%= $rev %></b>.

-          Try <a href="<%= url_for("/$user/$project/compare/$rev...$from_rev") %>">switching the base</a> for your comparison.

+          Try <a href="<%= url_for("/$user_id/$project_id/compare/$rev...$from_rev") %>">switching the base</a> for your comparison.

       </div>

     </div>

   % }