@@ -183,29 +183,29 @@ sub startup {

       table => 'ssh_public_key',

       primary_key => 'row_id',

       join => [

-        'left join user as user on ssh_public_key.user = user.row_id'

+        'left join user on ssh_public_key.user = user.row_id'

       ]

     },

     {

       table => 'project',

       primary_key => 'row_id',

       join => [

-        'left join user as user on project.user = user.row_id'

+        'left join user on project.user = user.row_id'

       ]

     },

     {

       table => 'collaboration',

       primary_key => 'row_id',

       join => [

-        'left join user as user on collaboration.user = user.row_id',

-        'left join project as project on collaboration.project = project.row_id',

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

+        'left join project on collaboration.project = project.row_id',

       ]

     },

     {

       table => 'issue',

       join => [

-        'left join pull_request as pull_request on issue.pull_request = pull_request.row_id',

-        

+        'left join project on issue.project = project.row_id',

+        'left join pull_request on issue.pull_request = pull_request.row_id',

         'left join user as open_user on issue.open_user = open_user.row_id',

         'left join project as pull_request__base_project on pull_request.base_project = pull_request__base_project.row_id',

         'left join user as pull_request__base_project__user'

@@ -220,8 +220,8 @@ sub startup {

       table => 'issue_message',

       primary_key => 'row_id',

       join => [

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

-        'left join issue as issue on issue_message.issue = issue.row_id'

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

+        'left join issue on issue_message.issue = issue.row_id'

       ]

     },

     {

@@ -19,14 +19,20 @@ my $dbi = DBIx::Custom->connect(%dbi_args);

 # Copy pull_request data to issue

 my $pull_requests = $dbi->select(table => 'pull_request')->all;

+my $issue_project_numbers = {};

 for my $pull_request (@$pull_requests) {

+

+  my $project = $pull_request->{base_project};

+  $issue_project_numbers->{$project}++;

   my $new_issue = {

     row_id => $pull_request->{row_id},

     title => $pull_request->{title},

     open => $pull_request->{open},

     open_time => $pull_request->{open_time},

     open_user => $pull_request->{open_user},

-    pull_request => $pull_request->{row_id}

+    pull_request => $pull_request->{row_id},

+    project => $project,

+    number => $issue_project_numbers->{$project}

   };

   my $issue = $dbi->select(

@@ -156,7 +156,10 @@ EOS

   eval {

     my $sql = <<"EOS";

 create table issue (

-  row_id integer primary key autoincrement

+  row_id integer primary key autoincrement,

+  project integer not null default 0,

+  number integer not null default 0,

+  unique(project, number)

 );

 EOS

     $dbi->execute($sql);

@@ -165,17 +168,17 @@ EOS

   # Create issue columns

   my @issue_columns = (

     "title not null default ''",

-    "open integer default 0",

-    "open_time integer default 0",

-    "open_user integer default 0",

-    "pull_request integer default 0"

+    "open integer not null default 0",

+    "open_time integer not null default 0",

+    "open_user integer not null default 0",

+    "pull_request integer  not null default 0",

   );

   for my $column (@issue_columns) {

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

   }

   # Check issue table

-  eval { $dbi->select([qw/row_id title open open_time open_user pull_request/], table => 'issue') };

+  eval { $dbi->select([qw/row_id title open open_time open_user pull_request project/], table => 'issue') };

   if ($@) {

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

     die $error;

@@ -197,8 +200,8 @@ EOS

   # Create issue_message columns

   my @issue_message_columns = (

     "message not null default ''",

-    "create_time integer default 0",

-    "update_time integer default 0",

+    "create_time integer not null default 0",

+    "update_time integer not null default 0",

     "user integer not null default 0"

   );

   for my $column (@issue_message_columns) {

@@ -377,7 +377,7 @@

               </span>

             % } else {

               <span style="margin-left:10px">

-                <span style="color:red;font-weight:bold"><%= "??" %>Not able to merge.</span> These branches can't be automatically merged.

+                <span style="color:red;font-weight:bold">Not able to merge.</span> These branches can't be automatically merged.

               </span>

             % }

           % }

@@ -21,8 +21,8 @@

       {pull_request => ['target_branch']}

     ],

     where => [

-      ['and', ':issue.open{=}', ':pull_request{<>}'],

-      {'issue.open' => $open, pull_request => 0}

+      ['and', ':issue.open{=}', ':pull_request{<>}', ':project.id{=}'],

+      {'issue.open' => $open, pull_request => 0, 'project.id' => $project_id}

     ]

   )->all;

@@ -30,8 +30,8 @@

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

     'count(*)',

     where => [

-      ['and', ':issue.open{=}', ':pull_request{<>}'],

-      {'issue.open' => 1, pull_request => 0}

+      ['and', ':issue.open{=}', ':pull_request{<>}', ':project.id{=}'],

+      {'issue.open' => 1, pull_request => 0, 'project.id' => $project_id}

     ]

   )->value;

@@ -39,8 +39,8 @@

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

     'count(*)',

     where => [

-      ['and', ':issue.open{=}', ':pull_request{<>}'],

-      {'issue.open' => 0, pull_request => 0}

+      ['and', ':issue.open{=}', ':pull_request{<>}', ':project.id{=}'],

+      {'issue.open' => 0, pull_request => 0, 'project.id' => $project_id}

     ]

   )->value;

 %>