remove table __ prefix

troneill · Jun 11, 2016 · 783cc7b · 783cc7b
1 parent 8cf8aff
commit 783cc7b
Show file tree

Hide file tree

Showing 12 changed files with 73 additions and 74 deletions.
diff --git a/lib/Gitprep.pm b/lib/Gitprep.pm
@@ -174,7 +174,6 @@ sub startup {
   }
 
   # Model
-  # joined table start "__" and follow column name
   my $models = [
     {
       table => 'user',
@@ -184,58 +183,58 @@ 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 as 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 as 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 as user on collaboration.user = user.row_id',
+        'left join project as 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 pull_request as 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'
-          . ' on __pull_request__base_project.user = __pull_request__base_project__user.row_id',
-        'left join project as __pull_request__target_project on __pull_request.target_project = __pull_request__target_project.row_id',
-        'left join user as __pull_request__target_project__user'
-          . ' on __pull_request__target_project.user = __pull_request__target_project__user.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'
+          . ' on pull_request__base_project.user = pull_request__base_project__user.row_id',
+        'left join project as pull_request__target_project on pull_request.target_project = pull_request__target_project.row_id',
+        'left join user as pull_request__target_project__user'
+          . ' on pull_request__target_project.user = pull_request__target_project__user.row_id'
 
       ]
     },
     {
       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 as user on issue_message.user = user.row_id',
+        'left join issue as issue on issue_message.issue = issue.row_id'
       ]
     },
     {
       table => 'pull_request',
       primary_key => 'row_id',
       join => [
-        'left join user as __open_user on pull_request.open_user = __open_user.row_id',
-        'left join project as __base_project on pull_request.base_project = __base_project.row_id',
-        'left join user as __base_project__user'
-          . ' on __base_project.user = __base_project__user.row_id',
-        'left join project as __target_project on pull_request.target_project = __target_project.row_id',
+        'left join user as open_user on pull_request.open_user = open_user.row_id',
+        'left join project as base_project on pull_request.base_project = base_project.row_id',
+        'left join user as base_project__user'
+          . ' on base_project.user = base_project__user.row_id',
+        'left join project as target_project on pull_request.target_project = target_project.row_id',
         'left join user as pull_request__target_project__user'
-          . ' on __target_project.user = __target_project__user.row_id'
+          . ' on target_project.user = target_project__user.row_id'
       ]
     },
   ];

