... | ... |
@@ -174,6 +174,7 @@ sub startup { |
174 | 174 |
} |
175 | 175 |
|
176 | 176 |
# Model |
177 |
+ # joined table start "__" and follow column name |
|
177 | 178 |
my $models = [ |
178 | 179 |
{ |
179 | 180 |
table => 'user', |
... | ... |
@@ -183,43 +184,43 @@ sub startup { |
183 | 184 |
table => 'ssh_public_key', |
184 | 185 |
primary_key => 'row_id', |
185 | 186 |
join => [ |
186 |
- 'left join user on ssh_public_key.user = user.row_id' |
|
187 |
+ 'left join user as __user on ssh_public_key.user = __user.row_id' |
|
187 | 188 |
] |
188 | 189 |
}, |
189 | 190 |
{ |
190 | 191 |
table => 'project', |
191 | 192 |
primary_key => 'row_id', |
192 | 193 |
join => [ |
193 |
- 'left join user on project.user = user.row_id' |
|
194 |
+ 'left join user as __user on project.user = __user.row_id' |
|
194 | 195 |
] |
195 | 196 |
}, |
196 | 197 |
{ |
197 | 198 |
table => 'collaboration', |
198 | 199 |
primary_key => 'row_id', |
199 | 200 |
join => [ |
200 |
- 'left join user on collaboration.user = user.row_id', |
|
201 |
- 'left join project on collaboration.project = project.row_id', |
|
201 |
+ 'left join user as __user on collaboration.user = __user.row_id', |
|
202 |
+ 'left join project as __project on collaboration.project = __project.row_id', |
|
202 | 203 |
] |
203 | 204 |
}, |
204 | 205 |
{ |
205 | 206 |
table => 'pull_request', |
206 | 207 |
primary_key => 'row_id', |
207 | 208 |
join => [ |
208 |
- 'left join user as pull_request__open_user on pull_request.open_user = pull_request__open_user.row_id', |
|
209 |
- 'left join project as pull_request__base_project on pull_request.base_project = pull_request__base_project.row_id', |
|
210 |
- 'left join user as pull_request__base_project__user' |
|
211 |
- . ' on pull_request__base_project.user = pull_request__base_project__user.row_id', |
|
212 |
- 'left join project as pull_request__target_project on pull_request.target_project = pull_request__target_project.row_id', |
|
209 |
+ 'left join user as __open_user on pull_request.open_user = __open_user.row_id', |
|
210 |
+ 'left join project as __base_project on pull_request.base_project = __base_project.row_id', |
|
211 |
+ 'left join user as __base_project__user' |
|
212 |
+ . ' on __base_project.user = __base_project__user.row_id', |
|
213 |
+ 'left join project as __target_project on pull_request.target_project = __target_project.row_id', |
|
213 | 214 |
'left join user as pull_request__target_project__user' |
214 |
- . ' on pull_request__target_project.user = pull_request__target_project__user.row_id' |
|
215 |
+ . ' on __target_project.user = __target_project__user.row_id' |
|
215 | 216 |
] |
216 | 217 |
}, |
217 | 218 |
{ |
218 | 219 |
table => 'pull_request_message', |
219 | 220 |
primary_key => 'row_id', |
220 | 221 |
join => [ |
221 |
- 'left join user on pull_request_message.user = user.row_id', |
|
222 |
- 'left join pull_request on pull_request_message.pull_request = pull_request.row_id' |
|
222 |
+ 'left join user as __user on pull_request_message.user = __user.row_id', |
|
223 |
+ 'left join pull_request as __pull_request on pull_request_message.pull_request = __pull_request.row_id' |
|
223 | 224 |
] |
224 | 225 |
} |
225 | 226 |
]; |
... | ... |
@@ -92,6 +92,8 @@ sub can_access_private_project { |
92 | 92 |
my ($self, $user_id, $project_id) = @_; |
93 | 93 |
|
94 | 94 |
my $session_user_row_id = $self->cntl->session('user_row_id'); |
95 |
+ return unless defined $session_user_row_id; |
|
96 |
+ |
|
95 | 97 |
my $session_user_id = $self->app->dbi->model('user')->select( |
96 | 98 |
'id', where => {row_id => $session_user_row_id} |
97 | 99 |
)->value; |
... | ... |
@@ -238,7 +238,7 @@ sub fork_project { |
238 | 238 |
# Original project id |
239 | 239 |
my $project = $dbi->model('project')->select( |
240 | 240 |
{__MY__ => ['row_id', 'private']}, |
241 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
241 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
242 | 242 |
)->one; |
243 | 243 |
|
244 | 244 |
# Create project |
... | ... |
@@ -299,19 +299,19 @@ sub member_projects { |
299 | 299 |
# project id |
300 | 300 |
my $project_row_id = $dbi->model('project')->select( |
301 | 301 |
'project.row_id', |
302 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
302 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
303 | 303 |
)->value; |
304 | 304 |
|
305 | 305 |
# Members |
306 | 306 |
my $member_projects = $dbi->model('project')->select( |
307 | 307 |
[ |
308 | 308 |
{__MY__ => ['id']}, |
309 |
- {user => ['id']} |
|
309 |
+ {__user => ['id']} |
|
310 | 310 |
], |
311 | 311 |
where => { |
312 | 312 |
original_project => $project_row_id, |
313 | 313 |
}, |
314 |
- append => 'order by user.id, project.id' |
|
314 |
+ append => 'order by __user.id, project.id' |
|
315 | 315 |
)->all; |
316 | 316 |
|
317 | 317 |
return $member_projects; |
... | ... |
@@ -411,7 +411,7 @@ sub original_project { |
411 | 411 |
my $original_project = $dbi->model('project')->select( |
412 | 412 |
[ |
413 | 413 |
{__MY__ => '*'}, |
414 |
- {user => ['id']} |
|
414 |
+ {__user => ['id']} |
|
415 | 415 |
], |
416 | 416 |
where => { |
417 | 417 |
'project.row_id' => $original_project_row_id |
... | ... |
@@ -427,7 +427,7 @@ sub child_project { |
427 | 427 |
my ($self, $user_id, $project_id, $child_user_id) = @_; |
428 | 428 |
|
429 | 429 |
my $project_row_id = $self->app->dbi->model('project')->select( |
430 |
- 'project.row_id', where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
430 |
+ 'project.row_id', where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
431 | 431 |
)->value; |
432 | 432 |
|
433 | 433 |
my $child_project = $self->app->dbi->model('project')->select( |
... | ... |
@@ -436,7 +436,7 @@ sub child_project { |
436 | 436 |
], |
437 | 437 |
where => { |
438 | 438 |
'project.original_project' => $project_row_id, |
439 |
- 'user.id' => $child_user_id |
|
439 |
+ '__user.id' => $child_user_id |
|
440 | 440 |
} |
441 | 441 |
)->one; |
442 | 442 |
|
... | ... |
@@ -52,7 +52,7 @@ for my $rep (glob "$rep_dir/*") { |
52 | 52 |
$project_id =~ s/\.git$//; |
53 | 53 |
|
54 | 54 |
my $project = $dbi->model('project')->select( |
55 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
55 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
56 | 56 |
)->one; |
57 | 57 |
|
58 | 58 |
# Create project |
... | ... |
@@ -146,7 +146,7 @@ |
146 | 146 |
|
147 | 147 |
my $original_project_row_id = app->dbi->model('project')->select( |
148 | 148 |
'original_project', |
149 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
149 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
150 | 150 |
)->value; |
151 | 151 |
|
152 | 152 |
my $original_project; |
... | ... |
@@ -154,7 +154,7 @@ |
154 | 154 |
$original_project = app->dbi->model('project')->select( |
155 | 155 |
[ |
156 | 156 |
{__MY__ => '*'}, |
157 |
- {user => ['id']} |
|
157 |
+ {__user => ['id']} |
|
158 | 158 |
], |
159 | 159 |
where => {'project.row_id' => $original_project_row_id} |
160 | 160 |
)->one; |
... | ... |
@@ -232,8 +232,8 @@ |
232 | 232 |
my $pull_request = app->dbi->model('pull_request')->select( |
233 | 233 |
{__MY__ => ['row_id', 'open']}, |
234 | 234 |
where => { |
235 |
- 'pull_request__base_project.id' => $project_id, |
|
236 |
- 'pull_request__base_project__user.id' => $user_id, |
|
235 |
+ '__base_project.id' => $project_id, |
|
236 |
+ '__base_project__user.id' => $user_id, |
|
237 | 237 |
base_branch => $default_branch_name, |
238 | 238 |
target_branch => $branch_name |
239 | 239 |
} |
... | ... |
@@ -321,7 +321,7 @@ |
321 | 321 |
<% |
322 | 322 |
my $compare_url; |
323 | 323 |
if ($original_project) { |
324 |
- my $original_user_id = $original_project->{'user.id'}; |
|
324 |
+ my $original_user_id = $original_project->{'__user.id'}; |
|
325 | 325 |
my $original_project_id = $original_project->{id}; |
326 | 326 |
|
327 | 327 |
my $exists_original_branch_name = app->git->exists_branch( |
... | ... |
@@ -16,7 +16,7 @@ |
16 | 16 |
# Base project |
17 | 17 |
my $base_project = app->dbi->model('project')->select( |
18 | 18 |
{__MY__ => '*'}, |
19 |
- where => {'project.id' => $base_project_id, 'user.id' => $base_user_id} |
|
19 |
+ where => {'project.id' => $base_project_id, '__user.id' => $base_user_id} |
|
20 | 20 |
)->one; |
21 | 21 |
|
22 | 22 |
# Get target user, project, branch |
... | ... |
@@ -46,7 +46,7 @@ |
46 | 46 |
|
47 | 47 |
my $project_row_id = app->dbi->model('project')->select( |
48 | 48 |
'project.row_id', |
49 |
- where => {'user.id' => $base_user_id, 'project.id' => $base_project_id} |
|
49 |
+ where => {'__user.id' => $base_user_id, 'project.id' => $base_project_id} |
|
50 | 50 |
)->value; |
51 | 51 |
|
52 | 52 |
my $pull_request = app->dbi->model('pull_request')->select( |
... | ... |
@@ -80,8 +80,8 @@ |
80 | 80 |
<small> |
81 | 81 |
( |
82 | 82 |
forked from |
83 |
- <a href="<%= url_for("/$original_project->{'user.id'}/$original_project->{id}") %>"> |
|
84 |
- <%= "$original_project->{'user.id'}/$original_project->{id}" %> |
|
83 |
+ <a href="<%= url_for("/$original_project->{'__user.id'}/$original_project->{id}") %>"> |
|
84 |
+ <%= "$original_project->{'__user.id'}/$original_project->{id}" %> |
|
85 | 85 |
</a> |
86 | 86 |
) |
87 | 87 |
</small> |
... | ... |
@@ -13,7 +13,7 @@ |
13 | 13 |
# Original project id |
14 | 14 |
my $original_project_id = app->dbi->model('project')->select( |
15 | 15 |
'original_project', |
16 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
16 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
17 | 17 |
)->value; |
18 | 18 |
|
19 | 19 |
# Original project |
... | ... |
@@ -22,7 +22,7 @@ |
22 | 22 |
$original_project = app->dbi->model('project')->select( |
23 | 23 |
[ |
24 | 24 |
{__MY__ => '*'}, |
25 |
- {user => ['id']} |
|
25 |
+ {__user => ['id']} |
|
26 | 26 |
], |
27 | 27 |
where => {'project.row_id' => $original_project_id} |
28 | 28 |
)->one; |
... | ... |
@@ -31,19 +31,19 @@ |
31 | 31 |
$original_project = app->dbi->model('project')->select( |
32 | 32 |
[ |
33 | 33 |
{__MY__ => '*'}, |
34 |
- {user => ['id']} |
|
34 |
+ {__user => ['id']} |
|
35 | 35 |
], |
36 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
36 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
37 | 37 |
)->one; |
38 | 38 |
} |
39 | 39 |
|
40 | 40 |
# Members |
41 |
- my $member_projects = app->manager->member_projects($original_project->{'user.id'}, $original_project->{id}); |
|
41 |
+ my $member_projects = app->manager->member_projects($original_project->{'__user.id'}, $original_project->{id}); |
|
42 | 42 |
unshift @$member_projects, $original_project; |
43 | 43 |
|
44 | 44 |
# Members branches |
45 | 45 |
for my $member_project (@$member_projects) { |
46 |
- my $member_rep_info = $self->app->rep_info($member_project->{'user.id'}, $member_project->{id}); |
|
46 |
+ my $member_rep_info = $self->app->rep_info($member_project->{'__user.id'}, $member_project->{id}); |
|
47 | 47 |
|
48 | 48 |
my $branches = app->git->branches($member_rep_info); |
49 | 49 |
$branches = [map { $_->{name} } @$branches]; |
... | ... |
@@ -103,7 +103,7 @@ |
103 | 103 |
% for my $member_project (@$member_projects) { |
104 | 104 |
<% |
105 | 105 |
my $member_project_id = $member_project->{id}; |
106 |
- my $member_id = $member_project->{'user.id'}; |
|
106 |
+ my $member_id = $member_project->{'__user.id'}; |
|
107 | 107 |
my $member_branches = $member_project->{branches}; |
108 | 108 |
|
109 | 109 |
next if $member_id eq $user_id; |
... | ... |
@@ -11,7 +11,7 @@ |
11 | 11 |
my $pull_request = app->dbi->model('pull_request')->select( |
12 | 12 |
[ |
13 | 13 |
{__MY__ => '*'}, |
14 |
- {'pull_request__open_user' => ['id']} |
|
14 |
+ {'__open_user' => ['id']} |
|
15 | 15 |
], |
16 | 16 |
where => {'pull_request.row_id' => $row_id} |
17 | 17 |
)->one; |
... | ... |
@@ -21,14 +21,14 @@ |
21 | 21 |
my $base_project = app->dbi->model('project')->select( |
22 | 22 |
[ |
23 | 23 |
{__MY__ => '*'}, |
24 |
- {user => ['id']} |
|
24 |
+ {__user => ['id']} |
|
25 | 25 |
], |
26 | 26 |
where => {'project.row_id' => $base_project_row_id} |
27 | 27 |
)->one; |
28 | 28 |
my $base_branch = $pull_request->{base_branch}; |
29 | 29 |
|
30 | 30 |
Carp::croak "pull_request invalid user id" |
31 |
- if $base_user_id ne $base_project->{'user.id'}; |
|
31 |
+ if $base_user_id ne $base_project->{'__user.id'}; |
|
32 | 32 |
Carp::croak "pull_request invalid project id" |
33 | 33 |
if $base_project_id ne $base_project->{id}; |
34 | 34 |
|
... | ... |
@@ -37,12 +37,12 @@ |
37 | 37 |
my $target_project = app->dbi->model('project')->select( |
38 | 38 |
[ |
39 | 39 |
{__MY__ => '*'}, |
40 |
- {user => ['id']} |
|
40 |
+ {__user => ['id']} |
|
41 | 41 |
], |
42 | 42 |
where => {'project.row_id' => $target_project_row_id} |
43 | 43 |
)->one; |
44 | 44 |
my $target_branch = $pull_request->{target_branch}; |
45 |
- my $target_user_id = $target_project->{'user.id'}; |
|
45 |
+ my $target_user_id = $target_project->{'__user.id'}; |
|
46 | 46 |
my $taregt_project_id = $target_project->{id}; |
47 | 47 |
|
48 | 48 |
# Session |
... | ... |
@@ -151,7 +151,7 @@ |
151 | 151 |
my $pull_request_message_first = app->dbi->model('pull_request_message')->select( |
152 | 152 |
[ |
153 | 153 |
{__MY__ => '*'}, |
154 |
- {user => ['id']} |
|
154 |
+ {__user => ['id']} |
|
155 | 155 |
], |
156 | 156 |
where => {pull_request => $row_id, number => 1} |
157 | 157 |
)->one; |
... | ... |
@@ -197,7 +197,7 @@ |
197 | 197 |
<div class="container"> |
198 | 198 |
<div style="font-size:23px;margin-top:20px;margin-bottom:9px;"> |
199 | 199 |
<% |
200 |
- my $pull_title = $pull_request->{branch2}; |
|
200 |
+ my $pull_title = $pull_request->{target_branch}; |
|
201 | 201 |
$pull_title =~ s/_/ /g; |
202 | 202 |
$pull_title = ucfirst $pull_title; |
203 | 203 |
%> |
... | ... |
@@ -216,7 +216,7 @@ |
216 | 216 |
</div> |
217 | 217 |
% } |
218 | 218 |
</div> |
219 |
- % my $open_user_id = $pull_request->{'pull_request__open_user.id'}; |
|
219 |
+ % my $open_user_id = $pull_request->{'__open_user.id'}; |
|
220 | 220 |
<a style="color:#333333;font-weight:bold" href="<%= url_for("/$open_user_id") %>"><%= $open_user_id %></a> |
221 | 221 |
<span style="color:#767676"> |
222 | 222 |
wants to merge <%= $commits_count %> commits |
... | ... |
@@ -258,7 +258,7 @@ |
258 | 258 |
</ul> |
259 | 259 |
<div class="pull-comment"> |
260 | 260 |
<div class="pull-comment-header"> |
261 |
- <b><%= $pull_request_message_first->{'pull_request__open_user.id'} %></b> |
|
261 |
+ <b><%= $pull_request_message_first->{'__open_user.id'} %></b> |
|
262 | 262 |
<span style="color:#767676"> |
263 | 263 |
commented |
264 | 264 |
<%= $api->age_string($pull_request_message_first->{update_time}) %></b> |
... | ... |
@@ -17,7 +17,7 @@ |
17 | 17 |
my $pull_requests = app->dbi->model('pull_request')->select( |
18 | 18 |
[ |
19 | 19 |
{__MY__ => '*'}, |
20 |
- {user => ['id']} |
|
20 |
+ {__open_user => ['id']} |
|
21 | 21 |
], |
22 | 22 |
where => {open => $open} |
23 | 23 |
)->all; |
... | ... |
@@ -54,8 +54,8 @@ |
54 | 54 |
<ul> |
55 | 55 |
% for my $pull_request (@$pull_requests) { |
56 | 56 |
<% |
57 |
- my $branch2 = $pull_request->{branch2}; |
|
58 |
- my $commit = app->git->get_commit(app->rep_info($user_id, $project_id), $branch2); |
|
57 |
+ my $target_branch = $pull_request->{target_branch}; |
|
58 |
+ my $commit = app->git->get_commit(app->rep_info($user_id, $project_id), $target_branch); |
|
59 | 59 |
my $open_time = $pull_request->{open_time}; |
60 | 60 |
my $open_time_age = Time::Moment->now->epoch - $open_time; |
61 | 61 |
my $open_time_age_string = $self->app->git->_age_string($open_time_age); |
... | ... |
@@ -69,7 +69,7 @@ |
69 | 69 |
<div class="pulls-description"> |
70 | 70 |
#<%= $pull_request->{row_id} %> <%= $pull_request->{open} ? 'opened' : 'closed' %> |
71 | 71 |
<%= $open_time_age_string %> |
72 |
- by <%= $pull_request->{'user.id'} %> |
|
72 |
+ by <%= $pull_request->{'__open_user.id'} %> |
|
73 | 73 |
</div> |
74 | 74 |
</li> |
75 | 75 |
% } |
... | ... |
@@ -16,7 +16,7 @@ |
16 | 16 |
|
17 | 17 |
my $project_row_id = app->dbi->model('project')->select( |
18 | 18 |
'project.row_id', |
19 |
- where => {'user.id' => $user_id, 'project.id' => $project_id} |
|
19 |
+ where => {'__user.id' => $user_id, 'project.id' => $project_id} |
|
20 | 20 |
)->value; |
21 | 21 |
|
22 | 22 |
# Rename project |
... | ... |
@@ -48,7 +48,7 @@ |
48 | 48 |
} |
49 | 49 |
else { |
50 | 50 |
my $row = app->dbi->model('collaboration')->select( |
51 |
- where => {project => $project_row_id, 'user.id' => $collaborator_id} |
|
51 |
+ where => {project => $project_row_id, '__user.id' => $collaborator_id} |
|
52 | 52 |
)->one; |
53 | 53 |
if ($row) { |
54 | 54 |
$validation->add_failed(collaborator => "Collaborator $collaborator_id already exists"); |
... | ... |
@@ -110,7 +110,7 @@ |
110 | 110 |
} |
111 | 111 |
|
112 | 112 |
my $collaborators = app->dbi->model('collaboration')->select( |
113 |
- {user => ['id']}, |
|
113 |
+ {__user => ['id']}, |
|
114 | 114 |
where => {project => $project_row_id}, |
115 | 115 |
append => 'order by collaboration.user' |
116 | 116 |
)->all; |
... | ... |
@@ -139,9 +139,9 @@ |
139 | 139 |
% for my $collaborator (@$collaborators) { |
140 | 140 |
<tr> |
141 | 141 |
<td> |
142 |
- <a href="<%= url_for("/$collaborator->{'user.id'}") %>"><%= $collaborator->{'user.id'} %></a> |
|
142 |
+ <a href="<%= url_for("/$collaborator->{'__user.id'}") %>"><%= $collaborator->{'__user.id'} %></a> |
|
143 | 143 |
<form action="<%= url_for->query(op => 'remove') %>" method="post" style="display:inline-block"> |
144 |
- <%= hidden_field 'collaborator' => $collaborator->{'user.id'} %> |
|
144 |
+ <%= hidden_field 'collaborator' => $collaborator->{'__user.id'} %> |
|
145 | 145 |
(<a href="javascript:void(0)" onclick="$(this).closest('form').submit();" style="color:red">remove</a>) |
146 | 146 |
</form> |
147 | 147 |
</td> |
... | ... |
@@ -1 +1 @@ |
1 |
-Subproject commit 79b1363f003d2e074ab59e82e39a34bfdb7fbeb1 |
|
1 |
+Subproject commit aae2cd54f5891d0a0ed5e2f845fa47199442d7a5 |