diff --git a/lib/Gitprep/Manager.pm b/lib/Gitprep/Manager.pm
@@ -269,7 +269,7 @@ sub fork_project {
       # Original project id
       my $project = $dbi->model('project')->select(
         {__MY__ => ['row_id', 'private']},
-        where => {'__user.id' => $user_id, 'project.id' => $project_id}
+        where => {'user.id' => $user_id, 'project.id' => $project_id}
       )->one;
 
       # Create project
@@ -330,19 +330,19 @@ sub member_projects {
   # project id
   my $project_row_id = $dbi->model('project')->select(
     'project.row_id',
-    where => {'__user.id' => $user_id, 'project.id' => $project_id}
+    where => {'user.id' => $user_id, 'project.id' => $project_id}
   )->value;
 
   # Members
   my $member_projects = $dbi->model('project')->select(
     [
       {__MY__ => ['id']},
-      {__user => ['id']}
+      {user => ['id']}
     ],
     where => {
       original_project => $project_row_id,
     },
-    append => 'order by __user.id, project.id'
+    append => 'order by user.id, project.id'
   )->all;
 
   return $member_projects;
@@ -442,7 +442,7 @@ sub original_project {
   my $original_project = $dbi->model('project')->select(
     [
       {__MY__ => '*'},
-      {__user => ['id']}
+      {user => ['id']}
     ],
     where => {
       'project.row_id' => $original_project_row_id
@@ -458,17 +458,17 @@ sub child_project {
   my ($self, $user_id, $project_id, $child_user_id) = @_;
 
   my $project_row_id = $self->app->dbi->model('project')->select(
-    'project.row_id', where => {'__user.id' => $user_id, 'project.id' => $project_id}
+    'project.row_id', where => {'user.id' => $user_id, 'project.id' => $project_id}
   )->value;
 
   my $child_project = $self->app->dbi->model('project')->select(
     [
       {__MY__ => '*'},
-      {__user => ['id']}
+      {user => ['id']}
     ],
     where => {
       'project.original_project' => $project_row_id,
-      '__user.id' => $child_user_id
+      'user.id' => $child_user_id
     }
   )->one;
 
@@ -562,14 +562,14 @@ sub update_authorized_keys_file {
     my $ssh_public_keys = $self->app->dbi->model('ssh_public_key')->select(
       [
         {__MY__ => '*'},
-        {__user => ['id']}
+        {user => ['id']}
       ]
     )->all;
     my $ssh_public_keys_str = '';
     for my $key (@$ssh_public_keys) {
       my $ssh_public_key_str = 'command="' . $self->app->home->rel_file('script/gitprep-shell')
-        . " $key->{'__user.id'}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty $key->{key}";
-      $ssh_public_keys_str .= "$ssh_public_key_str $key->{'__user.id'}\n\n";
+        . " $key->{'user.id'}\",no-port-forwarding,no-X11-forwarding,no-agent-forwarding,no-pty $key->{key}";
+      $ssh_public_keys_str .= "$ssh_public_key_str $key->{'user.id'}\n\n";
     }
 
     # Output tmp file

diff --git a/script/import_rep b/script/import_rep
@@ -52,7 +52,7 @@ for my $rep (glob "$rep_dir/*") {
     $project_id =~ s/\.git$//;
 
     my $project = $dbi->model('project')->select(
-      where => {'__user.id' => $user_id, 'project.id' => $project_id}
+      where => {'user.id' => $user_id, 'project.id' => $project_id}
     )->one;
 
     # Create project

diff --git a/templates/branches.html.ep b/templates/branches.html.ep
@@ -146,15 +146,15 @@
 
   my $original_project_row_id = app->dbi->model('project')->select(
     'original_project',
-    where => {'__user.id' => $user_id, 'project.id' => $project_id}
+    where => {'user.id' => $user_id, 'project.id' => $project_id}
   )->value;
 
   my $original_project;
   if ($original_project_row_id) {
     $original_project = app->dbi->model('project')->select(
       [
         {__MY__ => '*'},
-        {__user => ['id']}
+        {user => ['id']}
       ],
       where => {'project.row_id' => $original_project_row_id}
     )->one;
@@ -232,8 +232,8 @@
                 my $pull_request = app->dbi->model('pull_request')->select(
                   {__MY__ => ['row_id']},
                   where => {
-                    '__base_project.id' => $project_id,
-                    '__base_project__user.id' => $user_id,
+                    'base_project.id' => $project_id,
+                    'base_project__user.id' => $user_id,
                     base_branch => $default_branch_name,
                     target_branch => $branch_name
                   }
@@ -329,7 +329,7 @@
                             <% 
                               my $compare_url;
                               if ($original_project) {
-                                my $original_user_id = $original_project->{'__user.id'};
+                                my $original_user_id = $original_project->{'user.id'};
                                 my $original_project_id = $original_project->{id};
 
                                 my $exists_original_branch_name = app->git->exists_branch(

diff --git a/templates/compare.html.ep b/templates/compare.html.ep
@@ -17,9 +17,9 @@
   my $base_project = app->dbi->model('project')->select(
     [
       {__MY__ => '*'},
-      {__user => ['id']}
+      {user => ['id']}
     ],
-    where => {'project.id' => $base_project_id, '__user.id' => $base_user_id}
+    where => {'project.id' => $base_project_id, 'user.id' => $base_user_id}
   )->one;
 
   # Get target user, project, branch
@@ -74,7 +74,7 @@
 
         my $project_row_id = app->dbi->model('project')->select(
           'project.row_id',
-          where => {'__user.id' => $base_user_id, 'project.id' => $base_project_id}
+          where => {'user.id' => $base_user_id, 'project.id' => $base_project_id}
         )->value;
 
         my $pull_request = app->dbi->model('pull_request')->select(
@@ -352,7 +352,7 @@
         <div style="display:inline-block">
           % if ($base_user_id ne $target_user_id) {
             <button id="base-fork-btn" class="btn btn-small">
-              <span>base fork:</span><b> <%= $base_project->{'__user.id'} %>/<%= $base_project->{id} %></b><i class="icon-arrow-down"></i>
+              <span>base fork:</span><b> <%= $base_project->{'user.id'} %>/<%= $base_project->{id} %></b><i class="icon-arrow-down"></i>
             </button>
           % }
           <button id="base-branch-btn" class="btn btn-small">
@@ -363,7 +363,7 @@
         <div style="display:inline-block;margin-top:10px;">
           % if ($base_user_id ne $target_user_id) {
             <button id="head-fork-btn" class="btn btn-small">
-              <span>head fork:</span><b> <%= $target_project->{'__user.id'} %>/<%= $target_project->{id} %></b><i class="icon-arrow-down"></i>
+              <span>head fork:</span><b> <%= $target_project->{'user.id'} %>/<%= $target_project->{id} %></b><i class="icon-arrow-down"></i>
             </button>
           % }
           <button id="target-branch-btn" class="btn btn-small">
@@ -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>
             % }
           % }
@@ -477,7 +477,7 @@
           % for (my $i = 0; $i < @$member_projects; $i++) {
             % my $member_project = $member_projects->[$i];
               <%
-                my $member_user_id = $member_project->{'__user.id'};
+                my $member_user_id = $member_project->{'user.id'};
                 my $member_project_id = $member_project->{id};
               %>
               <li>
@@ -518,7 +518,7 @@
           % for (my $i = 0; $i < @$member_projects; $i++) {
             % my $member_project = $member_projects->[$i];
               <%
-                my $member_user_id = $member_project->{'__user.id'};
+                my $member_user_id = $member_project->{'user.id'};
                 my $member_project_id = $member_project->{id};
               %>
               <li>

diff --git a/templates/include/header.html.ep b/templates/include/header.html.ep
@@ -85,8 +85,8 @@
             <small>
               (
                 forked from
-                <a href="<%= url_for("/$original_project->{'__user.id'}/$original_project->{id}") %>">
-                  <%= "$original_project->{'__user.id'}/$original_project->{id}" %>
+                <a href="<%= url_for("/$original_project->{'user.id'}/$original_project->{id}") %>">
+                  <%= "$original_project->{'user.id'}/$original_project->{id}" %>
                 </a>
               )
             </small>

diff --git a/templates/network.html.ep b/templates/network.html.ep
@@ -13,7 +13,7 @@
   # Original project id
   my $original_project_id = app->dbi->model('project')->select(
     'original_project',
-    where => {'__user.id' => $user_id, 'project.id' => $project_id}
+    where => {'user.id' => $user_id, 'project.id' => $project_id}
   )->value;
 
   # Original project
@@ -22,7 +22,7 @@
     $original_project = app->dbi->model('project')->select(
       [
         {__MY__ => '*'},
-        {__user => ['id']}
+        {user => ['id']}
       ],
       where => {'project.row_id' => $original_project_id}
     )->one;
@@ -31,19 +31,19 @@
     $original_project = app->dbi->model('project')->select(
       [
         {__MY__ => '*'},
-        {__user => ['id']}
+        {user => ['id']}
       ],
-      where => {'__user.id' => $user_id, 'project.id' => $project_id}
+      where => {'user.id' => $user_id, 'project.id' => $project_id}
     )->one;
   }
 
   # Members
-  my $member_projects = app->manager->member_projects($original_project->{'__user.id'}, $original_project->{id});
+  my $member_projects = app->manager->member_projects($original_project->{'user.id'}, $original_project->{id});
   unshift @$member_projects, $original_project;
 
   # Members branches
   for my $member_project (@$member_projects) {
-    my $member_rep_info = $self->app->rep_info($member_project->{'__user.id'}, $member_project->{id});
+    my $member_rep_info = $self->app->rep_info($member_project->{'user.id'}, $member_project->{id});
 
     my $branches = app->git->branches($member_rep_info);
     $branches = [map { $_->{name} } @$branches];
@@ -91,7 +91,7 @@
         % for my $member_project (@$member_projects) {
           <%
             my $member_project_id = $member_project->{id};
-            my $member_id = $member_project->{'__user.id'};
+            my $member_id = $member_project->{'user.id'};
             my $member_branches = $member_project->{branches};
 
             next if $member_id eq $user_id;